From 45d1b471ec5d0b275cb75398016b1a93277f6d9b Mon Sep 17 00:00:00 2001
From: Nikolay Tischenko <niktischenko@gmail.com>
Date: Sat, 9 Oct 2010 22:56:43 +0700
Subject: [PATCH] Fixed settings save bug Set focus on search line

---
 src/libraryform.cpp    |    2 ++
 src/player/player.cpp  |    2 --
 src/playerform.cpp     |    3 +++
 src/settingsdialog.cpp |    2 +-
 src/toolswidget.cpp    |    4 ++++
 src/toolswidget.h      |    1 +
 src/ui/libraryform.ui  |   34 +++++++++++-----------------------
 src/ui/playerform.ui   |   32 +++++++++++++++-----------------
 8 files changed, 37 insertions(+), 43 deletions(-)

diff --git a/src/libraryform.cpp b/src/libraryform.cpp
index e7e3384..5bd43d1 100644
--- a/src/libraryform.cpp
+++ b/src/libraryform.cpp
@@ -452,9 +452,11 @@ void LibraryForm::_more_button() {
 	if (_tools_widget->isVisible()) {
 		ui->moreButton->setIcon(QIcon(":/icons/white/more.png"));
 		_tools_widget->hide();
+		_tools_widget->reset();
 		cancelSearch();
 	} else {
 		ui->moreButton->setIcon(QIcon(":/icons/white/unmore.png"));
 		_tools_widget->show();
+		_tools_widget->setFocus();
 	}
 }
diff --git a/src/player/player.cpp b/src/player/player.cpp
index e34b2cd..80fc64e 100644
--- a/src/player/player.cpp
+++ b/src/player/player.cpp
@@ -278,8 +278,6 @@ void Player::enableEqualizer() {
 		return;
 	_equalizer_enabled = true;
 	_path.insertEffect(_equalizer);
-	if (_state == PLAYER_PAUSED)
-		pause();
 	Config config;
 	config.setValue("equalizer/equalizer", "enabled");
 }
diff --git a/src/playerform.cpp b/src/playerform.cpp
index 3c5f3dd..cb2fc3d 100644
--- a/src/playerform.cpp
+++ b/src/playerform.cpp
@@ -118,6 +118,7 @@ PlayerForm::PlayerForm(Library* lib, QWidget *parent) :
 	connect(_tools_widget, SIGNAL(nextSearch()), this, SLOT(nextItem()));
 	connect(_tools_widget, SIGNAL(prevSearch()), this, SLOT(prevItem()));
 	connect(_tools_widget, SIGNAL(toggleFullscreen(bool)), this, SIGNAL(fullscreen(bool)));
+	ui->viewButton->setIcon(QIcon(":/icons/white/playback.png"));
 
 	// dbus
 	_dbusadaptor = new DBusAdaptop(_player);
@@ -385,9 +386,11 @@ void PlayerForm::_tools_widget_toggle() {
 	if (_tools_widget->isVisible()) {
 		ui->moreButton->setIcon(QIcon(":/icons/white/more.png"));
 		_tools_widget->hide();
+		_tools_widget->reset();
 		cancelSearch();
 	} else {
 		ui->moreButton->setIcon(QIcon(":/icons/white/unmore.png"));
 		_tools_widget->show();
+		_tools_widget->setFocus();
 	}
 }
diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index d01ff1c..988484b 100644
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -43,7 +43,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) :
 	}
 	if (orientation == "portrait") {
 		ui->orientationPButton->setChecked(true);
-	} else if (orientation == "auty") {
+	} else if (orientation == "auto") {
 		ui->orientationAButton->setChecked(true);
 	}
 	connect (ui->albumsSortAButton, SIGNAL(toggled(bool)), this, SLOT(_set_album_sorting_alphabet(bool)));
