* update Preferences and Settings forms

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@901 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2009-01-01 22:07:49 +00:00
parent 8ba3c2de28
commit 67706cc73c
18 changed files with 2173 additions and 1327 deletions

View file

@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>440</width>
<height>311</height>
<width>410</width>
<height>300</height>
</rect>
</property>
<property name="palette" >
@ -492,223 +492,292 @@
<property name="contextMenuPolicy" >
<enum>Qt::NoContextMenu</enum>
</property>
<widget class="QGroupBox" name="grpLanguage" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>441</width>
<height>75</height>
</rect>
<layout class="QGridLayout" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="contextMenuPolicy" >
<enum>Qt::NoContextMenu</enum>
<property name="topMargin" >
<number>6</number>
</property>
<property name="title" >
<string>Language</string>
<property name="rightMargin" >
<number>6</number>
</property>
<widget class="QWidget" name="layoutWidget_2" >
<property name="geometry" >
<rect>
<x>10</x>
<y>44</y>
<width>341</width>
<height>26</height>
</rect>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>0</number>
<property name="bottomMargin" >
<number>6</number>
</property>
<property name="horizontalSpacing" >
<number>0</number>
</property>
<property name="verticalSpacing" >
<number>0</number>
</property>
<item row="0" column="0" >
<widget class="QGroupBox" name="grpLanguage" >
<property name="minimumSize" >
<size>
<width>0</width>
<height>75</height>
</size>
</property>
<property name="spacing" >
<number>6</number>
<property name="contextMenuPolicy" >
<enum>Qt::NoContextMenu</enum>
</property>
<item row="0" column="1" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
<property name="title" >
<string>Language</string>
</property>
<widget class="QWidget" name="layoutWidget_2" >
<property name="geometry" >
<rect>
<x>10</x>
<y>44</y>
<width>341</width>
<height>26</height>
</rect>
</property>
<layout class="QGridLayout" >
<property name="leftMargin" >
<number>0</number>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>300</width>
<height>16</height>
</size>
<property name="topMargin" >
<number>0</number>
</property>
</spacer>
</item>
<item row="0" column="0" >
<widget class="QComboBox" name="cmboLanguage" >
<property name="minimumSize" >
<size>
<width>150</width>
<height>0</height>
</size>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="contextMenuPolicy" >
<enum>Qt::NoContextMenu</enum>
<property name="bottomMargin" >
<number>0</number>
</property>
<property name="toolTip" >
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="0" column="1" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>300</width>
<height>16</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0" >
<widget class="QComboBox" name="cmboLanguage" >
<property name="minimumSize" >
<size>
<width>150</width>
<height>0</height>
</size>
</property>
<property name="contextMenuPolicy" >
<enum>Qt::NoContextMenu</enum>
</property>
<property name="toolTip" >
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
p, li { white-space: pre-wrap; }
&lt;/style>&lt;/head>&lt;body style=" font-family:'Arial'; font-size:10pt; font-weight:400; font-style:normal; text-decoration:none;">
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the language used in RetroShare&lt;/p>&lt;/body>&lt;/html></string>
</property>
<property name="editable" >
<bool>false</bool>
</property>
<property name="iconSize" >
<size>
<width>24</width>
<height>16</height>
</size>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QLabel" name="label" >
<property name="geometry" >
<rect>
<x>10</x>
<y>27</y>
<width>591</width>
<height>17</height>
</rect>
</property>
<property name="contextMenuPolicy" >
<enum>Qt::NoContextMenu</enum>
</property>
<property name="text" >
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;/head>&lt;body style=" white-space: pre-wrap; font-family:Arial; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;">&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Changes to language will only take effect after restarting RetroShare!&lt;/p>&lt;/body>&lt;/html></string>
</property>
</widget>
</widget>
<widget class="QGroupBox" name="grpStyle" >
<property name="geometry" >
<rect>
<x>0</x>
<y>80</y>
<width>441</width>
<height>55</height>
</rect>
</property>
<property name="contextMenuPolicy" >
<enum>Qt::NoContextMenu</enum>
</property>
<property name="toolTip" >
<string/>
</property>
<property name="title" >
<string>Style</string>
</property>
<widget class="QWidget" name="layoutWidget" >
<property name="geometry" >
<rect>
<x>10</x>
<y>24</y>
<width>341</width>
<height>26</height>
</rect>
</property>
<layout class="QGridLayout" name="_2" >
<property name="margin" >
<number>0</number>
</property>
<property name="editable" >
<bool>false</bool>
</property>
<property name="iconSize" >
<size>
<width>24</width>
<height>16</height>
</size>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QLabel" name="label" >
<property name="geometry" >
<rect>
<x>10</x>
<y>27</y>
<width>591</width>
<height>17</height>
</rect>
</property>
<property name="contextMenuPolicy" >
<enum>Qt::NoContextMenu</enum>
</property>
<property name="text" >
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;/head>&lt;body style=" white-space: pre-wrap; font-family:Arial; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;">&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Changes to language will only take effect after restarting RetroShare!&lt;/p>&lt;/body>&lt;/html></string>
</property>
</widget>
</widget>
</item>
<item row="1" column="0" >
<widget class="QGroupBox" name="grpStyle" >
<property name="minimumSize" >
<size>
<width>0</width>
<height>64</height>
</size>
</property>
<property name="spacing" >
<number>6</number>
<property name="contextMenuPolicy" >
<enum>Qt::NoContextMenu</enum>
</property>
<item row="0" column="0" >
<widget class="QComboBox" name="cmboStyle" >
<property name="minimumSize" >
<size>
<width>150</width>
<height>0</height>
</size>
<property name="toolTip" >
<string/>
</property>
<property name="title" >
<string>Style</string>
</property>
<widget class="QWidget" name="layoutWidget" >
<property name="geometry" >
<rect>
<x>10</x>
<y>24</y>
<width>341</width>
<height>26</height>
</rect>
</property>
<layout class="QGridLayout" >
<property name="leftMargin" >
<number>0</number>
</property>
<property name="contextMenuPolicy" >
<enum>Qt::NoContextMenu</enum>
<property name="topMargin" >
<number>0</number>
</property>
<property name="toolTip" >
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="0" column="0" >
<widget class="QComboBox" name="cmboStyle" >
<property name="minimumSize" >
<size>
<width>150</width>
<height>0</height>
</size>
</property>
<property name="contextMenuPolicy" >
<enum>Qt::NoContextMenu</enum>
</property>
<property name="toolTip" >
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
p, li { white-space: pre-wrap; }
&lt;/style>&lt;/head>&lt;body style=" font-family:'Arial'; font-size:10pt; font-weight:400; font-style:normal; text-decoration:none;">
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose RetroShare's interface style&lt;/p>&lt;/body>&lt;/html></string>
</property>
<property name="editable" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="0" column="1" >
<spacer>
<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>
</widget>
</widget>
<widget class="QGroupBox" name="groupBox" >
<property name="geometry" >
<rect>
<x>0</x>
<y>140</y>
<width>441</width>
<height>61</height>
</rect>
</property>
<property name="title" >
<string>Style Sheet</string>
</property>
<widget class="QWidget" name="layoutWidget_3" >
<property name="geometry" >
<rect>
<x>11</x>
<y>20</y>
<width>341</width>
<height>25</height>
</rect>
</property>
<layout class="QGridLayout" name="_3" >
<property name="margin" >
<number>0</number>
</property>
<property name="editable" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="0" column="1" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
</item>
<item row="2" column="0" >
<widget class="QGroupBox" name="groupBox" >
<property name="minimumSize" >
<size>
<width>0</width>
<height>64</height>
</size>
</property>
<property name="spacing" >
<number>6</number>
<property name="title" >
<string>Style Sheet</string>
</property>
<item row="0" column="1" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
<widget class="QWidget" name="layoutWidget_3" >
<property name="geometry" >
<rect>
<x>11</x>
<y>20</y>
<width>341</width>
<height>25</height>
</rect>
</property>
<layout class="QGridLayout" >
<property name="leftMargin" >
<number>0</number>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>181</width>
<height>20</height>
</size>
<property name="topMargin" >
<number>0</number>
</property>
</spacer>
</item>
<item row="0" column="0" >
<widget class="QComboBox" name="styleSheetCombo" >
<property name="minimumSize" >
<size>
<width>150</width>
<height>0</height>
</size>
<property name="rightMargin" >
<number>0</number>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
<property name="bottomMargin" >
<number>0</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="0" column="1" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>181</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0" >
<widget class="QComboBox" name="styleSheetCombo" >
<property name="minimumSize" >
<size>
<width>150</width>
<height>0</height>
</size>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
<item row="3" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>361</width>
<height>61</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<resources>
<include location="../images.qrc" />

