Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-04 20:34:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

61
retroshare-gui/src/gui/chat/ChatWidget.ui
View file

@ -52,28 +52,33 @@
<number>3</number>
</property>
<item>
<widget class="QLabel" name="titleLabel">
<property name="font">
<font>
<pointsize>11</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string notr="true">Title</string>
</property>
</widget>
<layout class="QHBoxLayout" name="nameLayout">
<item>
<widget class="StyledLabel" name="titleLabel">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string notr="true">Title</string>
</property>
</widget>
</item>
<item>
<widget class="StyledLabel" name="statusLabel">
<property name="text">
<string>(Status)</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QLabel" name="statusMessageLabel">
<property name="font">
<font>
<pointsize>9</pointsize>
</font>
</property>
<property name="text">
<string notr="true">Status</string>
<string notr="true">Status message</string>
</property>
</widget>
</item>
@ -441,10 +446,7 @@ border-image: url(:/images/closepressed.png)
</widget>
</item>
<item>
<widget class="QLabel" name="statusLabel">
<property name="text">
<string/>
</property>
<widget class="QLabel" name="typingLabel">
<property name="margin">
<number>0</number>
</property>
@ -824,6 +826,16 @@ border-image: url(:/images/closepressed.png)
</action>
</widget>
<customwidgets>
<customwidget>
<class>LineEditClear</class>
<extends>QLineEdit</extends>
<header location="global">gui/common/LineEditClear.h</header>
</customwidget>
<customwidget>
<class>StyledLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledLabel.h</header>
</customwidget>
<customwidget>
<class>RSTextBrowser</class>
<extends>QTextBrowser</extends>
@ -840,11 +852,6 @@ border-image: url(:/images/closepressed.png)
<extends>QTextEdit</extends>
<header location="global">gui/common/MimeTextEdit.h</header>
</customwidget>
<customwidget>
<class>LineEditClear</class>
<extends>QLineEdit</extends>
<header location="global">gui/common/LineEditClear.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="../images.qrc"/>