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

     case Removed:
         a << Commit << Revert << Add;
         break;
 
     case InConflict:
-        a << Annotate << Diff << RedoMerge << MarkResolved;
+        a << Annotate << Diff << RedoMerge << Revert << MarkResolved;
         break;
 
     case Missing:
         a << Revert << Remove;
         break;

     case Commit: case Revert: return 1;
     case Add: case Remove: return 2;
     case RedoMerge: case MarkResolved: return 3;
     case Ignore: case UnIgnore: return 4;
     }
+    return 0;
 }
 
 bool FileStates::supportsActivity(QString file, Activity a) const
 {
     return supportsActivity(stateOf(file), a);

 QStringList FileStates::filesSupportingActivity(Activity a) const
 {
     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;
 }
 
 FileStates::Activities FileStates::activitiesSupportedBy(QString file) const