View file

@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>456</width>
<height>356</height>
<width>452</width>
<height>349</height>
</rect>
</property>
<property name="sizePolicy" >
@ -501,197 +501,195 @@
<property name="contextMenuPolicy" >
<enum>Qt::NoContextMenu</enum>
</property>
<widget class="QGroupBox" name="groupBox_2" >
<property name="geometry" >
<rect>
<x>0</x>
<y>200</y>
<width>441</width>
<height>72</height>
</rect>
<layout class="QGridLayout" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="title" >
<string>Incoming Directory</string>
<property name="topMargin" >
<number>6</number>
</property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLineEdit" name="incomingDir" >
<property name="readOnly" >
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QPushButton" name="incomingButton" >
<property name="minimumSize" >
<size>
<width>31</width>
<height>31</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>31</width>
<height>31</height>
</size>
</property>
<property name="text" >
<string/>
</property>
<property name="icon" >
<iconset resource="../images.qrc" >:/images/directoryselect_24x24_shadow.png</iconset>
</property>
<property name="iconSize" >
<size>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QGroupBox" name="groupBox" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>441</width>
<height>200</height>
</rect>
<property name="rightMargin" >
<number>6</number>
</property>
<property name="title" >
<string>Shared Directories</string>
<property name="bottomMargin" >
<number>6</number>
</property>
<widget class="QListWidget" name="dirList" >
<property name="geometry" >
<rect>
<x>10</x>
<y>20</y>
<width>381</width>
<height>171</height>
</rect>
</property>
</widget>
<widget class="QPushButton" name="addButton" >
<property name="geometry" >
<rect>
<x>400</x>
<y>20</y>
<width>34</width>
<height>34</height>
</rect>
</property>
<property name="minimumSize" >
<size>
<width>34</width>
<height>34</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>34</width>
<height>34</height>
</size>
</property>
<property name="text" >
<string/>
</property>
<property name="icon" >
<iconset resource="../images.qrc" >:/images/directoryadd_24x24_shadow.png</iconset>
</property>
<property name="iconSize" >
<size>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
<widget class="QPushButton" name="removeButton" >
<property name="geometry" >
<rect>
<x>400</x>
<y>60</y>
<width>34</width>
<height>34</height>
</rect>
</property>
<property name="minimumSize" >
<size>
<width>34</width>
<height>34</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>34</width>
<height>34</height>
</size>
</property>
<property name="text" >
<string/>
</property>
<property name="icon" >
<iconset resource="../images.qrc" >:/images/directoryremove_24x24_shadow.png</iconset>
</property>
<property name="iconSize" >
<size>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
</widget>
<widget class="QGroupBox" name="groupBox_3" >
<property name="geometry" >
<rect>
<x>0</x>
<y>270</y>
<width>441</width>
<height>72</height>
</rect>
<property name="horizontalSpacing" >
<number>0</number>
</property>
<property name="title" >
<string>Partials Direcrtory</string>
<property name="verticalSpacing" >
<number>0</number>
</property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLineEdit" name="partialsDir" >
<property name="readOnly" >
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QPushButton" name="partialButton" >
<property name="minimumSize" >
<size>
<width>31</width>
<height>31</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>31</width>
<height>31</height>
</size>
</property>
<property name="text" >
<string/>
</property>
<property name="icon" >
<iconset resource="../images.qrc" >:/images/directoryselect_24x24_shadow.png</iconset>
</property>
<property name="iconSize" >
<size>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
</item>
</layout>
</widget>
<item row="0" column="0" >
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
<string>Shared Directories</string>
</property>
<layout class="QGridLayout" >
<item rowspan="3" row="0" column="0" >
<widget class="QListWidget" name="dirList" />
</item>
<item row="0" column="1" >
<widget class="QPushButton" name="addButton" >
<property name="minimumSize" >
<size>
<width>34</width>
<height>34</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>34</width>
<height>34</height>
</size>
</property>
<property name="text" >
<string/>
</property>
<property name="icon" >
<iconset resource="../images.qrc" >:/images/directoryadd_24x24_shadow.png</iconset>
</property>
<property name="iconSize" >
<size>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QPushButton" name="removeButton" >
<property name="minimumSize" >
<size>
<width>34</width>
<height>34</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>34</width>
<height>34</height>
</size>
</property>
<property name="text" >
<string/>
</property>
<property name="icon" >
<iconset resource="../images.qrc" >:/images/directoryremove_24x24_shadow.png</iconset>
</property>
<property name="iconSize" >
<size>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
</item>
<item row="2" column="1" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>71</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item row="1" column="0" >
<widget class="QGroupBox" name="groupBox_2" >
<property name="title" >
<string>Incoming Directory</string>
</property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLineEdit" name="incomingDir" >
<property name="readOnly" >
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QPushButton" name="incomingButton" >
<property name="minimumSize" >
<size>
<width>31</width>
<height>31</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>31</width>
<height>31</height>
</size>
</property>
<property name="text" >
<string/>
</property>
<property name="icon" >
<iconset resource="../images.qrc" >:/images/directoryselect_24x24_shadow.png</iconset>
</property>
<property name="iconSize" >
<size>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="2" column="0" >
<widget class="QGroupBox" name="groupBox_3" >
<property name="title" >
<string>Partials Direcrtory</string>
</property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLineEdit" name="partialsDir" >
<property name="readOnly" >
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QPushButton" name="partialButton" >
<property name="minimumSize" >
<size>
<width>31</width>
<height>31</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>31</width>
<height>31</height>
</size>
</property>
<property name="text" >
<string/>
</property>
<property name="icon" >
<iconset resource="../images.qrc" >:/images/directoryselect_24x24_shadow.png</iconset>
</property>
<property name="iconSize" >
<size>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<tabstops>
<tabstop>incomingDir</tabstop>

