library: moved 'Show quick search' option to context menu

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9642 90c681e8-e032-0410-971d-27865f9a5e38

4 files changed, 30 insertions, 32 deletions

diff --git a/src/plugins/General/library/librarywidget.cpp b/src/plugins/General/library/librarywidget.cpp
index 8d3ddca85..27cc266db 100644
--- a/src/plugins/General/library/librarywidget.cpp
+++ b/src/plugins/General/library/librarywidget.cpp
@@ -48,15 +48,21 @@ LibraryWidget::LibraryWidget(bool dialog, QWidget *parent) :
 
     m_menu = new QMenu(this);
     m_menu->addAction(QIcon::fromTheme("list-add"), tr("&Add to Playlist"), this, SLOT(addSelected()));
-    m_menu->addSeparator();
     m_menu->addAction(QIcon::fromTheme("dialog-information"), tr("&View Track Details"), this, SLOT(showInformation()));
+    m_menu->addSeparator();
+    m_filterAction = m_menu->addAction(tr("Quick Search"), m_ui->filterLineEdit, SLOT(setVisible(bool)));
+    m_filterAction->setCheckable(true);
 
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
-    m_ui->filterLineEdit->setVisible(settings.value("Library/quick_search_visible", true).toBool());
+    m_filterAction->setChecked(settings.value("Library/quick_search_visible", true).toBool());
+    m_ui->filterLineEdit->setVisible(m_filterAction->isChecked());
 }
 
 LibraryWidget::~LibraryWidget()
 {
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
+    settings.value("Library/quick_search_visible", m_filterAction->isChecked());
+
     delete m_ui;
 }
 
diff --git a/src/plugins/General/library/librarywidget.h b/src/plugins/General/library/librarywidget.h
index 126c916c4..39b6e7022 100644
--- a/src/plugins/General/library/librarywidget.h
+++ b/src/plugins/General/library/librarywidget.h
@@ -28,6 +28,7 @@ class LibraryWidget;
 }
 
 class QMenu;
+class QAction;
 class LibraryModel;
 class QContextMenuEvent;
 
@@ -51,6 +52,7 @@ private:
     Ui::LibraryWidget *m_ui;
     LibraryModel *m_model;
     QMenu *m_menu;
+    QAction *m_filterAction;
 };
 
 #endif // LIBRARYWIDGET_H
diff --git a/src/plugins/General/library/settingsdialog.cpp b/src/plugins/General/library/settingsdialog.cpp
index d7666a563..703f8748f 100644
--- a/src/plugins/General/library/settingsdialog.cpp
+++ b/src/plugins/General/library/settingsdialog.cpp
@@ -18,11 +18,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include <qmmp/qmmp.h>
-#include <qmmpui/filedialog.h>
 #include <QDir>
-
 #include <QSettings>
+#include <qmmp/qmmp.h>
+#include <qmmpui/filedialog.h>
 #include "settingsdialog.h"
 #include "ui_settingsdialog.h"
 
@@ -35,7 +34,6 @@ SettingsDialog::SettingsDialog(QWidget *parent) :
     m_lastPath = settings.value("Library/last_path", QDir::homePath()).toString();
     QStringList dirs = settings.value("Library/dirs").toStringList();
     m_ui->dirsListWidget->addItems(dirs);
-    m_ui->quickSearchCheckBox->setChecked(settings.value("Library/quick_search_visible", true).toBool());
 }
 
 SettingsDialog::~SettingsDialog()
@@ -53,7 +51,6 @@ void SettingsDialog::accept()
         dirs << m_ui->dirsListWidget->item(i)->text();
 
     settings.setValue("Library/dirs", dirs);
-    settings.setValue("Library/quick_search_visible", m_ui->quickSearchCheckBox->isChecked());
     QDialog::accept();
 }
 
diff --git a/src/plugins/General/library/settingsdialog.ui b/src/plugins/General/library/settingsdialog.ui
index 028731ebf..88ebcffd9 100644
--- a/src/plugins/General/library/settingsdialog.ui
+++ b/src/plugins/General/library/settingsdialog.ui
@@ -34,15 +34,8 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="0">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>List of directories for scanning:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1">
-    <spacer name="verticalSpacer">
+   <item row="4" column="1">
+    <spacer name="verticalSpacer_2">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
@@ -54,8 +47,8 @@
      </property>
     </spacer>
    </item>
-   <item row="4" column="1">
-    <spacer name="verticalSpacer_2">
+   <item row="1" column="1">
+    <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
@@ -67,15 +60,8 @@
      </property>
     </spacer>
    </item>
-   <item row="6" column="0" colspan="2">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
+   <item row="1" column="0" rowspan="4">
+    <widget class="QListWidget" name="dirsListWidget"/>
    </item>
    <item row="2" column="1">
     <widget class="QToolButton" name="addDirButton">
@@ -88,13 +74,20 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="0" rowspan="4">
-    <widget class="QListWidget" name="dirsListWidget"/>
-   </item>
    <item row="5" column="0" colspan="2">
-    <widget class="QCheckBox" name="quickSearchCheckBox">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0">
+    <widget class="QLabel" name="label">
      <property name="text">
-      <string>Show quick search</string>
+      <string>List of directories for scanning:</string>
      </property>
     </widget>
    </item>