Changeset 137 for smplayer/vendor/current/src/prefinterface.cpp

Timestamp:

Dec 3, 2012, 5:29:00 PM (13 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: updated vendor to 0.8.2

File:

• smplayer/vendor/current/src/prefinterface.cpp (modified) (23 diffs)

smplayer/vendor/current/src/prefinterface.cpp

@@ -22 +22 @@
 #include "preferences.h"
 #include "paths.h"
-#include "config.h"
 #include "languages.h"
 #include "recents.h"
+#include "urlhistory.h"
 
 #include <QDir>
@@ -50 +50 @@
         iconset_combo->addItem( "Default" );
 
+#ifdef SKINS
+        n_skins = 0;
+#endif
+
         // User
         QDir icon_dir = Paths::configPath() + "/themes";
@@ -55 +59 @@
         QStringList iconsets = icon_dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
         for (int n=0; n < iconsets.count(); n++) {
+                #ifdef SKINS
+                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);
+                if (is_skin) {
+                        skin_combo->addItem( iconsets[n] );
+                        n_skins++;
+                }
+                else
+                #endif
                 iconset_combo->addItem( iconsets[n] );
         }
@@ -62 +76 @@
         iconsets = icon_dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
         for (int n=0; n < iconsets.count(); n++) {
+                #ifdef SKINS
+                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);
+                if ((is_skin) && (iconset_combo->findText( iconsets[n] ) == -1)) {
+                        skin_combo->addItem( iconsets[n] );
+                        n_skins++;
+                }
+                else
+                #endif
                 if (iconset_combo->findText( iconsets[n] ) == -1) {
                         iconset_combo->addItem( iconsets[n] );
                 }
         }
+        #ifdef SKINS
+        if (skin_combo->itemText(0) == "Black") {
+                skin_combo->removeItem(0);
+                skin_combo->addItem("Black");
+        }
+        #endif
 
 #ifdef SINGLE_INSTANCE
@@ -74 +104 @@
 #endif
 
+#ifdef SKINS
+        connect(gui_combo, SIGNAL(currentIndexChanged(int)),
+            this, SLOT(GUIChanged(int)));
+#endif
+
 #ifdef Q_OS_WIN
         floating_bypass_wm_check->hide();
+#endif
+
+#ifndef SEEKBAR_RESOLUTION
+        seeking_method_group->hide();
+#endif
+
+#ifndef SKINS
+        skin_combo->hide();
+        skin_label->hide();
+        skin_sp->hide();
 #endif
 
@@ -163 +208 @@
         gui_combo->addItem( tr("Mini GUI"), "MiniGUI");
         gui_combo->addItem( tr("Mpc GUI"), "MpcGUI");
+#ifdef SKINS
+        gui_combo->addItem( tr("Skinnable GUI"), "SkinGUI");
+        if (n_skins == 0) {
+                QModelIndex index = gui_combo->model()->index(gui_combo->count()-1,0);
+                gui_combo->model()->setData(index, QVariant(0), Qt::UserRole -1);
+        }
+#endif
         gui_combo->setCurrentIndex(gui_index);
 
@@ -180 +232 @@
         setUseSingleInstance(pref->use_single_instance);
 #endif
-        setRecentsMaxItems(pref->history_recents->maxItems());
-
         setSeeking1(pref->seeking1);
         setSeeking2(pref->seeking2);
@@ -188 +238 @@
 
         setUpdateWhileDragging(pref->update_while_seeking);
+#ifdef SEEKBAR_RESOLUTION
         setRelativeSeeking(pref->relative_seeking);
+#endif
         setPreciseSeeking(pref->precise_seeking);
 
@@ -208 +260 @@
         setFloatingBypassWindowManager(pref->bypass_window_manager);
 #endif
+
+        setRecentsMaxItems(pref->history_recents->maxItems());
+        setURLMaxItems(pref->history_urls->maxItems());
+        setRememberDirs(pref->save_dirs);
 }
 