View file

@ -5,10 +5,16 @@
<rect>
<x>0</x>
<y>0</y>
<width>466</width>
<height>405</height>
<width>431</width>
<height>250</height>
</rect>
</property>
<property name="minimumSize" >
<size>
<width>0</width>
<height>64</height>
</size>
</property>
<property name="palette" >
<palette>
<active>
@ -492,90 +498,123 @@
<property name="contextMenuPolicy" >
<enum>Qt::NoContextMenu</enum>
</property>
<widget class="QGroupBox" name="grpLogin" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>441</width>
<height>61</height>
</rect>
<layout class="QGridLayout" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="title" >
<string>Login</string>
<property name="topMargin" >
<number>6</number>
</property>
<widget class="QCheckBox" name="autologincheckBox" >
<property name="geometry" >
<rect>
<x>10</x>
<y>20</y>
<width>141</width>
<height>18</height>
</rect>
</property>
<property name="text" >
<string>Auto Login</string>
</property>
</widget>
</widget>
<widget class="QGroupBox" name="groupBox_2" >
<property name="geometry" >
<rect>
<x>0</x>
<y>60</y>
<width>441</width>
<height>111</height>
</rect>
<property name="rightMargin" >
<number>6</number>
</property>
<property name="title" >
<string>Misc</string>
<property name="bottomMargin" >
<number>6</number>
</property>
<widget class="QCheckBox" name="chkShowOnStartup" >
<property name="geometry" >
<rect>
<x>10</x>
<y>40</y>
<width>401</width>
<height>20</height>
</rect>
</property>
<property name="text" >
<string>Show MainWindow at Startup</string>
</property>
<property name="checked" >
<bool>false</bool>
</property>
</widget>
<widget class="QCheckBox" name="checkStartMinimized" >
<property name="geometry" >
<rect>
<x>10</x>
<y>60</y>
<width>401</width>
<height>20</height>
</rect>
</property>
<property name="text" >
<string>Start minimized</string>
</property>
<property name="checked" >
<bool>true</bool>
</property>
</widget>
<widget class="QCheckBox" name="chkRunRetroshareAtSystemStartup" >
<property name="geometry" >
<rect>
<x>10</x>
<y>20</y>
<width>411</width>
<height>18</height>
</rect>
</property>
<property name="text" >
<string>Start RetroShare when my system starts</string>
</property>
</widget>
</widget>
<property name="horizontalSpacing" >
<number>0</number>
</property>
<property name="verticalSpacing" >
<number>0</number>
</property>
<item row="0" column="0" >
<widget class="QGroupBox" name="grpLogin" >
<property name="minimumSize" >
<size>
<width>0</width>
<height>48</height>
</size>
</property>
<property name="title" >
<string>Login</string>
</property>
<widget class="QCheckBox" name="autologincheckBox" >
<property name="geometry" >
<rect>
<x>10</x>
<y>20</y>
<width>141</width>
<height>18</height>
</rect>
</property>
<property name="text" >
<string>Auto Login</string>
</property>
</widget>
</widget>
</item>
<item row="1" column="0" >
<widget class="QGroupBox" name="groupBox_2" >
<property name="minimumSize" >
<size>
<width>0</width>
<height>80</height>
</size>
</property>
<property name="title" >
<string>Misc</string>
</property>
<widget class="QCheckBox" name="chkShowOnStartup" >
<property name="geometry" >
<rect>
<x>10</x>
<y>40</y>
<width>401</width>
<height>20</height>
</rect>
</property>
<property name="text" >
<string>Show MainWindow at Startup</string>
</property>
<property name="checked" >
<bool>false</bool>
</property>
</widget>
<widget class="QCheckBox" name="checkStartMinimized" >
<property name="geometry" >
<rect>
<x>10</x>
<y>60</y>
<width>401</width>
<height>20</height>
</rect>
</property>
<property name="text" >
<string>Start minimized</string>
</property>
<property name="checked" >
<bool>true</bool>
</property>
</widget>
<widget class="QCheckBox" name="chkRunRetroshareAtSystemStartup" >
<property name="geometry" >
<rect>
<x>10</x>
<y>20</y>
<width>411</width>
<height>18</height>
</rect>
</property>
<property name="text" >
<string>Start RetroShare when my system starts</string>
</property>
</widget>
</widget>
</item>
<item row="2" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>401</width>
<height>91</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<resources>
<include location="../images.qrc" />

