comparison mainwindow.h @ 307:5b4aa1c24407 new-branches-with-status-outside-tabs

Merge branch status_outside_tabs into branch new-branches, and make a new branch

 class QAction;
 class QMenu;
 class QTimer;
 QT_END_NAMESPACE
 
+class WorkStatusWidget;
+
 class MainWindow : public QMainWindow
 {
     Q_OBJECT
 
 public:
     MainWindow(QString myDirPath);
-    HgTabWidget *hgTabs;
-    void writeSettings();
-
-    //Paths to remote repo & workfolder
-    //Local repo is directory "./hg/" under work folder
-    QString remoteRepoPath;
-    QString workFolderPath;
-    QString currentBranch;
-    Changesets currentHeads;
-    Changesets currentParents;
-    int commitsSincePush;
-    bool stateUnknown;
-    bool hgIsOK;
-    bool needNewLog;
 
 protected:
     void closeEvent(QCloseEvent *event);
 
 public slots:

     void hgStat();
     void hgRemove();
     void hgAdd();
     void hgCommit();
     void hgShowSummary();
+    void hgShowSummaryFor(Changeset *);
     void hgFolderDiff();
     void hgDiffToCurrent(QString);
     void hgDiffToParent(QString, QString);
     void hgUpdate();
     void hgRevert();

     void createStatusBar();
     void readSettings();
     void splitChangeSets(QStringList *list, QString hgLogOutput);
     void reportNewRemoteHeads(QString);
     void presentLongStdoutToUser(QString stdo);
+    void writeSettings();
 
     QStringList listAllUpIpV4Addresses();
     QString filterTag(QString tag);
 
     QString getUserInfo() const;

 
     void showIncoming(QString);
     void showPullResult(QString);
     void showPushResult(QString);
     int extractChangeCount(QString);
+    QString format1(QString);
     QString format3(QString, QString, QString);
 
     void clearState();
 
     void updateFileSystemWatcher();
     void suspendFileSystemWatcher();
     void restoreFileSystemWatcher();
 
-    bool firstStart;
-
-    bool showAllFiles;
+    void updateWorkFolderAndRepoNames();
+
+    WorkStatusWidget *m_workStatus;
+    HgTabWidget *m_hgTabs;
+
+    QString m_remoteRepoPath;
+    QString m_workFolderPath;
+    QString m_currentBranch;
+    Changesets m_currentHeads;
+    Changesets m_currentParents;
+    int m_commitsSincePush;
+    bool m_stateUnknown;
+    bool m_hgIsOK;
+    bool m_needNewLog;
+
+    bool m_firstStart;
+
+    bool m_showAllFiles;
 
     //Actions enabled flags
-    bool remoteRepoActionsEnabled;
-    bool localRepoActionsEnabled;
+    bool m_remoteRepoActionsEnabled;
+    bool m_localRepoActionsEnabled;
 
     QString m_myDirPath;
 
-    //File menu actions
-    QAction *openAct;
-    QAction *changeRemoteRepoAct;
-    QAction *settingsAct;
-    QAction *exitAct;
-
-    //Repo actions
-    QAction *hgIncomingAct;
-    QAction *hgPushAct;
-    QAction *hgPullAct;
-    QAction *hgRefreshAct;
-    QAction *hgFolderDiffAct;
-    QAction *hgChgSetDiffAct;
-    QAction *hgRevertAct;
-    QAction *hgAddAct;
-    QAction *hgRemoveAct;
-    QAction *hgUpdateAct;
-    QAction *hgCommitAct;
-    QAction *hgMergeAct;
-    QAction *hgUpdateToRevAct;
-    QAction *hgAnnotateAct;
-    QAction *hgIgnoreAct;
-    QAction *hgServeAct;
-
-    //Menus
-    QMenu   *fileMenu;
-    QMenu   *advancedMenu;
-    QMenu   *helpMenu;
-
-    //Help menu actions
-    QAction *aboutAct;
-
-    QToolBar *fileToolBar;
-    QToolBar *repoToolBar;
-    QToolBar *workFolderToolBar;
-
-    HgRunner *runner;
-
-    bool shouldHgStat;
+    // File menu actions
+    QAction *m_openAct;
+    QAction *m_changeRemoteRepoAct;
+    QAction *m_settingsAct;
+    QAction *m_exitAct;
+
+    // Repo actions
+    QAction *m_hgIncomingAct;
+    QAction *m_hgPushAct;
+    QAction *m_hgPullAct;
+    QAction *m_hgRefreshAct;
+    QAction *m_hgFolderDiffAct;
+    QAction *m_hgChgSetDiffAct;
+    QAction *m_hgRevertAct;
+    QAction *m_hgAddAct;
+    QAction *m_hgRemoveAct;
+    QAction *m_hgUpdateAct;
+    QAction *m_hgCommitAct;
+    QAction *m_hgMergeAct;
+    QAction *m_hgUpdateToRevAct;
+    QAction *m_hgAnnotateAct;
+    QAction *m_hgIgnoreAct;
+    QAction *m_hgServeAct;
+
+    // Menus
+    QMenu *m_fileMenu;
+    QMenu *m_advancedMenu;
+    QMenu *m_helpMenu;
+
+    // Help menu actions
+    QAction *m_aboutAct;
+
+    QToolBar *m_fileToolBar;
+    QToolBar *m_repoToolBar;
+    QToolBar *m_workFolderToolBar;
+
+    HgRunner *m_runner;
+
+    bool m_shouldHgStat;
 
     QString getDiffBinaryName();
     QString getMergeBinaryName();
     QString getEditorBinaryName();
 
-    QFileSystemWatcher *fsWatcher;
+    QFileSystemWatcher *m_fsWatcher;
     QTimer *m_fsWatcherGeneralTimer;
     QTimer *m_fsWatcherRestoreTimer;
     bool m_fsWatcherSuspended;
 
-    QString lastStatOutput;
-    QStringList lastRevertedFiles;
-
-    bool justMerged;
-    QString mergeTargetRevision;
-    QString mergeCommitComment;
+    QString m_lastStatOutput;
+    QStringList m_lastRevertedFiles;
+
+    bool m_justMerged;
+    QString m_mergeTargetRevision;
+    QString m_mergeCommitComment;
 };
 
 #endif