Mercurial > hg > easyhg
diff hgtabwidget.h @ 336:4229b6a8e9c6
Merge
author | Chris Cannam |
---|---|
date | Mon, 14 Mar 2011 10:00:29 +0000 |
parents | 6e1fdda1dff2 |
children | 4cd753e083cc |
line wrap: on
line diff
--- a/hgtabwidget.h Wed Mar 02 15:58:34 2011 +0000 +++ b/hgtabwidget.h Mon Mar 14 10:00:29 2011 +0000 @@ -62,22 +62,12 @@ bool canResolve() const; bool haveChangesToCommit() const; - QStringList getAllSelectedFiles() const; - - QStringList getSelectedCommittableFiles() const; QStringList getAllCommittableFiles() const; - - QStringList getSelectedRevertableFiles() const; QStringList getAllRevertableFiles() const; + QStringList getAllUnresolvedFiles() const; QStringList getSelectedAddableFiles() const; - QStringList getAllAddableFiles() const; - QStringList getSelectedRemovableFiles() const; - QStringList getAllRemovableFiles() const; - - QStringList getSelectedUnresolvedFiles() const; - QStringList getAllUnresolvedFiles() const; signals: void selectionChanged(); @@ -98,6 +88,17 @@ void newBranch(QString id); void tag(QString id); + void annotateFiles(QStringList); + void diffFiles(QStringList); + void commitFiles(QStringList); + void revertFiles(QStringList); + void addFiles(QStringList); + void removeFiles(QStringList); + void redoFileMerges(QStringList); + void markFilesResolved(QStringList); + void ignoreFiles(QStringList); + void unIgnoreFiles(QStringList); + public slots: void clearSelections(); void showWorkTab();