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

Timestamp:

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

Author:

Silvan Scherrer

Message:

SMPlayer: update vendor to 0.8.7

File:

• smplayer/vendor/current/src/preferences.cpp (modified) (37 diffs)

smplayer/vendor/current/src/preferences.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2013 Ricardo Villalba <[email protected]>
+    Copyright (C) 2006-201 Ricardo Villalba <[email protected]>
 
     This program is free software; you can redistribute it and/or modify
@@ -24 +24 @@
 #include "urlhistory.h"
 #include "filters.h"
+
 
 #include <QSettings>
@@ -30 +31 @@
 #include <QDir>
 #include <QLocale>
+
+
+
+
 
 #if QT_VERSION >= 0x040400
@@ -109 +114 @@
 
 #if defined(Q_OS_WIN) || defined(Q_OS_OS2)
+
         turn_screensaver_off = false;
+
+
         avoid_screensaver = true;
+
 #else
         disable_screensaver = true;
@@ -134 +143 @@
         mute = false;
 
+
+
+
         autosync = false;
         autosync_factor = 100;
@@ -139 +151 @@
         use_mc = false;
         mc_value = 0;
+
+
+
 
         osd = None;
@@ -152 +167 @@
         dvd_device = "";
         cdrom_device = "";
+
+
+
 
 #ifndef Q_OS_WIN
@@ -238 +256 @@
 
         freetype_support = true;
+
+
+
 
 
@@ -257 +278 @@
 
         use_idx = false;
+
 
         mplayer_additional_options="";
@@ -353 +375 @@
 
         reset_stop = false;
+
 
         language = "";
@@ -398 +421 @@
 
         auto_add_to_playlist = true;
-        add_to_playlist_consecutive_files = false;
+        ;
 
 #if LOGO_ANIMATION
@@ -479 +502 @@
         floating_control_animated = true;
         floating_display_in_compact_mode = false;
-#ifndef Q_OS_WIN
-        bypass_window_manager = true;
-#endif
+        floating_activation_area = AutohideWidget::Anywhere;
+        floating_hide_delay = 3000;
 
 
@@ -523 +545 @@
        ******* */
 
