X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fnetworkssettingspage.ui;h=7e6ad135e9a95b73ed8aeef3c81dec44ea32e934;hp=5b9316045832bdff2cc4275b9630e3e3f1dc1527;hb=e8a39b4c3c92e193ab861a3fea84a261bb6fbd24;hpb=7d30b18136eecbdf2089e5d5877c7e41c6f4bcb6 diff --git a/src/qtui/settingspages/networkssettingspage.ui b/src/qtui/settingspages/networkssettingspage.ui index 5b931604..7e6ad135 100644 --- a/src/qtui/settingspages/networkssettingspage.ui +++ b/src/qtui/settingspages/networkssettingspage.ui @@ -664,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 @@ -677,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 @@ -732,60 +819,53 @@ 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: - - - - <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 - - - @@ -794,7 +874,7 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne 20 - 40 + 10 @@ -891,8 +971,7 @@ This setting defines the encoding for messages that are not UTF-8. - 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: @@ -905,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> @@ -961,12 +1039,13 @@ Unless you *really* know what you do, leave this as ISO-8859-1! messageRateBurstSize unlimitedMessageRate messageRateDelay - autoIdentify - autoIdentifyService - autoIdentifyPassword sasl saslAccount saslPassword + saslStatusDetails + autoIdentify + autoIdentifyService + autoIdentifyPassword useCustomEncodings sendEncoding recvEncoding