</attribute>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
- <widget class="QGroupBox" name="autoIdentify">
+ <widget class="QGroupBox" name="sasl">
<property name="enabled">
<bool>true</bool>
</property>
+ <property name="toolTip">
+ <string>Authenticate using your nickname and password before joining any channels</string>
+ </property>
<property name="title">
- <string>Auto Identify</string>
+ <string>Use SASL Authentication</string>
</property>
<property name="checkable">
<bool>true</bool>
<property name="checked">
<bool>true</bool>
</property>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="1">
- <widget class="QLineEdit" name="autoIdentifyService">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="text">
- <string>NickServ</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QLineEdit" name="autoIdentifyPassword">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="echoMode">
- <enum>QLineEdit::Password</enum>
- </property>
- </widget>
- </item>
- <item row="0" column="0">
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>Service:</string>
+ <layout class="QVBoxLayout" name="verticalLayout_11">
+ <item>
+ <widget class="QFrame" name="saslContents">
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
</property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_3">
- <property name="enabled">
- <bool>true</bool>
+ <property name="frameShadow">
+ <enum>QFrame::Plain</enum>
</property>
- <property name="text">
- <string>Password:</string>
+ <property name="lineWidth">
+ <number>0</number>
</property>
+ <layout class="QVBoxLayout" name="verticalLayout_12">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="saslAccount">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="toolTip">
+ <string>Account name, often the same as your nickname</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="saslAccountLabel">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="text">
+ <string>Account:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QLineEdit" name="saslPassword">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="toolTip">
+ <string>Account password</string>
+ </property>
+ <property name="echoMode">
+ <enum>QLineEdit::Password</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="saslPasswordLabel">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="text">
+ <string>Password:</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_7">
+ <item>
+ <widget class="QLabel" name="saslStatusIcon">
+ <property name="text">
+ <string notr="true">[icon]</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="saslStatusLabel">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Could not detect if supported by server</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="saslStatusDetails">
+ <property name="text">
+ <string>Details...</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
</widget>
</item>
</layout>
</widget>
</item>
<item>
- <widget class="QGroupBox" name="sasl">
+ <widget class="QLabel" name="saslExtInfo">
+ <property name="text">
+ <string><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></string>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="autoIdentify">
<property name="enabled">
<bool>true</bool>
</property>
+ <property name="toolTip">
+ <string>Authenticate to services using your password. Use SASL instead to identify before joining channels.</string>
+ </property>
<property name="title">
- <string>Use SASL Authentication</string>
+ <string>Auto Identify</string>
</property>
<property name="checkable">
<bool>true</bool>
<property name="checked">
<bool>true</bool>
</property>
- <layout class="QGridLayout" name="gridLayout_2">
+ <layout class="QGridLayout" name="gridLayout">
<item row="0" column="1">
- <widget class="QLineEdit" name="saslAccount">
+ <widget class="QLineEdit" name="autoIdentifyService">
<property name="enabled">
<bool>true</bool>
</property>
+ <property name="toolTip">
+ <string>Service user to send your password to, usually NickServ</string>
+ </property>
<property name="text">
- <string/>
+ <string>NickServ</string>
</property>
</widget>
</item>
<item row="1" column="1">
- <widget class="QLineEdit" name="saslPassword">
+ <widget class="QLineEdit" name="autoIdentifyPassword">
<property name="enabled">
<bool>true</bool>
</property>
+ <property name="toolTip">
+ <string>Account password</string>
+ </property>
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
- <item row="1" column="0">
- <widget class="QLabel" name="saslPasswordLabel">
- <property name="enabled">
- <bool>true</bool>
- </property>
+ <item row="0" column="0">
+ <widget class="QLabel" name="identifyServiceLabel">
<property name="text">
- <string>Password:</string>
+ <string>Service:</string>
</property>
</widget>
</item>
- <item row="0" column="0">
- <widget class="QLabel" name="saslAccountLabel">
+ <item row="1" column="0">
+ <widget class="QLabel" name="identifyPasswordLabel">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
- <string>Account:</string>
+ <string>Password:</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
- <item>
- <widget class="QLabel" name="saslExtInfo">
- <property name="text">
- <string><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></string>
- </property>
- <property name="wordWrap">
- <bool>true</bool>
- </property>
- </widget>
- </item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
- <height>40</height>
+ <height>10</height>
</size>
</property>
</spacer>
<item row="2" column="0">
<widget class="QLabel" name="label_9">
<property name="toolTip">
- <string>This specifies how control messages, nicks and servernames are encoded.
-Unless you *really* know what you do, leave this as ISO-8859-1!</string>
+ <string><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></string>
</property>
<property name="text">
<string>Server encoding:</string>
<bool>true</bool>
</property>
<property name="toolTip">
- <string>This specifies how control messages, nicks and servernames are encoded.
-Unless you *really* know what you do, leave this as ISO-8859-1!</string>
+ <string><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></string>
</property>
</widget>
</item>
<tabstop>messageRateBurstSize</tabstop>
<tabstop>unlimitedMessageRate</tabstop>
<tabstop>messageRateDelay</tabstop>
- <tabstop>autoIdentify</tabstop>
- <tabstop>autoIdentifyService</tabstop>
- <tabstop>autoIdentifyPassword</tabstop>
<tabstop>sasl</tabstop>
<tabstop>saslAccount</tabstop>
<tabstop>saslPassword</tabstop>
+ <tabstop>saslStatusDetails</tabstop>
+ <tabstop>autoIdentify</tabstop>
+ <tabstop>autoIdentifyService</tabstop>
+ <tabstop>autoIdentifyPassword</tabstop>
<tabstop>useCustomEncodings</tabstop>
<tabstop>sendEncoding</tabstop>
<tabstop>recvEncoding</tabstop>
projects / quassel.git / blobdiff