X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fqtui%2Fsettingspages%2Fnetworkssettingspage.ui;h=8426dd0c76e04e866f3c3905b9466c0db30a623b;hb=8fe8accd73abf77ab21d2d1c1346d2bc5c4de2ff;hp=41bcfb9f84c95bbe27167f0bbd51c743e8314ac7;hpb=5578332c19054aa494d2dea869ffa643ce15d303;p=quassel.git
diff --git a/src/qtui/settingspages/networkssettingspage.ui b/src/qtui/settingspages/networkssettingspage.ui
index 41bcfb9f..8426dd0c 100644
--- a/src/qtui/settingspages/networkssettingspage.ui
+++ b/src/qtui/settingspages/networkssettingspage.ui
@@ -6,8 +6,8 @@
0
0
- 515
- 453
+ 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
@@ -492,11 +663,153 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
Auto Identify
+
-
+
+
+ true
+
+
+ Authenticate using your nickname and password before joining any channels
+
+
+ Use SASL Authentication
+
+
+ true
+
+
+ true
+
+
+
-
+
+
+ QFrame::NoFrame
+
+
+ QFrame::Plain
+
+
+ 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.
+
Auto Identify
@@ -512,6 +825,9 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
true
+
+ Service user to send your password to, usually NickServ
+
NickServ
@@ -522,20 +838,23 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
true
+
+ Account password
+
QLineEdit::Password
-
-
+
Service:
-
-
+
true
@@ -555,7 +874,7 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
20
- 40
+ 10
@@ -621,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:
@@ -641,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
@@ -718,6 +1037,14 @@ 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
@@ -735,12 +1062,44 @@ Unless you *really* know what you do, leave this as ISO-8859-1!
setDisabled(bool)
- 173
- 296
+ 317
+ 331
+
+
+ 209
+ 334
+
+
+
+
+ unlimitedMessageRate
+ toggled(bool)
+ messageRateBurstSize
+ setDisabled(bool)
+
+
+ 332
+ 392
+
+
+ 249
+ 393
+
+
+
+
+ unlimitedMessageRate
+ toggled(bool)
+ messageRateDelayFrame
+ setDisabled(bool)
+
+
+ 332
+ 392
- 118
- 294
+ 262
+ 428