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

Moved own frame for Avatar,status,nick display to the top of FriendsList.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7742 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2014-12-09 18:17:32 +00:00
parent 0738121a90
commit a9b56819cd
2 changed files with 68 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

102
retroshare-gui/src/gui/FriendsDialog.ui
View file

@ -10,8 +10,11 @@
<height>491</height> <height>491</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QGridLayout" name="gridLayout_2">
<item> <property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QFrame" name="titleBarFrame"> <widget class="QFrame" name="titleBarFrame">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum"> <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
@ -79,37 +82,17 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item> <item row="1" column="0">
<widget class="QSplitter" name="splitter"> <widget class="QSplitter" name="splitter">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<widget class="FriendList" name="friendList" native="true"> <widget class="QWidget" name="layoutWidget">
<property name="sizePolicy"> <layout class="QVBoxLayout" name="verticalLayout">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding"> <property name="spacing">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
</widget>
<widget class="QWidget" name="layoutWidget_1">
<layout class="QGridLayout" name="tabLayout">
<property name="verticalSpacing">
<number>1</number> <number>1</number>
</property> </property>
<item row="0" column="0"> <item>
<widget class="QFrame" name="headFrame"> <widget class="QFrame" name="headFrame">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
@ -123,6 +106,9 @@
<height>70</height> <height>70</height>
</size> </size>
</property> </property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::Box</enum> <enum>QFrame::Box</enum>
</property> </property>
@ -136,6 +122,12 @@
<property name="topMargin"> <property name="topMargin">
<number>1</number> <number>1</number>
</property> </property>
<property name="rightMargin">
<number>6</number>
</property>
<property name="bottomMargin">
<number>6</number>
</property>
<item row="0" column="1" colspan="2"> <item row="0" column="1" colspan="2">
<widget class="StyledLabel" name="nicknameLabel"> <widget class="StyledLabel" name="nicknameLabel">
<property name="text"> <property name="text">
@ -156,20 +148,23 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="1" column="2" colspan="2"> <item row="0" column="0" rowspan="2">
<spacer name="horizontalSpacer_2"> <widget class="AvatarWidget" name="avatar">
<property name="orientation"> <property name="minimumSize">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size> <size>
<width>277</width> <width>61</width>
<height>20</height> <height>61</height>
</size> </size>
</property> </property>
</spacer> <property name="maximumSize">
<size>
<width>61</width>
<height>61</height>
</size>
</property>
</widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1" colspan="3">
<widget class="QToolButton" name="mypersonalstatusLabel"> <widget class="QToolButton" name="mypersonalstatusLabel">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred"> <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
@ -198,26 +193,39 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0" rowspan="2"> </layout>
<widget class="AvatarWidget" name="avatar"> </widget>
</item>
<item>
<widget class="FriendList" name="friendList" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>61</width> <width>150</width>
<height>61</height> <height>0</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>61</width> <width>16777215</width>
<height>61</height> <height>16777215</height>
</size> </size>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
</item> <widget class="QWidget" name="layoutWidget_1">
<item row="1" column="0"> <layout class="QGridLayout" name="tabLayout">
<property name="verticalSpacing">
<number>1</number>
</property>
<item row="0" column="0">
<widget class="ChatTabWidget" name="tabWidget"> <widget class="ChatTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>0</number>
@ -226,6 +234,10 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<widget class="QWidget" name="groupChatTab"> <widget class="QWidget" name="groupChatTab">
<attribute name="icon">
<iconset resource="images.qrc">
<normaloff>:/images/kblogger.png</normaloff>:/images/kblogger.png</iconset>
</attribute>
<attribute name="title"> <attribute name="title">
<string>Broadcast</string> <string>Broadcast</string>
</attribute> </attribute>

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

@ -54,7 +54,8 @@ GenCertDialog QPushButton#genButton:hover {
FriendsDialog QFrame#headFrame { FriendsDialog QFrame#headFrame {
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #9BDBF9, stop:1 #1592CD); background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #9BDBF9, stop:1 #1592CD);
border: 0px; border: 1px;
border-radius: 4px;
} }
FriendsDialog QFrame#headFrame > QLabel#nicknameLabel { FriendsDialog QFrame#headFrame > QLabel#nicknameLabel {