Mercurial > hg > easyhg
diff 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 |
line wrap: on
line diff
--- a/filestates.cpp Thu Mar 10 21:04:58 2011 +0000 +++ b/filestates.cpp Fri Mar 11 15:33:16 2011 +0000 @@ -156,7 +156,7 @@ break; case InConflict: - a << Annotate << Diff << RedoMerge << MarkResolved; + a << Annotate << Diff << RedoMerge << Revert << MarkResolved; break; case Missing: @@ -193,6 +193,7 @@ case RedoMerge: case MarkResolved: return 3; case Ignore: case UnIgnore: return 4; } + return 0; } bool FileStates::supportsActivity(QString file, Activity a) const @@ -205,7 +206,9 @@ QStringList f; for (int i = int(FirstState); i <= int(LastState); ++i) { State s = (State)i; - f << filesInState(s); + if (supportsActivity(s, a)) { + f << filesInState(s); + } } return f; }