projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get rid off obsolete icons.qrc references in ui files
[quassel.git]
/
src
/
qtui
/
settingspages
/
networkssettingspage.ui
diff --git
a/src/qtui/settingspages/networkssettingspage.ui
b/src/qtui/settingspages/networkssettingspage.ui
index
cabddac
..
4c1563e
100644
(file)
--- a/
src/qtui/settingspages/networkssettingspage.ui
+++ b/
src/qtui/settingspages/networkssettingspage.ui
@@
-37,7
+37,7
@@
<string>Re&name...</string>
</property>
<property name="icon" >
<string>Re&name...</string>
</property>
<property name="icon" >
- <iconset
resource="../../icons/icons.qrc"
>
+ <iconset>
<normaloff>:/16x16/actions/oxygen/16x16/actions/edit-rename.png</normaloff>:/16x16/actions/oxygen/16x16/actions/edit-rename.png</iconset>
</property>
</widget>
<normaloff>:/16x16/actions/oxygen/16x16/actions/edit-rename.png</normaloff>:/16x16/actions/oxygen/16x16/actions/edit-rename.png</iconset>
</property>
</widget>
@@
-54,7
+54,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>
<property name="iconSize" >
<normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</iconset>
</property>
<property name="iconSize" >
@@
-77,7
+77,7
@@
<string>De&lete</string>
</property>
<property name="icon" >
<string>De&lete</string>
</property>
<property name="icon" >
- <iconset
resource="../../icons/icons.qrc"
>
+ <iconset>
<normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</iconset>
</property>
</widget>
<normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</iconset>
</property>
</widget>
@@
-121,7
+121,7
@@
<item>
<widget class="QGroupBox" name="detailsBox" >
<property name="sizePolicy" >
<item>
<widget class="QGroupBox" name="detailsBox" >
<property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="
Minimum
Expanding" >
+ <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
<horstretch>10</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
<horstretch>10</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@
-160,20
+160,12
@@
<string/>
</property>
<property name="currentIndex" >
<string/>
</property>
<property name="currentIndex" >
- <number>
0
</number>
+ <number>
2
</number>
</property>
<widget class="QWidget" name="serversTab" >
<property name="enabled" >
<bool>true</bool>
</property>
</property>
<widget class="QWidget" name="serversTab" >
<property name="enabled" >
<bool>true</bool>
</property>
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>376</width>
- <height>332</height>
- </rect>
- </property>
<attribute name="title" >
<string>Servers</string>
</attribute>
<attribute name="title" >
<string>Servers</string>
</attribute>
@@
-225,7
+217,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>
@@
-242,7
+234,7
@@
<string>De&lete</string>
</property>
<property name="icon" >
<string>De&lete</string>
</property>
<property name="icon" >
- <iconset
resource="../../icons/icons.qrc"
>
+ <iconset>
<normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</iconset>
</property>
</widget>
<normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</iconset>
</property>
</widget>
@@
-271,7
+263,7
@@
<string>...</string>
</property>
<property name="icon" >
<string>...</string>
</property>
<property name="icon" >
- <iconset
resource="../../icons/icons.qrc"
>
+ <iconset>
<normaloff>:/16x16/actions/oxygen/16x16/actions/go-up.png</normaloff>:/16x16/actions/oxygen/16x16/actions/go-up.png</iconset>
</property>
</widget>
<normaloff>:/16x16/actions/oxygen/16x16/actions/go-up.png</normaloff>:/16x16/actions/oxygen/16x16/actions/go-up.png</iconset>
</property>
</widget>
@@
-285,7
+277,7
@@
<string>...</string>
</property>
<property name="icon" >
<string>...</string>
</property>
<property name="icon" >
- <iconset
resource="../../icons/icons.qrc"
>
+ <iconset>
<normaloff>:/16x16/actions/oxygen/16x16/actions/go-down.png</normaloff>:/16x16/actions/oxygen/16x16/actions/go-down.png</iconset>
</property>
</widget>
<normaloff>:/16x16/actions/oxygen/16x16/actions/go-down.png</normaloff>:/16x16/actions/oxygen/16x16/actions/go-down.png</iconset>
</property>
</widget>
@@
-335,14
+327,6
@@
</layout>
</widget>
<widget class="QWidget" name="performTab" >
</layout>
</widget>
<widget class="QWidget" name="performTab" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>376</width>
- <height>332</height>
- </rect>
- </property>
<attribute name="title" >
<string>Perform</string>
</attribute>
<attribute name="title" >
<string>Perform</string>
</attribute>
@@
-362,6
+346,10
@@
<property name="enabled" >
<bool>true</bool>
</property>
<property name="enabled" >
<bool>true</bool>
</property>
+ <property name="toolTip" >
+ <string>Specify a list of IRC commands to be executed upon connect.
+Note that Quassel IRC automatically rejoins channels, so /join will rarely be needed here!</string>
+ </property>
<property name="lineWrapMode" >
<enum>QTextEdit::NoWrap</enum>
</property>
<property name="lineWrapMode" >
<enum>QTextEdit::NoWrap</enum>
</property>
@@
-425,20
+413,11
@@
</layout>
</widget>
<widget class="QWidget" name="advancedTab" >
</layout>
</widget>
<widget class="QWidget" name="advancedTab" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>376</width>
- <height>332</height>
- </rect>
- </property>
<attribute name="title" >
<string>Advanced</string>
</attribute>
<attribute name="toolTip" >
<attribute name="title" >
<string>Advanced</string>
</attribute>
<attribute name="toolTip" >
- <string>This specifies how control messages, nicks and servernames are encoded.
-Unless you *really* know what you do, leave this as ISO-8859-1!</string>
+ <string>Configure advanced settings such as message encodings and automatic reconnect</string>
</attribute>
<layout class="QVBoxLayout" >
<item>
</attribute>
<layout class="QVBoxLayout" >
<item>
@@
-446,6
+425,9
@@
Unless you *really* know what you do, leave this as ISO-8859-1!</string>
<property name="enabled" >
<bool>true</bool>
</property>
<property name="enabled" >
<bool>true</bool>
</property>
+ <property name="toolTip" >
+ <string>Control encodings for in- and outgoing messages</string>
+ </property>
<property name="title" >
<string>Encodings</string>
</property>
<property name="title" >
<string>Encodings</string>
</property>
@@
-454,6
+436,10
@@
Unless you *really* know what you do, leave this as ISO-8859-1!</string>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="label_4" >
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="label_4" >
+ <property name="toolTip" >
+ <string>Specify which encoding your messages will be sent in.
+UTF-8 should be a sane choice for most networks.</string>
+ </property>
<property name="text" >
<string>Send messages in:</string>
</property>
<property name="text" >
<string>Send messages in:</string>
</property>
@@
-470,6
+456,10
@@
Unless you *really* know what you do, leave this as ISO-8859-1!</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="toolTip" >
+ <string>Specify which encoding your messages will be sent in.
+UTF-8 should be a sane choice for most networks.</string>
+ </property>
<property name="insertPolicy" >
<enum>QComboBox::InsertAlphabetically</enum>
</property>
<property name="insertPolicy" >
<enum>QComboBox::InsertAlphabetically</enum>
</property>
@@
-478,7
+468,8
@@
Unless you *really* know what you do, leave this as ISO-8859-1!</string>
<item row="1" column="0" >
<widget class="QLabel" name="label_5" >
<property name="toolTip" >
<item row="1" column="0" >
<widget class="QLabel" name="label_5" >
<property name="toolTip" >
- <string>Incoming messages encoded in Utf8 will always be treated as such. This setting defines the encoding for messages that are not Utf8.</string>
+ <string>Incoming messages encoded in Utf8 will always be treated as such.
+This setting defines the encoding for messages that are not Utf8.</string>
</property>
<property name="text" >
<string>Receive fallback:</string>
</property>
<property name="text" >
<string>Receive fallback:</string>
@@
-496,6
+487,10
@@
Unless you *really* know what you do, leave this as ISO-8859-1!</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="toolTip" >
+ <string>Incoming messages encoded in Utf8 will always be treated as such.
+This setting defines the encoding for messages that are not Utf8.</string>
+ </property>
<property name="insertPolicy" >
<enum>QComboBox::InsertAlphabetically</enum>
</property>
<property name="insertPolicy" >
<enum>QComboBox::InsertAlphabetically</enum>
</property>
@@
-517,6
+512,10
@@
Unless you *really* know what you do, leave this as ISO-8859-1!</string>
<property name="enabled" >
<bool>false</bool>
</property>
<property name="enabled" >
<bool>false</bool>
</property>
+ <property name="toolTip" >
+ <string>This specifies how control messages, nicks and servernames are encoded.
+Unless you *really* know what you do, leave this as ISO-8859-1!</string>
+ </property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
@@
-526,6
+525,9
@@
Unless you *really* know what you do, leave this as ISO-8859-1!</string>
<property name="enabled" >
<bool>true</bool>
</property>
<property name="enabled" >
<bool>true</bool>
</property>
+ <property name="toolTip" >
+ <string>Use default settings for encodings (recommended)</string>
+ </property>
<property name="text" >
<string>Use defaults</string>
</property>
<property name="text" >
<string>Use defaults</string>
</property>
@@
-542,6
+544,9
@@
Unless you *really* know what you do, leave this as ISO-8859-1!</string>
<property name="enabled" >
<bool>true</bool>
</property>
<property name="enabled" >
<bool>true</bool>
</property>
+ <property name="toolTip" >
+ <string>Control automatic reconnect to the network</string>
+ </property>
<property name="title" >
<string>Automatic Reconnect</string>
</property>
<property name="title" >
<string>Automatic Reconnect</string>
</property>
@@
-628,9
+633,7
@@
Unless you *really* know what you do, leave this as ISO-8859-1!</string>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
- <resources>
- <include location="../../icons/icons.qrc" />
- </resources>
+ <resources/>
<connections>
<connection>
<sender>unlimitedRetries</sender>
<connections>
<connection>
<sender>unlimitedRetries</sender>