Changeset 118 for smplayer/vendor/current/src/baseguiplus.cpp

Timestamp:

Dec 22, 2011, 6:27:52 PM (14 years ago)

Author:

Silvan Scherrer

Message:

smplayer vendor udate

File:

• smplayer/vendor/current/src/baseguiplus.cpp (modified) (4 diffs)

smplayer/vendor/current/src/baseguiplus.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2010 Ricardo Villalba <rvm@escomposlinux.org>
+    Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
 
     This program is free software; you can redistribute it and/or modify
@@ -77 +77 @@
         connect( showTrayAct, SIGNAL(toggled(bool)),
              tray, SLOT(setVisible(bool)) );
+
+#ifndef Q_OS_OS2
         optionsMenu->addAction(showTrayAct);
+#else
+        trayAvailable();
+        connect( optionsMenu, SIGNAL(aboutToShow()),
+             this, SLOT(trayAvailable()) );
+#endif
 
         showAllAct = new MyAction(this, "restore/hide");
@@ -149 +156 @@
 
 bool BaseGuiPlus::startHidden() {
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
         return false;
 #else
@@ -607 +614 @@
 }
 
+#ifdef Q_OS_OS2
+// we test if xcenter is available at all. if not disable the tray action. this is possible when xcenter is not opened or crashed
+void BaseGuiPlus::trayAvailable() {
+        if (!tray->isSystemTrayAvailable()) {
+                        optionsMenu->removeAction(showTrayAct);
+        }
+        else {
+                optionsMenu->addAction(showTrayAct);
+        }
+}
+#endif
+
 #include "moc_baseguiplus.cpp"