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

Timestamp:

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

Author:

Silvan Scherrer

Message:

smplayer: update vendor to version 16.8.0

File:

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

smplayer/vendor/current/src/prefinterface.cpp

@@ -31 +31 @@
 #include <QFontDialog>
 
+#ifdef HDPI_SUPPORT
+#include "hdpisupport.h"
+
+#if QT_VERSION >= 0x050600
+#define HDPI_USE_SCALE_FACTOR
+#endif
+#endif
+
 #define SINGLE_INSTANCE_TAB 2
+#define HDPI_TAB 5
 
 PrefInterface::PrefInterface(QWidget * parent, Qt::WindowFlags f)
@@ -41 +50 @@
         // Style combo
 #if !STYLE_SWITCHING
-    style_label->hide();
-    style_combo->hide();
+        style_label->hide();
+        style_combo->hide();
 #else
         style_combo->addItem( "<default>" );
@@ -123 +132 @@
 #endif
 
+#ifdef HDPI_SUPPORT
+        scale_group->setEnabled(false);
+        connect(hdpi_scale_slider, SIGNAL(valueChanged(int)), this, SLOT(updateHDPIScaleNumber(int)));
+        #ifndef HDPI_STORE_DATA
+        tabWidget->setTabEnabled(HDPI_TAB, false);
+        #endif
+#else
+        tabWidget->setTabEnabled(HDPI_TAB, false);
+#endif
+
         retranslateStrings();
 }
@@ -135 +154 @@
 
 QPixmap PrefInterface::sectionIcon() {
-    return Images::icon("pref_gui", 22);
+    return Images::icon("pref_gui");
 }
 
@@ -146 +165 @@
         QRegExp rx_lang("smplayer_(.*)\\.qm");
         language_combo->clear();
-        language_combo->addItem( tr("<Autodetect>") );
+        language_combo->addItem("<" + tr("System language") + ">");
         for (int n=0; n < languages.count(); n++) {
                 if (rx_lang.indexIn(languages[n]) > -1) {
@@ -226 +245 @@
         floating_margin_label->setNum(floating_margin_slider->value());
 
+#ifdef HDPI_SUPPORT
+        #ifdef HDPI_USE_SCALE_FACTOR
+        hdpi_scale_label->setText(tr("Scale fact&or:"));
+        hdpi_scale_num_label->setNum((double) hdpi_scale_slider->value() / 10);
+        #else
+        hdpi_scale_label->setText(tr("Pixel rati&o:"));
+        hdpi_scale_num_label->setNum(hdpi_scale_slider->value());
+        #endif
+#endif
+
         createHelp();
 }
@@ -275 +304 @@
         setURLMaxItems(pref->history_urls->maxItems());
         setRememberDirs(pref->save_dirs);
+
+#ifdef HDPI_SUPPORT
+        loadHDPIData();
+#endif
 }
 
@@ -353 +386 @@
 
         pref->save_dirs = rememberDirs();
+
+#ifdef HDPI_SUPPORT
+        saveHDPIData();
+#endif
 }
 
@@ -432 +469 @@
 
 void PrefInterface::setStyle(QString style) {
-        if (style.isEmpty()) 
+        if (style.isEmpty()) {
                 style_combo->setCurrentIndex(0);
+        } else {
+                int i = style_combo->findText(style, Qt::MatchFixedString);
+                if (i < 0) i = 0;
+                style_combo->setCurrentIndex(i);
+        }
+}
+
+QString PrefInterface::style() {
+        if (style_combo->currentIndex() == 0)
+                return "";
         else
-                style_combo->setCurrentText(style);
-}
-
-QString PrefInterface::style() {
-        if (style_combo->currentIndex()==0)
-                return "";
-        else 
                 return style_combo->currentText();
 }
@@ -652 +692 @@
 }
 
+#ifdef HDPI_SUPPORT
+void PrefInterface::loadHDPIData() {
+        HDPISupport * hdpi = HDPISupport::instance();
+        enable_hdpi_check->setChecked(hdpi->isHDPIEnabled());
+        auto_scale_check->setChecked(hdpi->autoScale());
+
+        #ifdef HDPI_USE_SCALE_FACTOR
+        hdpi_scale_slider->setMinimum(5);
+        hdpi_scale_slider->setMaximum(4*10);
+        hdpi_scale_slider->setValue(hdpi->scaleFactor() * 10);
+        #else
+        hdpi_scale_slider->setMinimum(0);
+        hdpi_scale_slider->setMaximum(4);
+        hdpi_scale_slider->setValue(hdpi->pixelRatio());
+        #endif
+}
+
+void PrefInterface::updateHDPIScaleNumber(int v) {
+        #ifdef HDPI_USE_SCALE_FACTOR
+        hdpi_scale_num_label->setNum((double) v / 10);
+        #else
+        hdpi_scale_num_label->setNum(v);
+        #endif
+}
+
+void PrefInterface::saveHDPIData() {
+        HDPISupport * hdpi = HDPISupport::instance();
+        hdpi->setHDPIEnabled(enable_hdpi_check->isChecked());
+        hdpi->setAutoScale(auto_scale_check->isChecked());
+        #ifdef HDPI_USE_SCALE_FACTOR
+        hdpi->setScaleFactor((double) hdpi_scale_slider->value() / 10);
+        #else
+        hdpi->setPixelRatio(hdpi_scale_slider->value());
+        #endif
+        #ifdef HDPI_STORE_DATA
+        hdpi->save();
+        #endif
+}
+#endif
+
 void PrefInterface::createHelp() {
         clearHelp();