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

Cleaned layout(s) in config->server, and removed the ;setFixedSize that caused some damages to the server interface

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@757 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2008-10-18 20:07:05 +00:00
parent 78d09f5af2
commit ef902d52cf
2 changed files with 132 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
retroshare-gui/src/gui/Preferences/PreferencesWindow.cpp
View File

@ -79,7 +79,7 @@ PreferencesWindow::PreferencesWindow(QWidget *parent, Qt::WFlags flags)
/* Select the first action */ /* Select the first action */
grp->actions()[0]->setChecked(true); grp->actions()[0]->setChecked(true);
setFixedSize(QSize(480, 450)); // setFixedSize(QSize(480, 450));
connect(ui.okButton, SIGNAL(clicked( bool )), this, SLOT( saveChanges()) ); connect(ui.okButton, SIGNAL(clicked( bool )), this, SLOT( saveChanges()) );
connect(ui.cancelprefButton, SIGNAL(clicked( bool )), this, SLOT( cancelpreferences()) ); connect(ui.cancelprefButton, SIGNAL(clicked( bool )), this, SLOT( cancelpreferences()) );

148
retroshare-gui/src/gui/Preferences/ServerDialog.ui
View File

@ -5,8 +5,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>451</width> <width>636</width>
<height>438</height> <height>418</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy" > <property name="sizePolicy" >
@ -499,20 +499,8 @@
<property name="title" > <property name="title" >
<string>Network Configuration (takes effect after restart)</string> <string>Network Configuration (takes effect after restart)</string>
</property> </property>
<layout class="QGridLayout" > <layout class="QHBoxLayout" >
<property name="leftMargin" > <item>
<number>4</number>
</property>
<property name="topMargin" >
<number>2</number>
</property>
<property name="rightMargin" >
<number>4</number>
</property>
<property name="bottomMargin" >
<number>2</number>
</property>
<item row="0" column="0" >
<layout class="QVBoxLayout" > <layout class="QVBoxLayout" >
<item> <item>
<widget class="QComboBox" name="netModeComboBox" > <widget class="QComboBox" name="netModeComboBox" >
@ -567,13 +555,26 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="1" column="0" > <item row="1" column="0" >
<widget class="QGroupBox" name="groupBox" > <widget class="QGroupBox" name="groupBox" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Preferred" > <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -581,15 +582,44 @@
<property name="title" > <property name="title" >
<string>Network Configuration</string> <string>Network Configuration</string>
</property> </property>
<layout class="QGridLayout" > <layout class="QVBoxLayout" >
<item row="0" column="0" > <item>
<layout class="QHBoxLayout" >
<item>
<layout class="QVBoxLayout" >
<item>
<widget class="QRadioButton" name="radio_nonet" > <widget class="QRadioButton" name="radio_nonet" >
<property name="text" > <property name="text" >
<string>No Conectivity</string> <string>No Conectivity</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1" > <item>
<widget class="QRadioButton" name="radio_netLimited" >
<property name="text" >
<string>Limited</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radio_netUdp" >
<property name="text" >
<string>Udp</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radio_netServer" >
<property name="text" >
<string>Retroshare Server</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" >
<item>
<widget class="QCheckBox" name="check_udp" > <widget class="QCheckBox" name="check_udp" >
<property name="text" > <property name="text" >
<string>UDP Connections</string> <string>UDP Connections</string>
@ -599,14 +629,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" > <item>
<widget class="QRadioButton" name="radio_netLimited" >
<property name="text" >
<string>Limited</string>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QCheckBox" name="check_ext" > <widget class="QCheckBox" name="check_ext" >
<property name="text" > <property name="text" >
<string>Stable External IP Addrress</string> <string>Stable External IP Addrress</string>
@ -616,14 +639,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item rowspan="2" row="2" column="0" > <item>
<widget class="QRadioButton" name="radio_netUdp" >
<property name="text" >
<string>Udp</string>
</property>
</widget>
</item>
<item row="2" column="1" >
<widget class="QCheckBox" name="check_dht" > <widget class="QCheckBox" name="check_dht" >
<property name="text" > <property name="text" >
<string>DHT Okay</string> <string>DHT Okay</string>
@ -633,7 +649,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1" > <item>
<widget class="QCheckBox" name="check_upnp" > <widget class="QCheckBox" name="check_upnp" >
<property name="text" > <property name="text" >
<string>UPnP Active</string> <string>UPnP Active</string>
@ -643,14 +659,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0" > <item>
<widget class="QRadioButton" name="radio_netServer" >
<property name="text" >
<string>Retroshare Server</string>
</property>
</widget>
</item>
<item row="4" column="1" >
<widget class="QCheckBox" name="check_tcp" > <widget class="QCheckBox" name="check_tcp" >
<property name="text" > <property name="text" >
<string>TCP server</string> <string>TCP server</string>
@ -660,7 +669,11 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0" colspan="2" > </layout>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout" >
<item> <item>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout" >
@ -682,6 +695,9 @@
</item> </item>
<item> <item>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLineEdit" name="localAddress" />
</item>
<item row="0" column="1" > <item row="0" column="1" >
<widget class="QLabel" name="label_5" > <widget class="QLabel" name="label_5" >
<property name="text" > <property name="text" >
@ -702,6 +718,9 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" >
<widget class="QLineEdit" name="extAddress" />
</item>
<item row="1" column="1" > <item row="1" column="1" >
<widget class="QLabel" name="label_4" > <widget class="QLabel" name="label_4" >
<property name="text" > <property name="text" >
@ -722,12 +741,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" >
<widget class="QLineEdit" name="extAddress" />
</item>
<item row="0" column="0" >
<widget class="QLineEdit" name="localAddress" />
</item>
</layout> </layout>
</item> </item>
</layout> </layout>
@ -746,20 +759,8 @@
<property name="title" > <property name="title" >
<string>Transfer Rates</string> <string>Transfer Rates</string>
</property> </property>
<layout class="QGridLayout" > <layout class="QHBoxLayout" >
<property name="leftMargin" > <item>
<number>4</number>
</property>
<property name="topMargin" >
<number>4</number>
</property>
<property name="rightMargin" >
<number>4</number>
</property>
<property name="bottomMargin" >
<number>4</number>
</property>
<item row="0" column="0" >
<layout class="QHBoxLayout" > <layout class="QHBoxLayout" >
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
@ -798,7 +799,7 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="0" column="1" > <item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout" >
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
@ -837,6 +838,19 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>