From 37384f8f7b4b54114ec41cf8456509dcfc8a192c Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Tue, 1 Oct 2013 11:23:14 +0000
Subject: status icon plugin: disabled unsupported options

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3734 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/General/statusicon/settingsdialog.cpp | 16 +++++++++++++---
 src/plugins/General/statusicon/statusicon.cpp     | 16 ++++++++--------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/plugins/General/statusicon/settingsdialog.cpp b/src/plugins/General/statusicon/settingsdialog.cpp
index 5c7d58672..02880a013 100644
--- a/src/plugins/General/statusicon/settingsdialog.cpp
+++ b/src/plugins/General/statusicon/settingsdialog.cpp
@@ -33,17 +33,25 @@ SettingsDialog::SettingsDialog(QWidget *parent)
     ui.messageGroupBox->setChecked(settings.value("show_message",true).toBool());
     ui.messageDelaySpinBox->setValue(settings.value("message_delay", 2000).toInt());
     ui.niceTooltipGroupBox->setChecked(settings.value("show_tooltip", true).toBool());
+#ifdef Q_WS_X11
     ui.niceTooltipDelaySpinBox->setValue(settings.value("tooltip_delay",2000).toInt());
     ui.transparencySlider->setValue(settings.value("tooltip_transparency",0).toInt());
     ui.coverSizeSlider->setValue(settings.value("tooltip_cover_size", 100).toInt());
+    ui.progressCheckBox->setChecked(settings.value("tooltip_progress",true).toBool());
     ui.niceTooltipSplitCheckBox->setChecked(settings.value("split_file_name",true).toBool());
+#else
+    ui.niceTooltipDelaySpinBox->setEnabled(false);
+    ui.transparencySlider->setEnabled(false);
+    ui.coverSizeSlider->setEnabled(false);
+    ui.progressCheckBox->setEnabled(false);
+    ui.niceTooltipSplitCheckBox->setEnabled(false);
+    ui.templateButton->setEnabled(false);
+#endif
     ui.standardIconsCheckBox->setChecked(settings.value("use_standard_icons",false).toBool());
-    ui.progressCheckBox->setChecked(settings.value("tooltip_progress",true).toBool());
     m_template = settings.value("tooltip_template", DEFAULT_TEMPLATE).toString();
     settings.endGroup();
 }
 
-
 SettingsDialog::~SettingsDialog()
 {}
 
@@ -53,13 +61,15 @@ void SettingsDialog::accept()
     settings.beginGroup("Tray");
     settings.setValue("show_message", ui.messageGroupBox->isChecked());
     settings.setValue("message_delay", ui.messageDelaySpinBox->value());
-    settings.setValue("split_file_name", ui.niceTooltipSplitCheckBox->isChecked());
     settings.setValue("use_standard_icons", ui.standardIconsCheckBox->isChecked());
     settings.setValue("show_tooltip", ui.niceTooltipGroupBox->isChecked());
+#ifdef Q_WS_X11
+    settings.setValue("split_file_name", ui.niceTooltipSplitCheckBox->isChecked());
     settings.setValue("tooltip_delay", ui.niceTooltipDelaySpinBox->value());
     settings.setValue("tooltip_transparency",  ui.transparencySlider->value());
     settings.setValue("tooltip_cover_size",  ui.coverSizeSlider->value());
     settings.setValue("tooltip_progress", ui.progressCheckBox->isChecked());
+#endif
     settings.setValue("tooltip_template", m_template);
     settings.endGroup();
     QDialog::accept();
diff --git a/src/plugins/General/statusicon/statusicon.cpp b/src/plugins/General/statusicon/statusicon.cpp
index 79e3afe37..077babe5c 100644
--- a/src/plugins/General/statusicon/statusicon.cpp
+++ b/src/plugins/General/statusicon/statusicon.cpp
@@ -130,14 +130,14 @@ void StatusIcon::showMetaData()
         m_tray->showMessage (tr("Now Playing"), message,
                              QSystemTrayIcon::Information, m_messageDelay);
 #ifndef Q_WS_X11
-         if(m_tooltip)
-         {
-             MetaDataFormatter f("%p%if(%p&%t, - ,)%t");
-             QString message = f.parse(m_core->metaData());
-             if(message.isEmpty())
-                 message = m_core->metaData(Qmmp::URL).section('/',-1);
-             m_tray->setToolTip(f.parse(m_core->metaData()));
-         }
+    if(m_tooltip)
+    {
+        MetaDataFormatter f("%p%if(%p&%t, - ,)%t");
+        QString message = f.parse(m_core->metaData());
+        if(message.isEmpty())
+            message = m_core->metaData(Qmmp::URL).section('/',-1);
+        m_tray->setToolTip(f.parse(m_core->metaData()));
+    }
 #endif
 }
 
-- 
cgit v1.2.3-13-gbd6f