diff src/filestatuswidget.cpp @ 413:2a19d5706673 ignore

Reconnect the ignore-related right-button menu entries (still not implemented yet though)

--- a/src/filestatuswidget.cpp	Mon Jun 13 16:56:01 2011 +0100
+++ b/src/filestatuswidget.cpp	Mon Jun 13 17:28:49 2011 +0100
@@ -67,8 +67,8 @@
     m_actionLabels[FileStates::Remove] = tr("Remove from version control");
     m_actionLabels[FileStates::RedoMerge] = tr("Redo merge");
     m_actionLabels[FileStates::MarkResolved] = tr("Mark conflict as resolved");
-    m_actionLabels[FileStates::Ignore] = tr("Ignore");
-    m_actionLabels[FileStates::UnIgnore] = tr("Stop ignoring");
+    m_actionLabels[FileStates::Ignore] = tr("Ignore...");
+    m_actionLabels[FileStates::UnIgnore] = tr("Stop ignoring...");
 
     m_descriptions[FileStates::Clean] = tr("You have not changed these files.");
     m_descriptions[FileStates::Modified] = tr("You have changed these files since you last committed them.");
@@ -125,11 +125,6 @@
         FileStates::Activities activities = m_fileStates.activitiesSupportedBy(s);
         int prevGroup = -1;
         foreach (FileStates::Activity a, activities) {
-            // Skip activities which are not yet implemented
-            if (a == FileStates::Ignore ||
-                a == FileStates::UnIgnore) {
-                continue;
-            }
             int group = FileStates::activityGroup(a);
             if (group != prevGroup && prevGroup != -1) {
                 QAction *sep = new QAction("", w);