Skip to content

Commit db31173

Browse files
stokitostokito
authored
Account modify dialog (#894)
* accountmodify.ui: remove vertical spacers to let controls extend * accountmodify.ui: move example as a third column after JID * accountmodify.ui: JID field: add tip * accountmodify.ui: move password as a second line after JID * accountmodify.ui: move ck_scram_salted_password under password field * accountmodify.ui: make ck_scram_salted_password true by default accountmodify.ui: make ck_scram_salted_password true by default
1 parent e3cf834 commit db31173

File tree

2 files changed

+33
-78
lines changed

2 files changed

+33
-78
lines changed

‎src/accountmodify.ui‎

Lines changed: 32 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -94,16 +94,6 @@
9494
<property name="spacing">
9595
<number>6</number>
9696
</property>
97-
<item row="1" column="1">
98-
<widget class="QLabel" name="lb_example">
99-
<property name="enabled">
100-
<bool>false</bool>
101-
</property>
102-
<property name="text">
103-
<string>Example: [email protected]</string>
104-
</property>
105-
</widget>
106-
</item>
10797
<item row="0" column="0">
10898
<widget class="QLabel" name="lb_jid">
10999
<property name="text">
@@ -113,6 +103,9 @@
113103
</item>
114104
<item row="0" column="1">
115105
<widget class="QLineEdit" name="le_jid">
106+
<property name="toolTip">
107+
<string>Example: [email protected]</string>
108+
</property>
116109
<property name="inputMethodHints">
117110
<set>Qt::ImhEmailCharactersOnly|Qt::ImhNoAutoUppercase|Qt::ImhPreferLatin|Qt::ImhPreferLowercase</set>
118111
</property>
@@ -121,33 +114,24 @@
121114
</property>
122115
</widget>
123116
</item>
124-
</layout>
125-
</item>
126-
<item>
127-
<layout class="QHBoxLayout">
128-
<property name="spacing">
129-
<number>6</number>
130-
</property>
131-
<property name="leftMargin">
132-
<number>0</number>
133-
</property>
134-
<property name="topMargin">
135-
<number>0</number>
136-
</property>
137-
<property name="rightMargin">
138-
<number>0</number>
139-
</property>
140-
<property name="bottomMargin">
141-
<number>0</number>
142-
</property>
143-
<item>
117+
<item row="0" column="2">
118+
<widget class="QLabel" name="lb_example">
119+
<property name="enabled">
120+
<bool>false</bool>
121+
</property>
122+
<property name="text">
123+
<string>Example: [email protected]</string>
124+
</property>
125+
</widget>
126+
</item>
127+
<item row="1" column="0">
144128
<widget class="QLabel" name="textLabel1">
145129
<property name="text">
146130
<string>Password:</string>
147131
</property>
148132
</widget>
149133
</item>
150-
<item>
134+
<item row="1" column="1">
151135
<widget class="QLineEdit" name="le_pass">
152136
<property name="inputMethodHints">
153137
<set>Qt::ImhNoAutoUppercase|Qt::ImhNoPredictiveText|Qt::ImhPreferLatin|Qt::ImhSensitiveData</set>
@@ -157,13 +141,28 @@
157141
</property>
158142
</widget>
159143
</item>
160-
<item>
144+
<item row="1" column="2">
161145
<widget class="QPushButton" name="pb_changepw">
162146
<property name="text">
163147
<string>Change...</string>
164148
</property>
165149
</widget>
166150
</item>
151+
<item row="2" column="0" colspan="3">
152+
<widget class="QCheckBox" name="ck_scram_salted_password">
153+
<property name="toolTip">
154+
<string>&lt;b&gt;Attention!&lt;/b&gt;
155+
&lt;br/&gt;
156+
When you enable this option you will not be able to find your password in config files. Only hash text will be there. So if you forget your password, it will be lost if you have not make a backup somewhere else.</string>
157+
</property>
158+
<property name="text">
159+
<string>Store hash instead of plaintext password if server supports this feature.</string>
160+
</property>
161+
<property name="checked">
162+
<bool>true</bool>
163+
</property>
164+
</widget>
165+
</item>
167166
</layout>
168167
</item>
169168
</layout>
@@ -897,22 +896,6 @@
897896
</item>
898897
</layout>
899898
</item>
900-
<item>
901-
<spacer>
902-
<property name="orientation">
903-
<enum>Qt::Vertical</enum>
904-
</property>
905-
<property name="sizeType">
906-
<enum>QSizePolicy::Expanding</enum>
907-
</property>
908-
<property name="sizeHint" stdset="0">
909-
<size>
910-
<width>20</width>
911-
<height>0</height>
912-
</size>
913-
</property>
914-
</spacer>
915-
</item>
916899
</layout>
917900
</widget>
918901
<widget class="QWidget" name="tab_misc">
@@ -1190,34 +1173,6 @@
11901173
</item>
11911174
</layout>
11921175
</item>
1193-
<item>
1194-
<widget class="QCheckBox" name="ck_scram_salted_password">
1195-
<property name="toolTip">
1196-
<string>&lt;b&gt;Attention!&lt;/b&gt;
1197-
&lt;br/&gt;
1198-
When you enable this option you will not be able to find your password in config files. Only hash text will be there. So if you forget your password, it will be lost if you have not make a backup somewhere else.</string>
1199-
</property>
1200-
<property name="text">
1201-
<string>Store hash instead of plaintext password if server supports this feature.</string>
1202-
</property>
1203-
</widget>
1204-
</item>
1205-
<item>
1206-
<spacer>
1207-
<property name="orientation">
1208-
<enum>Qt::Vertical</enum>
1209-
</property>
1210-
<property name="sizeType">
1211-
<enum>QSizePolicy::Expanding</enum>
1212-
</property>
1213-
<property name="sizeHint" stdset="0">
1214-
<size>
1215-
<width>460</width>
1216-
<height>0</height>
1217-
</size>
1218-
</property>
1219-
</spacer>
1220-
</item>
12211176
</layout>
12221177
</widget>
12231178
</widget>
@@ -1238,6 +1193,7 @@ When you enable this option you will not be able to find your password in config
12381193
<tabstop>le_jid</tabstop>
12391194
<tabstop>le_pass</tabstop>
12401195
<tabstop>pb_changepw</tabstop>
1196+
<tabstop>ck_scram_salted_password</tabstop>
12411197
<tabstop>ck_auto</tabstop>
12421198
<tabstop>ck_connectAfterSleep</tabstop>
12431199
<tabstop>ck_autoSameStatus</tabstop>
@@ -1272,7 +1228,6 @@ When you enable this option you will not be able to find your password in config
12721228
<tabstop>ck_custom_auth</tabstop>
12731229
<tabstop>le_authid</tabstop>
12741230
<tabstop>le_realm</tabstop>
1275-
<tabstop>ck_scram_salted_password</tabstop>
12761231
</tabstops>
12771232
<resources/>
12781233
<connections>

‎src/psi_profiles.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ void UserAccount::reset()
6363
tog_agents = true;
6464
tog_self = false;
6565
customAuth = false;
66-
storeSaltedHashedPassword = false;
66+
storeSaltedHashedPassword = true;
6767
req_mutual_auth = false;
6868
security_level = QCA::SL_None;
6969
ssl = TLS_Auto;

0 commit comments

Comments
 (0)