X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fnetworkssettingspage.ui;h=4c1563e2fbcd1e4ac77a8c89a2ff63cfd742485b;hp=a180f3e3e9927c51d250ef7bc4b1f2be9959963f;hb=d230a0e8119ea9d698259b9be876617bc5f37394;hpb=f98c17616467bbf8fe0762718f9457cfea039e50;ds=sidebyside
diff --git a/src/qtui/settingspages/networkssettingspage.ui b/src/qtui/settingspages/networkssettingspage.ui
index a180f3e3..4c1563e2 100644
--- a/src/qtui/settingspages/networkssettingspage.ui
+++ b/src/qtui/settingspages/networkssettingspage.ui
@@ -5,8 +5,8 @@
0
0
- 514
- 452
+ 565
+ 468
@@ -37,7 +37,7 @@
Re&name...
-
+
:/16x16/actions/oxygen/16x16/actions/edit-rename.png:/16x16/actions/oxygen/16x16/actions/edit-rename.png
@@ -54,7 +54,7 @@
&Add...
-
+
:/16x16/actions/oxygen/16x16/actions/list-add.png:/16x16/actions/oxygen/16x16/actions/list-add.png
@@ -77,7 +77,7 @@
De&lete
-
+
:/16x16/actions/oxygen/16x16/actions/edit-delete.png:/16x16/actions/oxygen/16x16/actions/edit-delete.png
@@ -157,27 +157,21 @@
true
- This specifies how control messages, nicks and servernames are encoded.
-Unless you *really* know what you do, leave this as ISO-8859-1!
+
- 0
+ 2
true
-
-
- 0
- 0
- 244
- 332
-
-
Servers
+
+ Manage servers for this network
+
-
@@ -223,7 +217,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!
&Add...
-
+
:/16x16/actions/oxygen/16x16/actions/list-add.png:/16x16/actions/oxygen/16x16/actions/list-add.png
@@ -240,7 +234,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!
De&lete
-
+
:/16x16/actions/oxygen/16x16/actions/edit-delete.png:/16x16/actions/oxygen/16x16/actions/edit-delete.png
@@ -269,7 +263,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!
...
-
+
:/16x16/actions/oxygen/16x16/actions/go-up.png:/16x16/actions/oxygen/16x16/actions/go-up.png
@@ -283,7 +277,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!
...
-
+
:/16x16/actions/oxygen/16x16/actions/go-down.png:/16x16/actions/oxygen/16x16/actions/go-down.png
@@ -333,17 +327,12 @@ Unless you *really* know what you do, leave this as ISO-8859-1!
-
-
- 0
- 0
- 244
- 332
-
-
Perform
+
+ Configure automatic identification or misc. commands to be executed after connecting to a server
+
-
@@ -357,6 +346,10 @@ Unless you *really* know what you do, leave this as ISO-8859-1!
true
+
+ 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!
+
QTextEdit::NoWrap
@@ -415,32 +408,26 @@ Unless you *really* know what you do, leave this as ISO-8859-1!
- autoIdentifyService
- autoIdentifyPassword
- label_2
- label_3
-
-
-
- 0
- 0
- 244
- 332
-
-
+
Advanced
+
+ Configure advanced settings such as message encodings and automatic reconnect
+
-
true
+
+ Control encodings for in- and outgoing messages
+
Encodings
@@ -449,6 +436,10 @@ Unless you *really* know what you do, leave this as ISO-8859-1!
-
+
+ Specify which encoding your messages will be sent in.
+UTF-8 should be a sane choice for most networks.
+
Send messages in:
@@ -465,6 +456,10 @@ Unless you *really* know what you do, leave this as ISO-8859-1!
0
+
+ Specify which encoding your messages will be sent in.
+UTF-8 should be a sane choice for most networks.
+
QComboBox::InsertAlphabetically
@@ -473,7 +468,8 @@ Unless you *really* know what you do, leave this as ISO-8859-1!
-
- Incoming messages encoded in Utf8 will always be treated as such. This setting defines the encoding for messages that are not Utf8.
+ Incoming messages encoded in Utf8 will always be treated as such.
+This setting defines the encoding for messages that are not Utf8.
Receive fallback:
@@ -491,6 +487,10 @@ Unless you *really* know what you do, leave this as ISO-8859-1!
0
+
+ Incoming messages encoded in Utf8 will always be treated as such.
+This setting defines the encoding for messages that are not Utf8.
+
QComboBox::InsertAlphabetically
@@ -512,6 +512,10 @@ Unless you *really* know what you do, leave this as ISO-8859-1!
false
+
+ This specifies how control messages, nicks and servernames are encoded.
+Unless you *really* know what you do, leave this as ISO-8859-1!
+
@@ -521,6 +525,9 @@ Unless you *really* know what you do, leave this as ISO-8859-1!
true
+
+ Use default settings for encodings (recommended)
+
Use defaults
@@ -537,6 +544,9 @@ Unless you *really* know what you do, leave this as ISO-8859-1!
true
+
+ Control automatic reconnect to the network
+
Automatic Reconnect
@@ -623,9 +633,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!
-
-
-
+
unlimitedRetries