diff --git a/src/toolswidget.cpp b/src/toolswidget.cpp
index 62e9cea..cd3ee4c 100644
--- a/src/toolswidget.cpp
+++ b/src/toolswidget.cpp
@@ -46,3 +46,7 @@ void ToolsWidget::_fullscreen_button() {
 void ToolsWidget::reset() {
 	ui->searchLine->setText("");
 }
+
+void ToolsWidget::setFocus() {
+	ui->searchLine->setFocus();
+}
diff --git a/src/toolswidget.h b/src/toolswidget.h
index e89ac81..a908df2 100644
--- a/src/toolswidget.h
+++ b/src/toolswidget.h
@@ -34,6 +34,7 @@ public:
 	explicit ToolsWidget(QWidget *parent = 0);
 	~ToolsWidget();
 	void reset();
+	void setFocus();
 
 signals:
 	void toggleFullscreen(bool);
diff --git a/src/ui/libraryform.ui b/src/ui/libraryform.ui
index 6c2a84d..afa2aa2 100644
--- a/src/ui/libraryform.ui
+++ b/src/ui/libraryform.ui
@@ -98,7 +98,7 @@
            <string/>
           </property>
           <property name="icon">
-           <iconset resource="../../resources/resources.qrc">
+           <iconset>
             <normaloff>:/icons/white/back.png</normaloff>:/icons/white/back.png</iconset>
           </property>
           <property name="flat">
@@ -146,7 +146,7 @@
            <string/>
           </property>
           <property name="icon">
-           <iconset resource="../../resources/resources.qrc">
+           <iconset>
             <normaloff>:/icons/white/add.png</normaloff>:/icons/white/add.png</iconset>
           </property>
           <property name="flat">
@@ -185,7 +185,7 @@
            <string/>
           </property>
           <property name="icon">
-           <iconset resource="../../resources/resources.qrc">
+           <iconset>
             <normaloff>:/icons/white/delete.png</normaloff>:/icons/white/delete.png</iconset>
           </property>
           <property name="flat">
@@ -230,7 +230,7 @@
            <string/>
           </property>
           <property name="icon">
-           <iconset resource="../../resources/resources.qrc">
+           <iconset>
             <normaloff>:/icons/white/use.png</normaloff>:/icons/white/use.png</iconset>
           </property>
           <property name="flat">
@@ -275,7 +275,7 @@
            <string/>
           </property>
           <property name="icon">
-           <iconset resource="../../resources/resources.qrc">
+           <iconset>
             <normaloff>:/icons/white/select_all.png</normaloff>:/icons/white/select_all.png</iconset>
           </property>
           <property name="flat">
@@ -320,7 +320,7 @@
            <string/>
           </property>
           <property name="icon">
-           <iconset resource="../../resources/resources.qrc">
+           <iconset>
             <normaloff>:/icons/white/more.png</normaloff>:/icons/white/more.png</iconset>
           </property>
           <property name="flat">
@@ -356,16 +356,6 @@ color: white;</string>
      </item>
      <item>
       <widget class="QListView" name="listView">
-       <property name="styleSheet">
-        <string notr="true">QListView {
-background: black;
-color: white;
-}
-QListView::item:selected {
-background: qlineargradient(spread:reflect, x1:1, y1:0.5, x2:1, y2:0, stop:0 rgba(38, 38, 38, 255), stop:1 rgba(92, 92, 92, 255));
-color: white;
-}</string>
-       </property>
        <property name="horizontalScrollBarPolicy">
         <enum>Qt::ScrollBarAlwaysOff</enum>
        </property>
@@ -425,7 +415,7 @@ color: white;
            <string/>
           </property>
           <property name="icon">
-           <iconset resource="../../resources/resources.qrc">
+           <iconset>
             <normaloff>:/icons/white/player.png</normaloff>:/icons/white/player.png</iconset>
           </property>
           <property name="flat">
@@ -470,7 +460,7 @@ color: white;
            <string/>
           </property>
           <property name="icon">
-           <iconset resource="../../resources/resources.qrc">
+           <iconset>
             <normaloff>:/icons/white/artists.png</normaloff>:/icons/white/artists.png</iconset>
           </property>
           <property name="flat">
@@ -515,7 +505,7 @@ color: white;
            <string/>
           </property>
           <property name="icon">
-           <iconset resource="../../resources/resources.qrc">
+           <iconset>
             <normaloff>:/icons/white/dynamic.png</normaloff>:/icons/white/dynamic.png</iconset>
           </property>
           <property name="flat">
@@ -554,7 +544,7 @@ color: white;
            <string/>
           </property>
           <property name="icon">
-           <iconset resource="../../resources/resources.qrc">
+           <iconset>
             <normaloff>:/icons/white/playlists.png</normaloff>:/icons/white/playlists.png</iconset>
           </property>
           <property name="flat">
@@ -569,8 +559,6 @@ color: white;
    </item>
   </layout>
  </widget>
- <resources>
-  <include location="../../resources/resources.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>
diff --git a/src/ui/playerform.ui b/src/ui/playerform.ui
index 3154c12..d2e5f94 100644
--- a/src/ui/playerform.ui
+++ b/src/ui/playerform.ui
@@ -56,7 +56,7 @@
          <string/>
         </property>
         <property name="icon">
-         <iconset resource="../../resources/resources.qrc">
+         <iconset>
           <normaloff>:/icons/white/prev.png</normaloff>:/icons/white/prev.png</iconset>
         </property>
         <property name="flat">
@@ -78,7 +78,7 @@
        </spacer>
       </item>
       <item>
-       <widget class="QPushButton" name="playpauseButton">
+       <widget class="QPushButton" name="stopButton">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
           <horstretch>0</horstretch>
@@ -101,8 +101,8 @@
          <string/>
         </property>
         <property name="icon">
-         <iconset resource="../../resources/resources.qrc">
-          <normaloff>:/icons/white/play.png</normaloff>:/icons/white/play.png</iconset>
+         <iconset>
+          <normaloff>:/icons/white/stop.png</normaloff>:/icons/white/stop.png</iconset>
         </property>
         <property name="flat">
          <bool>true</bool>
@@ -123,7 +123,7 @@
        </spacer>
       </item>
       <item>
-       <widget class="QPushButton" name="stopButton">
+       <widget class="QPushButton" name="playpauseButton">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
           <horstretch>0</horstretch>
@@ -146,8 +146,8 @@
          <string/>
         </property>
         <property name="icon">
-         <iconset resource="../../resources/resources.qrc">
-          <normaloff>:/icons/white/stop.png</normaloff>:/icons/white/stop.png</iconset>
+         <iconset>
+          <normaloff>:/icons/white/play.png</normaloff>:/icons/white/play.png</iconset>
         </property>
         <property name="flat">
          <bool>true</bool>
@@ -191,7 +191,7 @@
          <string/>
         </property>
         <property name="icon">
-         <iconset resource="../../resources/resources.qrc">
+         <iconset>
           <normaloff>:/icons/white/next.png</normaloff>:/icons/white/next.png</iconset>
         </property>
         <property name="flat">
@@ -236,7 +236,7 @@
          <string/>
         </property>
         <property name="icon">
-         <iconset resource="../../resources/resources.qrc">
+         <iconset>
           <normaloff>:/icons/white/more.png</normaloff>:/icons/white/more.png</iconset>
         </property>
         <property name="flat">
@@ -532,7 +532,7 @@
            <string/>
           </property>
           <property name="icon">
-           <iconset resource="../../resources/resources.qrc">
+           <iconset>
             <normaloff>:/icons/white/library.png</normaloff>:/icons/white/library.png</iconset>
           </property>
           <property name="flat">
@@ -577,7 +577,7 @@
            <string/>
           </property>
           <property name="icon">
-           <iconset resource="../../resources/resources.qrc">
+           <iconset>
             <normaloff>:/icons/white/playlist.png</normaloff>:/icons/white/playlist.png</iconset>
           </property>
           <property name="checkable">
@@ -625,7 +625,7 @@
            <string/>
           </property>
           <property name="icon">
-           <iconset resource="../../resources/resources.qrc">
+           <iconset>
             <normaloff>:/icons/white/random_inactive.png</normaloff>:/icons/white/random_inactive.png</iconset>
           </property>
           <property name="iconSize">
@@ -679,7 +679,7 @@
            <string/>
           </property>
           <property name="icon">
-           <iconset resource="../../resources/resources.qrc">
+           <iconset>
             <normaloff>:/icons/white/repeat_inactive.png</normaloff>:/icons/white/repeat_inactive.png</iconset>
           </property>
           <property name="iconSize">
@@ -727,7 +727,7 @@
            <string/>
           </property>
           <property name="icon">
-           <iconset resource="../../resources/resources.qrc">
+           <iconset>
             <normaloff>:/icons/white/volume.png</normaloff>:/icons/white/volume.png</iconset>
           </property>
           <property name="flat">
@@ -742,8 +742,6 @@
    </item>
   </layout>
  </widget>
- <resources>
-  <include location="../../resources/resources.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>
-- 
1.7.9.5