Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Moved font size definitions from ui files to default qss.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7737 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2014-12-08 01:04:57 +00:00
parent 24567d3d90
commit 96bfdec362
7 changed files with 431 additions and 567 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
retroshare-gui/src/gui/Posted/PostedCreatePostDialog.ui
View File

@ -40,7 +40,7 @@
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0" colspan="3">
<widget class="QLabel" name="info_label">
<widget class="StyledLabel" name="info_label">
<property name="palette">
<palette>
<active>
@ -56,9 +56,9 @@
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>246</red>
<green>230</green>
<blue>159</blue>
<red>255</red>
<green>255</green>
<blue>178</blue>
</color>
</brush>
</colorrole>
@ -76,9 +76,9 @@
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>246</red>
<green>230</green>
<blue>159</blue>
<red>255</red>
<green>255</green>
<blue>178</blue>
</color>
</brush>
</colorrole>
@ -87,30 +87,24 @@
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>246</red>
<green>230</green>
<blue>159</blue>
<red>255</red>
<green>255</green>
<blue>178</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>246</red>
<green>230</green>
<blue>159</blue>
<red>255</red>
<green>255</green>
<blue>178</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
<property name="font">
<font>
<family>Tahoma</family>
<pointsize>11</pointsize>
</font>
</property>
<property name="autoFillBackground">
<bool>true</bool>
</property>
@ -133,22 +127,14 @@
<item row="0" column="0">
<widget class="QLabel" name="titleLabel">
<property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;Title&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>Title</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="linkLabel">
<property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600;&quot;&gt;Link&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>Link</string>
</property>
</widget>
</item>
@ -185,38 +171,38 @@ p, li { white-space: pre-wrap; }
<item>
<widget class="GxsIdChooser" name="idChooser"/>
</item>
<item>
<widget class="QToolButton" name="toolButton_NewId">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>Create new Identity</string>
</property>
<property name="text">
<string>New ID</string>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<normaloff>:/images/identity/identity_create_32.png</normaloff>:/images/identity/identity_create_32.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="toolButton_NewId">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>Create new Identity</string>
</property>
<property name="text">
<string>New ID</string>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<normaloff>:/images/identity/identity_create_32.png</normaloff>:/images/identity/identity_create_32.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item row="3" column="0" colspan="3">
@ -286,8 +272,15 @@ p, li { white-space: pre-wrap; }
<extends>QComboBox</extends>
<header>gui/gxs/GxsIdChooser.h</header>
</customwidget>
<customwidget>
<class>StyledLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledLabel.h</header>
</customwidget>
</customwidgets>
<resources/>
<resources>
<include location="../images.qrc"/>
</resources>
<connections>
<connection>
<sender>buttonBox</sender>

10
retroshare-gui/src/gui/SearchDialog.ui
View File

@ -179,11 +179,6 @@
<height>0</height>
</size>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
</font>
</property>
<property name="mouseTracking">
<bool>true</bool>
</property>
@ -219,11 +214,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
</font>
</property>
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
</property>

22
retroshare-gui/src/gui/profile/ProfileWidget.ui
View File

@ -141,7 +141,7 @@
<item row="0" column="0" colspan="3">
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QLabel" name="label_4">
<widget class="QLabel" name="publicIcon">
<property name="maximumSize">
<size>
<width>16</width>
@ -154,10 +154,9 @@
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_5">
<widget class="StyledLabel" name="publicLabel">
<property name="font">
<font>
<pointsize>11</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
@ -412,7 +411,7 @@
<item row="1" column="0" colspan="3">
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label_12">
<widget class="QLabel" name="otherIcon">
<property name="maximumSize">
<size>
<width>16</width>
@ -428,10 +427,9 @@
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_13">
<widget class="StyledLabel" name="otherLabel">
<property name="font">
<font>
<pointsize>11</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
@ -458,7 +456,7 @@
<item row="0" column="0" colspan="4">
<layout class="QGridLayout" name="gridLayout_8">
<item row="0" column="0">
<widget class="QLabel" name="label">
<widget class="QLabel" name="myIcon">
<property name="maximumSize">
<size>
<width>16</width>
@ -474,10 +472,9 @@
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_15">
<widget class="StyledLabel" name="myLabel">
<property name="font">
<font>
<pointsize>11</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
@ -725,6 +722,13 @@
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>StyledLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledLabel.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="../images.qrc"/>
</resources>

10
retroshare-gui/src/gui/qss/stylesheet/qss.default
View File

@ -114,6 +114,16 @@ CryptoPage QLabel#publicLabel, CryptoPage QLabel#otherLabel
qproperty-fontSizeFactor: 125;
}
ProfileWidget QLabel#publicLabel, ProfileWidget QLabel#otherLabel, ProfileWidget QLabel#myLabel
{
qproperty-fontSizeFactor: 125;
}
PostedCreatePostDialog QLabel#info_label
{
qproperty-fontSizeFactor: 125;
}
/* Color definitions */
ForumsDialog, GxsForumThreadWidget

59
retroshare-gui/src/gui/statistics/DhtWindow.ui
View File

@ -234,12 +234,6 @@
<layout class="QHBoxLayout" name="horizontalLayout_18">
<item>
<widget class="QFrame" name="frame">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="2">
<layout class="QHBoxLayout" name="horizontalLayout_8">
@ -258,12 +252,6 @@
</item>
<item>
<widget class="QLabel" name="label_unreachable">
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text">
<string/>
</property>
@ -288,12 +276,6 @@
</item>
<item>
<widget class="QLabel" name="label_online">
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text">
<string/>
</property>
@ -318,12 +300,6 @@
</item>
<item>
<widget class="QLabel" name="label_offline">
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text">
<string/>
</property>
@ -348,12 +324,6 @@
</item>
<item>
<widget class="QLabel" name="label_peers">
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text">
<string/>
</property>
@ -373,12 +343,6 @@
</item>
<item>
<widget class="QWidget" name="widget_2" native="true">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_15">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_11">
@ -397,12 +361,6 @@
</item>
<item>
<widget class="QLabel" name="label_disconnected">
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text">
<string/>
</property>
@ -427,12 +385,6 @@
</item>
<item>
<widget class="QLabel" name="label_direct">
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text">
<string/>
</property>
@ -457,12 +409,6 @@
</item>
<item>
<widget class="QLabel" name="label_proxy">
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text">
<string/>
</property>
@ -666,11 +612,6 @@
<height>80</height>
</size>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="contextMenuPolicy">
<enum>Qt::NoContextMenu</enum>
</property>

5
retroshare-gui/src/gui/statistics/TurtleRouterStatistics.ui
View File

@ -66,11 +66,6 @@
<height>200</height>
</size>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="contextMenuPolicy">
<enum>Qt::NoContextMenu</enum>
</property>

775
retroshare-gui/src/gui/unfinished/StatisticDialog.ui
View File

File diff suppressed because it is too large Load Diff