[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kate] addons/search: S&R: Only open the folder options when search-place is "Folder"
From:       Kåre Särs <kare.sars () iki ! fi>
Date:       2016-07-20 8:13:03
Message-ID: E1bPmcp-0002JC-F7 () code ! kde ! org
[Download RAW message or body]

Git commit 87d3562dea0003d492fe1c8e2e697676b1f77693 by Kåre Särs.
Committed on 20/07/2016 at 08:04.
Pushed by sars into branch 'master'.

S&R: Only open the folder options when search-place is "Folder"

M  +7    -2    addons/search/plugin_search.cpp

http://commits.kde.org/kate/87d3562dea0003d492fe1c8e2e697676b1f77693

diff --git a/addons/search/plugin_search.cpp b/addons/search/plugin_search.cpp
index d35e0ac..7160587 100644
--- a/addons/search/plugin_search.cpp
+++ b/addons/search/plugin_search.cpp
@@ -433,7 +433,9 @@ void KatePluginSearchView::openSearchView()
         m_mainWindow->showToolView(m_toolView);
     }
     m_ui.searchCombo->setFocus(Qt::OtherFocusReason);
-    m_ui.displayOptions->setChecked(true);
+    if (m_ui.searchPlaceCombo->currentIndex() == Folder) {
+        m_ui.displayOptions->setChecked(true);
+    }
 
     KTextEditor::View* editView = m_mainWindow->activeView();
     if (editView && editView->document()) {
@@ -595,10 +597,12 @@ void KatePluginSearchView::folderFileListChanged()
 
 void KatePluginSearchView::searchPlaceChanged()
 {
-    m_ui.displayOptions->setChecked(true);
 
     int searchPlace = m_ui.searchPlaceCombo->currentIndex();
     const bool inFolder = (searchPlace == Folder);
+    if (inFolder) {
+        m_ui.displayOptions->setChecked(true);
+    }
 
     m_ui.filterCombo->setEnabled(searchPlace >= Folder);
     m_ui.excludeCombo->setEnabled(searchPlace >= Folder);
@@ -1668,6 +1672,7 @@ void KatePluginSearchView::readSessionConfig(const KConfigGroup &cg)
     m_ui.excludeCombo->clear();
     m_ui.excludeCombo->addItems(cg.readEntry("ExcludeFilters", QStringList()));
     m_ui.excludeCombo->setCurrentIndex(cg.readEntry("CurrentExcludeFilter", 0));
+    m_ui.displayOptions->setChecked(searchPlaceIndex == Folder);
 }
 
 void KatePluginSearchView::writeSessionConfig(KConfigGroup &cg)
[prev in list] [next in list] [prev in thread] [next in thread]