skinned: fixed geometry saving bug

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

6 files changed, 15 insertions, 9 deletions

diff --git a/src/plugins/Ui/skinned/eqwidget.cpp b/src/plugins/Ui/skinned/eqwidget.cpp
index a9f5bd895..b28afeae2 100644
--- a/src/plugins/Ui/skinned/eqwidget.cpp
+++ b/src/plugins/Ui/skinned/eqwidget.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006-2013 by Ilya Kotov                                 *
+ *   Copyright (C) 2006-2015 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -114,7 +114,6 @@ void EqWidget::changeEvent (QEvent * event)
 
 void EqWidget::closeEvent (QCloseEvent* e)
 {
-    writeSettings();
     if (e->spontaneous ())
         parentWidget()->close();
 }
diff --git a/src/plugins/Ui/skinned/eqwidget.h b/src/plugins/Ui/skinned/eqwidget.h
index 2153adf0d..28ce4fefc 100644
--- a/src/plugins/Ui/skinned/eqwidget.h
+++ b/src/plugins/Ui/skinned/eqwidget.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006-2013 by Ilya Kotov                                 *
+ *   Copyright (C) 2006-2015 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -52,6 +52,8 @@ public:
     void loadPreset(const QString &name);
     void setMimimalMode(bool b = true);
 
+    void writeSettings();
+
 signals:
     void closed();
 
@@ -71,7 +73,6 @@ private slots:
 private:
     void updatePositions();
     void readSettings();
-    void writeSettings();
     void createActions();
     void updateMask();
     EQPreset *findPreset(const QString &name);
diff --git a/src/plugins/Ui/skinned/mainwindow.cpp b/src/plugins/Ui/skinned/mainwindow.cpp
index 1cdb06890..be817e38a 100644
--- a/src/plugins/Ui/skinned/mainwindow.cpp
+++ b/src/plugins/Ui/skinned/mainwindow.cpp
@@ -197,13 +197,17 @@ void MainWindow::showMetaData()
 
 void MainWindow::closeEvent (QCloseEvent *)
 {
-    writeSettings();
-    m_playlist->close();
-    m_equalizer->close();
     if (!m_hideOnClose || !m_uiHelper->visibilityControl())
         m_uiHelper->exit();
 }
 
+void MainWindow::hideEvent (QHideEvent *)
+{
+    writeSettings();
+    m_playlist->writeSettings();
+    m_equalizer->writeSettings();
+}
+
 void MainWindow::addDir()
 {
     m_uiHelper->addDirectory(this);
diff --git a/src/plugins/Ui/skinned/mainwindow.h b/src/plugins/Ui/skinned/mainwindow.h
index e3c182462..0d18aa9bf 100644
--- a/src/plugins/Ui/skinned/mainwindow.h
+++ b/src/plugins/Ui/skinned/mainwindow.h
@@ -91,9 +91,11 @@ private slots:
 private:
     //events
     void closeEvent (QCloseEvent *);
+    void hideEvent (QHideEvent *);
     void changeEvent (QEvent *event);
     void keyPressEvent (QKeyEvent* );
 
+
     void readSettings();
     void writeSettings();
     void createActions();
diff --git a/src/plugins/Ui/skinned/playlist.cpp b/src/plugins/Ui/skinned/playlist.cpp
index 5aa4513de..cc7412281 100644
--- a/src/plugins/Ui/skinned/playlist.cpp
+++ b/src/plugins/Ui/skinned/playlist.cpp
@@ -357,7 +357,6 @@ void PlayList::createActions()
 
 void PlayList::closeEvent (QCloseEvent *e)
 {
-    writeSettings();
     if (e->spontaneous ())
         parentWidget()->close();
 }
diff --git a/src/plugins/Ui/skinned/playlist.h b/src/plugins/Ui/skinned/playlist.h
index 8a74b0d19..1146711f2 100644
--- a/src/plugins/Ui/skinned/playlist.h
+++ b/src/plugins/Ui/skinned/playlist.h
@@ -55,6 +55,8 @@ class PlayList : public QWidget
         void readSettings();
         void setMinimalMode(bool b = true);
 
+        void writeSettings();
+
     signals:
         void play();
         void next();
@@ -86,7 +88,6 @@ class PlayList : public QWidget
         void updatePositions();
         QString formatTime (int sec);
         void drawPixmap (QPainter *painter, int x, int y, const QPixmap &pix);
-        void writeSettings();
         void createMenus();
         void createActions();
         //events