Changeset 163 for smplayer/vendor/current/src/prefgeneral.cpp

Timestamp:

May 15, 2014, 7:53:54 PM (11 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update vendor to 0.8.7

File:

• smplayer/vendor/current/src/prefgeneral.cpp (modified) (15 diffs)

smplayer/vendor/current/src/prefgeneral.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -57 +57 @@
 #if defined(Q_OS_WIN) || defined(Q_OS_OS2)
         screensaver_check->hide();
+        #ifndef SCREENSAVER_OFF
+        turn_screensaver_off_check->hide();
+        #endif
+        #ifndef AVOID_SCREENSAVER
+        avoid_screensaver_check->hide();
+        #endif
 #else
         screensaver_group->hide();
@@ -196 +202 @@
         setEq2( pref->use_soft_video_eq );
         setUseAudioEqualizer( pref->use_audio_equalizer );
+        global_audio_equalizer_check->setChecked(pref->global_audio_equalizer);
         setGlobalVolume( pref->global_volume );
         setSoftVol( pref->use_soft_vol );
@@ -212 +219 @@
 
 #if defined(Q_OS_WIN) || defined(Q_OS_OS2)
+        #ifdef SCREENSAVER_OFF
+        setTurnScreensaverOff( pref->turn_screensaver_off );
+        #endif
+        #ifdef AVOID_SCREENSAVER
         setAvoidScreensaver( pref->avoid_screensaver );
-        setTurnScreensaverOff( pref->turn_screensaver_off );
+        #endif
 #else
         setDisableScreensaver( pref->disable_screensaver );
@@ -282 +293 @@
         pref->global_volume = globalVolume();
         TEST_AND_SET(pref->use_audio_equalizer, useAudioEqualizer());
+        pref->global_audio_equalizer = global_audio_equalizer_check->isChecked();
         TEST_AND_SET(pref->use_hwac3, Ac3DTSPassthrough());
         pref->initial_volnorm = initialVolNorm();
@@ -299 +311 @@
 
 #if defined(Q_OS_WIN) || defined(Q_OS_OS2)
+        #ifdef SCREENSAVER_OFF
+        TEST_AND_SET(pref->turn_screensaver_off, turnScreensaverOff());
+        #endif
+        #ifdef AVOID_SCREENSAVER
         pref->avoid_screensaver = avoidScreensaver();
-        TEST_AND_SET(pref->turn_screensaver_off, turnScreensaverOff());
+        #endif
 #else
         TEST_AND_SET(pref->disable_screensaver, disableScreensaver());
@@ -745 +761 @@
 
 #if defined(Q_OS_WIN) || defined(Q_OS_OS2)
+#ifdef AVOID_SCREENSAVER
 void PrefGeneral::setAvoidScreensaver(bool b) {
         avoid_screensaver_check->setChecked(b);
@@ -752 +769 @@
         return avoid_screensaver_check->isChecked();
 }
-
+#endif
+
+#ifdef SCREENSAVER_OFF
 void PrefGeneral::setTurnScreensaverOff(bool b) {
         turn_screensaver_off_check->setChecked(b);
@@ -760 +779 @@
         return turn_screensaver_off_check->isChecked();
 }
+#endif
+
 #else
 void PrefGeneral::setDisableScreensaver(bool b) {
@@ -797 +818 @@
         qDebug("PrefGeneral::vo_combo_changed: %d", idx);
         bool visible = (vo_combo->itemData(idx).toString() == "user_defined");
-        vo_user_defined_edit->setShown(visible);
+        vo_user_defined_edit->setVisible(visible);
         vo_user_defined_edit->setFocus();
 
 #ifndef Q_OS_WIN
         bool vdpau_button_visible = (vo_combo->itemData(idx).toString() == "vdpau");
-        vdpau_button->setShown(vdpau_button_visible);
+        vdpau_button->setVisible(vdpau_button_visible);
 #endif
 }
@@ -809 +830 @@
         qDebug("PrefGeneral::ao_combo_changed: %d", idx);
         bool visible = (ao_combo->itemData(idx).toString() == "user_defined");
-        ao_user_defined_edit->setShown(visible);
+        ao_user_defined_edit->setVisible(visible);
         ao_user_defined_edit->setFocus();
 }
@@ -965 +986 @@
 
 #if defined(Q_OS_WIN) || defined(Q_OS_OS2)
+        #ifdef SCREENSAVER_OFF
         setWhatsThis(turn_screensaver_off_check, tr("Switch screensaver off"),
                 tr("This option switches the screensaver off just before starting to "
@@ -970 +992 @@
            "option is enabled, the screensaver won't appear even if playing "
            "audio files or when a file is paused."));
-
+        #endif
+        #ifdef AVOID_SCREENSAVER
         setWhatsThis(avoid_screensaver_check, tr("Avoid screensaver"),
                 tr("When this option is checked, SMPlayer will try to prevent the "
@@ -977 +1000 @@
            "mode. This option only works if the SMPlayer window is in "
                    "the foreground."));
+        #endif
 #else
         setWhatsThis(screensaver_check, tr("Disable screensaver"),
@@ -1009 +1033 @@
         setWhatsThis(audio_equalizer_check, tr("Enable the audio equalizer"),
                 tr("Check this option if you want to use the audio equalizer.") );
+
+        setWhatsThis(global_audio_equalizer_check, tr("Global audio equalizer"),
+                tr("If this option is checked, all media files share the audio equalizer.") +" "+
+                tr("If it's not checked, the audio equalizer values are saved along each file "
+           "and loaded back when the file is played later.") );
 
         setWhatsThis(hwac3_check, tr("AC3/DTS pass-through S/PDIF"),