DlgPrefInterface: show skin preview screenshot

mixxxdj · Apr 3, 2018 · 80f9c8a · 80f9c8a
1 parent 9f96292
commit 80f9c8a
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 14 deletions.
diff --git a/src/preferences/dialog/dlgprefinterface.cpp b/src/preferences/dialog/dlgprefinterface.cpp
@@ -82,6 +82,7 @@ DlgPrefInterface::DlgPrefInterface(QWidget * parent, MixxxMainWindow * mixxx,
     warningLabel->setText(warningString);
 
     ComboBoxSkinconf->clear();
+    skinPreviewLabel->setText("");
 
     QList<QDir> skinSearchPaths = m_pSkinLoader->getSkinSearchPaths();
     QList<QFileInfo> skins;
@@ -104,6 +105,7 @@ DlgPrefInterface::DlgPrefInterface(QWidget * parent, MixxxMainWindow * mixxx,
         if (skinInfo.absoluteFilePath() == configuredSkinPath) {
             m_skin = skinInfo.fileName();
             ComboBoxSkinconf->setCurrentIndex(index);
+            skinPreviewLabel->setPixmap(m_pSkinLoader->getSkinPreview(m_skin));
             if (size_ok) {
                 warningLabel->hide();
             } else {
@@ -319,6 +321,7 @@ void DlgPrefInterface::slotSetScheme(int) {
 
 void DlgPrefInterface::slotSetSkin(int) {
     QString newSkin = ComboBoxSkinconf->currentText();
+    skinPreviewLabel->setPixmap(m_pSkinLoader->getSkinPreview(newSkin));
     if (newSkin != m_skin) {
         m_skin = newSkin;
         m_bRebootMixxxView = newSkin != m_skinOnUpdate;

diff --git a/src/preferences/dialog/dlgprefinterfacedlg.ui b/src/preferences/dialog/dlgprefinterfacedlg.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>562</width>
+    <width>594</width>
     <height>723</height>
    </rect>
   </property>
@@ -52,7 +52,7 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="1" colspan="2">
+      <item row="2" column="1" colspan="2">
        <widget class="QLabel" name="warningLabel">
         <property name="text">
          <string/>
@@ -81,7 +81,7 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="1" rowspan="2" colspan="2">
+      <item row="3" column="1" rowspan="2" colspan="2">
        <widget class="QComboBox" name="ComboBoxSchemeconf">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -97,7 +97,7 @@
         </property>
        </widget>
       </item>
-      <item row="5" column="0">
+      <item row="6" column="0">
        <widget class="QLabel" name="textLabelLocale">
         <property name="text">
          <string>Locale</string>
@@ -107,14 +107,14 @@
         </property>
        </widget>
       </item>
-      <item row="5" column="1" colspan="2">
+      <item row="6" column="1" colspan="2">
        <widget class="QComboBox" name="ComboBoxLocale">
         <property name="toolTip">
          <string>Locales determine country and language specific settings.</string>
         </property>
        </widget>
       </item>
-      <item row="7" column="0">
+      <item row="8" column="0">
        <widget class="QLabel" name="labelFullscreenOption">
         <property name="text">
          <string>Full-screen mode</string>
@@ -124,14 +124,14 @@
         </property>
        </widget>
       </item>
-      <item row="7" column="1" colspan="2">
+      <item row="8" column="1" colspan="2">
        <widget class="QCheckBox" name="checkBoxStartFullScreen">
         <property name="text">
          <string>Start in full-screen mode</string>
         </property>
        </widget>
       </item>
-      <item row="9" column="0">
+      <item row="10" column="0">
        <widget class="QLabel" name="labelTooltips">
         <property name="enabled">
          <bool>true</bool>
@@ -150,7 +150,7 @@
         </property>
        </widget>
       </item>
-      <item row="9" column="1" colspan="2">
+      <item row="10" column="1" colspan="2">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="QRadioButton" name="radioButtonTooltipsOff">
@@ -184,7 +184,7 @@
         </item>
        </layout>
       </item>
-      <item row="6" column="0">
+      <item row="7" column="0">
        <widget class="QLabel" name="labelScaleFactor">
         <property name="text">
          <string>HiDPI / Retina scaling</string>
@@ -194,7 +194,7 @@
         </property>
        </widget>
       </item>
-      <item row="6" column="1">
+      <item row="7" column="1">
        <widget class="QDoubleSpinBox" name="spinBoxScaleFactor">
         <property name="toolTip">
          <string>Change the size of text, buttons, and other items.</string>
@@ -216,7 +216,7 @@
         </property>
        </widget>
       </item>
-      <item row="6" column="2">
+      <item row="7" column="2">
        <widget class="QCheckBox" name="checkBoxScaleFactorAuto">
         <property name="toolTip">
          <string>Adopt scale factor from the operating system</string>
@@ -226,16 +226,23 @@
         </property>
        </widget>
       </item>
-      <item row="10" column="0">
+      <item row="11" column="0">
        <widget class="QLabel" name="label">
         <property name="text">
          <string>Screen saver</string>
         </property>
        </widget>
       </item>
-      <item row="10" column="1" colspan="2">
+      <item row="11" column="1" colspan="2">
        <widget class="QComboBox" name="comboBoxScreensaver"/>
       </item>
+      <item row="1" column="1">
+       <widget class="QLabel" name="skinPreviewLabel">
+        <property name="text">
+         <string notr="true">skin preview screenshot goes here</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -264,6 +271,8 @@
   <tabstop>radioButtonTooltipsLibrary</tabstop>
   <tabstop>radioButtonTooltipsLibraryAndSkin</tabstop>
  </tabstops>
+ <resources/>
+ <connections/>
  <buttongroups>
   <buttongroup name="buttonGroupTooltips"/>
  </buttongroups>

diff --git a/src/skin/skinloader.cpp b/src/skin/skinloader.cpp
@@ -56,6 +56,10 @@ QString SkinLoader::getSkinPath(const QString& skinName) const {
     return QString();
 }
 
+QPixmap SkinLoader::getSkinPreview(const QString& skinName) const {
+    return QPixmap(getSkinPath(skinName) + "/preferences_preview_screenshot.png");
+}
+
 QString SkinLoader::getConfiguredSkinPath() const {
     QString configSkin = m_pConfig->getValueString(ConfigKey("[Config]", "ResizableSkin"));
 

diff --git a/src/skin/skinloader.h b/src/skin/skinloader.h
@@ -33,6 +33,7 @@ class SkinLoader {
     LaunchImage* loadLaunchImage(QWidget* pParent);
 
     QString getSkinPath(const QString& skinName) const;
+    QPixmap getSkinPreview(const QString& skinName) const;
     QString getConfiguredSkinPath() const;
     QString getDefaultSkinName() const;
     QList<QDir> getSkinSearchPaths() const;