View file

@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>404</width>
<height>270</height>
<width>388</width>
<height>332</height>
</rect>
</property>
<property name="sizePolicy" >
@ -499,6 +499,18 @@
<enum>Qt::NoContextMenu</enum>
</property>
<layout class="QGridLayout" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>6</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<item rowspan="2" row="0" column="0" >
<widget class="QGroupBox" name="notify_ForumNewMsg" >
<property name="title" >
@ -509,16 +521,16 @@
<number>0</number>
</property>
<property name="leftMargin" >
<number>0</number>
<number>6</number>
</property>
<property name="topMargin" >
<number>0</number>
<number>6</number>
</property>
<property name="rightMargin" >
<number>0</number>
<number>6</number>
</property>
<property name="bottomMargin" >
<number>0</number>
<number>6</number>
</property>
<item>
<widget class="QCheckBox" name="notify_Peers" >
@ -578,6 +590,12 @@
<string>Popups</string>
</property>
<layout class="QVBoxLayout" >
<property name="leftMargin" >
<number>9</number>
</property>
<property name="topMargin" >
<number>9</number>
</property>
<item>
<widget class="QCheckBox" name="popup_Connect" >
<property name="text" >
@ -632,6 +650,19 @@
</layout>
</widget>
</item>
<item row="2" column="0" colspan="2" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>361</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<resources>

