Changeset 181 for smplayer/trunk/src/preferencesdialog.cpp

Timestamp:

Aug 31, 2016, 5:31:04 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update trunk to version 16.8.0

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/preferencesdialog.cpp (modified) (10 diffs)

smplayer/trunk/src/preferencesdialog.cpp

@@ -29 +29 @@
 #include "prefadvanced.h"
 #include "prefplaylist.h"
-#include "preftv.h"
 #include "prefupdates.h"
 #include "prefnetwork.h"
+#include "infowindow.h"
+#include "preferences.h"
+#include "images.h"
+#include <QVBoxLayout>
+#include <QDebug>
+
+#ifdef TV_SUPPORT
+#include "preftv.h"
+#endif
 
 #if USE_ASSOCIATIONS
@@ -37 +45 @@
 #endif
 
-#include "preferences.h"
-
-#include <QVBoxLayout>
-#include <QTextBrowser>
-
-#include "images.h"
+#if QT_VERSION >= 0x050000
+#include "myscroller.h"
+#endif
 
 PreferencesDialog::PreferencesDialog(QWidget * parent, Qt::WindowFlags f)
         : QDialog(parent, f )
+        , icon_mode(false)
 {
         setupUi(this);
+        /*
+        sections->setUniformItemSizes(true);
+        sections->setResizeMode(QListView::Adjust);
+        */
+        sections->setMovement(QListView::Static);
+
+#if QT_VERSION >= 0x050000
+        MyScroller::setScroller(sections->viewport());
+#endif
 
         // Setup buttons
@@ -56 +71 @@
         connect( applyButton, SIGNAL(clicked()), this, SLOT(apply()) );
         connect( helpButton, SIGNAL(clicked()), this, SLOT(showHelp()) );
-        
 
         setWindowIcon( Images::icon("logo") );
 
-        help_window = new QTextBrowser(this);
-        help_window->setWindowFlags(Qt::Window);
-        help_window->resize(300, 450);
-        //help_window->adjustSize();
-        help_window->setWindowTitle( tr("SMPlayer - Help") );
-        help_window->setWindowIcon( Images::icon("logo") );
-        help_window->setOpenExternalLinks(true);
+        help_window = new InfoWindow(this);
 
         page_general = new PrefGeneral;
@@ -89 +97 @@
         addSection( page_playlist );
 
+#ifdef TV_SUPPORT
         page_tv = new PrefTV;
         addSection( page_tv );
+#endif
 
 #if USE_ASSOCIATIONS
@@ -111 +121 @@
         //adjustSize();
         retranslateStrings();
-}
-
-PreferencesDialog::~PreferencesDialog()
-{
+
+        /*
+        qDebug() << "PreferencesDialog: movement:" << sections->movement();
+        qDebug() << "PreferencesDialog: maximumWidth:" << sections->maximumWidth();
+        qDebug() << "PreferencesDialog: spacing:" << sections->spacing();
+        */
+}
+
+PreferencesDialog::~PreferencesDialog() {
+}
+
+void PreferencesDialog::setIconMode(bool b) {
+        qDebug() << "PreferencesDialog::setIconMode:" << b;
+
+        if (b) {
+                sections->setUniformItemSizes(true);
+                sections->setViewMode(QListView::IconMode);
+                sections->setMaximumWidth(128);
+                sections->setSpacing(12);
+        } else {
+                sections->setUniformItemSizes(false);
+                sections->setViewMode(QListView::ListMode);
+                sections->setMaximumWidth(16777215);
+                sections->setSpacing(0);
+        }
 }
 
@@ -130 +161 @@
                 sections->item(n)->setText( w->sectionName() );
                 sections->item(n)->setIcon( w->sectionIcon() );
+                sections->item(n)->setToolTip( w->sectionName() );
         }
 
@@ -138 +170 @@
 
         help_window->setWindowTitle( tr("SMPlayer - Help") );
-
-        // Qt 4.2 doesn't update the buttons' text
-#if QT_VERSION < 0x040300
-        okButton->setText( tr("OK") );
-        cancelButton->setText( tr("Cancel") );
+        help_window->setWindowIcon( Images::icon("logo") );
+
+        // Some Qt versions don't provide translated strings
+        // for these buttons
+        okButton->setText( tr("&OK") );
+        cancelButton->setText( tr("&Cancel") );
         applyButton->setText( tr("Apply") );
         helpButton->setText( tr("Help") );
-#endif
 }
 
@@ -183 +215 @@
         page_advanced->setData(pref);
         page_playlist->setData(pref);
+#ifdef TV_SUPPORT
         page_tv->setData(pref);
+#endif
         page_updates->setData(pref);
         page_network->setData(pref);
@@ -201 +235 @@
         page_advanced->getData(pref);
         page_playlist->getData(pref);
+#ifdef TV_SUPPORT
         page_tv->getData(pref);
+#endif
         page_updates->getData(pref);
         page_network->getData(pref);
@@ -219 +255 @@
         if (!need_restart) need_restart = page_advanced->requiresRestart();
         if (!need_restart) need_restart = page_playlist->requiresRestart();
+#ifdef TV_SUPPORT
         if (!need_restart) need_restart = page_tv->requiresRestart();
+#endif
         if (!need_restart) need_restart = page_updates->requiresRestart();
         if (!need_restart) need_restart = page_network->requiresRestart();