comparison src/filestatuswidget.cpp @ 548:dca5bd5b2a06

Merge from branch "fswatcher"

 bool FileStatusWidget::shouldShowAll() const
 {
     return m_showAllFiles->isChecked();
 }
 
+bool FileStatusWidget::shouldShow(FileStates::State s) const
+{
+    if (shouldShowAll()) return true;
+    else return (s != FileStates::Clean &&
+                 s != FileStates::Ignored);
+}
+
 QString FileStatusWidget::labelFor(FileStates::State s, bool addHighlightExplanation)
 {
     QSettings settings;
     settings.beginGroup("Presentation");
     if (settings.value("showhelpfultext", true).toBool()) {

         } else {
             return QString("<qt><b>%1</b><br>%2</qt>")
                 .arg(m_simpleLabels[s])
                 .arg(m_descriptions[s]);
         }
-    } else {
-        return QString("<qt><b>%1</b></qt>")
-            .arg(m_simpleLabels[s]);
-    }
-    settings.endGroup();
+    }
+    return QString("<qt><b>%1</b></qt>")
+        .arg(m_simpleLabels[s]);
 }
 
 void FileStatusWidget::setNoModificationsLabelText()
 {
     QSettings settings;

 
     foreach (FileStates::State s, m_stateListMap.keys()) {
 
         QListWidget *w = m_stateListMap[s];
         w->clear();
+
+        if (!shouldShow(s)) {
+            w->parentWidget()->hide();
+            continue;
+        }
+
         QStringList files = m_fileStates.filesInState(s);
 
         QStringList highPriority, lowPriority;
 
         foreach (QString file, files) {