Changeset 182 for smplayer/trunk/src/baseguiplus.cpp

Timestamp:

Aug 31, 2016, 7:22:54 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: restore some os/2 removals from vendor, fix branding

File:

• smplayer/trunk/src/baseguiplus.cpp (modified) (2 diffs)

smplayer/trunk/src/baseguiplus.cpp

@@ -222 +222 @@
         if (!pref->tablet_mode) {
                 openMenu->addAction(quitAct);
+#ifndef Q_OS_OS2
                 optionsMenu->addAction(showTrayAct);
+#else
+                trayAvailable();
+                connect( optionsMenu, SIGNAL(aboutToShow()),
+                     this, SLOT(trayAvailable()) );
+#endif
         }
 
@@ -693 +699 @@
 #endif
 
+#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
 
 // Convenience functions intended for other GUI's