X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fnetworkssettingspage.ui;h=120f3f1bb2c420f727e0c68b83218d391273f828;hb=0d3d7a861472313710b51c8d19e81af56e2208a1;hp=e3db6c16a9ea744684fbe56e03c6efb7e42af11f;hpb=1c0ad0ad9c7f7c71e642c868f731fe259f5776c2;p=quassel.git
diff --git a/src/qtui/settingspages/networkssettingspage.ui b/src/qtui/settingspages/networkssettingspage.ui
index e3db6c16..120f3f1b 100644
--- a/src/qtui/settingspages/networkssettingspage.ui
+++ b/src/qtui/settingspages/networkssettingspage.ui
@@ -5,8 +5,8 @@
0
0
- 514
- 452
+ 565
+ 468
@@ -157,11 +157,10 @@
true
- This specifies how control messages, nicks and servernames are encoded.
-Unless you *really* know what you do, leave this as ISO-8859-1!
+
- 1
+ 0
@@ -171,13 +170,16 @@ Unless you *really* know what you do, leave this as ISO-8859-1!
0
0
- 301
- 326
+ 364
+ 348
Servers
+
+ Manage servers for this network
+
-
@@ -337,13 +339,16 @@ Unless you *really* know what you do, leave this as ISO-8859-1!
0
0
- 301
- 326
+ 364
+ 348
Perform
+
+ Configure automatic identification or misc. commands to be executed after connecting to a server
+
-
@@ -357,6 +362,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
@@ -376,14 +385,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!
true
-
-
-
-
-
- Service:
-
-
-
+
-
@@ -394,54 +396,62 @@ Unless you *really* know what you do, leave this as ISO-8859-1!
- -
-
+
-
+
true
+
+ QLineEdit::Password
+
+
+
+ -
+
- Password:
+ Service:
- -
-
+
-
+
true
-
- QLineEdit::Password
+
+ Password:
-
- autoIdentifyService
- autoIdentifyPassword
- label_2
- label_3
-
+
0
0
- 301
- 326
+ 364
+ 348
Advanced
+
+ Configure advanced settings such as message encodings and automatic reconnect
+
-
true
+
+ Control encodings for in- and outgoing messages
+
Encodings
@@ -450,6 +460,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:
@@ -466,6 +480,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
@@ -474,7 +492,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:
@@ -492,6 +511,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
@@ -513,6 +536,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!
+
@@ -522,6 +549,9 @@ Unless you *really* know what you do, leave this as ISO-8859-1!
true
+
+ Use default settings for encodings (recommended)
+
Use defaults
@@ -538,6 +568,9 @@ Unless you *really* know what you do, leave this as ISO-8859-1!
true
+
+ Control automatic reconnect to the network
+
Automatic Reconnect