X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fnetworkssettingspage.ui;h=e18f9db9f31670f19bf339c26f177ede90dbf0e9;hb=9204e98848ab202c0117aa1428fa0ea10b4dcd75;hp=c28c85217e042de6af206b565fabda39fa8ead59;hpb=8f237cecca9a6353bc4d150b4b55719a6bf37476;p=quassel.git
diff --git a/src/qtui/settingspages/networkssettingspage.ui b/src/qtui/settingspages/networkssettingspage.ui
index c28c8521..e18f9db9 100644
--- a/src/qtui/settingspages/networkssettingspage.ui
+++ b/src/qtui/settingspages/networkssettingspage.ui
@@ -13,16 +13,7 @@
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
-
+
+
+
@@ -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...
-
+
+
+
@@ -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
@@ -347,6 +352,14 @@
+
+
+ 0
+ 0
+ 394
+ 340
+
+
Perform
@@ -420,7 +433,7 @@
true
- QLineEdit::PasswordEchoOnEdit
+ QLineEdit::Password
@@ -434,27 +447,35 @@
+
+
+ 0
+ 0
+ 394
+ 340
+
+
Advanced
-
+
-
true
- Network Encoding
+ Encodings
-
+
-
-
+
-
-
- Sending:
+ Send messages in:
@@ -476,8 +497,11 @@
-
+
+ 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:
@@ -497,6 +521,24 @@
+ -
+
+
+ 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
+
+
+
-
@@ -504,10 +546,10 @@
Qt::Horizontal
-
+
- 40
- 20
+ 58
+ 61
@@ -603,7 +645,7 @@
Qt::Horizontal
-
+
40
20
@@ -615,6 +657,9 @@
-
+
+ false
+
Rejoin all channels on reconnect
@@ -631,7 +676,7 @@
Qt::Vertical
-
+
386
31
@@ -661,8 +706,8 @@
setDisabled(bool)
- 647
- 238
+ 659
+ 262
471
@@ -677,8 +722,8 @@
setDisabled(bool)
- 658
- 238
+ 659
+ 262
471
@@ -693,12 +738,28 @@
setDisabled(bool)
- 443
- 336
+ 512
+ 373
+
+
+ 420
+ 377
+
+
+
+
+ useDefaultEncodings
+ toggled(bool)
+ serverEncoding
+ setDisabled(bool)
+
+
+ 396
+ 251
- 390
- 338
+ 456
+ 230