comparison filestates.h @ 336:4229b6a8e9c6

Merge

         LastState = Ignored
     };
 
     void parseStates(QString text);
 
-    void clearBuckets();
+    bool isInState(QString file, State s) const;
+    QStringList filesInState(State s) const;
+    State stateOf(QString file) const;
 
-    QStringList getFilesInState(State) const;
-
+/*!!! -- to remove: */
     QStringList modified() const { return m_modified; }
     QStringList added() const { return m_added; }
     QStringList unknown() const { return m_unknown; }
     QStringList removed() const { return m_removed; }
     QStringList missing() const { return m_missing; }
     QStringList inConflict() const { return m_inConflict; }
     QStringList clean() const { return m_clean; }
     QStringList ignored() const { return m_ignored; }
 
-    State getStateOfFile(QString file) const;
+    enum Activity {
+
+        // These are in the order in which they want to be listed in
+        // the context menu
+
+        Diff,
+        Annotate,
+
+        Commit,
+        Revert,
+
+        Add,
+        Remove,
+
+        RedoMerge,
+        MarkResolved,
+
+        Ignore,
+        UnIgnore,
+
+        FirstActivity = Diff,
+        LastActivity = UnIgnore
+    };
+
+    typedef QList<Activity> Activities;
+
+    static bool supportsActivity(State s, Activity a);
+    static Activities activitiesSupportedBy(State s);
+    static int activityGroup(Activity a);
+    
+    bool supportsActivity(QString file, Activity a) const;
+    QStringList filesSupportingActivity(Activity) const;
+    Activities activitiesSupportedBy(QString file) const;
 
 private:
     QStringList m_modified;
     QStringList m_added;
     QStringList m_unknown;

     QStringList m_inConflict;
     QStringList m_clean;
     QStringList m_ignored;
     QMap<QString, State> m_stateMap;
 
+    void clearBuckets();
+
     State charToState(QChar, bool * = 0);
     QStringList *stateToBucket(State);
 };
 
 #endif // FILESTATES_H