@@ -241 +297 @@
 #endif
 
-        if (pref->history_recents->maxItems() != recentsMaxItems()) {
-                pref->history_recents->setMaxItems( recentsMaxItems() );
-                recents_changed = true;
-        }
-
         pref->seeking1 = seeking1();
         pref->seeking2 = seeking2();
@@ -252 +303 @@
 
         pref->update_while_seeking = updateWhileDragging();
+#ifdef SEEKBAR_RESOLUTION
         pref->relative_seeking= relativeSeeking();
+#endif
         pref->precise_seeking = preciseSeeking();
 
@@ -273 +326 @@
         pref->bypass_window_manager = floatingBypassWindowManager();
 #endif
+
+        if (pref->history_recents->maxItems() != recentsMaxItems()) {
+                pref->history_recents->setMaxItems( recentsMaxItems() );
+                recents_changed = true;
+        }
+
+        if (pref->history_urls->maxItems() != urlMaxItems()) {
+                pref->history_urls->setMaxItems( urlMaxItems() );
+                url_max_changed = true;
+        }
+
+        pref->save_dirs = rememberDirs();
 }
 
@@ -296 +361 @@
 
 void PrefInterface::setIconSet(QString set) {
+        /*
         if (set.isEmpty())
                 iconset_combo->setCurrentIndex(0);
         else
                 iconset_combo->setCurrentText(set);
+        */
+        iconset_combo->setCurrentIndex(0);
+        for (int n=0; n < iconset_combo->count(); n++) {
+                if (iconset_combo->itemText(n) == set) {
+                        iconset_combo->setCurrentIndex(n);
+                        break;
+                }
+        }
+#ifdef SKINS
+        skin_combo->setCurrentIndex(0);
+        for (int n=0; n < skin_combo->count(); n++) {
+                if (skin_combo->itemText(n) == set) {
+                        skin_combo->setCurrentIndex(n);
+                        break;
+                }
+        }
+#endif
 }
 
 QString PrefInterface::iconSet() {
+#ifdef SKINS
+        QString GUI = gui_combo->itemData(gui_combo->currentIndex()).toString();
+        if (GUI == "SkinGUI") {
+                return skin_combo->currentText();
+        }
+        else
+#endif
         if (iconset_combo->currentIndex()==0) 
                 return "";
@@ -341 +431 @@
 
 void PrefInterface::setGUI(QString gui_name) {
+#ifdef SKINS
+        if ((n_skins == 0) && (gui_name == "SkinGUI")) gui_name = "DefaultGUI";
+#endif
         int i = gui_combo->findData(gui_name);
         if (i < 0) i=0;
@@ -349 +442 @@
         return gui_combo->itemData(gui_combo->currentIndex()).toString();
 }
+
+#ifdef SKINS
+void PrefInterface::GUIChanged(int index) {
+        if (gui_combo->itemData(index).toString() == "SkinGUI") {
+                iconset_combo->hide();
+                iconset_label->hide();
+                iconset_sp->hide();
+                skin_combo->show();
+                skin_label->show();
+                skin_sp->show();
+        } else {
+                iconset_combo->show();
+                iconset_label->show();
+                iconset_sp->show();
+                skin_combo->hide();
+                skin_label->hide();
+                skin_sp->hide();
+        }
+}
+#endif
 
 #ifdef SINGLE_INSTANCE
@@ -360 +473 @@
 }
 #endif
-
-void PrefInterface::setRecentsMaxItems(int n) {
-        recents_max_items_spin->setValue(n);
-}
-
-int PrefInterface::recentsMaxItems() {
-        return recents_max_items_spin->value();
-}
 
 void PrefInterface::setSeeking1(int n) {
@@ -412 +517 @@
 }
 
