diff mainwindow.h @ 312:f98c8ece3035

Merge from branch "new-branches-with-status-outside-tabs"

--- a/mainwindow.h	Mon Feb 28 17:35:55 2011 +0000
+++ b/mainwindow.h	Tue Mar 01 14:22:53 2011 +0000
@@ -34,6 +34,8 @@
 class QTimer;
 QT_END_NAMESPACE
 
+class WorkStatusWidget;
+
 class MainWindow : public QMainWindow
 {
     Q_OBJECT
@@ -88,6 +90,8 @@
     void hgAnnotate();
     void hgResolveList();
     void hgTag(QString);
+    void hgNewBranch();
+    void hgNoBranch();
     void hgServe();
     void hgIgnore();
 
@@ -151,6 +155,9 @@
     void suspendFileSystemWatcher();
     void restoreFileSystemWatcher();
 
+    void updateWorkFolderAndRepoNames();
+
+    WorkStatusWidget *m_workStatus;
     HgTabWidget *m_hgTabs;
 
     QString m_remoteRepoPath;