some visibility options

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

6 files changed, 41 insertions, 89 deletions

diff --git a/src/plugins/General/dbuscontrol/dbuscontrolfactory.cpp b/src/plugins/General/dbuscontrol/dbuscontrolfactory.cpp
index 567614673..704538b8b 100644
--- a/src/plugins/General/dbuscontrol/dbuscontrolfactory.cpp
+++ b/src/plugins/General/dbuscontrol/dbuscontrolfactory.cpp
@@ -29,6 +29,7 @@ const GeneralProperties DBUSControlFactory::properties() const
     properties.name = tr("D-Bus Plugin");
     properties.hasAbout = TRUE;
     properties.hasSettings = FALSE;
+    properties.visibilityControl = FALSE;
     return properties;
 }
 
diff --git a/src/plugins/General/notifier/notifierfactory.cpp b/src/plugins/General/notifier/notifierfactory.cpp
index 708c1e1dd..91e7eab17 100644
--- a/src/plugins/General/notifier/notifierfactory.cpp
+++ b/src/plugins/General/notifier/notifierfactory.cpp
@@ -30,6 +30,7 @@ const GeneralProperties NotifierFactory::properties() const
     properties.name = tr("Notifier Plugin");
     properties.hasAbout = TRUE;
     properties.hasSettings = TRUE;
+    properties.visibilityControl = FALSE;
     return properties;
 }
 
diff --git a/src/plugins/General/scrobbler/scrobblerfactory.cpp b/src/plugins/General/scrobbler/scrobblerfactory.cpp
index 7f1fe7757..2bf7bfdfc 100644
--- a/src/plugins/General/scrobbler/scrobblerfactory.cpp
+++ b/src/plugins/General/scrobbler/scrobblerfactory.cpp
@@ -30,6 +30,7 @@ const GeneralProperties ScrobblerFactory::properties() const
     properties.name = tr("Scrobbler Plugin");
     properties.hasAbout = TRUE;
     properties.hasSettings = TRUE;
+    properties.visibilityControl = FALSE;
     return properties;
 }
 
diff --git a/src/plugins/General/statusicon/settingsdialog.cpp b/src/plugins/General/statusicon/settingsdialog.cpp
index 5dc1ab4eb..d2050f88c 100644
--- a/src/plugins/General/statusicon/settingsdialog.cpp
+++ b/src/plugins/General/statusicon/settingsdialog.cpp
@@ -32,7 +32,6 @@ SettingsDialog::SettingsDialog(QWidget *parent)
     ui.messageCheckBox->setChecked(settings.value("show_message",TRUE).toBool());
     ui.messageDelaySpinBox->setValue(settings.value("message_delay", 2000).toInt());
     ui.toolTipCheckBox->setChecked(settings.value("show_tooltip",FALSE).toBool());
-    ui.hideToTrayRadioButton->setChecked(settings.value("hide_on_close", FALSE).toBool());
     settings.endGroup();
     connect(ui.okButton, SIGNAL(clicked()), SLOT(writeSettings()));
 }
@@ -48,7 +47,6 @@ void SettingsDialog::writeSettings()
     settings.setValue ("show_message", ui.messageCheckBox->isChecked());
     settings.setValue ("message_delay", ui.messageDelaySpinBox->value());
     settings.setValue ("show_tooltip", ui.toolTipCheckBox->isChecked());
-    settings.setValue ("hide_on_close", ui.hideToTrayRadioButton->isChecked());
     settings.endGroup();
     accept();
 }
diff --git a/src/plugins/General/statusicon/settingsdialog.ui b/src/plugins/General/statusicon/settingsdialog.ui
index 126fcce7a..7ef412e3c 100644
--- a/src/plugins/General/statusicon/settingsdialog.ui
+++ b/src/plugins/General/statusicon/settingsdialog.ui
@@ -6,104 +6,54 @@
     <x>0</x>
     <y>0</y>
     <width>267</width>
-    <height>285</height>
+    <height>156</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Status Icon Plugin Settings</string>
   </property>
-  <layout class="QVBoxLayout" >
-   <item>
-    <widget class="QGroupBox" name="groupBox_4" >
-     <property name="title" >
-      <string>Tray Icon</string>
+  <layout class="QGridLayout" >
+   <item row="0" column="0" >
+    <widget class="QCheckBox" name="messageCheckBox" >
+     <property name="text" >
+      <string>Show message</string>
      </property>
-     <layout class="QGridLayout" >
-      <item row="0" column="0" >
-       <widget class="QCheckBox" name="messageCheckBox" >
-        <property name="text" >
-         <string>Show message</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0" >
-       <widget class="QCheckBox" name="toolTipCheckBox" >
-        <property name="text" >
-         <string>Show tooltip</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0" >
-       <widget class="QLabel" name="label_3" >
-        <property name="text" >
-         <string>Message delay, ms:</string>
-        </property>
-        <property name="alignment" >
-         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1" >
-       <widget class="QSpinBox" name="messageDelaySpinBox" >
-        <property name="minimum" >
-         <number>100</number>
-        </property>
-        <property name="maximum" >
-         <number>10000</number>
-        </property>
-        <property name="singleStep" >
-         <number>100</number>
-        </property>
-        <property name="value" >
-         <number>1000</number>
-        </property>
-       </widget>
-      </item>
-     </layout>
     </widget>
    </item>
-   <item>
-    <widget class="QGroupBox" name="closeGroupBox" >
-     <property name="title" >
-      <string>Action On Close</string>
+   <item row="1" column="0" >
+    <widget class="QCheckBox" name="toolTipCheckBox" >
+     <property name="text" >
+      <string>Show tooltip</string>
      </property>
-     <layout class="QVBoxLayout" >
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <property name="leftMargin" >
-       <number>9</number>
-      </property>
-      <property name="topMargin" >
-       <number>9</number>
-      </property>
-      <property name="rightMargin" >
-       <number>9</number>
-      </property>
-      <property name="bottomMargin" >
-       <number>9</number>
-      </property>
-      <item>
-       <widget class="QRadioButton" name="hideToTrayRadioButton" >
-        <property name="text" >
-         <string>Hide to tray</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QRadioButton" name="quitRadioButton" >
-        <property name="text" >
-         <string>Quit</string>
-        </property>
-        <property name="checked" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
     </widget>
    </item>
-   <item>
+   <item row="2" column="0" >
+    <widget class="QLabel" name="label_3" >
+     <property name="text" >
+      <string>Message delay, ms:</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1" >
+    <widget class="QSpinBox" name="messageDelaySpinBox" >
+     <property name="minimum" >
+      <number>100</number>
+     </property>
+     <property name="maximum" >
+      <number>10000</number>
+     </property>
+     <property name="singleStep" >
+      <number>100</number>
+     </property>
+     <property name="value" >
+      <number>1000</number>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="2" >
     <layout class="QHBoxLayout" >
      <property name="spacing" >
       <number>6</number>
diff --git a/src/plugins/General/statusicon/statusiconfactory.cpp b/src/plugins/General/statusicon/statusiconfactory.cpp
index 12c57261c..5aedc6f7c 100644
--- a/src/plugins/General/statusicon/statusiconfactory.cpp
+++ b/src/plugins/General/statusicon/statusiconfactory.cpp
@@ -30,6 +30,7 @@ const GeneralProperties StatusIconFactory::properties() const
     properties.name = tr("Status Icon Plugin");
     properties.hasAbout = TRUE;
     properties.hasSettings = TRUE;
+    properties.visibilityControl = TRUE;
     return properties;
 }