diff options
| author | Dirk von Suchodoletz | 2011-03-25 02:29:55 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2011-03-25 02:29:55 +0100 |
| commit | 2da95e2716a5e912089562f0c43aa7bdae07a70e (patch) | |
| tree | 9f2e1df13f7c7a1d98faf6df687586b3ff82f958 /src/gui/ui | |
| parent | ... (diff) | |
| parent | revert username generator (diff) | |
| download | pvs-2da95e2716a5e912089562f0c43aa7bdae07a70e.tar.gz pvs-2da95e2716a5e912089562f0c43aa7bdae07a70e.tar.xz pvs-2da95e2716a5e912089562f0c43aa7bdae07a70e.zip | |
Merge branch 'master' of openslx.org:pvs
Diffstat (limited to 'src/gui/ui')
| -rw-r--r-- | src/gui/ui/clientConfigDialog.ui | 30 | ||||
| -rw-r--r-- | src/gui/ui/mainwindowtouch.ui | 6 |
2 files changed, 9 insertions, 27 deletions
diff --git a/src/gui/ui/clientConfigDialog.ui b/src/gui/ui/clientConfigDialog.ui index bb4bdc9..aa73433 100644 --- a/src/gui/ui/clientConfigDialog.ui +++ b/src/gui/ui/clientConfigDialog.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>445</width> - <height>266</height> + <width>366</width> + <height>195</height> </rect> </property> <property name="windowTitle"> @@ -27,7 +27,7 @@ <enum>QTabWidget::North</enum> </property> <property name="currentIndex"> - <number>2</number> + <number>0</number> </property> <widget class="QWidget" name="tabPermissions"> <attribute name="title"> @@ -130,30 +130,6 @@ </property> </widget> </item> - <item> - <layout class="QVBoxLayout" name="verticalLayout_5"> - <item> - <widget class="QCheckBox" name="checkBoxAllowChat"> - <property name="text"> - <string>Accept chat messages</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - </item> - <item> - <widget class="QCheckBox" name="checkBoxAllowFiletransfer"> - <property name="text"> - <string>Accept file transfers</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - </item> - </layout> - </item> </layout> </widget> <widget class="QWidget" name="tabDisplay"> diff --git a/src/gui/ui/mainwindowtouch.ui b/src/gui/ui/mainwindowtouch.ui index 7241895..651217e 100644 --- a/src/gui/ui/mainwindowtouch.ui +++ b/src/gui/ui/mainwindowtouch.ui @@ -116,6 +116,7 @@ <string>&File</string> </property> <addaction name="separator"/> + <addaction name="action_Info"/> <addaction name="action_Save_Profile"/> <addaction name="action_Manage_Profiles"/> <addaction name="separator"/> @@ -491,6 +492,11 @@ <string>Use Password</string> </property> </action> + <action name="action_Info"> + <property name="text"> + <string>&Info</string> + </property> + </action> </widget> <resources> <include location="../../../pvsmgr.qrc"/> |