diff src/filestatuswidget.cpp @ 489:86cdaa346e59

Merge

--- a/src/filestatuswidget.cpp	Wed Aug 17 22:13:14 2011 +0100
+++ b/src/filestatuswidget.cpp	Wed Aug 17 22:13:51 2011 +0100
@@ -79,7 +79,7 @@
     m_descriptions[FileStates::Missing] = tr("These files are recorded in the version control, but absent from your working folder.<br>"
                                              "If you intended to delete them, select them and use Remove to tell the version control system about it.<br>"
                                              "If you deleted them by accident, select them and use Revert to restore their previous contents.");
-    m_descriptions[FileStates::InConflict] = tr("These files are unresolved following an incomplete merge.<br>Select a file and use Merge to try to resolve the merge again.");
+    m_descriptions[FileStates::InConflict] = tr("These files are unresolved following an incomplete merge.<br>Use Merge to try to resolve the merge again.");
     m_descriptions[FileStates::Unknown] = tr("These files are in your working folder but are not under version control.<br>"
 //                                             "Select a file and use Add to place it under version control or Ignore to remove it from this list.");
                                              "Select a file and use Add to place it under version control.");
@@ -157,15 +157,27 @@
     m_showAllFiles = new QCheckBox(tr("Show all files"), this);
     m_showAllFiles->setEnabled(false);
     layout->addWidget(m_showAllFiles, ++row, 0, Qt::AlignLeft);
+
+    QSettings settings;
+    m_showAllFiles->setChecked(settings.value("showall", false).toBool());
+
     connect(m_showAllFiles, SIGNAL(toggled(bool)),
-            this, SIGNAL(showAllChanged(bool)));
+            this, SIGNAL(showAllChanged()));
 }
 
 FileStatusWidget::~FileStatusWidget()
 {
+    QSettings settings;
+    settings.setValue("showall", m_showAllFiles->isChecked());
+
     delete m_dateReference;
 }
 
+bool FileStatusWidget::shouldShowAll() const
+{
+    return m_showAllFiles->isChecked();
+}
+
 QString FileStatusWidget::labelFor(FileStates::State s, bool addHighlightExplanation)
 {
     QSettings settings;