Changeset 121 for smplayer/vendor/current/src/defaultgui.cpp

Timestamp:

Mar 15, 2012, 5:14:10 PM (13 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer 0.7.1: vendor update

File:

• smplayer/vendor/current/src/defaultgui.cpp (modified) (6 diffs)

smplayer/vendor/current/src/defaultgui.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
+    Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -44 +44 @@
 #include <QMenuBar>
 
+#define TOOLBAR_VERSION 1
+
 using namespace Global;
 
-DefaultGui::DefaultGui( QWidget * parent, Qt::WindowFlags flags )
-        : BaseGuiPlus( parent, flags )
+DefaultGui::DefaultGui( bool use_server, QWidget * parent, Qt::WindowFlags flags )
+        : BaseGuiPlus( use_server, parent, flags )
 {
         createStatusBar();
@@ -545 +547 @@
 
 #if CONTROLWIDGET_OVER_VIDEO
-        floating_control->setAnimated( pref->floating_control_animated );
+        if ((pref->compact_mode) && (!pref->fullscreen)) {
+                floating_control->setAnimated( false );
+        } else {
+                floating_control->setAnimated( pref->floating_control_animated );
+        }
         floating_control->setMargin(pref->floating_control_margin);
 #ifndef Q_OS_WIN
@@ -641 +647 @@
         set->setValue("controlwidget_mini", ToolbarEditor::save(controlwidget_mini) );
         set->setValue("floating_control", ToolbarEditor::save(floating_control->toolbar()) );
+        set->setValue("toolbar1_version", TOOLBAR_VERSION);
         set->endGroup();
 #endif
@@ -682 +689 @@
         QList<QAction *> actions_list = findChildren<QAction *>();
         QStringList toolbar1_actions;
-        toolbar1_actions << "open_file" << "open_dvd" << "open_url" << "separator" << "compact" << "fullscreen"
+        toolbar1_actions << "open_file" << "open_dvd" << "open_url" << "favorites_menu" << "separator" << "compact" << "fullscreen"
                      << "separator" << "screenshot" << "separator" << "show_file_properties" << "show_playlist" 
                      << "show_preferences" << "separator" << "play_prev" << "play_next";
@@ -729 +736 @@
 
         set->beginGroup( "actions" );
-        ToolbarEditor::load(toolbar1, set->value("toolbar1", toolbar1_actions).toStringList(), actions_list );
+        int toolbar_version = set->value("toolbar1_version", 0).toInt();
+        if (toolbar_version >= TOOLBAR_VERSION) {
+                ToolbarEditor::load(toolbar1, set->value("toolbar1", toolbar1_actions).toStringList(), actions_list );
+        } else {
+                qDebug("DefaultGui::loadConfig: toolbar too old, loading default one");
+                ToolbarEditor::load(toolbar1, toolbar1_actions, actions_list );
+        }
         ToolbarEditor::load(controlwidget, set->value("controlwidget", controlwidget_actions).toStringList(), actions_list );
         ToolbarEditor::load(controlwidget_mini, set->value("controlwidget_mini", controlwidget_mini_actions).toStringList(), actions_list );