X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fnetworkssettingspage.ui;h=7e6ad135e9a95b73ed8aeef3c81dec44ea32e934;hb=158443f71d48215eea8b47b836b61afd77654b78;hp=4bbafbaaec1e8a7582669629e9f48e60c4b044b6;hpb=e4972a0ebce0d555d752ab2f34ffd6a6dcdef1dd;p=quassel.git
diff --git a/src/qtui/settingspages/networkssettingspage.ui b/src/qtui/settingspages/networkssettingspage.ui
index 4bbafbaa..7e6ad135 100644
--- a/src/qtui/settingspages/networkssettingspage.ui
+++ b/src/qtui/settingspages/networkssettingspage.ui
@@ -6,8 +6,8 @@
0
0
- 515
- 503
+ 510
+ 553
@@ -218,8 +218,7 @@
-
-
+ ..
@@ -373,14 +372,14 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
Connection
-
+
-
true
- Control automatic reconnect to the network
+ Automatically reconnect to the IRC network after connection failures
Automatic Reconnect
@@ -388,17 +387,17 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
true
-
+
-
-
-
-
+
+
-
- Interval:
+ Wait
- -
+
-
s
@@ -414,14 +413,38 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
- -
+
-
+
+
+ between retries
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
-
- Retries:
+ Number of retries:
- -
+
-
1
@@ -434,14 +457,14 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
- -
+
-
Unlimited
- -
+
-
Qt::Horizontal
@@ -462,7 +485,7 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
true
- Rejoin all channels on reconnect
+ Rejoin all channels after reconnect
true
@@ -472,6 +495,154 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
+ -
+
+
+ true
+
+
+ Tooltip not yet loaded - to modify tooltip, edit NetworksSettingsPage::load()
+
+
+ Use Custom Rate Limits
+
+
+ true
+
+
+ false
+
+
+
-
+
+
-
+
+
+ Max. messages at once:
+
+
+
+ -
+
+
+ Maximum number of messages to send without any delays
+
+
+ 1
+
+
+ 999
+
+
+ 5
+
+
+
+ -
+
+
+ <html><head/><body><p>Disable all rate limiting, e.g. for IRC bridges.</p><p>Don't use with most normal networks.</p></body></html>
+
+
+ Unlimited
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
+ QFrame::NoFrame
+
+
+ QFrame::Plain
+
+
+ 1
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
-
+
+
+ Wait
+
+
+
+ -
+
+
+ <html><head/><body><p>Delay between messages after the maximum number of undelayed messages have been sent.</p></body></html>
+
+
+ s
+
+
+ 0.010000000000000
+
+
+ 0.100000000000000
+
+
+ 2.200000000000000
+
+
+
+ -
+
+
+ between future messages
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -480,7 +651,7 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
20
- 79
+ 1
@@ -493,12 +664,15 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
-
-
+
true
+
+ Authenticate using your nickname and password before joining any channels
+
- Auto Identify
+ Use SASL Authentication
true
@@ -506,54 +680,138 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
true
-
-
-
-
-
- true
-
-
- NickServ
-
-
-
- -
-
-
- true
-
-
- QLineEdit::Password
-
-
-
- -
-
-
- Service:
+
+
-
+
+
+ QFrame::NoFrame
-
-
- -
-
-
- true
+
+ QFrame::Plain
-
- Password:
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
-
+
+
+ true
+
+
+ Account name, often the same as your nickname
+
+
+
+
+
+
+ -
+
+
+ true
+
+
+ Account:
+
+
+
+ -
+
+
+ true
+
+
+ Account password
+
+
+ QLineEdit::Password
+
+
+
+ -
+
+
+ true
+
+
+ Password:
+
+
+
+
+
+ -
+
+
-
+
+
+ [icon]
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Could not detect if supported by server
+
+
+
+ -
+
+
+ Details...
+
+
+
+
+
+
-
-
+
+
+ <html><head/><body><p><span style=" font-weight:600;">Note:</span> because the identity has an ssl certificate set, SASL EXTERNAL will be used.</p></body></html>
+
+
+ true
+
+
+
+ -
+
true
+
+ Authenticate to services using your password. Use SASL instead to identify before joining channels.
+
- Use SASL Authentication
+ Auto Identify
true
@@ -561,44 +819,47 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
true
-
+
-
-
+
true
+
+ Service user to send your password to, usually NickServ
+
-
+ NickServ
-
-
+
true
+
+ Account password
+
QLineEdit::Password
- -
-
-
- true
-
+
-
+
- Password:
+ Service:
- -
-
+
-
+
true
- Account:
+ Password:
@@ -613,7 +874,7 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
20
- 40
+ 10
@@ -679,8 +940,8 @@ UTF-8 should be a sane choice for most networks.
-
- 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 UTF-8 will always be treated as such.
+This setting defines the encoding for messages that are not UTF-8.
Receive fallback:
@@ -699,8 +960,8 @@ 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.
+ Incoming messages encoded in UTF-8 will always be treated as such.
+This setting defines the encoding for messages that are not UTF-8.
QComboBox::InsertAlphabetically
@@ -710,8 +971,7 @@ This setting defines the encoding for messages that are not Utf8.
-
- This specifies how control messages, nicks and servernames are encoded.
-Unless you *really* know what you do, leave this as ISO-8859-1!
+ <qt><p>This specifies how control messages, nicks and servernames are encoded.</p><p><b>UTF-8</b> should be fine for modern networks. On other networks, you may need to use <b>ISO-8859-1</b> to avoid errors with illegal characters and invalid encoding.</p></qt>
Server encoding:
@@ -724,8 +984,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!
true
- This specifies how control messages, nicks and servernames are encoded.
-Unless you *really* know what you do, leave this as ISO-8859-1!
+ <qt><p>This specifies how control messages, nicks and servernames are encoded.</p><p><b>UTF-8</b> should be fine for modern networks. On other networks, you may need to use <b>ISO-8859-1</b> to avoid errors with illegal characters and invalid encoding.</p></qt>
@@ -776,6 +1035,15 @@ Unless you *really* know what you do, leave this as ISO-8859-1!
reconnectRetries
unlimitedRetries
rejoinOnReconnect
+ useCustomMessageRate
+ messageRateBurstSize
+ unlimitedMessageRate
+ messageRateDelay
+ sasl
+ saslAccount
+ saslPassword
+ saslStatusDetails
+ autoIdentify
autoIdentifyService
autoIdentifyPassword
useCustomEncodings
@@ -801,5 +1069,37 @@ Unless you *really* know what you do, leave this as ISO-8859-1!
+
+ unlimitedMessageRate
+ toggled(bool)
+ messageRateBurstSize
+ setDisabled(bool)
+
+
+ 332
+ 392
+
+
+ 249
+ 393
+
+
+
+
+ unlimitedMessageRate
+ toggled(bool)
+ messageRateDelayFrame
+ setDisabled(bool)
+
+
+ 332
+ 392
+
+
+ 262
+ 428
+
+
+