From 2494f02bbbada53720efb414c7e549e012ca91a5 Mon Sep 17 00:00:00 2001
From: thunder2 <retroshare.project@gmail.com>
Date: Sun, 28 Jun 2015 10:26:48 +0000
Subject: [PATCH] Removed fix font size from plugins (Patch from Henry).

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8564 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 plugins/FeedReader/gui/FeedReaderFeedItem.ui  | 10 ++++++++--
 plugins/FeedReader/qss/FeedReader_qss.default |  7 +++++++
 plugins/LinksCloud/LinksDialog.ui             |  6 ------
 plugins/VOIP/gui/AudioWizard.ui               | 20 -------------------
 plugins/VOIP/gui/VOIPToasterItem.ui           |  8 ++++++--
 plugins/VOIP/qss/VOIP_qss.default             |  7 +++++++
 6 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/plugins/FeedReader/gui/FeedReaderFeedItem.ui b/plugins/FeedReader/gui/FeedReaderFeedItem.ui
index d7cbdebf3..f2b7431c5 100644
--- a/plugins/FeedReader/gui/FeedReaderFeedItem.ui
+++ b/plugins/FeedReader/gui/FeedReaderFeedItem.ui
@@ -92,7 +92,7 @@
              </widget>
             </item>
             <item>
-             <widget class="QLabel" name="titleLabel">
+             <widget class="StyledLabel" name="titleLabel">
               <property name="sizePolicy">
                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
                 <horstretch>0</horstretch>
@@ -101,7 +101,6 @@
               </property>
               <property name="font">
                <font>
-                <pointsize>11</pointsize>
                 <weight>75</weight>
                 <bold>true</bold>
                </font>
@@ -337,6 +336,13 @@ p, li { white-space: pre-wrap; }
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>StyledLabel</class>
+   <extends>QLabel</extends>
+   <header>gui/common/StyledLabel.h</header>
+  </customwidget>
+ </customwidgets>
  <resources>
   <include location="FeedReader_images.qrc"/>
   <include location="../../../retroshare-gui/src/gui/images.qrc"/>
diff --git a/plugins/FeedReader/qss/FeedReader_qss.default b/plugins/FeedReader/qss/FeedReader_qss.default
index d9d5c62d1..27ca35f0c 100644
--- a/plugins/FeedReader/qss/FeedReader_qss.default
+++ b/plugins/FeedReader/qss/FeedReader_qss.default
@@ -1,2 +1,9 @@
 /* Default stylesheet
    This file is used as default for all stylesheets and can be overloaded */
+
+/* Font */
+
+FeedReaderFeedItem QLabel#titleLabel
+{
+	qproperty-fontSizeFactor: 135;
+}
diff --git a/plugins/LinksCloud/LinksDialog.ui b/plugins/LinksCloud/LinksDialog.ui
index d711a187b..6c2b06ab4 100644
--- a/plugins/LinksCloud/LinksDialog.ui
+++ b/plugins/LinksCloud/LinksDialog.ui
@@ -32,11 +32,6 @@
       <layout class="QGridLayout">
        <item row="0" column="0" colspan="13">
         <widget class="QTreeWidget" name="linkTreeWidget">
-         <property name="font">
-          <font>
-           <pointsize>9</pointsize>
-          </font>
-         </property>
          <property name="contextMenuPolicy">
           <enum>Qt::CustomContextMenu</enum>
          </property>
@@ -522,7 +517,6 @@ background: white;}</string>
        <widget class="QLabel" name="titleBarLabel">
         <property name="font">
          <font>
-          <pointsize>10</pointsize>
           <weight>75</weight>
           <bold>true</bold>
          </font>
diff --git a/plugins/VOIP/gui/AudioWizard.ui b/plugins/VOIP/gui/AudioWizard.ui
index ce4e1c970..1c02743c4 100644
--- a/plugins/VOIP/gui/AudioWizard.ui
+++ b/plugins/VOIP/gui/AudioWizard.ui
@@ -23,11 +23,6 @@
    <layout class="QVBoxLayout" name="verticalLayout">
     <item>
      <widget class="QLabel" name="label">
-      <property name="font">
-       <font>
-        <pointsize>11</pointsize>
-       </font>
-      </property>
       <property name="text">
        <string>This is the audio tuning wizard for RetroShare. This will help you correctly set the input levels of your sound card, and also set the correct parameters for sound processing in Retroshare. </string>
       </property>
@@ -61,11 +56,6 @@
    <layout class="QVBoxLayout" name="verticalLayout_3">
     <item>
      <widget class="QLabel" name="qliVolumeTuningText">
-      <property name="font">
-       <font>
-        <pointsize>11</pointsize>
-       </font>
-      </property>
       <property name="text">
        <string>&lt;p &gt;Open your sound control panel and go to the recording settings. Make sure the microphone is selected as active input with maximum recording volume. If there's an option to enable a &amp;quot;Microphone boost&amp;quot; make sure it's checked. &lt;/p&gt;
 &lt;p&gt;Speak loudly, as when you are annoyed or excited. Decrease the volume in the sound control panel until the bar below stays as high as possible in the green and orange but not the red zone while you speak. &lt;/p&gt;</string>
@@ -77,11 +67,6 @@
     </item>
     <item>
      <widget class="QLabel" name="qliAmpTuningText">
-      <property name="font">
-       <font>
-        <pointsize>9</pointsize>
-       </font>
-      </property>
       <property name="text">
        <string>Talk normally, and adjust the slider below so that the bar moves into green when you talk, and doesn't go into the orange zone.</string>
       </property>
@@ -303,11 +288,6 @@
    <layout class="QVBoxLayout" name="verticalLayout_4">
     <item>
      <widget class="QLabel" name="qlDone">
-      <property name="font">
-       <font>
-        <pointsize>11</pointsize>
-       </font>
-      </property>
       <property name="text">
        <string>Congratulations. You should now be ready to enjoy a richer sound experience with Retroshare.</string>
       </property>
diff --git a/plugins/VOIP/gui/VOIPToasterItem.ui b/plugins/VOIP/gui/VOIPToasterItem.ui
index ef15056c4..758c01165 100644
--- a/plugins/VOIP/gui/VOIPToasterItem.ui
+++ b/plugins/VOIP/gui/VOIPToasterItem.ui
@@ -125,7 +125,7 @@
       <item row="1" column="0">
        <layout class="QGridLayout" name="gridLayout">
         <item row="0" column="1">
-         <widget class="QLabel" name="textLabel">
+         <widget class="StyledLabel" name="textLabel">
           <property name="minimumSize">
            <size>
             <width>0</width>
@@ -140,7 +140,6 @@
           </property>
           <property name="font">
            <font>
-            <pointsize>10</pointsize>
             <weight>75</weight>
             <bold>true</bold>
            </font>
@@ -214,6 +213,11 @@ background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 0.67,
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>StyledLabel</class>
+   <extends>QLabel</extends>
+   <header>gui/common/StyledLabel.h</header>
+  </customwidget>
   <customwidget>
    <class>AvatarWidget</class>
    <extends>QLabel</extends>
diff --git a/plugins/VOIP/qss/VOIP_qss.default b/plugins/VOIP/qss/VOIP_qss.default
index d9d5c62d1..abe80ad93 100644
--- a/plugins/VOIP/qss/VOIP_qss.default
+++ b/plugins/VOIP/qss/VOIP_qss.default
@@ -1,2 +1,9 @@
 /* Default stylesheet
    This file is used as default for all stylesheets and can be overloaded */
+
+/* Font */
+
+VOIPToasterItem QLabel#textLabel
+{
+	qproperty-fontSizeFactor: 115;
+}