Changeset 176 for smplayer/trunk/src/prefinterface.cpp

Timestamp:

May 3, 2016, 5:25:45 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update trunk to version 16.4

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/prefinterface.cpp (modified) (14 diffs)

smplayer/trunk/src/prefinterface.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -60 +60 @@
         QStringList iconsets = icon_dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
         for (int n=0; n < iconsets.count(); n++) {
-                QString theme_dir = Paths::configPath() + "/themes/" + iconsets[n];
-                #ifdef USE_RESOURCES
-                if (!QFile::exists(theme_dir + "/" + iconsets[n] + ".rcc")) continue;
-                #endif
-
                 #ifdef SKINS
-                QString css_file = theme_dir + "/main.css";
+                QString css_file = Paths::configPath() + "/themes/" + iconsets[n] + "/main.css";
                 bool is_skin = QFile::exists(css_file);
                 //qDebug("***** %s %d", css_file.toUtf8().constData(), is_skin);
@@ -82 +77 @@
         iconsets = icon_dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
         for (int n=0; n < iconsets.count(); n++) {
-                QString theme_dir = Paths::themesPath() + "/" + iconsets[n];
-                #ifdef USE_RESOURCES
-                if (!QFile::exists(theme_dir + "/" + iconsets[n] + ".rcc")) continue;
-                #endif
-
                 #ifdef SKINS
-                QString css_file = theme_dir + "/main.css";
+                QString css_file = Paths::themesPath() + "/" + iconsets[n] + "/main.css";
                 bool is_skin = QFile::exists(css_file);
                 //qDebug("***** %s %d", css_file.toUtf8().constData(), is_skin);
@@ -119 +109 @@
             this, SLOT(GUIChanged(int)));
 #endif
+
+        connect(mainwindow_resize_combo, SIGNAL(currentIndexChanged(int)),
+            this, SLOT(resizeMethodChanged(int)));
 
 #ifndef SEEKBAR_RESOLUTION
@@ -174 +167 @@
 
         // Icons
-        resize_window_icon->setPixmap( Images::icon("resize_window") );
+        /* resize_window_icon->setPixmap( Images::icon("resize_window") ); */
         /* volume_icon->setPixmap( Images::icon("speaker") ); */
 
@@ -188 +181 @@
 
         if (qApp->isLeftToRight()) {
-                seek1->setIcon( Images::icon("forward10s") );
-                seek2->setIcon( Images::icon("forward1m") );
-                seek3->setIcon( Images::icon("forward10m") );
+                seek1->setIcon( Images::icon("forward10s", 32) );
+                seek2->setIcon( Images::icon("forward1m", 32) );
+                seek3->setIcon( Images::icon("forward10m", 32) );
         } else {
-                seek1->setIcon( Images::flippedIcon("forward10s") );
-                seek2->setIcon( Images::flippedIcon("forward1m") );
-                seek3->setIcon( Images::flippedIcon("forward10m") );
-        }
-        seek4->setIcon( Images::icon("mouse", seek1->icon()->width()) );
+                seek1->setIcon( Images::flippedIcon("forward10s", 32) );
+                seek2->setIcon( Images::flippedIcon("forward1m", 32) );
+                seek3->setIcon( Images::flippedIcon("forward10m", 32) );
+        }
+        seek4->setIcon( Images::icon("mouse",32) );
 
         // Language combo
@@ -212 +205 @@
         int gui_index = gui_combo->currentIndex();
         gui_combo->clear();
+#ifdef DEFAULTGUI
         gui_combo->addItem( tr("Basic GUI"), "DefaultGUI");
+#endif
+#ifdef MINIGUI
         gui_combo->addItem( tr("Mini GUI"), "MiniGUI");
+#endif
 #ifdef MPCGUI
         gui_combo->addItem( tr("Mpc GUI"), "MpcGUI");
@@ -239 +236 @@
         setSaveSize( pref->save_window_size_on_exit );
 
-        move_when_dragging_check->setChecked(pref->move_when_dragging);
+        center_window_check->setChecked(pref->center_window);
+        center_if_outside_check->setChecked(pref->center_window_if_outside);
 
 #ifdef SINGLE_INSTANCE
@@ -306 +304 @@
         pref->save_window_size_on_exit = saveSize();
 
-        pref->move_when_dragging = move_when_dragging_check->isChecked();
+        pref->center_window = center_window_check->isChecked();
+        pref->center_window_if_outside = center_if_outside_check->isChecked();
 
 #ifdef SINGLE_INSTANCE
@@ -479 +478 @@
 #endif
 
+void PrefInterface::resizeMethodChanged(int index) {
+        center_if_outside_check->setEnabled(index != 0);
+}
+
 #ifdef SINGLE_INSTANCE
 void PrefInterface::setUseSingleInstance(bool b) {
@@ -658 +661 @@
            "you prefer.") );
 
+        setWhatsThis(center_if_outside_check, tr("Prevent window to get outside of screen"),
+                tr("If after an autoresize the main window gets outside of the screen this option "
+           "will center the window to prevent it.") );
+
+        setWhatsThis(center_window_check, tr("Center window"),
+        tr("When this option is enabled, the main window will be centered on the desktop.") );
+
         setWhatsThis(save_size_check, tr("Remember position and size"),
         tr("If you check this option, the position and size of the main "
@@ -664 +674 @@
         setWhatsThis(hide_video_window_on_audio_check, tr("Hide video window when playing audio files"),
         tr("If this option is enabled the video window will be hidden when playing audio files.") );
-
-        setWhatsThis(move_when_dragging_check, tr("Move the window when the video area is dragged"),
-        tr("If this option is checked, the main window will be moved if you drag the mouse over the video area.") );
 
         setWhatsThis(language_combo, tr("Language"),
@@ -676 +683 @@
            "toolbar and control bar.") +" "+ 
         tr("The <b>Mini GUI</b> provides a more simple interface, without toolbar and a control bar with few "
-           "buttons.") +" "+
-        tr("The <b>Skinnable GUI</b> provides an interface where several skins are available.")
+           "buttons.")
 #ifdef MPCGUI
         +" "+
         tr("The <b>Mpc GUI</b> looks like the interface in Media Player Classic.")
 #endif
+#ifdef SKINS
+        +" "+
+        tr("The <b>Skinnable GUI</b> provides an interface where several skins are available.")
+#endif
+
         );
 
@@ -736 +747 @@
            "so if you press play button the media will resume at the same point. You need "
            "to press the stop button twice to reset the time position, but if this "
-           "option is checked the time position will be set to 0 with only once "
+           "option is checked the time position will be set to 0 with only one "
            "press of the stop button.") );