-        set->beginGroup( "general");
+        set->beginGroup(eneral");
 
         set->setValue("config_version", config_version);
@@ -552 +574 @@
 
 #if defined(Q_OS_WIN) || defined(Q_OS_OS2)
+
         set->setValue("turn_screensaver_off", turn_screensaver_off);
+
+
         set->setValue("avoid_screensaver", avoid_screensaver);
+
 #else
         set->setValue("disable_screensaver", disable_screensaver);
@@ -577 +603 @@
         set->setValue("mute", mute);
 
+
+
+
         set->setValue("autosync", autosync);
         set->setValue("autosync_factor", autosync_factor);
@@ -583 +612 @@
         set->setValue("mc_value", mc_value);
 
+
+
+
         set->setValue("osd", osd);
         set->setValue("osd_delay", osd_delay);
@@ -588 +620 @@
         set->setValue("file_settings_method", file_settings_method);
 
-        set->endGroup(); // general
+        set->endGroup(); // eneral
 
 
@@ -599 +631 @@
         set->setValue("dvd_device", dvd_device);
         set->setValue("cdrom_device", cdrom_device);
+
+
+
 
 #ifdef Q_OS_WIN
@@ -686 +721 @@
 
         set->setValue("freetype_support", freetype_support);
+
+
+
 
         set->endGroup(); // subtitles
@@ -709 +747 @@
 
         set->setValue("use_idx", use_idx);
+
 
         set->setValue("mplayer_additional_options", mplayer_additional_options);
@@ -796 +835 @@
 
         set->setValue("reset_stop", reset_stop);
+
 
         set->setValue("language", language);
@@ -831 +871 @@
 
         set->setValue("auto_add_to_playlist", auto_add_to_playlist);
-        set->setValue("add_to_playlist_consecutive_files", add_to_playlist_consecutive_files);
+        set->setValue(");
 
 #if LOGO_ANIMATION
@@ -932 +972 @@
         set->setValue("animated", floating_control_animated);
         set->setValue("display_in_compact_mode", floating_display_in_compact_mode);
-#ifndef Q_OS_WIN
-        set->setValue("bypass_window_manager", bypass_window_manager);
-#endif
+        set->setValue("activation_area", floating_activation_area);
+        set->setValue("hide_delay", floating_hide_delay);
         set->endGroup(); // floating_control
 
@@ -993 +1032 @@
        ******* */
 
-        set->beginGroup( "general");
+        set->beginGroup(eneral");
 
         config_version = set->value("config_version", 0).toInt();
@@ -1024 +1063 @@
 
 #if defined(Q_OS_WIN) || defined(Q_OS_OS2)
+
         turn_screensaver_off = set->value("turn_screensaver_off", turn_screensaver_off).toBool();
+
+
         avoid_screensaver = set->value("avoid_screensaver", avoid_screensaver).toBool();
+
 #else
         disable_screensaver = set->value("disable_screensaver", disable_screensaver).toBool();
@@ -1049 +1092 @@
         mute = set->value("mute", mute).toBool();
 
+
+
+
         autosync = set->value("autosync", autosync).toBool();
         autosync_factor = set->value("autosync_factor", autosync_factor).toInt();
@@ -1055 +1101 @@
         mc_value = set->value("mc_value", mc_value).toDouble();
 
+
+
+
         osd = set->value("osd", osd).toInt();
         osd_delay = set->value("osd_delay", osd_delay).toInt();
@@ -1060 +1109 @@
         file_settings_method = set->value("file_settings_method", file_settings_method).toString();
 
-        set->endGroup(); // general
+        set->endGroup(); // eneral
 
 
@@ -1071 +1120 @@
         dvd_device = set->value("dvd_device", dvd_device).toString();
         cdrom_device = set->value("cdrom_device", cdrom_device).toString();
+
+
+
 
 #ifdef Q_OS_WIN
@@ -1159 +1211 @@
 
         freetype_support = set->value("freetype_support", freetype_support).toBool();
+
+
+
 
         set->endGroup(); // subtitles
@@ -1187 +1242 @@
 
         use_idx = set->value("use_idx", use_idx).toBool();
+
 
         mplayer_additional_options = set->value("mplayer_additional_options", mplayer_additional_options).toString();
@@ -1254 +1310 @@
         mouse_xbutton2_click_function = set->value("mouse_xbutton2_click_function", mouse_xbutton2_click_function).toString();
         wheel_function = set->value("mouse_wheel_function", wheel_function).toInt();
-        int wheel_function_cycle_int = set->value("wheel_function_cycle", (int) wheel_function_cycle).toInt();
-        wheel_function_cycle = QFlags<Preferences::WheelFunctions> (QFlag(wheel_function_cycle_int));
+        {
+                int wheel_function_cycle_int = set->value("wheel_function_cycle", (int) wheel_function_cycle).toInt();
+                wheel_function_cycle = (WheelFunctions) wheel_function_cycle_int;
+        }
         wheel_function_seeking_reverse = set->value("wheel_function_seeking_reverse", wheel_function_seeking_reverse).toBool();
 
@@ -1273 +1331 @@
 
         reset_stop = set->value("reset_stop", reset_stop).toBool();
+
 
         language = set->value("language", language).toString();
@@ -1308 +1367 @@
 
         auto_add_to_playlist = set->value("auto_add_to_playlist", auto_add_to_playlist).toBool();
-        add_to_playlist_consecutive_files = set->value("add_to_playlist_consecutive_files", add_to_playlist_consecutive_files).toBool();
+        ();
 
 #if LOGO_ANIMATION
@@ -1408 +1467 @@
         floating_control_animated = set->value("animated", floating_control_animated).toBool();
         floating_display_in_compact_mode = set->value("display_in_compact_mode", floating_display_in_compact_mode).toBool();
-#ifndef Q_OS_WIN
-        bypass_window_manager = set->value("bypass_window_manager", bypass_window_manager).toBool();
-#endif
+        floating_activation_area = set->value("activation_area", floating_activation_area).toInt();
+        floating_hide_delay = set->value("hide_delay", floating_hide_delay).toInt();
         set->endGroup(); // floating_control
 
@@ -1460 +1518 @@
 
 
+
         // Fix some values if config is old
         if (config_version < CURRENT_CONFIG_VERSION) {
@@ -1537 +1596 @@
 #if QT_VERSION >= 0x040400
         if (screenshot_directory.isEmpty()) {
+
+
+
+
+
                 QString pdir = QDesktopServices::storageLocation(QDesktopServices::PicturesLocation);
                 if (pdir.isEmpty()) pdir = QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation);
                 if (pdir.isEmpty()) pdir = QDesktopServices::storageLocation(QDesktopServices::HomeLocation);
+
                 if (pdir.isEmpty()) pdir = "/tmp";
                 if (!QFile::exists(pdir)) {