Mercurial > hg > easyhg
diff filestatuswidget.h @ 336:4229b6a8e9c6
Merge
author | Chris Cannam |
---|---|
date | Mon, 14 Mar 2011 10:00:29 +0000 |
parents | acfe9390d5c6 |
children | 4cd753e083cc |
line wrap: on
line diff
--- a/filestatuswidget.h Wed Mar 02 15:58:34 2011 +0000 +++ b/filestatuswidget.h Mon Mar 14 10:00:29 2011 +0000 @@ -25,6 +25,7 @@ class QLabel; class QListWidget; +class QListWidgetItem; class QPushButton; class QFileInfo; class QCheckBox; @@ -46,33 +47,36 @@ 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(); + void itemDoubleClicked(QListWidgetItem *); private: QString m_localPath; @@ -84,6 +88,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 +104,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