some visibility options

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

4 files changed, 42 insertions, 9 deletions

diff --git a/src/ui/configdialog.cpp b/src/ui/configdialog.cpp
index fac9c4dd6..949667f80 100644
--- a/src/ui/configdialog.cpp
+++ b/src/ui/configdialog.cpp
@@ -122,6 +122,8 @@ void ConfigDialog::readSettings()
     ui.proxyUserLineEdit->setEnabled(ui.authProxyCheckBox->isChecked());
     ui.proxyPasswLineEdit->setEnabled(ui.authProxyCheckBox->isChecked());
 
+    ui.hiddenCheckBox->setChecked(settings.value("MainWindow/start_hidden", FALSE).toBool());
+    ui.hideOnCloseCheckBox->setChecked(settings.value("MainWindow/hide_on_close", FALSE).toBool());
     ui.softVolumeCheckBox->setChecked(settings.value("Volume/software_volume", FALSE).toBool());
 }
 
@@ -130,6 +132,7 @@ void ConfigDialog::changePage (QListWidgetItem *current, QListWidgetItem *previo
     if (!current)
         current = previous;
     ui.stackedWidget->setCurrentIndex (ui.contentsWidget->row (current));
+    ui.visibilityGroupBox->setEnabled(GeneralHandler::instance()->visibilityControl());
 }
 
 void ConfigDialog::changeSkin()
@@ -533,6 +536,8 @@ void ConfigDialog::saveSettings()
     settings.setValue ("Proxy/user",ui.proxyUserLineEdit->text());
     settings.setValue ("Proxy/passw",ui.proxyPasswLineEdit->text());
     settings.setValue ("Volume/software_volume", ui.softVolumeCheckBox->isChecked());
+    settings.setValue ("MainWindow/start_hidden", ui.hiddenCheckBox->isChecked());
+    settings.setValue ("MainWindow/hide_on_close", ui.hideOnCloseCheckBox->isChecked());
 }
 
 void ConfigDialog::updateButtons()
diff --git a/src/ui/forms/configdialog.ui b/src/ui/forms/configdialog.ui
index 12be43826..6e08c2c00 100644
--- a/src/ui/forms/configdialog.ui
+++ b/src/ui/forms/configdialog.ui
@@ -691,14 +691,37 @@
           </widget>
          </item>
          <item>
+          <widget class="QGroupBox" name="visibilityGroupBox" >
+           <property name="title" >
+            <string>Visibility Control</string>
+           </property>
+           <layout class="QVBoxLayout" >
+            <item>
+             <widget class="QCheckBox" name="hideOnCloseCheckBox" >
+              <property name="text" >
+               <string>Hide on close</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QCheckBox" name="hiddenCheckBox" >
+              <property name="text" >
+               <string>Start hidden</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+         </item>
+         <item>
           <spacer>
            <property name="orientation" >
             <enum>Qt::Vertical</enum>
            </property>
            <property name="sizeHint" >
             <size>
-             <width>20</width>
-             <height>251</height>
+             <width>387</width>
+             <height>151</height>
             </size>
            </property>
           </spacer>
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index b5fb8a6f9..59294d31a 100644
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   Copyright (C) 2006-2008 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -155,6 +155,8 @@ MainWindow::MainWindow(const QStringList& args,CommandLineOptionManager* option_
     char buf[PATH_MAX + 1];
     QString cwd = QString::fromLocal8Bit(getcwd(buf,PATH_MAX));
     processCommandArgs(args,cwd);
+    if(m_startHidden && m_generalHandler->visibilityControl())
+        toggleVisibility();
 }
 
 
@@ -532,8 +534,10 @@ void MainWindow::readSettings()
         move(settings.value("pos", QPoint(100, 100)).toPoint());
         //last directory
         m_lastDir = settings.value("last_dir","/").toString();
+        m_startHidden = settings.value("start_hidden", FALSE).toBool();
         settings.endGroup();
         show();
+
         //visibility
         m_playlist->setVisible(settings.value("Playlist/visible",TRUE).toBool());
         m_equalizer->setVisible(settings.value("Equalizer/visible",TRUE).toBool());
@@ -551,6 +555,7 @@ void MainWindow::readSettings()
 
         m_update = TRUE;
     }
+    m_hideOnClose = settings.value("MainWindow/hide_on_close", FALSE).toBool();
 }
 
 void MainWindow::writeSettings()
@@ -825,10 +830,10 @@ void MainWindow::jumpToFile()
 
 void MainWindow::handleCloseRequest()
 {
-    //if (m_hide_on_titlebar_close && m_tray->isVisible())
-    /*toggleVisibility();
-    else*/
-    QApplication::closeAllWindows();
+    if (m_hideOnClose && m_generalHandler->visibilityControl())
+        toggleVisibility();
+    else
+        QApplication::closeAllWindows();
 }
 
 void MainWindow::addUrl( )
diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h
index 0ad44cec4..21b1c8fab 100644
--- a/src/ui/mainwindow.h
+++ b/src/ui/mainwindow.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   Copyright (C) 2006-2008 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -132,7 +132,7 @@ private:
     Skin *m_skin;
     QString m_playlistName;
     JumpToTrackDialog* m_jumpDialog;
-    bool m_hide_on_titlebar_close;
+    bool m_hideOnClose, m_startHidden;
     int m_elapsed;
     VisualMenu *m_visMenu;
     CommandLineOptionManager* m_option_manager;