View file

@ -17,11 +17,11 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
****************************************************************/
#include <rshare.h>
#include "ServerDialog.h"
****************************************************************/
#include <rshare.h>
#include "ServerDialog.h"
#include <iostream>
#include <sstream>
@ -30,14 +30,14 @@
#include <QTimer>
/** Constructor */
ServerDialog::ServerDialog(QWidget *parent)
: ConfigPage(parent)
{
/* Invoke the Qt Designer generated object setup routine */
ui.setupUi(this);
/** Constructor */
ServerDialog::ServerDialog(QWidget *parent)
: ConfigPage(parent)
{
/* Invoke the Qt Designer generated object setup routine */
ui.setupUi(this);
/* Create RshareSettings object */
_settings = new RshareSettings();
@ -48,16 +48,19 @@ ServerDialog::ServerDialog(QWidget *parent)
timer->connect(timer, SIGNAL(timeout()), this, SLOT(updateStatus()));
timer->start(1000);
load();
updateStatus();
/* Hide platform specific features */
#ifdef Q_WS_WIN
#endif
}
/** Saves the changes on this page */
bool
ServerDialog::save(QString &errmsg)
/* Hide platform specific features */
#ifdef Q_WS_WIN
#endif
}
/** Saves the changes on this page */
bool
ServerDialog::save(QString &errmsg)
{
/* save the server address */

View file

@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>636</width>
<height>418</height>
<width>409</width>
<height>373</height>
</rect>
</property>
<property name="sizePolicy" >
@ -488,6 +488,24 @@
<enum>Qt::NoContextMenu</enum>
</property>
<layout class="QGridLayout" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>6</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<property name="horizontalSpacing" >
<number>0</number>
</property>
<property name="verticalSpacing" >
<number>0</number>
</property>
<item row="0" column="0" >
<widget class="QGroupBox" name="groupBox_2" >
<property name="sizePolicy" >
@ -572,180 +590,214 @@
</widget>
</item>
<item row="1" column="0" >
<widget class="QGroupBox" name="groupBox" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
<widget class="QTabWidget" name="tabWidget" >
<property name="currentIndex" >
<number>0</number>
</property>
<property name="title" >
<string>Network Configuration</string>
</property>
<layout class="QVBoxLayout" >
<item>
<layout class="QHBoxLayout" >
<item>
<layout class="QVBoxLayout" >
<item>
<widget class="QRadioButton" name="radio_nonet" >
<property name="text" >
<string>No Conectivity</string>
</property>
</widget>
</item>
<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" >
<property name="text" >
<string>UDP Connections</string>
</property>
<property name="checkable" >
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="check_ext" >
<property name="text" >
<string>Stable External IP Addrress</string>
</property>
<property name="checkable" >
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="check_dht" >
<property name="text" >
<string>DHT Okay</string>
</property>
<property name="checkable" >
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="check_upnp" >
<property name="text" >
<string>UPnP Active</string>
</property>
<property name="checkable" >
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="check_tcp" >
<property name="text" >
<string>TCP server</string>
</property>
<property name="checkable" >
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" >
<item>
<layout class="QVBoxLayout" >
<item>
<widget class="QLabel" name="label" >
<property name="text" >
<string>Local Address</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_2" >
<property name="text" >
<string>External Address</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QWidget" name="tab" >
<attribute name="title" >
<string>Network Configuration</string>
</attribute>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QGroupBox" name="groupBox" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title" >
<string>Network Configuration</string>
</property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLineEdit" name="localAddress" />
</item>
<item row="0" column="1" >
<widget class="QLabel" name="label_5" >
<property name="text" >
<string>Port:</string>
</property>
</widget>
</item>
<item row="0" column="2" >
<widget class="QSpinBox" name="localPort" >
<property name="minimum" >
<number>0</number>
</property>
<property name="maximum" >
<number>65535</number>
</property>
<property name="value" >
<number>7812</number>
</property>
</widget>
<layout class="QHBoxLayout" >
<item>
<layout class="QVBoxLayout" >
<item>
<widget class="QLabel" name="label" >
<property name="text" >
<string>Local Address</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_2" >
<property name="text" >
<string>External Address</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLineEdit" name="localAddress" />
</item>
<item row="0" column="1" >
<widget class="QLabel" name="label_5" >
<property name="text" >
<string>Port:</string>
</property>
</widget>
</item>
<item row="0" column="2" >
<widget class="QSpinBox" name="localPort" >
<property name="minimum" >
<number>0</number>
</property>
<property name="maximum" >
<number>65535</number>
</property>
<property name="value" >
<number>7812</number>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLineEdit" name="extAddress" />
</item>
<item row="1" column="1" >
<widget class="QLabel" name="label_4" >
<property name="text" >
<string>Port:</string>
</property>
</widget>
</item>
<item row="1" column="2" >
<widget class="QSpinBox" name="extPort" >
<property name="minimum" >
<number>0</number>
</property>
<property name="maximum" >
<number>65535</number>
</property>
<property name="value" >
<number>7812</number>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
<item row="1" column="0" >
<widget class="QLineEdit" name="extAddress" />
</item>
<item row="1" column="1" >
<widget class="QLabel" name="label_4" >
<property name="text" >
<string>Port:</string>
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
<item row="1" column="2" >
<widget class="QSpinBox" name="extPort" >
<property name="minimum" >
<number>0</number>
<property name="sizeHint" >
<size>
<width>301</width>
<height>20</height>
</size>
</property>
<property name="maximum" >
<number>65535</number>
</property>
<property name="value" >
<number>7812</number>
</property>
</widget>
</spacer>
</item>
</layout>
</item>
</layout>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_2" >
<attribute name="title" >
<string>Network Status</string>
</attribute>
<layout class="QGridLayout" >
<item row="0" column="0" >
<layout class="QHBoxLayout" >
<item>
<layout class="QVBoxLayout" >
<item>
<widget class="QRadioButton" name="radio_nonet" >
<property name="text" >
<string>No Conectivity</string>
</property>
</widget>
</item>
<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" >
<property name="text" >
<string>UDP Connections</string>
</property>
<property name="checkable" >
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="check_ext" >
<property name="text" >
<string>Stable External IP Addrress</string>
</property>
<property name="checkable" >
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="check_dht" >
<property name="text" >
<string>DHT Okay</string>
</property>
<property name="checkable" >
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="check_upnp" >
<property name="text" >
<string>UPnP Active</string>
</property>
<property name="checkable" >
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="check_tcp" >
<property name="text" >
<string>TCP server</string>
</property>
<property name="checkable" >
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
</layout>
</widget>
</widget>
</item>
<item row="2" column="0" >