Mercurial > hg > tony

changeset 188:b970b39e1fab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Do not put layer files in Recent Files list (related to #881)
author Chris Cannam
date Tue, 04 Mar 2014 15:28:59 +0000
parents dedd09297a3e
children e963bdbc0707
files .hgsubstate src/Analyser.cpp src/MainWindow.cpp
diffstat 3 files changed, 7 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Tue Mar 04 14:10:37 2014 +0000
+++ b/.hgsubstate	Tue Mar 04 15:28:59 2014 +0000
@@ -2,4 +2,4 @@
 27d4e7152c954bf3c4387319db088fb3cd02436b sv-dependency-builds
 350a410e05551b78f5df02966c17ed35e2937067 svapp
 d81c16e47e22b1c1a6600d3e9a8e0559fad8b539 svcore
-4eb741d63161b077d2b6c213c782c1f16299e201 svgui
+596414d20ef0526efd32027ed5ea953fe206fe8d svgui
--- a/src/Analyser.cpp	Tue Mar 04 14:10:37 2014 +0000
+++ b/src/Analyser.cpp	Tue Mar 04 15:28:59 2014 +0000
@@ -41,7 +41,9 @@
     m_document(0),
     m_fileModel(0),
     m_paneStack(0),
-    m_pane(0)
+    m_pane(0),
+    m_currentCandidate(-1),
+    m_candidatesVisible(false)
 {
     QSettings settings;
     settings.beginGroup("LayerDefaults");
--- a/src/MainWindow.cpp	Tue Mar 04 14:10:37 2014 +0000
+++ b/src/MainWindow.cpp	Tue Mar 04 15:28:59 2014 +0000
@@ -1282,9 +1282,9 @@
     QAction *action = qobject_cast<QAction *>(obj);
     
     if (!action) {
-    cerr << "WARNING: MainWindow::openRecentFile: sender is not an action"
-          << endl;
-    return;
+        cerr << "WARNING: MainWindow::openRecentFile: sender is not an action"
+             << endl;
+        return;
     }
 
     QString path = action->text();
@@ -1610,8 +1610,6 @@
 
                 //!!! swap all data in to existing layer instead of this
 
-                m_recentFiles.addFile(source.getLocation());
-                    
                 if (!source.isRemote()) {
                     registerLastOpenedFilePath
                         (FileFinder::LayerFile,
@@ -1678,7 +1676,6 @@
     if (error != "") {
         QMessageBox::critical(this, tr("Failed to write file"), error);
     } else {
-        m_recentFiles.addFile(path);
         emit activity(tr("Export layer to \"%1\"").arg(path));
     }
 }
@@ -1738,7 +1735,6 @@
     if (error != "") {
         QMessageBox::critical(this, tr("Failed to write file"), error);
     } else {
-        m_recentFiles.addFile(path);
         emit activity(tr("Export layer to \"%1\"").arg(path));
     }
 }