+#ifdef SEEKBAR_RESOLUTION
 void PrefInterface::setRelativeSeeking(bool b) {
         relative_seeking_button->setChecked(b);
@@ -420 +526 @@
         return relative_seeking_button->isChecked();
 }
+#endif
 
 void PrefInterface::setPreciseSeeking(bool b) {
@@ -512 +619 @@
 #endif
 
+void PrefInterface::setRecentsMaxItems(int n) {
+        recents_max_items_spin->setValue(n);
+}
+
+int PrefInterface::recentsMaxItems() {
+        return recents_max_items_spin->value();
+}
+
+void PrefInterface::setURLMaxItems(int n) {
+        url_max_items_spin->setValue(n);
+}
+
+int PrefInterface::urlMaxItems() {
+        return url_max_items_spin->value();
+}
+
+void PrefInterface::setRememberDirs(bool b) {
+        save_dirs_check->setChecked(b);
+}
+
+bool PrefInterface::rememberDirs() {
+        return save_dirs_check->isChecked();
+}
+
 void PrefInterface::createHelp() {
         clearHelp();
@@ -528 +659 @@
         tr("If this option is enabled the video window will be hidden when playing audio files.") );
 
-        setWhatsThis(recents_max_items_spin, tr("Recent files"),
-        tr("Select the maximum number of items that will be shown in the "
-           "<b>Open->Recent files</b> submenu. If you set it to 0 that "
-           "menu won't be shown at all.") );
-
         setWhatsThis(language_combo, tr("Language"),
                 tr("Here you can change the language of the application.") );
-
-        setWhatsThis(iconset_combo, tr("Icon set"),
-        tr("Select the icon set you prefer for the application.") );
-
-        setWhatsThis(style_combo, tr("Style"),
-        tr("Select the style you prefer for the application.") );
 
         setWhatsThis(gui_combo, tr("GUI"),
@@ -548 +668 @@
            "toolbar and control bar. The <b>Mini GUI</b> provides a "
            "more simple GUI, without toolbar and a control bar with few "
-           "buttons.<br>"
-           "<b>Note:</b> this option will take effect the next "
-           "time you run SMPlayer.") );
+           "buttons.") );
+
+        setWhatsThis(iconset_combo, tr("Icon set"),
+        tr("Select the icon set you prefer for the application.") );
+
+#ifdef SKINS
+        setWhatsThis(skin_combo, tr("Skin"),
+        tr("Select the skin you prefer for the application. Only available with the skinnable GUI.") );
+#endif
+
+        setWhatsThis(style_combo, tr("Style"),
+        tr("Select the style you prefer for the application.") );
+
 
         setWhatsThis(changeFontButton, tr("Default font"),
@@ -576 +706 @@
         tr("Select what to do when dragging the time slider.") );
 
+#ifdef SEEKBAR_RESOLUTION
         setWhatsThis(seeking_method_group, tr("Seeking method"),
                 tr("Sets the method to be used when seeking with the slider. "
            "Absolute seeking may be a little bit more accurate, while "
            "relative seeking may work better with files with a wrong length.") );
+#endif
 
         setWhatsThis(precise_seeking_check, tr("Precise seeking"),
@@ -621 +753 @@
            "doesn't work well with your window manager.") );
 #endif
+
+        addSectionTitle(tr("Privacy"));
+
+        setWhatsThis(recents_max_items_spin, tr("Recent files"),
+        tr("Select the maximum number of items that will be shown in the "
+           "<b>Open->Recent files</b> submenu. If you set it to 0 that "
+           "menu won't be shown at all.") );
+
+        setWhatsThis(url_max_items_spin, tr("Max. URLs"),
+        tr("Select the maximum number of items that the <b>Open->URL</b> "
+           "dialog will remember. Set it to 0 if you don't want any URL "
+           "to be stored.") );
+
+        setWhatsThis(save_dirs_check, tr("Remember last directory"),
+                tr("If this option is checked, SMPlayer will remember the last folder you use to open a file.") );
 }