Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-11-30 20:36:36 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Moved font size definitions from ui files to default qss.

Browse source 
Added new base class StyledLabel to emulate the missing font-size by factor in qss.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7733 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2014-12-06 22:09:44 +00:00
parent 4cbc6c1cdb
commit 90c3c24412
42 changed files with 379 additions and 543 deletions
Download patch file Download diff file Expand all files Collapse all files

13
retroshare-gui/src/gui/feeds/ChatMsgItem.ui
View file

@ -142,12 +142,7 @@
</layout>
</item>
<item row="0" column="1">
<widget class="QLabel" name="peerNameLabel">
<property name="font">
<font>
<pointsize>14</pointsize>
</font>
</property>
<widget class="StyledLabel" name="peerNameLabel">
<property name="text">
<string notr="true">Peer Name</string>
</property>
@ -179,7 +174,6 @@
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
@ -418,6 +412,11 @@
<header>gui/common/AvatarWidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>StyledLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledLabel.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="../images.qrc"/>

12
retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui
View file

@ -73,7 +73,7 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QLabel" name="titleLabel">
<widget class="StyledLabel" name="titleLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
@ -82,11 +82,9 @@
</property>
<property name="font">
<font>
<pointsize>11</pointsize>
<weight>75</weight>
<italic>true</italic>
<bold>true</bold>
<stylestrategy>PreferAntialias</stylestrategy>
</font>
</property>
<property name="text">
@ -233,7 +231,6 @@
<property name="font">
<font>
<family>Tahoma</family>
<pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
@ -518,6 +515,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>

3
retroshare-gui/src/gui/feeds/GxsForumMsgItem.ui
View file

@ -241,9 +241,7 @@
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
<weight>75</weight>
<italic>false</italic>
<bold>true</bold>
</font>
</property>
@ -282,7 +280,6 @@
<widget class="QLabel" name="timestamplabel">
<property name="font">
<font>
<pointsize>9</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>

14
retroshare-gui/src/gui/feeds/PeerItem.ui
View file

@ -100,7 +100,7 @@
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QFrame" name="frame_2">
<widget class="QFrame" name="peerFrame">
<layout class="QGridLayout">
<property name="leftMargin">
<number>0</number>
@ -130,12 +130,7 @@
<item row="0" column="1">
<layout class="QGridLayout">
<item row="0" column="0">
<widget class="QLabel" name="peerNameLabel">
<property name="font">
<font>
<pointsize>14</pointsize>
</font>
</property>
<widget class="StyledLabel" name="peerNameLabel">
<property name="text">
<string notr="true">Peer Name</string>
</property>
@ -542,6 +537,11 @@
<header>gui/common/AvatarWidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>StyledLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledLabel.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="../images.qrc"/>