Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-09 06:42:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Improving some layouts for the Feed Items

Browse source 
Update Splash Image

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7024 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2014-01-17 00:40:28 +00:00
parent b8c65db00e
commit bdecf3def1
4 changed files with 152 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

33
retroshare-gui/src/gui/feeds/MsgItem.ui
View file

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>438</width> <width>643</width>
<height>146</height> <height>140</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout"> <layout class="QGridLayout">
@ -17,7 +17,7 @@
<item row="0" column="0"> <item row="0" column="0">
<widget class="QFrame" name="frame"> <widget class="QFrame" name="frame">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -71,10 +71,7 @@
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QFrame" name="frame_2"> <widget class="QFrame" name="frame_2">
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout">
<property name="verticalSpacing">
<number>0</number>
</property>
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
@ -117,7 +114,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2" colspan="3"> <item row="0" column="2">
<spacer> <spacer>
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@ -133,7 +130,7 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="0" column="5" colspan="3"> <item row="0" column="3">
<widget class="QLabel" name="timestampLabel"> <widget class="QLabel" name="timestampLabel">
<property name="font"> <property name="font">
<font> <font>
@ -146,7 +143,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1" colspan="7"> <item row="1" column="1" colspan="2">
<widget class="QLabel" name="subjectLabel"> <widget class="QLabel" name="subjectLabel">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
@ -162,7 +159,9 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1" colspan="2"> <item row="2" column="1" colspan="3">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QToolButton" name="replyButton"> <widget class="QToolButton" name="replyButton">
<property name="focusPolicy"> <property name="focusPolicy">
<enum>Qt::NoFocus</enum> <enum>Qt::NoFocus</enum>
@ -185,7 +184,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="3"> <item>
<spacer name="horizontalSpacer"> <spacer name="horizontalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@ -198,7 +197,7 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="2" column="4"> <item>
<widget class="QPushButton" name="deleteButton"> <widget class="QPushButton" name="deleteButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@ -218,7 +217,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="5"> <item>
<widget class="QPushButton" name="playButton"> <widget class="QPushButton" name="playButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@ -238,7 +237,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="6"> <item>
<widget class="QPushButton" name="expandButton"> <widget class="QPushButton" name="expandButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@ -258,7 +257,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="7"> <item>
<widget class="QPushButton" name="clearButton"> <widget class="QPushButton" name="clearButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@ -279,6 +278,8 @@
</widget> </widget>
</item> </item>
</layout> </layout>
</item>
</layout>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">

27
retroshare-gui/src/gui/feeds/SecurityItem.ui
View file

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>856</width> <width>762</width>
<height>268</height> <height>263</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout"> <layout class="QGridLayout">
@ -108,6 +108,12 @@
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<layout class="QGridLayout"> <layout class="QGridLayout">
<property name="horizontalSpacing">
<number>6</number>
</property>
<property name="verticalSpacing">
<number>0</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="peerNameLabel"> <widget class="QLabel" name="peerNameLabel">
<property name="font"> <property name="font">
@ -133,9 +139,13 @@
</property> </property>
<property name="font"> <property name="font">
<font> <font>
<family>Tahoma</family>
<pointsize>9</pointsize>
<weight>75</weight> <weight>75</weight>
<italic>true</italic> <italic>true</italic>
<bold>true</bold> <bold>true</bold>
<stylestrategy>PreferAntialias</stylestrategy>
<kerning>true</kerning>
</font> </font>
</property> </property>
<property name="text"> <property name="text">
@ -397,6 +407,19 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="2" column="0" colspan="3">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>1</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>

BIN
retroshare-gui/src/gui/images/splash.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 215 KiB

After

Width:  |  Height:  |  Size: 72 KiB

Before After
Before After

3
retroshare-gui/src/gui/qss/stylesheet/Standard.qss
View file

@ -427,13 +427,12 @@ PeerItem QLabel#peerNameLabel {
} }
MsgItem > QFrame#frame { MsgItem > QFrame#frame {
border: 2px solid blue; border: 2px solid #3EA2FF;
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #2291E0, stop: 1 #3EB3FF); background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #2291E0, stop: 1 #3EB3FF);
border-radius: 10px; border-radius: 10px;
} }
MsgItem QWidget#avatar { MsgItem QWidget#avatar {
border: 2px solid blue;
background-color: #2291E0; background-color: #2291E0;
} }