Changeset 182 for smplayer/trunk/src

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

Location:

smplayer/trunk/src

Files:

• basegui.cpp (modified) (1 diff)
• basegui.h (modified) (2 diffs)
• baseguiplus.cpp (modified) (2 diffs)
• baseguiplus.h (modified) (1 diff)
• preferences.cpp (modified) (5 diffs)
• preferences.h (modified) (1 diff)
• prefgeneral.cpp (modified) (5 diffs)
• prefgeneral.h (modified) (1 diff)
• smplayer.cpp (modified) (1 diff)

smplayer/trunk/src/basegui.cpp

@@ -6251 +6251 @@
 #endif // Q_OS_WIN
 
+#if defined(AVOID_SCREENSAVER) && defined(Q_OS_OS2)
+void BaseGui::clear_just_stopped() {
+        qDebug("BaseGui::clear_just_stopped");
+        just_stopped = false;
+}
+#endif
+
 #include "moc_basegui.cpp"

smplayer/trunk/src/basegui.h

@@ -29 +29 @@
 #include "guiconfig.h"
 
-#ifdef AVOID_SCREENSAVER
+#if defined(AVOID_SCREENSAVER) && !defined(Q_OS_OS2)
 #include <windows.h>
 #endif
@@ -327 +327 @@
         virtual void setTabletMode(bool);
 
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
+        #ifdef Q_OS_WIN
         void checkSystemTabletMode();
         void systemTabletModeChanged(bool);
+        #endif
         
         #ifdef AVOID_SCREENSAVER

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

smplayer/trunk/src/baseguiplus.h

@@ -93 +93 @@
         virtual void showAll();
         virtual void quit();
+#ifdef Q_OS_OS2
+        void trayAvailable();
+#endif
 
 #if DOCK_PLAYLIST

smplayer/trunk/src/preferences.cpp

@@ -80 +80 @@
 #endif
 
-#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
+#if defined(Q_OS_WIN)
         //mplayer_bin= "mplayer/mplayer.exe";
         mplayer_bin= "mpv/mpv.exe";
+#elif defined(Q_OS_OS2)
+        mplayer_bin= "mplayer/mplayer.exe";
 #else
         //mplayer_bin = "mplayer";
@@ -127 +129 @@
         add_blackborders_on_fullscreen = false;
 
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
         #ifdef SCREENSAVER_OFF
         turn_screensaver_off = false;
@@ -655 +657 @@
         set->setValue("add_blackborders_on_fullscreen", add_blackborders_on_fullscreen);
 
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
         #ifdef SCREENSAVER_OFF
         set->setValue("turn_screensaver_off", turn_screensaver_off);
@@ -1207 +1209 @@
         add_blackborders_on_fullscreen = set->value("add_blackborders_on_fullscreen", add_blackborders_on_fullscreen).toBool();
 
-#ifdef Q_OS_WIN
+#if defined (Q_OS_WIN) || defined(Q_OS_OS2)
         #ifdef SCREENSAVER_OFF
         turn_screensaver_off = set->value("turn_screensaver_off", turn_screensaver_off).toBool();
@@ -1759 +1761 @@
 
 #if defined(MPV_SUPPORT) && defined(MPLAYER_SUPPORT)
-        #ifdef Q_OS_WIN
+        #if defined(Q_OS_WIN) || defined(Q_OS_OS2)
         // Check if the mplayer binary exists and try to fix it
         if (!QFile::exists(mplayer_bin)) {

smplayer/trunk/src/preferences.h

@@ -105 +105 @@
         bool add_blackborders_on_fullscreen;
 
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
         #ifdef SCREENSAVER_OFF
         bool turn_screensaver_off;

smplayer/trunk/src/prefgeneral.cpp

@@ -74 +74 @@
 
         // Screensaver
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
         screensaver_check->hide();
         #ifndef SCREENSAVER_OFF
@@ -251 +251 @@
         setAutoq( pref->autoq );
 
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
         #ifdef SCREENSAVER_OFF
         setTurnScreensaverOff( pref->turn_screensaver_off );
@@ -347 +347 @@
         TEST_AND_SET(pref->autoq, autoq());
 
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
         #ifdef SCREENSAVER_OFF
         TEST_AND_SET(pref->turn_screensaver_off, turnScreensaverOff());
@@ -835 +835 @@
 }
 
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
 #ifdef AVOID_SCREENSAVER
 void PrefGeneral::setAvoidScreensaver(bool b) {
@@ -1099 +1099 @@
            "subtitles automatically in the black borders.") */ );
 
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
         #ifdef SCREENSAVER_OFF
         setWhatsThis(turn_screensaver_off_check, tr("Switch screensaver off"),

smplayer/trunk/src/prefgeneral.h

@@ -120 +120 @@
         bool startInFullscreen();
 
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
         #ifdef SCREENSAVER_OFF
         void setTurnScreensaverOff(bool b);

smplayer/trunk/src/smplayer.cpp

@@ -572 +572 @@
 #else
 #ifdef Q_OS_OS2
-           .arg("eCS (OS/2)")
+           .arg("OS/2 and OS/2-based systems")
 #else
                    .arg("Other OS")