diff hgtabwidget.h @ 153:70fe12873106

* Show both parents of uncommitted merge; fixes to right-button menus
author Chris Cannam
date Thu, 02 Dec 2010 17:55:21 +0000
parents 2b997861174b
children 6bcb4a4d6521
line wrap: on
line diff
--- a/hgtabwidget.h	Thu Dec 02 11:51:15 2010 +0000
+++ b/hgtabwidget.h	Thu Dec 02 17:55:21 2010 +0000
@@ -48,7 +48,7 @@
     void setWorkFolderAndRepoNames(QString workFolderPath, QString remoteRepoPath);
     void setState(QString state);
 
-    void setCurrent(QStringList ids);
+    void setCurrent(QStringList ids, QString branch);
 
     FileStates getFileStates() { return m_fileStates; }
 
@@ -87,6 +87,8 @@
 
 public slots:
     void clearSelections();
+    void showWorkTab();
+    void showHistoryTab();
 
 private:
     FileStatusWidget *m_fileStatusWidget;