Mercurial > hg > easyhg
diff filestatuswidget.h @ 329:ef977e7482cd
Merge from branch "filelist_right_button_menu"
author | Chris Cannam |
---|---|
date | Fri, 11 Mar 2011 18:08:35 +0000 |
parents | 6e1fdda1dff2 |
children | acfe9390d5c6 |
line wrap: on
line diff
--- a/filestatuswidget.h Wed Mar 02 16:29:17 2011 +0000 +++ b/filestatuswidget.h Fri Mar 11 18:08:35 2011 +0000 @@ -46,32 +46,34 @@ bool haveChangesToCommit() const; bool haveSelection() 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 getSelectedRemovableFiles() const; - QStringList getAllRemovableFiles() const; - - QStringList getSelectedUnresolvedFiles() const; - QStringList getAllUnresolvedFiles() const; - signals: void selectionChanged(); void showAllChanged(bool); + 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 updateWidgets(); private slots: + void menuActionActivated(); void itemSelectionChanged(); private: @@ -84,6 +86,7 @@ QMap<FileStates::State, QString> m_simpleLabels; QMap<FileStates::State, QString> m_descriptions; QMap<FileStates::State, QListWidget *> m_stateListMap; + QMap<FileStates::Activity, QString> m_actionLabels; QString m_highlightExplanation; QFileInfo *m_dateReference; @@ -99,6 +102,9 @@ void setNoModificationsLabelText(); QString labelFor(FileStates::State, bool addHighlightExplanation = false); void setLabelFor(QWidget *w, FileStates::State, bool addHighlightExplanation); + + QStringList getSelectedFilesInState(FileStates::State s) const; + QStringList getSelectedFilesSupportingActivity(FileStates::Activity) const; }; #endif