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

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

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>

View file

@ -1,314 +1,340 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>CreateForum</class> <class>CreateForum</class>
<widget class="QDialog" name="CreateForum"> <widget class="QDialog" name="CreateForum">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>672</width> <width>672</width>
<height>495</height> <height>495</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Create new Forum</string> <string>Create new Forum</string>
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="../images.qrc"> <iconset resource="../images.qrc">
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset> <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="HeaderFrame" name="headerFrame"/> <widget class="HeaderFrame" name="headerFrame"/>
</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">
<property name="text"> <property name="text">
<string>Name</string> <string>Name</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLineEdit" name="forumName"/> <widget class="QLineEdit" name="forumName"/>
</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>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>300</width> <width>300</width>
<height>524287</height> <height>524287</height>
</size> </size>
</property> </property>
<property name="sizeIncrement"> <property name="sizeIncrement">
<size> <size>
<width>220</width> <width>220</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="baseSize"> <property name="baseSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>check peers you would like to share private publish key with</string> <string>check peers you would like to share private publish key with</string>
</property> </property>
<property name="floating"> <property name="floating">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="features"> <property name="features">
<set>QDockWidget::NoDockWidgetFeatures</set> <set>QDockWidget::NoDockWidgetFeatures</set>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Share Key With</string> <string>Share Key With</string>
</property> </property>
<widget class="QWidget" name="dockWidgetContents"> <widget class="QWidget" name="dockWidgetContents">
<layout class="QGridLayout" name="_2"> <layout class="QGridLayout" name="_2">
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="FriendSelectionWidget" name="keyShareList" native="true"> <widget class="FriendSelectionWidget" name="keyShareList" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding"> <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>4</verstretch> <verstretch>4</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>20</width> <width>20</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>300</width> <width>300</width>
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
<property name="sizeIncrement"> <property name="sizeIncrement">
<size> <size>
<width>220</width> <width>220</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="baseSize"> <property name="baseSize">
<size> <size>
<width>200</width> <width>200</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</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">
<property name="text"> <property name="text">
<string>Description</string> <string>Description</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QTextEdit" name="forumDesc"/> <widget class="QTextEdit" name="forumDesc"/>
</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="sizePolicy">
<string>Type:</string> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
</property> <horstretch>0</horstretch>
<layout class="QGridLayout" name="gridLayout_2"> <verstretch>0</verstretch>
<property name="margin"> </sizepolicy>
<number>6</number> </property>
</property> <property name="title">
<item row="0" column="0"> <string>Type:</string>
<widget class="QRadioButton" name="typePublic"> </property>
<property name="text"> <layout class="QGridLayout" name="gridLayout_2">
<string>Public - Anyone can read and publish (Shared Publish Key)</string> <property name="margin">
</property> <number>6</number>
</widget> </property>
</item> <item row="0" column="0">
<item row="1" column="0"> <widget class="QRadioButton" name="typePublic">
<widget class="QRadioButton" name="typePrivate"> <property name="text">
<property name="text"> <string>Public - Anyone can read and publish (Shared Publish Key)</string>
<string>Restricted - Anyone can read, limited publishing (Private Publish Key)</string> </property>
</property> </widget>
</widget> </item>
</item> <item row="1" column="0">
<item row="2" column="0"> <widget class="QRadioButton" name="typePrivate">
<widget class="QRadioButton" name="typeEncrypted"> <property name="text">
<property name="text"> <string>Restricted - Anyone can read, limited publishing (Private Publish Key)</string>
<string>Private - (Private Publish Key required to view Messages)</string> </property>
</property> </widget>
</widget> </item>
</item> <item row="2" column="0">
</layout> <widget class="QRadioButton" name="typeEncrypted">
</widget> <property name="text">
</item> <string>Private - (Private Publish Key required to view Messages)</string>
<item row="3" column="0" colspan="3"> </property>
<widget class="QGroupBox" name="msgGroupBox_2"> </widget>
<property name="title"> </item>
<string>Key Sharing</string> </layout>
</property> </widget>
<layout class="QVBoxLayout" name="_5"> </item>
<property name="spacing"> <item row="3" column="0">
<number>0</number> <widget class="QGroupBox" name="msgGroupBox_2">
</property> <property name="title">
<property name="margin"> <string>Key Sharing</string>
<number>6</number> </property>
</property> <layout class="QVBoxLayout" name="_5">
<item> <property name="spacing">
<widget class="QCheckBox" name="pubKeyShare_cb"> <number>0</number>
<property name="toolTip"> </property>
<string>Key recipients can publish to restricted-type channels, and can view and publish for private-type channels</string> <property name="margin">
</property> <number>6</number>
<property name="text"> </property>
<string>Share Private Publish Key</string> <item>
</property> <widget class="QCheckBox" name="pubKeyShare_cb">
</widget> <property name="toolTip">
</item> <string>Key recipients can publish to restricted-type channels, and can view and publish for private-type channels</string>
<item> </property>
<spacer name="verticalSpacer_3"> <property name="text">
<property name="orientation"> <string>Share Private Publish Key</string>
<enum>Qt::Vertical</enum> </property>
</property> </widget>
<property name="sizeHint" stdset="0"> </item>
<size> <item>
<width>20</width> <spacer name="verticalSpacer_3">
<height>40</height> <property name="orientation">
</size> <enum>Qt::Horizontal</enum>
</property> </property>
</spacer> <property name="sizeHint" stdset="0">
</item> <size>
</layout> <width>40</width>
</widget> <height>20</height>
</item> </size>
<item row="4" column="0" colspan="3"> </property>
<widget class="QGroupBox" name="msgGroupBox"> </spacer>
<property name="title"> </item>
<string>Allowed Messages</string> </layout>
</property> </widget>
<layout class="QVBoxLayout" name="_4"> </item>
<property name="spacing"> <item row="4" column="0">
<number>0</number> <widget class="QGroupBox" name="msgGroupBox">
</property> <property name="title">
<property name="margin"> <string>Allowed Messages</string>
<number>6</number> </property>
</property> <layout class="QVBoxLayout" name="_4">
<item> <property name="spacing">
<widget class="QRadioButton" name="msgAuth"> <number>0</number>
<property name="text"> </property>
<string>Authenticated Messages</string> <property name="margin">
</property> <number>6</number>
</widget> </property>
</item> <item>
<item> <widget class="QRadioButton" name="msgAuth">
<widget class="QRadioButton" name="msgAnon"> <property name="text">
<property name="text"> <string>Authenticated Messages</string>
<string>Anonymous Messages</string> </property>
</property> </widget>
</widget> </item>
</item> <item>
<item> <widget class="QRadioButton" name="msgAnon">
<spacer name="verticalSpacer_2"> <property name="text">
<property name="orientation"> <string>Anonymous Messages</string>
<enum>Qt::Vertical</enum> </property>
</property> </widget>
<property name="sizeHint" stdset="0"> </item>
<size> <item>
<width>20</width> <spacer name="verticalSpacer">
<height>40</height> <property name="orientation">
</size> <enum>Qt::Vertical</enum>
</property> </property>
</spacer> <property name="sizeHint" stdset="0">
</item> <size>
</layout> <width>20</width>
</widget> <height>40</height>
</item> </size>
<item row="5" column="0"> </property>
<spacer> </spacer>
<property name="orientation"> </item>
<enum>Qt::Horizontal</enum> <item>
</property> <spacer name="verticalSpacer_2">
<property name="sizeHint" stdset="0"> <property name="orientation">
<size> <enum>Qt::Horizontal</enum>
<width>238</width> </property>
<height>20</height> <property name="sizeHint" stdset="0">
</size> <size>
</property> <width>40</width>
</spacer> <height>20</height>
</item> </size>
<item row="5" column="1"> </property>
<widget class="QPushButton" name="cancelButton"> </spacer>
<property name="text"> </item>
<string>Cancel</string> </layout>
</property> </widget>
</widget> </item>
</item> <item row="5" column="0" colspan="2">
<item row="5" column="2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<widget class="QPushButton" name="createButton"> <item>
<property name="text"> <spacer>
<string>Create</string> <property name="orientation">
</property> <enum>Qt::Horizontal</enum>
<property name="default"> </property>
<bool>true</bool> <property name="sizeHint" stdset="0">
</property> <size>
</widget> <width>238</width>
</item> <height>20</height>
</layout> </size>
</widget> </property>
</item> </spacer>
</layout> </item>
</widget> <item>
<customwidgets> <widget class="QPushButton" name="cancelButton">
<customwidget> <property name="text">
<class>HeaderFrame</class> <string>Cancel</string>
<extends>QFrame</extends> </property>
<header>gui/common/HeaderFrame.h</header> </widget>
<container>1</container> </item>
</customwidget> <item>
<customwidget> <widget class="QPushButton" name="createButton">
<class>FriendSelectionWidget</class> <property name="text">
<extends>QWidget</extends> <string>Create</string>
<header>gui/common/FriendSelectionWidget.h</header> </property>
<container>1</container> <property name="checkable">
</customwidget> <bool>false</bool>
</customwidgets> </property>
<resources> <property name="default">
<include location="../images.qrc"/> <bool>false</bool>
</resources> </property>
<connections/> </widget>
</ui> </item>
</layout>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>HeaderFrame</class>
<extends>QFrame</extends>
<header>gui/common/HeaderFrame.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>FriendSelectionWidget</class>
<extends>QWidget</extends>
<header>gui/common/FriendSelectionWidget.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources>
<include location="../images.qrc"/>
</resources>
<connections/>
</ui>