projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removing debug output
[quassel.git]
/
src
/
qtui
/
ui
/
coreconnectdlg.ui
diff --git
a/src/qtui/ui/coreconnectdlg.ui
b/src/qtui/ui/coreconnectdlg.ui
index
9b62884
..
e172e8a
100644
(file)
--- a/
src/qtui/ui/coreconnectdlg.ui
+++ b/
src/qtui/ui/coreconnectdlg.ui
@@
-19,7
+19,7
@@
<string>Connect to Quassel Core</string>
</property>
<property name="windowIcon" >
<string>Connect to Quassel Core</string>
</property>
<property name="windowIcon" >
- <iconset
resource="../../icons/icons.qrc"
>
+ <iconset>
<normaloff>:/16x16/actions/network-disconnect</normaloff>:/16x16/actions/network-disconnect</iconset>
</property>
<layout class="QHBoxLayout" >
<normaloff>:/16x16/actions/network-disconnect</normaloff>:/16x16/actions/network-disconnect</iconset>
</property>
<layout class="QHBoxLayout" >
@@
-32,17
+32,9
@@
</sizepolicy>
</property>
<property name="currentIndex" >
</sizepolicy>
</property>
<property name="currentIndex" >
- <number>
2
</number>
+ <number>
0
</number>
</property>
<widget class="QWidget" name="accountPage" >
</property>
<widget class="QWidget" name="accountPage" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>539</width>
- <height>331</height>
- </rect>
- </property>
<layout class="QVBoxLayout" >
<item>
<widget class="QGroupBox" name="groupBox" >
<layout class="QVBoxLayout" >
<item>
<widget class="QGroupBox" name="groupBox" >
@@
-65,7
+57,7
@@
<string>Edit...</string>
</property>
<property name="icon" >
<string>Edit...</string>
</property>
<property name="icon" >
- <iconset
resource="../../icons/icons.qrc"
>
+ <iconset>
<normaloff>:/16x16/actions/oxygen/16x16/actions/document-properties.png</normaloff>:/16x16/actions/oxygen/16x16/actions/document-properties.png</iconset>
</property>
</widget>
<normaloff>:/16x16/actions/oxygen/16x16/actions/document-properties.png</normaloff>:/16x16/actions/oxygen/16x16/actions/document-properties.png</iconset>
</property>
</widget>
@@
-76,7
+68,7
@@
<string>Add...</string>
</property>
<property name="icon" >
<string>Add...</string>
</property>
<property name="icon" >
- <iconset
resource="../../icons/icons.qrc"
>
+ <iconset>
<normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</iconset>
</property>
</widget>
<normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</iconset>
</property>
</widget>
@@
-87,7
+79,7
@@
<string>Delete</string>
</property>
<property name="icon" >
<string>Delete</string>
</property>
<property name="icon" >
- <iconset
resource="../../icons/icons.qrc"
>
+ <iconset>
<normaloff>:/16x16/actions/oxygen/16x16/actions/list-remove.png</normaloff>:/16x16/actions/oxygen/16x16/actions/list-remove.png</iconset>
</property>
</widget>
<normaloff>:/16x16/actions/oxygen/16x16/actions/list-remove.png</normaloff>:/16x16/actions/oxygen/16x16/actions/list-remove.png</iconset>
</property>
</widget>
@@
-105,6
+97,13
@@
</property>
</spacer>
</item>
</property>
</spacer>
</item>
+ <item>
+ <widget class="QPushButton" name="useInternalCore" >
+ <property name="text" >
+ <string>Use internal core</string>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
</layout>
</layout>
</item>
</layout>
@@
-134,14
+133,6
@@
</layout>
</widget>
<widget class="QWidget" name="loginPage" >
</layout>
</widget>
<widget class="QWidget" name="loginPage" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>539</width>
- <height>332</height>
- </rect>
- </property>
<layout class="QVBoxLayout" >
<item>
<widget class="QGroupBox" name="groupBox_2" >
<layout class="QVBoxLayout" >
<item>
<widget class="QGroupBox" name="groupBox_2" >
@@
-169,7
+160,7
@@
<string/>
</property>
<property name="pixmap" >
<string/>
</property>
<property name="pixmap" >
- <pixmap
resource="../../icons/icons.qrc"
>:/22x22/actions/network-disconnect</pixmap>
+ <pixmap>:/22x22/actions/network-disconnect</pixmap>
</property>
</widget>
</item>
</property>
</widget>
</item>
@@
-208,10
+199,10
@@
</sizepolicy>
</property>
<property name="text" >
</sizepolicy>
</property>
<property name="text" >
- <string>
Core Info
-reserve
-some
-
space
</string>
+ <string>
THIS IS A PLACEHOLDER
+TO
+RESERVE
+
SOME SPACE
</string>
</property>
<property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@@
-227,7
+218,7
@@
space</string>
<string/>
</property>
<property name="pixmap" >
<string/>
</property>
<property name="pixmap" >
- <pixmap
resource="../../icons/icons.qrc"
>:/22x22/actions/oxygen/22x22/actions/document-encrypt.png</pixmap>
+ <pixmap>:/22x22/actions/oxygen/22x22/actions/document-encrypt.png</pixmap>
</property>
</widget>
</item>
</property>
</widget>
</item>
@@
-245,14
+236,6
@@
space</string>
<number>0</number>
</property>
<widget class="QWidget" name="loginCredentialsPage" >
<number>0</number>
</property>
<widget class="QWidget" name="loginCredentialsPage" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>501</width>
- <height>145</height>
- </rect>
- </property>
<layout class="QVBoxLayout" >
<item>
<spacer>
<layout class="QVBoxLayout" >
<item>
<spacer>
@@
-340,14
+323,6
@@
space</string>
</layout>
</widget>
<widget class="QWidget" name="coreConfigPage" >
</layout>
</widget>
<widget class="QWidget" name="coreConfigPage" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>100</width>
- <height>30</height>
- </rect>
- </property>
<layout class="QVBoxLayout" >
<item>
<widget class="QGroupBox" name="groupBox_4" >
<layout class="QVBoxLayout" >
<item>
<widget class="QGroupBox" name="groupBox_4" >
@@
-429,16
+404,7
@@
space</string>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
- <widget class="QWidget" name="loginEmptyPage" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>100</width>
- <height>30</height>
- </rect>
- </property>
- </widget>
+ <widget class="QWidget" name="loginEmptyPage" />
</widget>
</item>
</layout>
</widget>
</item>
</layout>
@@
-454,14
+420,6
@@
space</string>
</layout>
</widget>
<widget class="QWidget" name="syncPage" >
</layout>
</widget>
<widget class="QWidget" name="syncPage" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>539</width>
- <height>332</height>
- </rect>
- </property>
<layout class="QVBoxLayout" >
<item>
<widget class="QGroupBox" name="groupBox_3" >
<layout class="QVBoxLayout" >
<item>
<widget class="QGroupBox" name="groupBox_3" >
@@
-573,9
+531,7
@@
space</string>
<tabstop>launchCoreConfigWizard</tabstop>
<tabstop>syncButtonBox</tabstop>
</tabstops>
<tabstop>launchCoreConfigWizard</tabstop>
<tabstop>syncButtonBox</tabstop>
</tabstops>
- <resources>
- <include location="../../icons/icons.qrc" />
- </resources>
+ <resources/>
<connections>
<connection>
<sender>accountButtonBox</sender>
<connections>
<connection>
<sender>accountButtonBox</sender>