added feature to reset fonts

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@5010 90c681e8-e032-0410-971d-27865f9a5e38

3 files changed, 78 insertions, 41 deletions

diff --git a/src/plugins/Ui/skinned/forms/skinnedsettings.ui b/src/plugins/Ui/skinned/forms/skinnedsettings.ui
index f1f247db8..4bbad293d 100644
--- a/src/plugins/Ui/skinned/forms/skinnedsettings.ui
+++ b/src/plugins/Ui/skinned/forms/skinnedsettings.ui
@@ -409,70 +409,49 @@
          </property>
         </widget>
        </item>
-       <item row="0" column="4">
-        <widget class="QToolButton" name="mainFontButton">
-         <property name="text">
-          <string>...</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="label_2">
+       <item row="0" column="1">
+        <widget class="QLabel" name="mainFontLabel">
          <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
-         <property name="text">
-          <string>Playlist:</string>
+         <property name="frameShape">
+          <enum>QFrame::StyledPanel</enum>
          </property>
-         <property name="alignment">
-          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+         <property name="frameShadow">
+          <enum>QFrame::Sunken</enum>
          </property>
-        </widget>
-       </item>
-       <item row="1" column="4">
-        <widget class="QToolButton" name="plFontButton">
          <property name="text">
-          <string>...</string>
+          <string>???</string>
          </property>
         </widget>
        </item>
-       <item row="2" column="4">
-        <widget class="QToolButton" name="headerFontButton">
+       <item row="0" column="2">
+        <widget class="QToolButton" name="mainFontButton">
          <property name="text">
           <string>...</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="0" colspan="4">
-        <widget class="QCheckBox" name="useBitmapCheckBox">
-         <property name="text">
-          <string>Use bitmap font if available</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="1" colspan="3">
-        <widget class="QLabel" name="mainFontLabel">
+       <item row="1" column="0">
+        <widget class="QLabel" name="label_2">
          <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
-         <property name="frameShape">
-          <enum>QFrame::StyledPanel</enum>
-         </property>
-         <property name="frameShadow">
-          <enum>QFrame::Sunken</enum>
-         </property>
          <property name="text">
-          <string>???</string>
+          <string>Playlist:</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
          </property>
         </widget>
        </item>
-       <item row="1" column="1" colspan="3">
+       <item row="1" column="1">
         <widget class="QLabel" name="plFontLabel">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@@ -491,6 +470,13 @@
          </property>
         </widget>
        </item>
+       <item row="1" column="2">
+        <widget class="QToolButton" name="plFontButton">
+         <property name="text">
+          <string>...</string>
+         </property>
+        </widget>
+       </item>
        <item row="2" column="0">
         <widget class="QLabel" name="label_5">
          <property name="text">
@@ -498,7 +484,7 @@
          </property>
         </widget>
        </item>
-       <item row="2" column="1" colspan="3">
+       <item row="2" column="1">
         <widget class="QLabel" name="headerFontLabel">
          <property name="frameShape">
           <enum>QFrame::StyledPanel</enum>
@@ -511,7 +497,45 @@
          </property>
         </widget>
        </item>
-       <item row="4" column="0" colspan="4">
+       <item row="2" column="2">
+        <widget class="QToolButton" name="headerFontButton">
+         <property name="text">
+          <string>...</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="0" colspan="3">
+        <layout class="QHBoxLayout" name="horizontalLayout_4">
+         <item>
+          <spacer name="horizontalSpacer_4">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>348</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QPushButton" name="resetFontsButton">
+           <property name="text">
+            <string>Reset fonts</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="4" column="0" colspan="2">
+        <widget class="QCheckBox" name="useBitmapCheckBox">
+         <property name="text">
+          <string>Use bitmap font if available</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="0" colspan="2">
         <spacer name="verticalSpacer_3">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
diff --git a/src/plugins/Ui/skinned/skinnedsettings.cpp b/src/plugins/Ui/skinned/skinnedsettings.cpp
index df04f5691..ccc9784e9 100644
--- a/src/plugins/Ui/skinned/skinnedsettings.cpp
+++ b/src/plugins/Ui/skinned/skinnedsettings.cpp
@@ -45,6 +45,7 @@ SkinnedSettings::SkinnedSettings(QWidget *parent) : QWidget(parent)
     m_ui.skinInstallButton->setIcon(QIcon::fromTheme("list-add"));
     m_ui.skinReloadButton->setIcon(QIcon::fromTheme("view-refresh"));
     m_ui.popupTemplateButton->setIcon(QIcon::fromTheme("configure"));
+    m_ui.resetFontsButton->setIcon(QIcon::fromTheme("edit-clear"));
 }
 
 SkinnedSettings::~SkinnedSettings()
@@ -106,6 +107,15 @@ void SkinnedSettings::on_mainFontButton_clicked()
     }
 }
 
+void SkinnedSettings::on_resetFontsButton_clicked()
+{
+    QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
+    settings.remove("Skinned/pl_font");
+    settings.remove("Skinned/pl_header_font");
+    settings.remove("Skinned/mw_font");
+    loadFonts();
+}
+
 void SkinnedSettings::on_skinInstallButton_clicked()
 {
     QStringList files = FileDialog::getOpenFileNames(this,tr("Select Skin Files"), QDir::homePath(),
diff --git a/src/plugins/Ui/skinned/skinnedsettings.h b/src/plugins/Ui/skinned/skinnedsettings.h
index 8ed0110cc..756019981 100644
--- a/src/plugins/Ui/skinned/skinnedsettings.h
+++ b/src/plugins/Ui/skinned/skinnedsettings.h
@@ -41,11 +41,14 @@ private slots:
     void on_plFontButton_clicked();
     void on_headerFontButton_clicked();
     void on_mainFontButton_clicked();
+    void on_resetFontsButton_clicked();
     void on_skinInstallButton_clicked();
     void loadSkins();
     void on_popupTemplateButton_clicked();
     void addWindowTitleString(QAction *a);
 
+
+
 private:
     void showEvent(QShowEvent *);
     void loadFonts();