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

move the Buttons to end of the right side, when the Contacts dockwidget is enabled.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5654 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2012-10-09 15:37:04 +00:00
parent cf8cc496b8
commit e10ce3ff35
2 changed files with 381 additions and 377 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
retroshare-gui/src/gui/channels/CreateChannel.ui
View File

@ -29,8 +29,8 @@
</item> </item>
<item> <item>
<widget class="QFrame" name="frame"> <widget class="QFrame" name="frame">
<layout class="QGridLayout" name="gridLayout_5"> <layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0" colspan="3"> <item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
@ -44,7 +44,7 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="0" column="3" rowspan="7"> <item row="0" column="1" rowspan="6">
<widget class="QDockWidget" name="contactsdockWidget"> <widget class="QDockWidget" name="contactsdockWidget">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
@ -131,7 +131,7 @@
</widget> </widget>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="3"> <item row="1" column="0">
<layout class="QVBoxLayout"> <layout class="QVBoxLayout">
<item> <item>
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_5">
@ -145,7 +145,7 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="2" column="0" colspan="3"> <item row="2" column="0">
<widget class="QGroupBox" name="tyoeGroupBox"> <widget class="QGroupBox" name="tyoeGroupBox">
<property name="title"> <property name="title">
<string>Type:</string> <string>Type:</string>
@ -174,7 +174,7 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="3" column="0" colspan="3"> <item row="3" column="0">
<widget class="QGroupBox" name="msgGroupBox"> <widget class="QGroupBox" name="msgGroupBox">
<property name="title"> <property name="title">
<string>Allowed Messages</string> <string>Allowed Messages</string>
@ -200,23 +200,10 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="4" column="0" colspan="3"> <item row="4" column="0">
<widget class="QGroupBox" name="msgGroupBox_2"> <widget class="QGroupBox" name="msgGroupBox_2">
<property name="title"> <property name="title">
<string>Key Sharing</string> <string>Key Sharing</string>
@ -238,23 +225,10 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="5" column="0" colspan="3"> <item row="5" column="0">
<widget class="QGroupBox" name="groupBoxLogo"> <widget class="QGroupBox" name="groupBoxLogo">
<property name="title"> <property name="title">
<string>Channel Logo</string> <string>Channel Logo</string>
@ -360,35 +334,39 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="6" column="0"> <item row="6" column="0" colspan="2">
<spacer> <layout class="QGridLayout" name="gridLayout">
<property name="orientation"> <item row="0" column="0">
<enum>Qt::Horizontal</enum> <spacer>
</property> <property name="orientation">
<property name="sizeHint" stdset="0"> <enum>Qt::Horizontal</enum>
<size> </property>
<width>238</width> <property name="sizeHint" stdset="0">
<height>20</height> <size>
</size> <width>238</width>
</property> <height>20</height>
</spacer> </size>
</item> </property>
<item row="6" column="1"> </spacer>
<widget class="QPushButton" name="cancelButton"> </item>
<property name="text"> <item row="0" column="1">
<string>Cancel</string> <widget class="QPushButton" name="cancelButton">
</property> <property name="text">
</widget> <string>Cancel</string>
</item> </property>
<item row="6" column="2"> </widget>
<widget class="QPushButton" name="createButton"> </item>
<property name="text"> <item row="0" column="2">
<string>Create</string> <widget class="QPushButton" name="createButton">
</property> <property name="text">
<property name="default"> <string>Create</string>
<bool>true</bool> </property>
</property> <property name="default">
</widget> <bool>true</bool>
</property>
</widget>
</item>
</layout>
</item> </item>
</layout> </layout>
</widget> </widget>

108
retroshare-gui/src/gui/forums/CreateForum.ui
View File

@ -29,8 +29,8 @@
</item> </item>
<item> <item>
<widget class="QFrame" name="frame"> <widget class="QFrame" name="frame">
<layout class="QGridLayout" name="gridLayout_4"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" colspan="3"> <item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
@ -44,13 +44,13 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="0" column="3" rowspan="6"> <item row="0" column="1" rowspan="5">
<widget class="QDockWidget" name="contactsdockWidget"> <widget class="QDockWidget" name="contactsdockWidget">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -131,7 +131,7 @@
</widget> </widget>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="3"> <item row="1" column="0">
<layout class="QVBoxLayout"> <layout class="QVBoxLayout">
<item> <item>
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_5">
@ -145,8 +145,14 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="2" column="0" colspan="3"> <item row="2" column="0">
<widget class="QGroupBox" name="tyoeGroupBox"> <widget class="QGroupBox" name="tyoeGroupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title"> <property name="title">
<string>Type:</string> <string>Type:</string>
</property> </property>
@ -178,7 +184,7 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="3" column="0" colspan="3"> <item row="3" column="0">
<widget class="QGroupBox" name="msgGroupBox_2"> <widget class="QGroupBox" name="msgGroupBox_2">
<property name="title"> <property name="title">
<string>Key Sharing</string> <string>Key Sharing</string>
@ -203,12 +209,12 @@
<item> <item>
<spacer name="verticalSpacer_3"> <spacer name="verticalSpacer_3">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>40</width>
<height>40</height> <height>20</height>
</size> </size>
</property> </property>
</spacer> </spacer>
@ -216,7 +222,7 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="4" column="0" colspan="3"> <item row="4" column="0">
<widget class="QGroupBox" name="msgGroupBox"> <widget class="QGroupBox" name="msgGroupBox">
<property name="title"> <property name="title">
<string>Allowed Messages</string> <string>Allowed Messages</string>
@ -243,7 +249,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="verticalSpacer_2"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
@ -255,38 +261,58 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="5" column="0"> <item row="5" column="0" colspan="2">
<spacer> <layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="orientation"> <item>
<enum>Qt::Horizontal</enum> <spacer>
</property> <property name="orientation">
<property name="sizeHint" stdset="0"> <enum>Qt::Horizontal</enum>
<size> </property>
<width>238</width> <property name="sizeHint" stdset="0">
<height>20</height> <size>
</size> <width>238</width>
</property> <height>20</height>
</spacer> </size>
</item> </property>
<item row="5" column="1"> </spacer>
<widget class="QPushButton" name="cancelButton"> </item>
<property name="text"> <item>
<string>Cancel</string> <widget class="QPushButton" name="cancelButton">
</property> <property name="text">
</widget> <string>Cancel</string>
</item> </property>
<item row="5" column="2"> </widget>
<widget class="QPushButton" name="createButton"> </item>
<property name="text"> <item>
<string>Create</string> <widget class="QPushButton" name="createButton">
</property> <property name="text">
<property name="default"> <string>Create</string>
<bool>true</bool> </property>
</property> <property name="checkable">
</widget> <bool>false</bool>
</property>
<property name="default">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item> </item>
</layout> </layout>
</widget> </widget>