X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fnetworkssettingspage.ui;h=e18f9db9f31670f19bf339c26f177ede90dbf0e9;hp=71e2982980973884f60a44a24b760d5bc6db5d28;hb=189c2def1996c6a25a8182794f2d6efbbf712867;hpb=c5cbe5eb77fce2ab954a98399a1450803108217b
diff --git a/src/qtui/settingspages/networkssettingspage.ui b/src/qtui/settingspages/networkssettingspage.ui
index 71e29829..e18f9db9 100644
--- a/src/qtui/settingspages/networkssettingspage.ui
+++ b/src/qtui/settingspages/networkssettingspage.ui
@@ -5,24 +5,15 @@
0
0
- 560
- 322
+ 688
+ 462
Form
-
- 0
-
-
- 0
-
-
- 0
-
-
+
0
-
@@ -53,7 +44,8 @@
Re&name...
- :/16x16/actions/oxygen/16x16/actions/edit-rename.png
+
+ :/16x16/actions/oxygen/16x16/actions/edit-rename.png:/16x16/actions/oxygen/16x16/actions/edit-rename.png
@@ -69,7 +61,8 @@
&Add...
- :/16x16/actions/oxygen/16x16/actions/list-add.png
+
+ :/16x16/actions/oxygen/16x16/actions/list-add.png:/16x16/actions/oxygen/16x16/actions/list-add.png
@@ -91,7 +84,8 @@
De&lete
- :/16x16/actions/oxygen/16x16/actions/edit-delete.png
+
+ :/16x16/actions/oxygen/16x16/actions/edit-delete.png:/16x16/actions/oxygen/16x16/actions/edit-delete.png
@@ -100,7 +94,7 @@
Qt::Vertical
-
+
20
40
@@ -123,7 +117,9 @@
Connect now
- :/16x16/actions/oxygen/16x16/actions/network-connect.png
+
+
+
@@ -134,7 +130,7 @@
-
-
+
10
0
@@ -169,6 +165,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!
+
0
@@ -176,6 +176,14 @@
true
+
+
+ 0
+ 0
+ 394
+ 340
+
+
Servers
@@ -208,7 +216,9 @@
&Edit...
- :/16x16/actions/oxygen/16x16/actions/configure.png
+
+
+
@@ -224,7 +234,8 @@
&Add...
- :/16x16/actions/oxygen/16x16/actions/list-add.png
+
+ :/16x16/actions/oxygen/16x16/actions/list-add.png:/16x16/actions/oxygen/16x16/actions/list-add.png
@@ -240,7 +251,8 @@
De&lete
- :/16x16/actions/oxygen/16x16/actions/edit-delete.png
+
+ :/16x16/actions/oxygen/16x16/actions/edit-delete.png:/16x16/actions/oxygen/16x16/actions/edit-delete.png
@@ -249,16 +261,7 @@
6
-
- 0
-
-
- 0
-
-
- 0
-
-
+
0
-
@@ -266,7 +269,7 @@
Qt::Horizontal
-
+
0
20
@@ -283,7 +286,8 @@
...
- :/16x16/actions/oxygen/16x16/actions/go-up.png
+
+ :/16x16/actions/oxygen/16x16/actions/go-up.png:/16x16/actions/oxygen/16x16/actions/go-up.png
@@ -296,7 +300,8 @@
...
- :/16x16/actions/oxygen/16x16/actions/go-down.png
+
+ :/16x16/actions/oxygen/16x16/actions/go-down.png:/16x16/actions/oxygen/16x16/actions/go-down.png
@@ -305,7 +310,7 @@
Qt::Horizontal
-
+
0
20
@@ -320,7 +325,7 @@
Qt::Vertical
-
+
20
40
@@ -335,7 +340,7 @@
-
- false
+ true
Choose random server for connecting
@@ -347,6 +352,14 @@
+
+
+ 0
+ 0
+ 394
+ 340
+
+
Perform
@@ -363,7 +376,7 @@
-
- false
+ true
QTextEdit::NoWrap
@@ -373,7 +386,7 @@
-
- false
+ true
Auto Identify
@@ -382,7 +395,7 @@
true
- false
+ true
-
@@ -395,7 +408,10 @@
-
-
+
+
+ true
+
NickServ
@@ -403,15 +419,21 @@
-
+
+ true
+
Password:
-
-
+
+
+ true
+
- QLineEdit::PasswordEchoOnEdit
+ QLineEdit::Password
@@ -425,24 +447,35 @@
+
+
+ 0
+ 0
+ 394
+ 340
+
+
Advanced
-
+
-
+
+ true
+
- Network Encoding
+ Encodings
-
+
-
-
+
-
-
- Sending:
+ Send messages in:
@@ -457,12 +490,18 @@
0
+
+ QComboBox::InsertAlphabetically
+
-
+
+ Incoming messages encoded in Utf8 will always be treated as such. This setting defines the encoding for messages that are not Utf8.
+
- Receiving:
+ Receive fallback:
@@ -477,6 +516,27 @@
0
+
+ QComboBox::InsertAlphabetically
+
+
+
+ -
+
+
+ This specifies how control messages, nicks and servernames are encoded.
+Unless you *really* know what you do, leave this as ISO-8859-1!
+
+
+ Server encoding:
+
+
+
+ -
+
+
+ false
+
@@ -486,7 +546,106 @@
Qt::Horizontal
-
+
+
+ 58
+ 61
+
+
+
+
+
+
+ -
+
+
+ true
+
+
+ Use defaults
+
+
+ true
+
+
+
+
+
+
+ -
+
+
+ true
+
+
+ Automatic Reconnect
+
+
+ true
+
+
+
-
+
+
-
+
+
-
+
+
+ Interval:
+
+
+
+ -
+
+
+ s
+
+
+ 10
+
+
+ 3600
+
+
+ 30
+
+
+
+ -
+
+
+ Retries:
+
+
+
+ -
+
+
+ 1
+
+
+ 999
+
+
+ 10
+
+
+
+ -
+
+
+ Unlimited
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
40
20
@@ -497,12 +656,12 @@
-
-
+
false
- Use defaults
+ Rejoin all channels on reconnect
true
@@ -517,9 +676,9 @@
Qt::Vertical
-
+
- 375
+ 386
31
@@ -547,12 +706,12 @@
setDisabled(bool)
- 356
- 181
+ 659
+ 262
- 470
- 122
+ 471
+ 176
@@ -563,12 +722,44 @@
setDisabled(bool)
- 383
- 181
+ 659
+ 262
+
+
+ 471
+ 209
+
+
+
+
+ unlimitedRetries
+ toggled(bool)
+ reconnectRetries
+ setDisabled(bool)
+
+
+ 512
+ 373
+
+
+ 420
+ 377
+
+
+
+
+ useDefaultEncodings
+ toggled(bool)
+ serverEncoding
+ setDisabled(bool)
+
+
+ 396
+ 251
- 445
- 156
+ 456
+ 230