Mercurial > hg > easyhg
comparison filestates.cpp @ 326:6e1fdda1dff2 filelist_right_button_menu
Implement right-button menu functions for file lists; convert the toolbar-button functions (apart from Add and Remove) to modal only on working copy state rather than selection state
author | Chris Cannam |
---|---|
date | Fri, 11 Mar 2011 15:33:16 +0000 |
parents | 5fa5c908ca00 |
children | ea62eb083ed4 |
comparison
equal
deleted
inserted
replaced
325:5fa5c908ca00 | 326:6e1fdda1dff2 |
---|---|
154 case Removed: | 154 case Removed: |
155 a << Commit << Revert << Add; | 155 a << Commit << Revert << Add; |
156 break; | 156 break; |
157 | 157 |
158 case InConflict: | 158 case InConflict: |
159 a << Annotate << Diff << RedoMerge << MarkResolved; | 159 a << Annotate << Diff << RedoMerge << Revert << MarkResolved; |
160 break; | 160 break; |
161 | 161 |
162 case Missing: | 162 case Missing: |
163 a << Revert << Remove; | 163 a << Revert << Remove; |
164 break; | 164 break; |
191 case Commit: case Revert: return 1; | 191 case Commit: case Revert: return 1; |
192 case Add: case Remove: return 2; | 192 case Add: case Remove: return 2; |
193 case RedoMerge: case MarkResolved: return 3; | 193 case RedoMerge: case MarkResolved: return 3; |
194 case Ignore: case UnIgnore: return 4; | 194 case Ignore: case UnIgnore: return 4; |
195 } | 195 } |
196 return 0; | |
196 } | 197 } |
197 | 198 |
198 bool FileStates::supportsActivity(QString file, Activity a) const | 199 bool FileStates::supportsActivity(QString file, Activity a) const |
199 { | 200 { |
200 return supportsActivity(stateOf(file), a); | 201 return supportsActivity(stateOf(file), a); |
203 QStringList FileStates::filesSupportingActivity(Activity a) const | 204 QStringList FileStates::filesSupportingActivity(Activity a) const |
204 { | 205 { |
205 QStringList f; | 206 QStringList f; |
206 for (int i = int(FirstState); i <= int(LastState); ++i) { | 207 for (int i = int(FirstState); i <= int(LastState); ++i) { |
207 State s = (State)i; | 208 State s = (State)i; |
208 f << filesInState(s); | 209 if (supportsActivity(s, a)) { |
210 f << filesInState(s); | |
211 } | |
209 } | 212 } |
210 return f; | 213 return f; |
211 } | 214 } |
212 | 215 |
213 FileStates::Activities FileStates::activitiesSupportedBy(QString file) const | 216 FileStates::Activities FileStates::activitiesSupportedBy(QString file) const |