Mercurial > hg > easyhg
comparison hgtabwidget.h @ 336:4229b6a8e9c6
Merge
author | Chris Cannam |
---|---|
date | Mon, 14 Mar 2011 10:00:29 +0000 |
parents | 6e1fdda1dff2 |
children | 4cd753e083cc |
comparison
equal
deleted
inserted
replaced
335:aa852b477e4d | 336:4229b6a8e9c6 |
---|---|
60 bool canAdd() const; | 60 bool canAdd() const; |
61 bool canRemove() const; | 61 bool canRemove() const; |
62 bool canResolve() const; | 62 bool canResolve() const; |
63 bool haveChangesToCommit() const; | 63 bool haveChangesToCommit() const; |
64 | 64 |
65 QStringList getAllSelectedFiles() const; | |
66 | |
67 QStringList getSelectedCommittableFiles() const; | |
68 QStringList getAllCommittableFiles() const; | 65 QStringList getAllCommittableFiles() const; |
69 | |
70 QStringList getSelectedRevertableFiles() const; | |
71 QStringList getAllRevertableFiles() const; | 66 QStringList getAllRevertableFiles() const; |
67 QStringList getAllUnresolvedFiles() const; | |
72 | 68 |
73 QStringList getSelectedAddableFiles() const; | 69 QStringList getSelectedAddableFiles() const; |
74 QStringList getAllAddableFiles() const; | |
75 | |
76 QStringList getSelectedRemovableFiles() const; | 70 QStringList getSelectedRemovableFiles() const; |
77 QStringList getAllRemovableFiles() const; | |
78 | |
79 QStringList getSelectedUnresolvedFiles() const; | |
80 QStringList getAllUnresolvedFiles() const; | |
81 | 71 |
82 signals: | 72 signals: |
83 void selectionChanged(); | 73 void selectionChanged(); |
84 void showAllChanged(bool); | 74 void showAllChanged(bool); |
85 | 75 |
96 void diffToCurrent(QString id); | 86 void diffToCurrent(QString id); |
97 void mergeFrom(QString id); | 87 void mergeFrom(QString id); |
98 void newBranch(QString id); | 88 void newBranch(QString id); |
99 void tag(QString id); | 89 void tag(QString id); |
100 | 90 |
91 void annotateFiles(QStringList); | |
92 void diffFiles(QStringList); | |
93 void commitFiles(QStringList); | |
94 void revertFiles(QStringList); | |
95 void addFiles(QStringList); | |
96 void removeFiles(QStringList); | |
97 void redoFileMerges(QStringList); | |
98 void markFilesResolved(QStringList); | |
99 void ignoreFiles(QStringList); | |
100 void unIgnoreFiles(QStringList); | |
101 | |
101 public slots: | 102 public slots: |
102 void clearSelections(); | 103 void clearSelections(); |
103 void showWorkTab(); | 104 void showWorkTab(); |
104 void showHistoryTab(); | 105 void showHistoryTab(); |
105 | 106 |