summaryrefslogtreecommitdiff
authorconber <conber>2002-06-20 17:19:56 (UTC)
committer conber <conber>2002-06-20 17:19:56 (UTC)
commit0996b7f1bcbdb05db00eadb0cdd60b2066cdd899 (patch) (unidiff)
treed2b3d8dc734c5957bb4ed86dbca80ce8e975a5e6
parente0eec50bf3992d95d7060af74fa98e9630abfa4e (diff)
downloadopie-0996b7f1bcbdb05db00eadb0cdd60b2066cdd899.zip
opie-0996b7f1bcbdb05db00eadb0cdd60b2066cdd899.tar.gz
opie-0996b7f1bcbdb05db00eadb0cdd60b2066cdd899.tar.bz2
little usability improvement in accounteditor
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/mail2/accounteditor.cpp15
-rw-r--r--noncore/unsupported/mail2/accounteditor.h1
-rw-r--r--noncore/unsupported/mail2/accounteditorbase.ui65
-rw-r--r--pics/mail/showpasswd.pngbin0 -> 217 bytes
4 files changed, 60 insertions, 21 deletions
diff --git a/noncore/unsupported/mail2/accounteditor.cpp b/noncore/unsupported/mail2/accounteditor.cpp
index 8230a69..5d80693 100644
--- a/noncore/unsupported/mail2/accounteditor.cpp
+++ b/noncore/unsupported/mail2/accounteditor.cpp
@@ -1,51 +1,66 @@
1#include <qmultilineedit.h> 1#include <qmultilineedit.h>
2#include <qbuttongroup.h> 2#include <qbuttongroup.h>
3#include <qradiobutton.h> 3#include <qradiobutton.h>
4#include <qmessagebox.h> 4#include <qmessagebox.h>
5#include <qtoolbutton.h>
5#include <qtabwidget.h> 6#include <qtabwidget.h>
6#include <qlineedit.h> 7#include <qlineedit.h>
7#include <qcheckbox.h> 8#include <qcheckbox.h>
8 9
10#include <qpe/resource.h>
11
9#include "accounteditor.h" 12#include "accounteditor.h"
10#include "miscfunctions.h" 13#include "miscfunctions.h"
11 14
12AccountEditor::AccountEditor(Account account, QWidget *parent, const char *name, bool modal, WFlags fl) 15AccountEditor::AccountEditor(Account account, QWidget *parent, const char *name, bool modal, WFlags fl)
13 : AccountEditorBase(parent, name, modal, fl), _account(account) 16 : AccountEditorBase(parent, name, modal, fl), _account(account)
14{ 17{
15 TabWidget2->removePage(sslTab); 18 TabWidget2->removePage(sslTab);
19 showPasswd->setPixmap(Resource::loadPixmap("mail/showpasswd"));
20
21 connect(showPasswd, SIGNAL(toggled(bool)),
22 SLOT(showPasswdToggled(bool)));
16 23
17 fillValues(); 24 fillValues();
18} 25}
19 26
27void AccountEditor::showPasswdToggled(bool toggled)
28{
29 if (toggled)
30 pass->setEchoMode(QLineEdit::Normal);
31 else
32 pass->setEchoMode(QLineEdit::Password);
33}
34
20void AccountEditor::accept() 35void AccountEditor::accept()
21{ 36{
22 int numLf = 0; 37 int numLf = 0;
23 for (unsigned int i = 0; i <= signature->text().length(); i++) { 38 for (unsigned int i = 0; i <= signature->text().length(); i++) {
24 if (signature->text()[i] == '\n') numLf++; 39 if (signature->text()[i] == '\n') numLf++;
25 } 40 }
26 if (numLf >= 4) { 41 if (numLf >= 4) {
27 int ret = QMessageBox::warning(this, tr("Warning"), tr("<p>Your signature is longer than 4 lines. This is considered inpolite by many people. You should shorten your signature.</p>"), tr("Change"), tr("Continue")); 42 int ret = QMessageBox::warning(this, tr("Warning"), tr("<p>Your signature is longer than 4 lines. This is considered inpolite by many people. You should shorten your signature.</p>"), tr("Change"), tr("Continue"));
28 if (ret == 0) return; 43 if (ret == 0) return;
29 } 44 }
30 45
31 _account.setAccountName(_account.accountName() ? _account.accountName() : MiscFunctions::uniqueString()); 46 _account.setAccountName(_account.accountName() ? _account.accountName() : MiscFunctions::uniqueString());
32 _account.setRealName(realname->text()); 47 _account.setRealName(realname->text());
33 _account.setEmail(email->text()); 48 _account.setEmail(email->text());
34 _account.setOrg(org->text()); 49 _account.setOrg(org->text());
35 _account.setImapServer(imapServer->text()); 50 _account.setImapServer(imapServer->text());
36 _account.setImapPort(imapPort->text()); 51 _account.setImapPort(imapPort->text());
37 _account.setSmtpServer(smtpServer->text()); 52 _account.setSmtpServer(smtpServer->text());
38 _account.setSmtpPort(smtpPort->text()); 53 _account.setSmtpPort(smtpPort->text());
39 _account.setUser(user->text()); 54 _account.setUser(user->text());
40 _account.setPass(pass->text()); 55 _account.setPass(pass->text());
41 _account.setSmtpSsl(smtpssl->isChecked()); 56 _account.setSmtpSsl(smtpssl->isChecked());
42 _account.setSmtpSslPort(smtpsPort->text()); 57 _account.setSmtpSslPort(smtpsPort->text());
43 _account.setImapSsl(imapssl->isChecked()); 58 _account.setImapSsl(imapssl->isChecked());
44 _account.setImapSslPort(imapsPort->text()); 59 _account.setImapSslPort(imapsPort->text());
45 _account.setDefaultCc(addCc->isChecked()); 60 _account.setDefaultCc(addCc->isChecked());
46 _account.setDefaultBcc(addBcc->isChecked()); 61 _account.setDefaultBcc(addBcc->isChecked());
47 _account.setDefaultReplyTo(addReplyTo->isChecked()); 62 _account.setDefaultReplyTo(addReplyTo->isChecked());
48 _account.setCc(cc->text()); 63 _account.setCc(cc->text());
49 _account.setBcc(bcc->text()); 64 _account.setBcc(bcc->text());
50 _account.setReplyTo(replyTo->text()); 65 _account.setReplyTo(replyTo->text());
51 _account.setSignature(signature->text()); 66 _account.setSignature(signature->text());
diff --git a/noncore/unsupported/mail2/accounteditor.h b/noncore/unsupported/mail2/accounteditor.h
index 4a2bda3..9acca2d 100644
--- a/noncore/unsupported/mail2/accounteditor.h
+++ b/noncore/unsupported/mail2/accounteditor.h
@@ -1,24 +1,25 @@
1#ifndef ACCOUNTEDITOR_H 1#ifndef ACCOUNTEDITOR_H
2#define ACCOUNTEDITOR_H 2#define ACCOUNTEDITOR_H
3 3
4#include "accounteditorbase.h" 4#include "accounteditorbase.h"
5#include "configfile.h" 5#include "configfile.h"
6 6
7class AccountEditor : public AccountEditorBase 7class AccountEditor : public AccountEditorBase
8{ 8{
9 Q_OBJECT 9 Q_OBJECT
10 10
11public: 11public:
12 AccountEditor(Account account = Account(), QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags fl = 0); 12 AccountEditor(Account account = Account(), QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags fl = 0);
13 13
14 Account _account; 14 Account _account;
15 15
16protected slots: 16protected slots:
17 void accept(); 17 void accept();
18 void showPasswdToggled(bool toggled);
18 19
19protected: 20protected:
20 void fillValues(); 21 void fillValues();
21 22
22}; 23};
23 24
24#endif 25#endif
diff --git a/noncore/unsupported/mail2/accounteditorbase.ui b/noncore/unsupported/mail2/accounteditorbase.ui
index fe9f2a4..8341e72 100644
--- a/noncore/unsupported/mail2/accounteditorbase.ui
+++ b/noncore/unsupported/mail2/accounteditorbase.ui
@@ -1,244 +1,267 @@
1<!DOCTYPE UI><UI> 1<!DOCTYPE UI><UI>
2<class>AccountEditorBase</class> 2<class>AccountEditorBase</class>
3<widget> 3<widget>
4 <class>QDialog</class> 4 <class>QDialog</class>
5 <property stdset="1"> 5 <property stdset="1">
6 <name>name</name> 6 <name>name</name>
7 <cstring>AccountEditorBase</cstring> 7 <cstring>AccountEditorBase</cstring>
8 </property> 8 </property>
9 <property stdset="1"> 9 <property stdset="1">
10 <name>geometry</name> 10 <name>geometry</name>
11 <rect> 11 <rect>
12 <x>0</x> 12 <x>0</x>
13 <y>0</y> 13 <y>0</y>
14 <width>243</width> 14 <width>239</width>
15 <height>320</height> 15 <height>320</height>
16 </rect> 16 </rect>
17 </property> 17 </property>
18 <property stdset="1"> 18 <property stdset="1">
19 <name>caption</name> 19 <name>caption</name>
20 <string>Account Editor</string> 20 <string>Account Editor</string>
21 </property> 21 </property>
22 <property> 22 <property>
23 <name>layoutMargin</name> 23 <name>layoutMargin</name>
24 </property> 24 </property>
25 <property> 25 <property>
26 <name>layoutSpacing</name> 26 <name>layoutSpacing</name>
27 </property> 27 </property>
28 <grid> 28 <grid>
29 <property stdset="1"> 29 <property stdset="1">
30 <name>margin</name> 30 <name>margin</name>
31 <number>0</number> 31 <number>0</number>
32 </property> 32 </property>
33 <property stdset="1"> 33 <property stdset="1">
34 <name>spacing</name> 34 <name>spacing</name>
35 <number>0</number> 35 <number>0</number>
36 </property> 36 </property>
37 <widget row="0" column="0" > 37 <widget row="0" column="0" >
38 <class>QTabWidget</class> 38 <class>QTabWidget</class>
39 <property stdset="1"> 39 <property stdset="1">
40 <name>name</name> 40 <name>name</name>
41 <cstring>TabWidget2</cstring> 41 <cstring>TabWidget2</cstring>
42 </property> 42 </property>
43 <property> 43 <property>
44 <name>layoutMargin</name> 44 <name>layoutMargin</name>
45 </property> 45 </property>
46 <property> 46 <property>
47 <name>layoutSpacing</name> 47 <name>layoutSpacing</name>
48 </property> 48 </property>
49 <widget> 49 <widget>
50 <class>QWidget</class> 50 <class>QWidget</class>
51 <property stdset="1"> 51 <property stdset="1">
52 <name>name</name> 52 <name>name</name>
53 <cstring>tab</cstring> 53 <cstring>tab</cstring>
54 </property> 54 </property>
55 <attribute> 55 <attribute>
56 <name>title</name> 56 <name>title</name>
57 <string>Server</string> 57 <string>Server</string>
58 </attribute> 58 </attribute>
59 <grid> 59 <grid>
60 <property stdset="1"> 60 <property stdset="1">
61 <name>margin</name> 61 <name>margin</name>
62 <number>4</number> 62 <number>4</number>
63 </property> 63 </property>
64 <property stdset="1"> 64 <property stdset="1">
65 <name>spacing</name> 65 <name>spacing</name>
66 <number>3</number> 66 <number>3</number>
67 </property> 67 </property>
68 <widget row="0" column="0" > 68 <widget row="1" column="1" rowspan="1" colspan="2" >
69 <class>QLabel</class>
70 <property stdset="1">
71 <name>name</name>
72 <cstring>TextLabel2</cstring>
73 </property>
74 <property stdset="1">
75 <name>text</name>
76 <string>&lt;b&gt;IMAP:</string>
77 </property>
78 </widget>
79 <widget row="0" column="1" >
80 <class>QLineEdit</class> 69 <class>QLineEdit</class>
81 <property stdset="1"> 70 <property stdset="1">
82 <name>name</name> 71 <name>name</name>
83 <cstring>imapServer</cstring> 72 <cstring>imapPort</cstring>
84 </property> 73 </property>
85 </widget> 74 </widget>
86 <widget row="1" column="0" > 75 <widget row="1" column="0" >
87 <class>QLabel</class> 76 <class>QLabel</class>
88 <property stdset="1"> 77 <property stdset="1">
89 <name>name</name> 78 <name>name</name>
90 <cstring>TextLabel3</cstring> 79 <cstring>TextLabel3</cstring>
91 </property> 80 </property>
92 <property stdset="1"> 81 <property stdset="1">
93 <name>text</name> 82 <name>text</name>
94 <string>&lt;b&gt;Port:</string> 83 <string>&lt;b&gt;Port:</string>
95 </property> 84 </property>
96 </widget> 85 </widget>
97 <widget row="1" column="1" > 86 <widget row="0" column="0" >
87 <class>QLabel</class>
88 <property stdset="1">
89 <name>name</name>
90 <cstring>TextLabel2</cstring>
91 </property>
92 <property stdset="1">
93 <name>text</name>
94 <string>&lt;b&gt;IMAP:</string>
95 </property>
96 </widget>
97 <widget row="0" column="1" rowspan="1" colspan="2" >
98 <class>QLineEdit</class> 98 <class>QLineEdit</class>
99 <property stdset="1"> 99 <property stdset="1">
100 <name>name</name> 100 <name>name</name>
101 <cstring>imapPort</cstring> 101 <cstring>imapServer</cstring>
102 </property> 102 </property>
103 </widget> 103 </widget>
104 <spacer row="8" column="1" > 104 <spacer row="8" column="1" >
105 <property> 105 <property>
106 <name>name</name> 106 <name>name</name>
107 <cstring>Spacer2</cstring> 107 <cstring>Spacer2</cstring>
108 </property> 108 </property>
109 <property stdset="1"> 109 <property stdset="1">
110 <name>orientation</name> 110 <name>orientation</name>
111 <enum>Vertical</enum> 111 <enum>Vertical</enum>
112 </property> 112 </property>
113 <property stdset="1"> 113 <property stdset="1">
114 <name>sizeType</name> 114 <name>sizeType</name>
115 <enum>Expanding</enum> 115 <enum>Expanding</enum>
116 </property> 116 </property>
117 <property> 117 <property>
118 <name>sizeHint</name> 118 <name>sizeHint</name>
119 <size> 119 <size>
120 <width>20</width> 120 <width>20</width>
121 <height>20</height> 121 <height>20</height>
122 </size> 122 </size>
123 </property> 123 </property>
124 </spacer> 124 </spacer>
125 <widget row="7" column="1" > 125 <widget row="4" column="2" >
126 <class>QToolButton</class>
127 <property stdset="1">
128 <name>name</name>
129 <cstring>showPasswd</cstring>
130 </property>
131 <property stdset="1">
132 <name>text</name>
133 <string>[--]</string>
134 </property>
135 <property stdset="1">
136 <name>pixmap</name>
137 <pixmap></pixmap>
138 </property>
139 <property stdset="1">
140 <name>toggleButton</name>
141 <bool>true</bool>
142 </property>
143 <property stdset="1">
144 <name>toggleButton</name>
145 <bool>true</bool>
146 </property>
147 </widget>
148 <widget row="7" column="1" rowspan="1" colspan="2" >
126 <class>QLineEdit</class> 149 <class>QLineEdit</class>
127 <property stdset="1"> 150 <property stdset="1">
128 <name>name</name> 151 <name>name</name>
129 <cstring>smtpPort</cstring> 152 <cstring>smtpPort</cstring>
130 </property> 153 </property>
131 </widget> 154 </widget>
132 <widget row="6" column="1" > 155 <widget row="6" column="1" rowspan="1" colspan="2" >
133 <class>QLineEdit</class> 156 <class>QLineEdit</class>
134 <property stdset="1"> 157 <property stdset="1">
135 <name>name</name> 158 <name>name</name>
136 <cstring>smtpServer</cstring> 159 <cstring>smtpServer</cstring>
137 </property> 160 </property>
138 </widget> 161 </widget>
139 <widget row="6" column="0" > 162 <widget row="6" column="0" >
140 <class>QLabel</class> 163 <class>QLabel</class>
141 <property stdset="1"> 164 <property stdset="1">
142 <name>name</name> 165 <name>name</name>
143 <cstring>TextLabel6</cstring> 166 <cstring>TextLabel6</cstring>
144 </property> 167 </property>
145 <property stdset="1"> 168 <property stdset="1">
146 <name>text</name> 169 <name>text</name>
147 <string>&lt;b&gt;SMTP:</string> 170 <string>&lt;b&gt;SMTP:</string>
148 </property> 171 </property>
149 </widget> 172 </widget>
150 <widget row="7" column="0" > 173 <widget row="7" column="0" >
151 <class>QLabel</class> 174 <class>QLabel</class>
152 <property stdset="1"> 175 <property stdset="1">
153 <name>name</name> 176 <name>name</name>
154 <cstring>TextLabel7</cstring> 177 <cstring>TextLabel7</cstring>
155 </property> 178 </property>
156 <property stdset="1"> 179 <property stdset="1">
157 <name>text</name> 180 <name>text</name>
158 <string>&lt;b&gt;Port:</string> 181 <string>&lt;b&gt;Port:</string>
159 </property> 182 </property>
160 </widget> 183 </widget>
161 <widget row="3" column="0" > 184 <widget row="3" column="0" >
162 <class>QLabel</class> 185 <class>QLabel</class>
163 <property stdset="1"> 186 <property stdset="1">
164 <name>name</name> 187 <name>name</name>
165 <cstring>TextLabel4</cstring> 188 <cstring>TextLabel4</cstring>
166 </property> 189 </property>
167 <property stdset="1"> 190 <property stdset="1">
168 <name>text</name> 191 <name>text</name>
169 <string>&lt;b&gt;User:</string> 192 <string>&lt;b&gt;User:</string>
170 </property> 193 </property>
171 </widget> 194 </widget>
172 <widget row="4" column="0" > 195 <widget row="4" column="0" >
173 <class>QLabel</class> 196 <class>QLabel</class>
174 <property stdset="1"> 197 <property stdset="1">
175 <name>name</name> 198 <name>name</name>
176 <cstring>TextLabel5</cstring> 199 <cstring>TextLabel5</cstring>
177 </property> 200 </property>
178 <property stdset="1"> 201 <property stdset="1">
179 <name>text</name> 202 <name>text</name>
180 <string>&lt;b&gt;Pass:</string> 203 <string>&lt;b&gt;Pass:</string>
181 </property> 204 </property>
182 </widget> 205 </widget>
183 <widget row="4" column="1" > 206 <widget row="4" column="1" >
184 <class>QLineEdit</class> 207 <class>QLineEdit</class>
185 <property stdset="1"> 208 <property stdset="1">
186 <name>name</name> 209 <name>name</name>
187 <cstring>pass</cstring> 210 <cstring>pass</cstring>
188 </property> 211 </property>
189 <property stdset="1"> 212 <property stdset="1">
190 <name>echoMode</name> 213 <name>echoMode</name>
191 <enum>Password</enum> 214 <enum>Password</enum>
192 </property> 215 </property>
193 </widget> 216 </widget>
194 <widget row="3" column="1" > 217 <widget row="3" column="1" rowspan="1" colspan="2" >
195 <class>QLineEdit</class> 218 <class>QLineEdit</class>
196 <property stdset="1"> 219 <property stdset="1">
197 <name>name</name> 220 <name>name</name>
198 <cstring>user</cstring> 221 <cstring>user</cstring>
199 </property> 222 </property>
200 </widget> 223 </widget>
201 <widget row="2" column="0" rowspan="1" colspan="2" > 224 <widget row="2" column="0" rowspan="1" colspan="3" >
202 <class>Line</class> 225 <class>Line</class>
203 <property stdset="1"> 226 <property stdset="1">
204 <name>name</name> 227 <name>name</name>
205 <cstring>Line1</cstring> 228 <cstring>Line1</cstring>
206 </property> 229 </property>
207 <property stdset="1"> 230 <property stdset="1">
208 <name>orientation</name> 231 <name>orientation</name>
209 <enum>Horizontal</enum> 232 <enum>Horizontal</enum>
210 </property> 233 </property>
211 </widget> 234 </widget>
212 <widget row="5" column="0" rowspan="1" colspan="2" > 235 <widget row="5" column="0" rowspan="1" colspan="3" >
213 <class>Line</class> 236 <class>Line</class>
214 <property stdset="1"> 237 <property stdset="1">
215 <name>name</name> 238 <name>name</name>
216 <cstring>Line2</cstring> 239 <cstring>Line2</cstring>
217 </property> 240 </property>
218 <property stdset="1"> 241 <property stdset="1">
219 <name>orientation</name> 242 <name>orientation</name>
220 <enum>Horizontal</enum> 243 <enum>Horizontal</enum>
221 </property> 244 </property>
222 </widget> 245 </widget>
223 </grid> 246 </grid>
224 </widget> 247 </widget>
225 <widget> 248 <widget>
226 <class>QWidget</class> 249 <class>QWidget</class>
227 <property stdset="1"> 250 <property stdset="1">
228 <name>name</name> 251 <name>name</name>
229 <cstring>tab</cstring> 252 <cstring>tab</cstring>
230 </property> 253 </property>
231 <attribute> 254 <attribute>
232 <name>title</name> 255 <name>title</name>
233 <string>Identity</string> 256 <string>Identity</string>
234 </attribute> 257 </attribute>
235 <grid> 258 <grid>
236 <property stdset="1"> 259 <property stdset="1">
237 <name>margin</name> 260 <name>margin</name>
238 <number>4</number> 261 <number>4</number>
239 </property> 262 </property>
240 <property stdset="1"> 263 <property stdset="1">
241 <name>spacing</name> 264 <name>spacing</name>
242 <number>3</number> 265 <number>3</number>
243 </property> 266 </property>
244 <widget row="0" column="0" > 267 <widget row="0" column="0" >
diff --git a/pics/mail/showpasswd.png b/pics/mail/showpasswd.png
new file mode 100644
index 0000000..7d5c08b
--- a/dev/null
+++ b/pics/mail/showpasswd.png
Binary files differ