Mercurial > hg > easyhg
comparison 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 |
comparison
equal
deleted
inserted
replaced
322:913d213dd427 | 329:ef977e7482cd |
---|---|
44 void setFileStates(FileStates sp); | 44 void setFileStates(FileStates sp); |
45 | 45 |
46 bool haveChangesToCommit() const; | 46 bool haveChangesToCommit() const; |
47 bool haveSelection() const; | 47 bool haveSelection() const; |
48 | 48 |
49 QStringList getAllSelectedFiles() const; | |
50 | |
51 QStringList getSelectedCommittableFiles() const; | |
52 QStringList getAllCommittableFiles() const; | 49 QStringList getAllCommittableFiles() const; |
53 | |
54 QStringList getSelectedRevertableFiles() const; | |
55 QStringList getAllRevertableFiles() const; | 50 QStringList getAllRevertableFiles() const; |
51 QStringList getAllUnresolvedFiles() const; | |
56 | 52 |
57 QStringList getSelectedAddableFiles() const; | 53 QStringList getSelectedAddableFiles() const; |
58 QStringList getAllAddableFiles() const; | 54 QStringList getSelectedRemovableFiles() const; |
59 | 55 |
60 QStringList getSelectedRemovableFiles() const; | |
61 QStringList getAllRemovableFiles() const; | |
62 | |
63 QStringList getSelectedUnresolvedFiles() const; | |
64 QStringList getAllUnresolvedFiles() const; | |
65 | |
66 signals: | 56 signals: |
67 void selectionChanged(); | 57 void selectionChanged(); |
68 void showAllChanged(bool); | 58 void showAllChanged(bool); |
59 | |
60 void annotateFiles(QStringList); | |
61 void diffFiles(QStringList); | |
62 void commitFiles(QStringList); | |
63 void revertFiles(QStringList); | |
64 void addFiles(QStringList); | |
65 void removeFiles(QStringList); | |
66 void redoFileMerges(QStringList); | |
67 void markFilesResolved(QStringList); | |
68 void ignoreFiles(QStringList); | |
69 void unIgnoreFiles(QStringList); | |
69 | 70 |
70 public slots: | 71 public slots: |
71 void clearSelections(); | 72 void clearSelections(); |
72 void updateWidgets(); | 73 void updateWidgets(); |
73 | 74 |
74 private slots: | 75 private slots: |
76 void menuActionActivated(); | |
75 void itemSelectionChanged(); | 77 void itemSelectionChanged(); |
76 | 78 |
77 private: | 79 private: |
78 QString m_localPath; | 80 QString m_localPath; |
79 QLabel *m_noModificationsLabel; | 81 QLabel *m_noModificationsLabel; |
82 | 84 |
83 FileStates m_fileStates; | 85 FileStates m_fileStates; |
84 QMap<FileStates::State, QString> m_simpleLabels; | 86 QMap<FileStates::State, QString> m_simpleLabels; |
85 QMap<FileStates::State, QString> m_descriptions; | 87 QMap<FileStates::State, QString> m_descriptions; |
86 QMap<FileStates::State, QListWidget *> m_stateListMap; | 88 QMap<FileStates::State, QListWidget *> m_stateListMap; |
89 QMap<FileStates::Activity, QString> m_actionLabels; | |
87 QString m_highlightExplanation; | 90 QString m_highlightExplanation; |
88 | 91 |
89 QFileInfo *m_dateReference; | 92 QFileInfo *m_dateReference; |
90 QStringList m_selectedFiles; | 93 QStringList m_selectedFiles; |
91 | 94 |
97 void layoutBoxesGridly(int count); | 100 void layoutBoxesGridly(int count); |
98 void layoutBoxesLinearly(); | 101 void layoutBoxesLinearly(); |
99 void setNoModificationsLabelText(); | 102 void setNoModificationsLabelText(); |
100 QString labelFor(FileStates::State, bool addHighlightExplanation = false); | 103 QString labelFor(FileStates::State, bool addHighlightExplanation = false); |
101 void setLabelFor(QWidget *w, FileStates::State, bool addHighlightExplanation); | 104 void setLabelFor(QWidget *w, FileStates::State, bool addHighlightExplanation); |
105 | |
106 QStringList getSelectedFilesInState(FileStates::State s) const; | |
107 QStringList getSelectedFilesSupportingActivity(FileStates::Activity) const; | |
102 }; | 108 }; |
103 | 109 |
104 #endif | 110 #endif |