author | zautrix <zautrix> | 2004-12-04 22:43:14 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-12-04 22:43:14 (UTC) |
commit | e4e75984b6cb581d87d436cb6c5140eb57dbdc51 (patch) (unidiff) | |
tree | bd3a1ddf191fd16d24dad9910c0b806cee23000e /pwmanager | |
parent | ac994c86c3037dbe2273e62c46115b942b09fdcc (diff) | |
download | kdepimpi-e4e75984b6cb581d87d436cb6c5140eb57dbdc51.zip kdepimpi-e4e75984b6cb581d87d436cb6c5140eb57dbdc51.tar.gz kdepimpi-e4e75984b6cb581d87d436cb6c5140eb57dbdc51.tar.bz2 |
set pwmpi update timer from 10 sec to 5 min
-rw-r--r-- | pwmanager/pwmanager/pwmdoc.cpp | 3 | ||||
-rw-r--r-- | pwmanager/pwmanager/pwmview.cpp | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pwmanager/pwmanager/pwmdoc.cpp b/pwmanager/pwmanager/pwmdoc.cpp index a740d6d..1f15ffd 100644 --- a/pwmanager/pwmanager/pwmdoc.cpp +++ b/pwmanager/pwmanager/pwmdoc.cpp | |||
@@ -1,587 +1,588 @@ | |||
1 | /*************************************************************************** | 1 | /*************************************************************************** |
2 | * * | 2 | * * |
3 | * copyright (C) 2003, 2004 by Michael Buesch * | 3 | * copyright (C) 2003, 2004 by Michael Buesch * |
4 | * email: mbuesch@freenet.de * | 4 | * email: mbuesch@freenet.de * |
5 | * * | 5 | * * |
6 | * This program is free software; you can redistribute it and/or modify * | 6 | * This program is free software; you can redistribute it and/or modify * |
7 | * it under the terms of the GNU General Public License version 2 * | 7 | * it under the terms of the GNU General Public License version 2 * |
8 | * as published by the Free Software Foundation. * | 8 | * as published by the Free Software Foundation. * |
9 | * * | 9 | * * |
10 | ***************************************************************************/ | 10 | ***************************************************************************/ |
11 | 11 | ||
12 | /*************************************************************************** | 12 | /*************************************************************************** |
13 | * copyright (C) 2004 by Ulf Schenk | 13 | * copyright (C) 2004 by Ulf Schenk |
14 | * This file is originaly based on version 1.1 of pwmanager | 14 | * This file is originaly based on version 1.1 of pwmanager |
15 | * and was modified to run on embedded devices that run microkde | 15 | * and was modified to run on embedded devices that run microkde |
16 | * | 16 | * |
17 | * $Id$ | 17 | * $Id$ |
18 | **************************************************************************/ | 18 | **************************************************************************/ |
19 | 19 | ||
20 | #include "pwmdoc.h" | 20 | #include "pwmdoc.h" |
21 | #include "pwmview.h" | 21 | #include "pwmview.h" |
22 | #include "blowfish.h" | 22 | #include "blowfish.h" |
23 | #include "sha1.h" | 23 | #include "sha1.h" |
24 | #include "globalstuff.h" | 24 | #include "globalstuff.h" |
25 | #include "gpasmanfile.h" | 25 | #include "gpasmanfile.h" |
26 | #include "serializer.h" | 26 | #include "serializer.h" |
27 | #include "compressgzip.h" | 27 | #include "compressgzip.h" |
28 | //US#include "compressbzip2.h" | 28 | //US#include "compressbzip2.h" |
29 | #include "randomizer.h" | 29 | #include "randomizer.h" |
30 | #include "pwminit.h" | 30 | #include "pwminit.h" |
31 | #include "libgcryptif.h" | 31 | #include "libgcryptif.h" |
32 | #ifdef PWM_EMBEDDED | 32 | #ifdef PWM_EMBEDDED |
33 | #include "pwmprefs.h" | 33 | #include "pwmprefs.h" |
34 | #include "kglobal.h" | 34 | #include "kglobal.h" |
35 | #endif | 35 | #endif |
36 | 36 | ||
37 | #include <kmessagebox.h> | 37 | #include <kmessagebox.h> |
38 | #include <libkcal/syncdefines.h> | 38 | #include <libkcal/syncdefines.h> |
39 | 39 | ||
40 | 40 | ||
41 | #ifdef CONFIG_KWALLETIF | 41 | #ifdef CONFIG_KWALLETIF |
42 | # include "kwalletemu.h" | 42 | # include "kwalletemu.h" |
43 | #endif // CONFIG_KWALLETIF | 43 | #endif // CONFIG_KWALLETIF |
44 | 44 | ||
45 | #include <qdatetime.h> | 45 | #include <qdatetime.h> |
46 | #include <qsize.h> | 46 | #include <qsize.h> |
47 | #include <qfileinfo.h> | 47 | #include <qfileinfo.h> |
48 | #include <qfile.h> | 48 | #include <qfile.h> |
49 | 49 | ||
50 | #include <stdio.h> | 50 | #include <stdio.h> |
51 | #include <stdlib.h> | 51 | #include <stdlib.h> |
52 | #include <errno.h> | 52 | #include <errno.h> |
53 | #include <string.h> | 53 | #include <string.h> |
54 | //US#include <iostream> | 54 | //US#include <iostream> |
55 | #include <algorithm> | 55 | #include <algorithm> |
56 | #include <sys/types.h> | 56 | #include <sys/types.h> |
57 | #include <sys/stat.h> | 57 | #include <sys/stat.h> |
58 | #ifndef _WIN32_ | 58 | #ifndef _WIN32_ |
59 | #include <unistd.h> | 59 | #include <unistd.h> |
60 | #include <stdint.h> | 60 | #include <stdint.h> |
61 | #endif | 61 | #endif |
62 | 62 | ||
63 | #ifdef PWM_EMBEDDED | 63 | #ifdef PWM_EMBEDDED |
64 | #ifndef Q_LONG | 64 | #ifndef Q_LONG |
65 | #define Q_LONG long | 65 | #define Q_LONG long |
66 | #endif | 66 | #endif |
67 | 67 | ||
68 | #ifndef Q_ULONG | 68 | #ifndef Q_ULONG |
69 | #define Q_ULONG unsigned long | 69 | #define Q_ULONG unsigned long |
70 | #endif | 70 | #endif |
71 | #endif //PWM_EMBEDDED | 71 | #endif //PWM_EMBEDDED |
72 | 72 | ||
73 | 73 | ||
74 | //TODO: reset to its normal value. | 74 | //TODO: reset to its normal value. |
75 | #define META_CHECK_TIMER_INTERVAL10/*300*/ /* sek */ | 75 | //LR set to 5 min |
76 | #define META_CHECK_TIMER_INTERVAL300 /* 10 300*/ /* sek */ | ||
76 | 77 | ||
77 | using namespace std; | 78 | using namespace std; |
78 | 79 | ||
79 | 80 | ||
80 | void PwMDocList::add(PwMDoc *doc, const string &id) | 81 | void PwMDocList::add(PwMDoc *doc, const string &id) |
81 | { | 82 | { |
82 | #ifdef PWM_DEBUG | 83 | #ifdef PWM_DEBUG |
83 | // check for existance of object in debug mode only. | 84 | // check for existance of object in debug mode only. |
84 | vector<listItem>::iterator begin = docList.begin(), | 85 | vector<listItem>::iterator begin = docList.begin(), |
85 | end = docList.end(), | 86 | end = docList.end(), |
86 | i = begin; | 87 | i = begin; |
87 | while (i != end) { | 88 | while (i != end) { |
88 | if (i->doc == doc) { | 89 | if (i->doc == doc) { |
89 | BUG(); | 90 | BUG(); |
90 | return; | 91 | return; |
91 | } | 92 | } |
92 | ++i; | 93 | ++i; |
93 | } | 94 | } |
94 | #endif | 95 | #endif |
95 | listItem newItem; | 96 | listItem newItem; |
96 | newItem.doc = doc; | 97 | newItem.doc = doc; |
97 | newItem.docId = id; | 98 | newItem.docId = id; |
98 | docList.push_back(newItem); | 99 | docList.push_back(newItem); |
99 | } | 100 | } |
100 | 101 | ||
101 | void PwMDocList::edit(PwMDoc *doc, const string &newId) | 102 | void PwMDocList::edit(PwMDoc *doc, const string &newId) |
102 | { | 103 | { |
103 | vector<listItem>::iterator begin = docList.begin(), | 104 | vector<listItem>::iterator begin = docList.begin(), |
104 | end = docList.end(), | 105 | end = docList.end(), |
105 | i = begin; | 106 | i = begin; |
106 | while (i != end) { | 107 | while (i != end) { |
107 | if (i->doc == doc) { | 108 | if (i->doc == doc) { |
108 | i->docId = newId; | 109 | i->docId = newId; |
109 | return; | 110 | return; |
110 | } | 111 | } |
111 | ++i; | 112 | ++i; |
112 | } | 113 | } |
113 | } | 114 | } |
114 | 115 | ||
115 | void PwMDocList::del(PwMDoc *doc) | 116 | void PwMDocList::del(PwMDoc *doc) |
116 | { | 117 | { |
117 | vector<listItem>::iterator begin = docList.begin(), | 118 | vector<listItem>::iterator begin = docList.begin(), |
118 | end = docList.end(), | 119 | end = docList.end(), |
119 | i = begin; | 120 | i = begin; |
120 | while (i != end) { | 121 | while (i != end) { |
121 | if (i->doc == doc) { | 122 | if (i->doc == doc) { |
122 | docList.erase(i); | 123 | docList.erase(i); |
123 | return; | 124 | return; |
124 | } | 125 | } |
125 | ++i; | 126 | ++i; |
126 | } | 127 | } |
127 | } | 128 | } |
128 | 129 | ||
129 | bool PwMDocList::find(const string &id, listItem *ret) | 130 | bool PwMDocList::find(const string &id, listItem *ret) |
130 | { | 131 | { |
131 | vector<listItem>::iterator begin = docList.begin(), | 132 | vector<listItem>::iterator begin = docList.begin(), |
132 | end = docList.end(), | 133 | end = docList.end(), |
133 | i = begin; | 134 | i = begin; |
134 | while (i != end) { | 135 | while (i != end) { |
135 | if (i->docId == id) { | 136 | if (i->docId == id) { |
136 | if (ret) | 137 | if (ret) |
137 | *ret = *i; | 138 | *ret = *i; |
138 | return true; | 139 | return true; |
139 | } | 140 | } |
140 | ++i; | 141 | ++i; |
141 | } | 142 | } |
142 | return false; | 143 | return false; |
143 | } | 144 | } |
144 | 145 | ||
145 | 146 | ||
146 | 147 | ||
147 | DocTimer::DocTimer(PwMDoc *_doc) | 148 | DocTimer::DocTimer(PwMDoc *_doc) |
148 | : doc (_doc) | 149 | : doc (_doc) |
149 | , mpwLock (0) | 150 | , mpwLock (0) |
150 | , autoLockLock (0) | 151 | , autoLockLock (0) |
151 | , metaCheckLock (0) | 152 | , metaCheckLock (0) |
152 | { | 153 | { |
153 | mpwTimer = new QTimer; | 154 | mpwTimer = new QTimer; |
154 | autoLockTimer = new QTimer; | 155 | autoLockTimer = new QTimer; |
155 | metaCheckTimer = new QTimer; | 156 | metaCheckTimer = new QTimer; |
156 | connect(mpwTimer, SIGNAL(timeout()), | 157 | connect(mpwTimer, SIGNAL(timeout()), |
157 | this, SLOT(mpwTimeout())); | 158 | this, SLOT(mpwTimeout())); |
158 | connect(autoLockTimer, SIGNAL(timeout()), | 159 | connect(autoLockTimer, SIGNAL(timeout()), |
159 | this, SLOT(autoLockTimeout())); | 160 | this, SLOT(autoLockTimeout())); |
160 | connect(metaCheckTimer, SIGNAL(timeout()), | 161 | connect(metaCheckTimer, SIGNAL(timeout()), |
161 | this, SLOT(metaCheckTimeout())); | 162 | this, SLOT(metaCheckTimeout())); |
162 | } | 163 | } |
163 | 164 | ||
164 | DocTimer::~DocTimer() | 165 | DocTimer::~DocTimer() |
165 | { | 166 | { |
166 | delete mpwTimer; | 167 | delete mpwTimer; |
167 | delete autoLockTimer; | 168 | delete autoLockTimer; |
168 | delete metaCheckTimer; | 169 | delete metaCheckTimer; |
169 | } | 170 | } |
170 | 171 | ||
171 | void DocTimer::start(TimerIDs timer) | 172 | void DocTimer::start(TimerIDs timer) |
172 | { | 173 | { |
173 | switch (timer) { | 174 | switch (timer) { |
174 | case id_mpwTimer: | 175 | case id_mpwTimer: |
175 | if (mpwTimer->isActive()) | 176 | if (mpwTimer->isActive()) |
176 | mpwTimer->stop(); | 177 | mpwTimer->stop(); |
177 | doc->setDocStatFlag(DOC_STAT_UNLOCK_WITHOUT_PW); | 178 | doc->setDocStatFlag(DOC_STAT_UNLOCK_WITHOUT_PW); |
178 | mpwTimer->start(conf()->confGlobPwTimeout() * 1000, true); | 179 | mpwTimer->start(conf()->confGlobPwTimeout() * 1000, true); |
179 | break; | 180 | break; |
180 | case id_autoLockTimer: | 181 | case id_autoLockTimer: |
181 | if (autoLockTimer->isActive()) | 182 | if (autoLockTimer->isActive()) |
182 | autoLockTimer->stop(); | 183 | autoLockTimer->stop(); |
183 | if (conf()->confGlobLockTimeout() > 0) | 184 | if (conf()->confGlobLockTimeout() > 0) |
184 | autoLockTimer->start(conf()->confGlobLockTimeout() * 1000, true); | 185 | autoLockTimer->start(conf()->confGlobLockTimeout() * 1000, true); |
185 | break; | 186 | break; |
186 | case id_metaCheckTimer: | 187 | case id_metaCheckTimer: |
187 | if (metaCheckTimer->isActive()) | 188 | if (metaCheckTimer->isActive()) |
188 | metaCheckTimer->stop(); | 189 | metaCheckTimer->stop(); |
189 | metaCheckTimer->start(META_CHECK_TIMER_INTERVAL * 1000, true); | 190 | metaCheckTimer->start(META_CHECK_TIMER_INTERVAL * 1000, true); |
190 | break; | 191 | break; |
191 | } | 192 | } |
192 | } | 193 | } |
193 | 194 | ||
194 | void DocTimer::stop(TimerIDs timer) | 195 | void DocTimer::stop(TimerIDs timer) |
195 | { | 196 | { |
196 | switch (timer) { | 197 | switch (timer) { |
197 | case id_mpwTimer: | 198 | case id_mpwTimer: |
198 | mpwTimer->stop(); | 199 | mpwTimer->stop(); |
199 | break; | 200 | break; |
200 | case id_autoLockTimer: | 201 | case id_autoLockTimer: |
201 | autoLockTimer->stop(); | 202 | autoLockTimer->stop(); |
202 | break; | 203 | break; |
203 | case id_metaCheckTimer: | 204 | case id_metaCheckTimer: |
204 | metaCheckTimer->stop(); | 205 | metaCheckTimer->stop(); |
205 | break; | 206 | break; |
206 | } | 207 | } |
207 | } | 208 | } |
208 | 209 | ||
209 | void DocTimer::getLock(TimerIDs timer) | 210 | void DocTimer::getLock(TimerIDs timer) |
210 | { | 211 | { |
211 | switch (timer) { | 212 | switch (timer) { |
212 | case id_mpwTimer: | 213 | case id_mpwTimer: |
213 | ++mpwLock; | 214 | ++mpwLock; |
214 | break; | 215 | break; |
215 | case id_autoLockTimer: | 216 | case id_autoLockTimer: |
216 | ++autoLockLock; | 217 | ++autoLockLock; |
217 | break; | 218 | break; |
218 | case id_metaCheckTimer: | 219 | case id_metaCheckTimer: |
219 | ++metaCheckLock; | 220 | ++metaCheckLock; |
220 | break; | 221 | break; |
221 | } | 222 | } |
222 | } | 223 | } |
223 | 224 | ||
224 | void DocTimer::putLock(TimerIDs timer) | 225 | void DocTimer::putLock(TimerIDs timer) |
225 | { | 226 | { |
226 | switch (timer) { | 227 | switch (timer) { |
227 | case id_mpwTimer: | 228 | case id_mpwTimer: |
228 | if (mpwLock) | 229 | if (mpwLock) |
229 | --mpwLock; | 230 | --mpwLock; |
230 | break; | 231 | break; |
231 | case id_autoLockTimer: | 232 | case id_autoLockTimer: |
232 | if (autoLockLock) | 233 | if (autoLockLock) |
233 | --autoLockLock; | 234 | --autoLockLock; |
234 | break; | 235 | break; |
235 | case id_metaCheckTimer: | 236 | case id_metaCheckTimer: |
236 | if (metaCheckLock) | 237 | if (metaCheckLock) |
237 | --metaCheckLock; | 238 | --metaCheckLock; |
238 | break; | 239 | break; |
239 | } | 240 | } |
240 | } | 241 | } |
241 | 242 | ||
242 | void DocTimer::mpwTimeout() | 243 | void DocTimer::mpwTimeout() |
243 | { | 244 | { |
244 | if (mpwLock) { | 245 | if (mpwLock) { |
245 | mpwTimer->start(1000, true); | 246 | mpwTimer->start(1000, true); |
246 | return; | 247 | return; |
247 | } | 248 | } |
248 | doc->unsetDocStatFlag(DOC_STAT_UNLOCK_WITHOUT_PW); | 249 | doc->unsetDocStatFlag(DOC_STAT_UNLOCK_WITHOUT_PW); |
249 | } | 250 | } |
250 | 251 | ||
251 | void DocTimer::autoLockTimeout() | 252 | void DocTimer::autoLockTimeout() |
252 | { | 253 | { |
253 | if (autoLockLock) { | 254 | if (autoLockLock) { |
254 | autoLockTimer->start(1000, true); | 255 | autoLockTimer->start(1000, true); |
255 | return; | 256 | return; |
256 | } | 257 | } |
257 | if (conf()->confGlobAutoDeepLock() && | 258 | if (conf()->confGlobAutoDeepLock() && |
258 | doc->filename != QString::null && | 259 | doc->filename != QString::null && |
259 | doc->filename != "") { | 260 | doc->filename != "") { |
260 | doc->deepLock(true); | 261 | doc->deepLock(true); |
261 | } else { | 262 | } else { |
262 | doc->lockAll(true); | 263 | doc->lockAll(true); |
263 | } | 264 | } |
264 | } | 265 | } |
265 | 266 | ||
266 | void DocTimer::metaCheckTimeout() | 267 | void DocTimer::metaCheckTimeout() |
267 | { | 268 | { |
268 | if (metaCheckLock) { | 269 | if (metaCheckLock) { |
269 | // check again in one second. | 270 | // check again in one second. |
270 | metaCheckTimer->start(1000, true); | 271 | metaCheckTimer->start(1000, true); |
271 | return; | 272 | return; |
272 | } | 273 | } |
273 | if (doc->isDeepLocked()) { | 274 | if (doc->isDeepLocked()) { |
274 | metaCheckTimer->start(META_CHECK_TIMER_INTERVAL * 1000, true); | 275 | metaCheckTimer->start(META_CHECK_TIMER_INTERVAL * 1000, true); |
275 | return; | 276 | return; |
276 | } | 277 | } |
277 | if (doc->isDocEmpty()) { | 278 | if (doc->isDocEmpty()) { |
278 | metaCheckTimer->start(META_CHECK_TIMER_INTERVAL * 1000, true); | 279 | metaCheckTimer->start(META_CHECK_TIMER_INTERVAL * 1000, true); |
279 | return; | 280 | return; |
280 | } | 281 | } |
281 | #ifdef CONFIG_KWALLETIF | 282 | #ifdef CONFIG_KWALLETIF |
282 | KWalletEmu *kwlEmu = doc->init->kwalletEmu(); | 283 | KWalletEmu *kwlEmu = doc->init->kwalletEmu(); |
283 | if (kwlEmu) | 284 | if (kwlEmu) |
284 | kwlEmu->suspendDocSignals(); | 285 | kwlEmu->suspendDocSignals(); |
285 | #endif // CONFIG_KWALLETIF | 286 | #endif // CONFIG_KWALLETIF |
286 | /* We simply trigger all views to update their | 287 | /* We simply trigger all views to update their |
287 | * displayed values. This way they have a chance | 288 | * displayed values. This way they have a chance |
288 | * to get notified when some meta changes over time. | 289 | * to get notified when some meta changes over time. |
289 | * (for example an entry expired). | 290 | * (for example an entry expired). |
290 | * The _view_ is responsive for not updating its | 291 | * The _view_ is responsive for not updating its |
291 | * contents if nothing really changed! | 292 | * contents if nothing really changed! |
292 | */ | 293 | */ |
293 | emit doc->dataChanged(doc); | 294 | emit doc->dataChanged(doc); |
294 | #ifdef CONFIG_KWALLETIF | 295 | #ifdef CONFIG_KWALLETIF |
295 | if (kwlEmu) | 296 | if (kwlEmu) |
296 | kwlEmu->resumeDocSignals(); | 297 | kwlEmu->resumeDocSignals(); |
297 | #endif // CONFIG_KWALLETIF | 298 | #endif // CONFIG_KWALLETIF |
298 | metaCheckTimer->start(META_CHECK_TIMER_INTERVAL * 1000, true); | 299 | metaCheckTimer->start(META_CHECK_TIMER_INTERVAL * 1000, true); |
299 | } | 300 | } |
300 | 301 | ||
301 | 302 | ||
302 | 303 | ||
303 | PwMDocList PwMDoc::openDocList; | 304 | PwMDocList PwMDoc::openDocList; |
304 | unsigned int PwMDocList::unnamedDocCnt = 1; | 305 | unsigned int PwMDocList::unnamedDocCnt = 1; |
305 | 306 | ||
306 | PwMDoc::PwMDoc(QObject *parent, const char *name) | 307 | PwMDoc::PwMDoc(QObject *parent, const char *name) |
307 | : PwMDocUi(parent, name) | 308 | : PwMDocUi(parent, name) |
308 | , dataChangedLock (0) | 309 | , dataChangedLock (0) |
309 | { | 310 | { |
310 | deleted = false; | 311 | deleted = false; |
311 | unnamedNum = 0; | 312 | unnamedNum = 0; |
312 | getOpenDocList()->add(this, getTitle().latin1()); | 313 | getOpenDocList()->add(this, getTitle().latin1()); |
313 | curDocStat = 0; | 314 | curDocStat = 0; |
314 | setMaxNumEntries(); | 315 | setMaxNumEntries(); |
315 | _timer = new DocTimer(this); | 316 | _timer = new DocTimer(this); |
316 | timer()->start(DocTimer::id_mpwTimer); | 317 | timer()->start(DocTimer::id_mpwTimer); |
317 | timer()->start(DocTimer::id_autoLockTimer); | 318 | timer()->start(DocTimer::id_autoLockTimer); |
318 | timer()->start(DocTimer::id_metaCheckTimer); | 319 | timer()->start(DocTimer::id_metaCheckTimer); |
319 | addCategory(DEFAULT_CATEGORY, 0, false); | 320 | addCategory(DEFAULT_CATEGORY, 0, false); |
320 | listView = 0; | 321 | listView = 0; |
321 | emit docCreated(this); | 322 | emit docCreated(this); |
322 | } | 323 | } |
323 | 324 | ||
324 | PwMDoc::~PwMDoc() | 325 | PwMDoc::~PwMDoc() |
325 | { | 326 | { |
326 | emit docClosed(this); | 327 | emit docClosed(this); |
327 | getOpenDocList()->del(this); | 328 | getOpenDocList()->del(this); |
328 | delete _timer; | 329 | delete _timer; |
329 | } | 330 | } |
330 | 331 | ||
331 | PwMerror PwMDoc::saveDoc(char compress, const QString *file) | 332 | PwMerror PwMDoc::saveDoc(char compress, const QString *file) |
332 | { | 333 | { |
333 | PwMerror ret, e; | 334 | PwMerror ret, e; |
334 | string serialized; | 335 | string serialized; |
335 | QFile f; | 336 | QFile f; |
336 | QString tmpFileMoved(QString::null); | 337 | QString tmpFileMoved(QString::null); |
337 | bool wasDeepLocked; | 338 | bool wasDeepLocked; |
338 | QString savedFilename(filename); | 339 | QString savedFilename(filename); |
339 | 340 | ||
340 | if (!file) { | 341 | if (!file) { |
341 | if (filename == "") | 342 | if (filename == "") |
342 | return e_filename; | 343 | return e_filename; |
343 | if (isDeepLocked()) { | 344 | if (isDeepLocked()) { |
344 | /* We don't need to save any data. | 345 | /* We don't need to save any data. |
345 | * It's already all on disk, because | 346 | * It's already all on disk, because |
346 | * we are deeplocked. | 347 | * we are deeplocked. |
347 | */ | 348 | */ |
348 | unsetDocStatFlag(DOC_STAT_DISK_DIRTY); | 349 | unsetDocStatFlag(DOC_STAT_DISK_DIRTY); |
349 | ret = e_success; | 350 | ret = e_success; |
350 | return ret; | 351 | return ret; |
351 | } | 352 | } |
352 | } else { | 353 | } else { |
353 | if (*file == "" && filename == "") | 354 | if (*file == "" && filename == "") |
354 | return e_filename; | 355 | return e_filename; |
355 | if (*file != "") | 356 | if (*file != "") |
356 | filename = *file; | 357 | filename = *file; |
357 | } | 358 | } |
358 | 359 | ||
359 | wasDeepLocked = isDeepLocked(); | 360 | wasDeepLocked = isDeepLocked(); |
360 | if (wasDeepLocked) { | 361 | if (wasDeepLocked) { |
361 | /* We are deeplocked. That means all data is already | 362 | /* We are deeplocked. That means all data is already |
362 | * on disk. BUT we need to do saving procedure, | 363 | * on disk. BUT we need to do saving procedure, |
363 | * because *file != savedFilename. | 364 | * because *file != savedFilename. |
364 | * Additionally we need to tempoarly restore | 365 | * Additionally we need to tempoarly restore |
365 | * the old "filename", because deepLock() references it. | 366 | * the old "filename", because deepLock() references it. |
366 | */ | 367 | */ |
367 | QString newFilename(filename); | 368 | QString newFilename(filename); |
368 | filename = savedFilename; | 369 | filename = savedFilename; |
369 | getDataChangedLock(); | 370 | getDataChangedLock(); |
370 | e = deepLock(false); | 371 | e = deepLock(false); |
371 | putDataChangedLock(); | 372 | putDataChangedLock(); |
372 | filename = newFilename; | 373 | filename = newFilename; |
373 | switch (e) { | 374 | switch (e) { |
374 | case e_success: | 375 | case e_success: |
375 | break; | 376 | break; |
376 | case e_wrongPw: | 377 | case e_wrongPw: |
377 | case e_noPw: | 378 | case e_noPw: |
378 | emitDataChanged(this); | 379 | emitDataChanged(this); |
379 | return e; | 380 | return e; |
380 | default: | 381 | default: |
381 | emitDataChanged(this); | 382 | emitDataChanged(this); |
382 | return e_openFile; | 383 | return e_openFile; |
383 | } | 384 | } |
384 | } | 385 | } |
385 | 386 | ||
386 | if (!isPwAvailable()) { | 387 | if (!isPwAvailable()) { |
387 | /* password is not available. This means, the | 388 | /* password is not available. This means, the |
388 | * document wasn't saved, yet. | 389 | * document wasn't saved, yet. |
389 | */ | 390 | */ |
390 | bool useChipcard = getDocStatFlag(DOC_STAT_USE_CHIPCARD); | 391 | bool useChipcard = getDocStatFlag(DOC_STAT_USE_CHIPCARD); |
391 | QString pw(requestNewMpw(&useChipcard)); | 392 | QString pw(requestNewMpw(&useChipcard)); |
392 | if (pw != "") { | 393 | if (pw != "") { |
393 | currentPw = pw; | 394 | currentPw = pw; |
394 | } else { | 395 | } else { |
395 | return e_noPw; | 396 | return e_noPw; |
396 | } | 397 | } |
397 | if (useChipcard) { | 398 | if (useChipcard) { |
398 | setDocStatFlag(DOC_STAT_USE_CHIPCARD); | 399 | setDocStatFlag(DOC_STAT_USE_CHIPCARD); |
399 | } else { | 400 | } else { |
400 | unsetDocStatFlag(DOC_STAT_USE_CHIPCARD); | 401 | unsetDocStatFlag(DOC_STAT_USE_CHIPCARD); |
401 | } | 402 | } |
402 | } | 403 | } |
403 | 404 | ||
404 | int _cryptAlgo = conf()->confGlobCryptAlgo(); | 405 | int _cryptAlgo = conf()->confGlobCryptAlgo(); |
405 | int _hashAlgo = conf()->confGlobHashAlgo(); | 406 | int _hashAlgo = conf()->confGlobHashAlgo(); |
406 | 407 | ||
407 | // sanity check for the selected algorithms | 408 | // sanity check for the selected algorithms |
408 | if (_cryptAlgo < PWM_CRYPT_BLOWFISH || | 409 | if (_cryptAlgo < PWM_CRYPT_BLOWFISH || |
409 | _cryptAlgo > PWM_CRYPT_TWOFISH128) { | 410 | _cryptAlgo > PWM_CRYPT_TWOFISH128) { |
410 | printWarn("Invalid Crypto-Algorithm selected! " | 411 | printWarn("Invalid Crypto-Algorithm selected! " |
411 | "Config-file seems to be corrupt. " | 412 | "Config-file seems to be corrupt. " |
412 | "Falling back to Blowfish."); | 413 | "Falling back to Blowfish."); |
413 | _cryptAlgo = PWM_CRYPT_BLOWFISH; | 414 | _cryptAlgo = PWM_CRYPT_BLOWFISH; |
414 | } | 415 | } |
415 | if (_hashAlgo < PWM_HASH_SHA1 || | 416 | if (_hashAlgo < PWM_HASH_SHA1 || |
416 | _hashAlgo > PWM_HASH_TIGER) { | 417 | _hashAlgo > PWM_HASH_TIGER) { |
417 | printWarn("Invalid Hash-Algorithm selected! " | 418 | printWarn("Invalid Hash-Algorithm selected! " |
418 | "Config-file seems to be corrupt. " | 419 | "Config-file seems to be corrupt. " |
419 | "Falling back to SHA1."); | 420 | "Falling back to SHA1."); |
420 | _hashAlgo = PWM_HASH_SHA1; | 421 | _hashAlgo = PWM_HASH_SHA1; |
421 | } | 422 | } |
422 | char cryptAlgo = static_cast<char>(_cryptAlgo); | 423 | char cryptAlgo = static_cast<char>(_cryptAlgo); |
423 | char hashAlgo = static_cast<char>(_hashAlgo); | 424 | char hashAlgo = static_cast<char>(_hashAlgo); |
424 | 425 | ||
425 | if (conf()->confGlobMakeFileBackup()) { | 426 | if (conf()->confGlobMakeFileBackup()) { |
426 | if (!backupFile(filename)) | 427 | if (!backupFile(filename)) |
427 | return e_fileBackup; | 428 | return e_fileBackup; |
428 | } | 429 | } |
429 | if (QFile::exists(filename)) { | 430 | if (QFile::exists(filename)) { |
430 | /* Move the existing file to some tmp file. | 431 | /* Move the existing file to some tmp file. |
431 | * When saving file succeeds, delete tmp file. Otherwise | 432 | * When saving file succeeds, delete tmp file. Otherwise |
432 | * move tmp file back. See below. | 433 | * move tmp file back. See below. |
433 | */ | 434 | */ |
434 | Randomizer *rnd = Randomizer::obj(); | 435 | Randomizer *rnd = Randomizer::obj(); |
435 | char rnd_buf[5]; | 436 | char rnd_buf[5]; |
436 | sprintf(rnd_buf, "%X%X%X%X", rnd->genRndChar() & 0xFF, rnd->genRndChar() & 0xFF, | 437 | sprintf(rnd_buf, "%X%X%X%X", rnd->genRndChar() & 0xFF, rnd->genRndChar() & 0xFF, |
437 | rnd->genRndChar() & 0xFF, rnd->genRndChar() & 0xFF); | 438 | rnd->genRndChar() & 0xFF, rnd->genRndChar() & 0xFF); |
438 | tmpFileMoved = filename + "." + rnd_buf + ".mv"; | 439 | tmpFileMoved = filename + "." + rnd_buf + ".mv"; |
439 | if (!copyFile(filename, tmpFileMoved)) | 440 | if (!copyFile(filename, tmpFileMoved)) |
440 | return e_openFile; | 441 | return e_openFile; |
441 | if (!QFile::remove(filename)) { | 442 | if (!QFile::remove(filename)) { |
442 | printWarn(string("removing orig file ") | 443 | printWarn(string("removing orig file ") |
443 | + filename.latin1() | 444 | + filename.latin1() |
444 | + " failed!"); | 445 | + " failed!"); |
445 | } | 446 | } |
446 | } | 447 | } |
447 | f.setName(filename); | 448 | f.setName(filename); |
448 | if (!f.open(IO_ReadWrite)) { | 449 | if (!f.open(IO_ReadWrite)) { |
449 | ret = e_openFile; | 450 | ret = e_openFile; |
450 | goto out_moveback; | 451 | goto out_moveback; |
451 | } | 452 | } |
452 | e = writeFileHeader(hashAlgo, hashAlgo, | 453 | e = writeFileHeader(hashAlgo, hashAlgo, |
453 | cryptAlgo, compress, | 454 | cryptAlgo, compress, |
454 | ¤tPw, &f); | 455 | ¤tPw, &f); |
455 | if (e == e_hashNotImpl) { | 456 | if (e == e_hashNotImpl) { |
456 | printDebug("PwMDoc::saveDoc(): writeFileHeader() failed: e_hashNotImpl"); | 457 | printDebug("PwMDoc::saveDoc(): writeFileHeader() failed: e_hashNotImpl"); |
457 | f.close(); | 458 | f.close(); |
458 | ret = e_hashNotImpl; | 459 | ret = e_hashNotImpl; |
459 | goto out_moveback; | 460 | goto out_moveback; |
460 | } else if (e != e_success) { | 461 | } else if (e != e_success) { |
461 | printDebug("PwMDoc::saveDoc(): writeFileHeader() failed"); | 462 | printDebug("PwMDoc::saveDoc(): writeFileHeader() failed"); |
462 | f.close(); | 463 | f.close(); |
463 | ret = e_writeHeader; | 464 | ret = e_writeHeader; |
464 | goto out_moveback; | 465 | goto out_moveback; |
465 | } | 466 | } |
466 | if (!serializeDta(&serialized)) { | 467 | if (!serializeDta(&serialized)) { |
467 | printDebug("PwMDoc::saveDoc(): serializeDta() failed"); | 468 | printDebug("PwMDoc::saveDoc(): serializeDta() failed"); |
468 | f.close(); | 469 | f.close(); |
469 | ret = e_serializeDta; | 470 | ret = e_serializeDta; |
470 | goto out_moveback; | 471 | goto out_moveback; |
471 | } | 472 | } |
472 | e = writeDataHash(hashAlgo, &serialized, &f); | 473 | e = writeDataHash(hashAlgo, &serialized, &f); |
473 | if (e == e_hashNotImpl) { | 474 | if (e == e_hashNotImpl) { |
474 | printDebug("PwMDoc::saveDoc(): writeDataHash() failed: e_hashNotImpl"); | 475 | printDebug("PwMDoc::saveDoc(): writeDataHash() failed: e_hashNotImpl"); |
475 | f.close(); | 476 | f.close(); |
476 | ret = e_hashNotImpl; | 477 | ret = e_hashNotImpl; |
477 | goto out_moveback; | 478 | goto out_moveback; |
478 | } else if (e != e_success) { | 479 | } else if (e != e_success) { |
479 | printDebug("PwMDoc::saveDoc(): writeDataHash() failed"); | 480 | printDebug("PwMDoc::saveDoc(): writeDataHash() failed"); |
480 | f.close(); | 481 | f.close(); |
481 | ret = e_writeHeader; | 482 | ret = e_writeHeader; |
482 | goto out_moveback; | 483 | goto out_moveback; |
483 | } | 484 | } |
484 | if (!compressDta(&serialized, compress)) { | 485 | if (!compressDta(&serialized, compress)) { |
485 | printDebug("PwMDoc::saveDoc(): compressDta() failed"); | 486 | printDebug("PwMDoc::saveDoc(): compressDta() failed"); |
486 | f.close(); | 487 | f.close(); |
487 | ret = e_enc; | 488 | ret = e_enc; |
488 | goto out_moveback; | 489 | goto out_moveback; |
489 | } | 490 | } |
490 | e = encrypt(&serialized, ¤tPw, &f, cryptAlgo, hashAlgo); | 491 | e = encrypt(&serialized, ¤tPw, &f, cryptAlgo, hashAlgo); |
491 | if (e == e_weakPw) { | 492 | if (e == e_weakPw) { |
492 | printDebug("PwMDoc::saveDoc(): encrypt() failed: e_weakPw"); | 493 | printDebug("PwMDoc::saveDoc(): encrypt() failed: e_weakPw"); |
493 | f.close(); | 494 | f.close(); |
494 | ret = e_weakPw; | 495 | ret = e_weakPw; |
495 | goto out_moveback; | 496 | goto out_moveback; |
496 | } else if (e == e_cryptNotImpl) { | 497 | } else if (e == e_cryptNotImpl) { |
497 | printDebug("PwMDoc::saveDoc(): encrypt() failed: e_cryptNotImpl"); | 498 | printDebug("PwMDoc::saveDoc(): encrypt() failed: e_cryptNotImpl"); |
498 | f.close(); | 499 | f.close(); |
499 | ret = e_cryptNotImpl; | 500 | ret = e_cryptNotImpl; |
500 | goto out_moveback; | 501 | goto out_moveback; |
501 | } else if (e != e_success) { | 502 | } else if (e != e_success) { |
502 | printDebug("PwMDoc::saveDoc(): encrypt() failed"); | 503 | printDebug("PwMDoc::saveDoc(): encrypt() failed"); |
503 | f.close(); | 504 | f.close(); |
504 | ret = e_enc; | 505 | ret = e_enc; |
505 | goto out_moveback; | 506 | goto out_moveback; |
506 | } | 507 | } |
507 | unsetDocStatFlag(DOC_STAT_DISK_DIRTY); | 508 | unsetDocStatFlag(DOC_STAT_DISK_DIRTY); |
508 | f.close(); | 509 | f.close(); |
509 | #ifndef _WIN32_ | 510 | #ifndef _WIN32_ |
510 | if (chmod(filename.latin1(), | 511 | if (chmod(filename.latin1(), |
511 | conf()->confGlobFilePermissions())) { | 512 | conf()->confGlobFilePermissions())) { |
512 | printWarn(string("chmod failed: ") + strerror(errno)); | 513 | printWarn(string("chmod failed: ") + strerror(errno)); |
513 | } | 514 | } |
514 | #endif | 515 | #endif |
515 | openDocList.edit(this, getTitle().latin1()); | 516 | openDocList.edit(this, getTitle().latin1()); |
516 | if (wasDeepLocked) { | 517 | if (wasDeepLocked) { |
517 | /* Do _not_ save the data with the deepLock() | 518 | /* Do _not_ save the data with the deepLock() |
518 | * call, because this will recurse | 519 | * call, because this will recurse |
519 | * into saveDoc() | 520 | * into saveDoc() |
520 | */ | 521 | */ |
521 | deepLock(true, false); | 522 | deepLock(true, false); |
522 | /* We don't check return value here, because | 523 | /* We don't check return value here, because |
523 | * it won't fail. See NOTE in deepLock() | 524 | * it won't fail. See NOTE in deepLock() |
524 | */ | 525 | */ |
525 | } | 526 | } |
526 | if (tmpFileMoved != QString::null) { | 527 | if (tmpFileMoved != QString::null) { |
527 | // now remove the moved file. | 528 | // now remove the moved file. |
528 | if (!QFile::remove(tmpFileMoved)) { | 529 | if (!QFile::remove(tmpFileMoved)) { |
529 | printWarn(string("removing file ") | 530 | printWarn(string("removing file ") |
530 | + tmpFileMoved.latin1() | 531 | + tmpFileMoved.latin1() |
531 | + " failed!"); | 532 | + " failed!"); |
532 | } | 533 | } |
533 | } | 534 | } |
534 | ret = e_success; | 535 | ret = e_success; |
535 | printDebug(string("writing file { name: ") | 536 | printDebug(string("writing file { name: ") |
536 | + filename.latin1() + " compress: " | 537 | + filename.latin1() + " compress: " |
537 | + tostr(static_cast<int>(compress)) + " cryptAlgo: " | 538 | + tostr(static_cast<int>(compress)) + " cryptAlgo: " |
538 | + tostr(static_cast<int>(cryptAlgo)) + " hashAlgo: " | 539 | + tostr(static_cast<int>(cryptAlgo)) + " hashAlgo: " |
539 | + tostr(static_cast<int>(hashAlgo)) | 540 | + tostr(static_cast<int>(hashAlgo)) |
540 | + " }"); | 541 | + " }"); |
541 | goto out; | 542 | goto out; |
542 | out_moveback: | 543 | out_moveback: |
543 | if (tmpFileMoved != QString::null) { | 544 | if (tmpFileMoved != QString::null) { |
544 | if (copyFile(tmpFileMoved, filename)) { | 545 | if (copyFile(tmpFileMoved, filename)) { |
545 | if (!QFile::remove(tmpFileMoved)) { | 546 | if (!QFile::remove(tmpFileMoved)) { |
546 | printWarn(string("removing tmp file ") | 547 | printWarn(string("removing tmp file ") |
547 | + filename.latin1() | 548 | + filename.latin1() |
548 | + " failed!"); | 549 | + " failed!"); |
549 | } | 550 | } |
550 | } else { | 551 | } else { |
551 | printWarn(string("couldn't copy file ") | 552 | printWarn(string("couldn't copy file ") |
552 | + tmpFileMoved.latin1() | 553 | + tmpFileMoved.latin1() |
553 | + " back to " | 554 | + " back to " |
554 | + filename.latin1()); | 555 | + filename.latin1()); |
555 | } | 556 | } |
556 | } | 557 | } |
557 | out: | 558 | out: |
558 | return ret; | 559 | return ret; |
559 | } | 560 | } |
560 | 561 | ||
561 | PwMerror PwMDoc::openDoc(const QString *file, int openLocked) | 562 | PwMerror PwMDoc::openDoc(const QString *file, int openLocked) |
562 | { | 563 | { |
563 | PWM_ASSERT(file); | 564 | PWM_ASSERT(file); |
564 | PWM_ASSERT(openLocked == 0 || openLocked == 1 || openLocked == 2); | 565 | PWM_ASSERT(openLocked == 0 || openLocked == 1 || openLocked == 2); |
565 | string decrypted, dataHash; | 566 | string decrypted, dataHash; |
566 | PwMerror ret; | 567 | PwMerror ret; |
567 | char cryptAlgo, dataHashType, compress; | 568 | char cryptAlgo, dataHashType, compress; |
568 | unsigned int headerLen; | 569 | unsigned int headerLen; |
569 | 570 | ||
570 | if (*file == "") | 571 | if (*file == "") |
571 | return e_readFile; | 572 | return e_readFile; |
572 | filename = *file; | 573 | filename = *file; |
573 | /* check if this file is already open. | 574 | /* check if this file is already open. |
574 | * This does not catch symlinks! | 575 | * This does not catch symlinks! |
575 | */ | 576 | */ |
576 | if (!isDeepLocked()) { | 577 | if (!isDeepLocked()) { |
577 | if (getOpenDocList()->find(filename.latin1())) | 578 | if (getOpenDocList()->find(filename.latin1())) |
578 | return e_alreadyOpen; | 579 | return e_alreadyOpen; |
579 | } | 580 | } |
580 | QFile f(filename); | 581 | QFile f(filename); |
581 | 582 | ||
582 | if (openLocked == 2) { | 583 | if (openLocked == 2) { |
583 | // open deep-locked | 584 | // open deep-locked |
584 | if (!QFile::exists(filename)) | 585 | if (!QFile::exists(filename)) |
585 | return e_openFile; | 586 | return e_openFile; |
586 | if (deepLock(true, false) != e_success) | 587 | if (deepLock(true, false) != e_success) |
587 | return e_openFile; | 588 | return e_openFile; |
diff --git a/pwmanager/pwmanager/pwmview.cpp b/pwmanager/pwmanager/pwmview.cpp index 7733028..cd816e5 100644 --- a/pwmanager/pwmanager/pwmview.cpp +++ b/pwmanager/pwmanager/pwmview.cpp | |||
@@ -1,619 +1,620 @@ | |||
1 | /*************************************************************************** | 1 | /*************************************************************************** |
2 | * * | 2 | * * |
3 | * copyright (C) 2003, 2004 by Michael Buesch * | 3 | * copyright (C) 2003, 2004 by Michael Buesch * |
4 | * email: mbuesch@freenet.de * | 4 | * email: mbuesch@freenet.de * |
5 | * * | 5 | * * |
6 | * This program is free software; you can redistribute it and/or modify * | 6 | * This program is free software; you can redistribute it and/or modify * |
7 | * it under the terms of the GNU General Public License version 2 * | 7 | * it under the terms of the GNU General Public License version 2 * |
8 | * as published by the Free Software Foundation. * | 8 | * as published by the Free Software Foundation. * |
9 | * * | 9 | * * |
10 | ***************************************************************************/ | 10 | ***************************************************************************/ |
11 | 11 | ||
12 | /*************************************************************************** | 12 | /*************************************************************************** |
13 | * copyright (C) 2004 by Ulf Schenk | 13 | * copyright (C) 2004 by Ulf Schenk |
14 | * This file is originaly based on version 1.0.1 of pwmanager | 14 | * This file is originaly based on version 1.0.1 of pwmanager |
15 | * and was modified to run on embedded devices that run microkde | 15 | * and was modified to run on embedded devices that run microkde |
16 | * | 16 | * |
17 | * $Id$ | 17 | * $Id$ |
18 | **************************************************************************/ | 18 | **************************************************************************/ |
19 | 19 | ||
20 | #include "pwmview.h" | 20 | #include "pwmview.h" |
21 | #include "pwmexception.h" | 21 | #include "pwmexception.h" |
22 | #include "globalstuff.h" | 22 | #include "globalstuff.h" |
23 | #include "pwm.h" | 23 | #include "pwm.h" |
24 | #include "rencatwnd.h" | 24 | #include "rencatwnd.h" |
25 | #ifndef PWM_EMBEDDED | 25 | #ifndef PWM_EMBEDDED |
26 | #include "configuration.h" | 26 | #include "configuration.h" |
27 | #else | 27 | #else |
28 | #include "pwmprefs.h" | 28 | #include "pwmprefs.h" |
29 | #endif | 29 | #endif |
30 | #include "commentbox.h" | 30 | #include "commentbox.h" |
31 | 31 | ||
32 | #include <kmessagebox.h> | 32 | #include <kmessagebox.h> |
33 | #include <klocale.h> | 33 | #include <klocale.h> |
34 | 34 | ||
35 | #include <qlineedit.h> | 35 | #include <qlineedit.h> |
36 | #include <qpoint.h> | 36 | #include <qpoint.h> |
37 | #include <qapplication.h> | 37 | #include <qapplication.h> |
38 | #include <qlayout.h> | 38 | #include <qlayout.h> |
39 | 39 | ||
40 | //US ENH: wouldn't it be a good idea if we could use this consts everywhere else. | 40 | //US ENH: wouldn't it be a good idea if we could use this consts everywhere else. |
41 | //US ENH: for examle in listviewpwm.cpp | 41 | //US ENH: for examle in listviewpwm.cpp |
42 | //US ENH: Because of that I transfer them into the headerfile. | 42 | //US ENH: Because of that I transfer them into the headerfile. |
43 | /* | 43 | /* |
44 | #define COLUMN_DESC 0 | 44 | #define COLUMN_DESC 0 |
45 | #define COLUMN_NAME 1 | 45 | #define COLUMN_NAME 1 |
46 | #define COLUMN_PW 2 | 46 | #define COLUMN_PW 2 |
47 | #define COLUMN_URL 3 | 47 | #define COLUMN_URL 3 |
48 | #define COLUMN_LAUNCHER 4 | 48 | #define COLUMN_LAUNCHER 4 |
49 | */ | 49 | */ |
50 | 50 | ||
51 | PwMView::PwMView(PwM *_mainClass, | 51 | PwMView::PwMView(PwM *_mainClass, |
52 | QWidget *parent, PwMDoc *_doc, | 52 | QWidget *parent, PwMDoc *_doc, |
53 | const char *name) | 53 | const char *name) |
54 | : PwMViewStyle(parent, name) | 54 | : PwMViewStyle(parent, name) |
55 | { | 55 | { |
56 | PWM_ASSERT(_mainClass); | 56 | PWM_ASSERT(_mainClass); |
57 | PWM_ASSERT(parent); | 57 | PWM_ASSERT(parent); |
58 | PWM_ASSERT(_doc); | 58 | PWM_ASSERT(_doc); |
59 | setView(this); | 59 | setView(this); |
60 | doc = _doc; | 60 | doc = _doc; |
61 | doc->setListViewPointer(this); | 61 | doc->setListViewPointer(this); |
62 | mainClass = _mainClass; | 62 | mainClass = _mainClass; |
63 | resize(_mainClass->size()); | 63 | resize(_mainClass->size()); |
64 | initStyle(conf()->confWndMainViewStyle()); | 64 | initStyle(conf()->confWndMainViewStyle()); |
65 | initCtxMenu(); | 65 | initCtxMenu(); |
66 | doc->setCurrentView(this); | 66 | doc->setCurrentView(this); |
67 | connect(doc, SIGNAL(dataChanged(PwMDoc *)), this, SLOT(updateView())); | 67 | connect(doc, SIGNAL(dataChanged(PwMDoc *)), this, SLOT(updateView())); |
68 | } | 68 | } |
69 | 69 | ||
70 | PwMView::~PwMView() | 70 | PwMView::~PwMView() |
71 | { | 71 | { |
72 | } | 72 | } |
73 | 73 | ||
74 | void PwMView::initCtxMenu() | 74 | void PwMView::initCtxMenu() |
75 | { | 75 | { |
76 | ctxMenu = new QPopupMenu(this); | 76 | ctxMenu = new QPopupMenu(this); |
77 | ctxMenu->insertItem(i18n("&Add password"), mainClass, SLOT(addPwd_slot())); | 77 | ctxMenu->insertItem(i18n("&Add password"), mainClass, SLOT(addPwd_slot())); |
78 | ctxMenu->insertSeparator(); | 78 | ctxMenu->insertSeparator(); |
79 | ctxMenu->insertItem(i18n("&Edit"), mainClass, SLOT(editPwd_slot())); | 79 | ctxMenu->insertItem(i18n("&Edit"), mainClass, SLOT(editPwd_slot())); |
80 | ctxMenu->insertItem(i18n("&Delete"), mainClass, SLOT(deletePwd_slot())); | 80 | ctxMenu->insertItem(i18n("&Delete"), mainClass, SLOT(deletePwd_slot())); |
81 | ctxMenu->insertSeparator(); | 81 | ctxMenu->insertSeparator(); |
82 | ctxMenu->insertItem(i18n("copy password to clipboard"), | 82 | ctxMenu->insertItem(i18n("copy password to clipboard"), |
83 | this, SLOT(copyPwToClip())); | 83 | this, SLOT(copyPwToClip())); |
84 | ctxMenu->insertItem(i18n("copy username to clipboard"), | 84 | ctxMenu->insertItem(i18n("copy username to clipboard"), |
85 | this, SLOT(copyNameToClip())); | 85 | this, SLOT(copyNameToClip())); |
86 | ctxMenu->insertItem(i18n("copy description to clipboard"), | 86 | ctxMenu->insertItem(i18n("copy description to clipboard"), |
87 | this, SLOT(copyDescToClip())); | 87 | this, SLOT(copyDescToClip())); |
88 | ctxMenu->insertItem(i18n("copy url to clipboard"), | 88 | ctxMenu->insertItem(i18n("copy url to clipboard"), |
89 | this, SLOT(copyUrlToClip())); | 89 | this, SLOT(copyUrlToClip())); |
90 | ctxMenu->insertItem(i18n("copy launcher to clipboard"), | 90 | ctxMenu->insertItem(i18n("copy launcher to clipboard"), |
91 | this, SLOT(copyLauncherToClip())); | 91 | this, SLOT(copyLauncherToClip())); |
92 | ctxMenu->insertItem(i18n("copy comment to clipboard"), | 92 | ctxMenu->insertItem(i18n("copy comment to clipboard"), |
93 | this, SLOT(copyCommentToClip())); | 93 | this, SLOT(copyCommentToClip())); |
94 | ctxMenu->insertSeparator(); | 94 | ctxMenu->insertSeparator(); |
95 | ctxMenu->insertItem(i18n("Execute \"Launcher\""), mainClass, | 95 | ctxMenu->insertItem(i18n("Execute \"Launcher\""), mainClass, |
96 | SLOT(execLauncher_slot())); | 96 | SLOT(execLauncher_slot())); |
97 | ctxMenu->insertItem(i18n("Go to \"URL\""), mainClass, | 97 | ctxMenu->insertItem(i18n("Go to \"URL\""), mainClass, |
98 | SLOT(goToURL_slot())); | 98 | SLOT(goToURL_slot())); |
99 | } | 99 | } |
100 | 100 | ||
101 | void PwMView::resizeEvent(QResizeEvent *) | 101 | void PwMView::resizeEvent(QResizeEvent *) |
102 | { | 102 | { |
103 | resizeView(size()); | 103 | resizeView(size()); |
104 | } | 104 | } |
105 | 105 | ||
106 | void PwMView::refreshCommentTextEdit(QListViewItem *curItem) | 106 | void PwMView::refreshCommentTextEdit(QListViewItem *curItem) |
107 | { | 107 | { |
108 | PWM_ASSERT(commentBox); | 108 | PWM_ASSERT(commentBox); |
109 | if (!curItem) | 109 | if (!curItem) |
110 | return; | 110 | return; |
111 | string comment; | 111 | string comment; |
112 | PwMerror ret; | 112 | PwMerror ret; |
113 | ret = document()->getCommentByLvp(getCurrentCategory(), | 113 | ret = document()->getCommentByLvp(getCurrentCategory(), |
114 | lv->childCount() - lv->itemIndex(curItem) - 1, | 114 | lv->childCount() - lv->itemIndex(curItem) - 1, |
115 | &comment); | 115 | &comment); |
116 | if (ret == e_binEntry) { | 116 | if (ret == e_binEntry) { |
117 | commentBox->setContent(i18n("This is a binary entry.\n" | 117 | commentBox->setContent(i18n("This is a binary entry.\n" |
118 | "It is not a normal password-entry, as it contains " | 118 | "It is not a normal password-entry, as it contains " |
119 | "binary data, which PwManager can't display here.")); | 119 | "binary data, which PwManager can't display here.")); |
120 | } else if (ret == e_normalEntry) { | 120 | } else if (ret == e_normalEntry) { |
121 | commentBox->setContent(comment.c_str()); | 121 | commentBox->setContent(comment.c_str()); |
122 | } else { | 122 | } else { |
123 | BUG(); | 123 | BUG(); |
124 | return; | 124 | return; |
125 | } | 125 | } |
126 | lv->ensureItemVisible(curItem); | 126 | lv->ensureItemVisible(curItem); |
127 | } | 127 | } |
128 | 128 | ||
129 | void PwMView::keyReleaseEvent(QKeyEvent * /*e*/) | 129 | void PwMView::keyReleaseEvent(QKeyEvent * /*e*/) |
130 | { | 130 | { |
131 | refreshCommentTextEdit(lv->currentItem()); | 131 | refreshCommentTextEdit(lv->currentItem()); |
132 | } | 132 | } |
133 | 133 | ||
134 | bool PwMView::getCurEntryIndex(unsigned int *index) | 134 | bool PwMView::getCurEntryIndex(unsigned int *index) |
135 | { | 135 | { |
136 | QListViewItem *current = lv->currentItem(); | 136 | QListViewItem *current = lv->currentItem(); |
137 | if (!current) | 137 | if (!current) |
138 | return false; | 138 | return false; |
139 | return getDocEntryIndex(index, current); | 139 | return getDocEntryIndex(index, current); |
140 | } | 140 | } |
141 | 141 | ||
142 | bool PwMView::getDocEntryIndex(unsigned int *index, | 142 | bool PwMView::getDocEntryIndex(unsigned int *index, |
143 | const QListViewItem *item) | 143 | const QListViewItem *item) |
144 | { | 144 | { |
145 | vector<unsigned int> foundPositions; | 145 | vector<unsigned int> foundPositions; |
146 | PwMDataItem curItem; | 146 | PwMDataItem curItem; |
147 | curItem.desc = item->text(COLUMN_DESC).latin1(); | 147 | curItem.desc = item->text(COLUMN_DESC).latin1(); |
148 | curItem.name = item->text(COLUMN_NAME).latin1(); | 148 | curItem.name = item->text(COLUMN_NAME).latin1(); |
149 | document()->getCommentByLvp(getCurrentCategory(), | 149 | document()->getCommentByLvp(getCurrentCategory(), |
150 | lv->childCount() - lv->itemIndex(item) - 1, | 150 | lv->childCount() - lv->itemIndex(item) - 1, |
151 | &curItem.comment); | 151 | &curItem.comment); |
152 | curItem.url = item->text(COLUMN_URL).latin1(); | 152 | curItem.url = item->text(COLUMN_URL).latin1(); |
153 | curItem.launcher = item->text(COLUMN_LAUNCHER).latin1(); | 153 | curItem.launcher = item->text(COLUMN_LAUNCHER).latin1(); |
154 | document()->findEntry(getCurrentCategory(), curItem, SEARCH_IN_DESC | | 154 | document()->findEntry(getCurrentCategory(), curItem, SEARCH_IN_DESC | |
155 | SEARCH_IN_NAME | SEARCH_IN_COMMENT | SEARCH_IN_URL | | 155 | SEARCH_IN_NAME | SEARCH_IN_COMMENT | SEARCH_IN_URL | |
156 | SEARCH_IN_LAUNCHER, | 156 | SEARCH_IN_LAUNCHER, |
157 | &foundPositions, true); | 157 | &foundPositions, true); |
158 | if (foundPositions.size()) { | 158 | if (foundPositions.size()) { |
159 | *index = foundPositions[0]; | 159 | *index = foundPositions[0]; |
160 | return true; | 160 | return true; |
161 | } | 161 | } |
162 | 162 | ||
163 | return false; | 163 | return false; |
164 | } | 164 | } |
165 | 165 | ||
166 | void PwMView::handleToggle(QListViewItem *item) | 166 | void PwMView::handleToggle(QListViewItem *item) |
167 | { | 167 | { |
168 | PWM_ASSERT(doc); | 168 | PWM_ASSERT(doc); |
169 | if (!item) | 169 | if (!item) |
170 | return; | 170 | return; |
171 | QCheckListItem *clItem = (QCheckListItem *)item; | 171 | QCheckListItem *clItem = (QCheckListItem *)item; |
172 | QString curCat(getCurrentCategory()); | 172 | QString curCat(getCurrentCategory()); |
173 | 173 | ||
174 | // find document position of this entry. | 174 | // find document position of this entry. |
175 | unsigned int curEntryDocIndex; | 175 | unsigned int curEntryDocIndex; |
176 | if (!getDocEntryIndex(&curEntryDocIndex, item)) | 176 | if (!getDocEntryIndex(&curEntryDocIndex, item)) |
177 | return; | 177 | return; |
178 | 178 | ||
179 | // hack to refresh the comment, if only one item is present | 179 | // hack to refresh the comment, if only one item is present |
180 | if (lv->childCount() == 1) | 180 | if (lv->childCount() == 1) |
181 | refreshCommentTextEdit(lv->currentItem()); | 181 | refreshCommentTextEdit(lv->currentItem()); |
182 | 182 | ||
183 | if (doc->isLocked(curCat, curEntryDocIndex) != clItem->isOn()) | 183 | if (doc->isLocked(curCat, curEntryDocIndex) != clItem->isOn()) |
184 | return; // this is just a click somewhere on the entry | 184 | return; // this is just a click somewhere on the entry |
185 | if (doc->isDeepLocked()) { | 185 | if (doc->isDeepLocked()) { |
186 | PwMerror ret; | 186 | PwMerror ret; |
187 | ret = doc->deepLock(false); | 187 | ret = doc->deepLock(false); |
188 | if (ret != e_success) | 188 | if (ret != e_success) |
189 | clItem->setOn(false); | 189 | clItem->setOn(false); |
190 | return; | 190 | return; |
191 | } | 191 | } |
192 | doc->lockAt(curCat, curEntryDocIndex, !clItem->isOn()); | 192 | doc->lockAt(curCat, curEntryDocIndex, !clItem->isOn()); |
193 | } | 193 | } |
194 | 194 | ||
195 | void PwMView::handleRightClick(QListViewItem *item, const QPoint &point, int) | 195 | void PwMView::handleRightClick(QListViewItem *item, const QPoint &point, int) |
196 | { | 196 | { |
197 | if (!item) | 197 | if (!item) |
198 | return; | 198 | return; |
199 | ctxMenu->move(point); | 199 | ctxMenu->move(point); |
200 | /* don't use ctxMenu->exec() here, as it generates race conditions | 200 | /* don't use ctxMenu->exec() here, as it generates race conditions |
201 | * with the card interface code. Believe it or not. :) | 201 | * with the card interface code. Believe it or not. :) |
202 | */ | 202 | */ |
203 | ctxMenu->show(); | 203 | ctxMenu->show(); |
204 | } | 204 | } |
205 | 205 | ||
206 | void PwMView::updateCategories() | 206 | void PwMView::updateCategories() |
207 | { | 207 | { |
208 | qDebug("PwMView::updateCategories() "); | ||
208 | QString oldSel(getCurrentCategory()); | 209 | QString oldSel(getCurrentCategory()); |
209 | delAllCategories(); | 210 | delAllCategories(); |
210 | QStringList catList; | 211 | QStringList catList; |
211 | document()->getCategoryList(&catList); | 212 | document()->getCategoryList(&catList); |
212 | catList.sort(); | 213 | catList.sort(); |
213 | #ifndef PWM_EMBEDDED | 214 | #ifndef PWM_EMBEDDED |
214 | QStringList::iterator i = catList.begin(), | 215 | QStringList::iterator i = catList.begin(), |
215 | end = catList.end(); | 216 | end = catList.end(); |
216 | #else | 217 | #else |
217 | QStringList::Iterator i = catList.begin(), | 218 | QStringList::Iterator i = catList.begin(), |
218 | end = catList.end(); | 219 | end = catList.end(); |
219 | #endif | 220 | #endif |
220 | while (i != end) { | 221 | while (i != end) { |
221 | addCategory(*i); | 222 | addCategory(*i); |
222 | ++i; | 223 | ++i; |
223 | } | 224 | } |
224 | selectCategory(oldSel); | 225 | selectCategory(oldSel); |
225 | } | 226 | } |
226 | 227 | ||
227 | void PwMView::shiftToView() | 228 | void PwMView::shiftToView() |
228 | { | 229 | { |
229 | int cX = lv->contentsX(); | 230 | int cX = lv->contentsX(); |
230 | int cY = lv->contentsY(); | 231 | int cY = lv->contentsY(); |
231 | commentBox->clear(); | 232 | commentBox->clear(); |
232 | 233 | ||
233 | unsigned int catDocIndex; | 234 | unsigned int catDocIndex; |
234 | if (unlikely( | 235 | if (unlikely( |
235 | !(document()->findCategory(getCurrentCategory(), | 236 | !(document()->findCategory(getCurrentCategory(), |
236 | &catDocIndex)))) { | 237 | &catDocIndex)))) { |
237 | BUG(); | 238 | BUG(); |
238 | } | 239 | } |
239 | 240 | ||
240 | // ensure all listViewPos are set | 241 | // ensure all listViewPos are set |
241 | doc->ensureLvp(); | 242 | doc->ensureLvp(); |
242 | 243 | ||
243 | // clear all tmp-data vectors | 244 | // clear all tmp-data vectors |
244 | unsigned int i, entries = doc->numEntries(catDocIndex); | 245 | unsigned int i, entries = doc->numEntries(catDocIndex); |
245 | if (entries) { | 246 | if (entries) { |
246 | mainClass->setVirgin(false); | 247 | mainClass->setVirgin(false); |
247 | } | 248 | } |
248 | vector<PwMDataItem> tmpSorted; | 249 | vector<PwMDataItem> tmpSorted; |
249 | PwMDataItem currItem; | 250 | PwMDataItem currItem; |
250 | currItem.clear(); | 251 | currItem.clear(); |
251 | tmpSorted.insert(tmpSorted.begin(), entries, currItem); | 252 | tmpSorted.insert(tmpSorted.begin(), entries, currItem); |
252 | 253 | ||
253 | // Sort items and store them in tempoary tmpSorted. | 254 | // Sort items and store them in tempoary tmpSorted. |
254 | for (i = 0; i < entries; ++i) { | 255 | for (i = 0; i < entries; ++i) { |
255 | doc->getEntry(catDocIndex, i, &currItem); | 256 | doc->getEntry(catDocIndex, i, &currItem); |
256 | //qDebug("PwMView::shiftToView: %s, %i", currItem.desc.c_str(), currItem.listViewPos); | 257 | //qDebug("PwMView::shiftToView: %s, %i", currItem.desc.c_str(), currItem.listViewPos); |
257 | tmpSorted[currItem.listViewPos] = currItem; | 258 | tmpSorted[currItem.listViewPos] = currItem; |
258 | } | 259 | } |
259 | 260 | ||
260 | // shift tempoary data to ListView. | 261 | // shift tempoary data to ListView. |
261 | tmpDisableSort(); | 262 | tmpDisableSort(); |
262 | lv->clear(); | 263 | lv->clear(); |
263 | 264 | ||
264 | //US ENH: adjust the headers of the table according the category texts | 265 | //US ENH: adjust the headers of the table according the category texts |
265 | { | 266 | { |
266 | PwMCategoryItem* catItem = doc->getCategoryEntry(catDocIndex); | 267 | PwMCategoryItem* catItem = doc->getCategoryEntry(catDocIndex); |
267 | // qDebug("PwMView::ShiftToView CAT: %i, %s", catDocIndex, catItem->name.c_str()); | 268 | // qDebug("PwMView::ShiftToView CAT: %i, %s", catDocIndex, catItem->name.c_str()); |
268 | lv->setColumnText(COLUMN_DESC, catItem->desc_text.c_str()); | 269 | lv->setColumnText(COLUMN_DESC, catItem->desc_text.c_str()); |
269 | lv->setColumnText(COLUMN_NAME, catItem->name_text.c_str()); | 270 | lv->setColumnText(COLUMN_NAME, catItem->name_text.c_str()); |
270 | lv->setColumnText(COLUMN_PW, catItem->pw_text.c_str()); | 271 | lv->setColumnText(COLUMN_PW, catItem->pw_text.c_str()); |
271 | } | 272 | } |
272 | 273 | ||
273 | QCheckListItem *newItem; | 274 | QCheckListItem *newItem; |
274 | vector<PwMDataItem>::iterator it = tmpSorted.begin(), | 275 | vector<PwMDataItem>::iterator it = tmpSorted.begin(), |
275 | end = tmpSorted.end(); | 276 | end = tmpSorted.end(); |
276 | while (it != end) { | 277 | while (it != end) { |
277 | newItem = new ListViewItemPwM(lv); | 278 | newItem = new ListViewItemPwM(lv); |
278 | newItem->setText(COLUMN_DESC, (*it).desc.c_str()); | 279 | newItem->setText(COLUMN_DESC, (*it).desc.c_str()); |
279 | if ((*it).binary) { | 280 | if ((*it).binary) { |
280 | newItem->setText(COLUMN_NAME, ""); | 281 | newItem->setText(COLUMN_NAME, ""); |
281 | newItem->setText(COLUMN_PW, i18n("<BINARY ENTRY>")); | 282 | newItem->setText(COLUMN_PW, i18n("<BINARY ENTRY>")); |
282 | newItem->setText(COLUMN_URL, ""); | 283 | newItem->setText(COLUMN_URL, ""); |
283 | newItem->setText(COLUMN_LAUNCHER, (*it).launcher.c_str()); | 284 | newItem->setText(COLUMN_LAUNCHER, (*it).launcher.c_str()); |
284 | } else { | 285 | } else { |
285 | newItem->setText(COLUMN_NAME, (*it).name.c_str()); | 286 | newItem->setText(COLUMN_NAME, (*it).name.c_str()); |
286 | if ((*it).lockStat) { | 287 | if ((*it).lockStat) { |
287 | newItem->setText(COLUMN_PW, QString((*it).pw.c_str()) | 288 | newItem->setText(COLUMN_PW, QString((*it).pw.c_str()) |
288 | + " " | 289 | + " " |
289 | + i18n("To unlock click the icon on the left.")); | 290 | + i18n("To unlock click the icon on the left.")); |
290 | } else { | 291 | } else { |
291 | newItem->setText(COLUMN_PW, (*it).pw.c_str()); | 292 | newItem->setText(COLUMN_PW, (*it).pw.c_str()); |
292 | } | 293 | } |
293 | newItem->setText(COLUMN_URL, (*it).url.c_str()); | 294 | newItem->setText(COLUMN_URL, (*it).url.c_str()); |
294 | newItem->setText(COLUMN_LAUNCHER, (*it).launcher.c_str()); | 295 | newItem->setText(COLUMN_LAUNCHER, (*it).launcher.c_str()); |
295 | } | 296 | } |
296 | newItem->setOn(!((*it).lockStat)); | 297 | newItem->setOn(!((*it).lockStat)); |
297 | lv->insertItem(newItem); | 298 | lv->insertItem(newItem); |
298 | ++it; | 299 | ++it; |
299 | } | 300 | } |
300 | tmpReEnableSort(); | 301 | tmpReEnableSort(); |
301 | 302 | ||
302 | if (cY || cX) | 303 | if (cY || cX) |
303 | lv->setContentsPos(cX, cY); | 304 | lv->setContentsPos(cX, cY); |
304 | } | 305 | } |
305 | 306 | ||
306 | void PwMView::reorgLp() | 307 | void PwMView::reorgLp() |
307 | { | 308 | { |
308 | if (!lv->childCount()) | 309 | if (!lv->childCount()) |
309 | return; | 310 | return; |
310 | PWM_ASSERT(doc); | 311 | PWM_ASSERT(doc); |
311 | PWM_ASSERT(!doc->isDocEmpty()); | 312 | PWM_ASSERT(!doc->isDocEmpty()); |
312 | QListViewItem *currItem; | 313 | QListViewItem *currItem; |
313 | vector<unsigned int> foundPos; | 314 | vector<unsigned int> foundPos; |
314 | /* This searchIn _should_ be: | 315 | /* This searchIn _should_ be: |
315 | *const unsigned int searchIn = SEARCH_IN_DESC; | 316 | *const unsigned int searchIn = SEARCH_IN_DESC; |
316 | * But we want backward compatibility (see comment in PwMDoc::addEntry()). | 317 | * But we want backward compatibility (see comment in PwMDoc::addEntry()). |
317 | * So we need to search again, if we don't find the entry. (see below) | 318 | * So we need to search again, if we don't find the entry. (see below) |
318 | */ | 319 | */ |
319 | const unsigned int searchIn = SEARCH_IN_DESC | SEARCH_IN_NAME | | 320 | const unsigned int searchIn = SEARCH_IN_DESC | SEARCH_IN_NAME | |
320 | SEARCH_IN_URL | SEARCH_IN_LAUNCHER; | 321 | SEARCH_IN_URL | SEARCH_IN_LAUNCHER; |
321 | QString curCat(getCurrentCategory()); | 322 | QString curCat(getCurrentCategory()); |
322 | PwMDataItem findThis; | 323 | PwMDataItem findThis; |
323 | unsigned int i, cnt = lv->childCount(); | 324 | unsigned int i, cnt = lv->childCount(); |
324 | for (i = 0; i < cnt; ++i) { | 325 | for (i = 0; i < cnt; ++i) { |
325 | currItem = lv->itemAtIndex(i); | 326 | currItem = lv->itemAtIndex(i); |
326 | findThis.desc = currItem->text(COLUMN_DESC).latin1(); | 327 | findThis.desc = currItem->text(COLUMN_DESC).latin1(); |
327 | findThis.name = currItem->text(COLUMN_NAME).latin1(); | 328 | findThis.name = currItem->text(COLUMN_NAME).latin1(); |
328 | findThis.url = currItem->text(COLUMN_URL).latin1(); | 329 | findThis.url = currItem->text(COLUMN_URL).latin1(); |
329 | findThis.launcher = currItem->text(COLUMN_LAUNCHER).latin1(); | 330 | findThis.launcher = currItem->text(COLUMN_LAUNCHER).latin1(); |
330 | doc->findEntry(curCat, findThis, searchIn, | 331 | doc->findEntry(curCat, findThis, searchIn, |
331 | &foundPos, true); | 332 | &foundPos, true); |
332 | if (!foundPos.size()) { | 333 | if (!foundPos.size()) { |
333 | /* Did not find the entry. We seem to have a binary | 334 | /* Did not find the entry. We seem to have a binary |
334 | * entry here (pray for it!). So search again with | 335 | * entry here (pray for it!). So search again with |
335 | * the "correct" searchIn flags. | 336 | * the "correct" searchIn flags. |
336 | */ | 337 | */ |
337 | const unsigned int searchIn2 = SEARCH_IN_DESC; | 338 | const unsigned int searchIn2 = SEARCH_IN_DESC; |
338 | doc->findEntry(curCat, findThis, searchIn2, | 339 | doc->findEntry(curCat, findThis, searchIn2, |
339 | &foundPos, true); | 340 | &foundPos, true); |
340 | if (unlikely(!foundPos.size())) { | 341 | if (unlikely(!foundPos.size())) { |
341 | BUG(); | 342 | BUG(); |
342 | continue; | 343 | continue; |
343 | } | 344 | } |
344 | /* We assert that it's a binary entry, now. | 345 | /* We assert that it's a binary entry, now. |
345 | * No chance to efficiently verify it here. | 346 | * No chance to efficiently verify it here. |
346 | */ | 347 | */ |
347 | } | 348 | } |
348 | doc->setListViewPos(curCat, foundPos[0], cnt - i - 1); | 349 | doc->setListViewPos(curCat, foundPos[0], cnt - i - 1); |
349 | } | 350 | } |
350 | } | 351 | } |
351 | 352 | ||
352 | void PwMView::selAt(int index) | 353 | void PwMView::selAt(int index) |
353 | { | 354 | { |
354 | QListViewItem *item = lv->itemAtIndex(index); | 355 | QListViewItem *item = lv->itemAtIndex(index); |
355 | if (!item) | 356 | if (!item) |
356 | return; | 357 | return; |
357 | lv->setCurrentItem(item); | 358 | lv->setCurrentItem(item); |
358 | lv->ensureItemVisible(item); | 359 | lv->ensureItemVisible(item); |
359 | } | 360 | } |
360 | 361 | ||
361 | void PwMView::renCatButton_slot() | 362 | void PwMView::renCatButton_slot() |
362 | { | 363 | { |
363 | if (doc->isDeepLocked()) | 364 | if (doc->isDeepLocked()) |
364 | return; | 365 | return; |
365 | RenCatWnd wnd(this); | 366 | RenCatWnd wnd(this); |
366 | if (wnd.exec() == 1) { | 367 | if (wnd.exec() == 1) { |
367 | QString newName(wnd.getNewName()); | 368 | QString newName(wnd.getNewName()); |
368 | if (newName == "") | 369 | if (newName == "") |
369 | return; | 370 | return; |
370 | document()->renameCategory(getCurrentCategory(), | 371 | document()->renameCategory(getCurrentCategory(), |
371 | newName); | 372 | newName); |
372 | } | 373 | } |
373 | } | 374 | } |
374 | 375 | ||
375 | void PwMView::delCatButton_slot() | 376 | void PwMView::delCatButton_slot() |
376 | { | 377 | { |
377 | if (doc->isDeepLocked()) | 378 | if (doc->isDeepLocked()) |
378 | return; | 379 | return; |
379 | if (numCategories() <= 1) { | 380 | if (numCategories() <= 1) { |
380 | mainClass->showStatMsg(i18n("Can't remove the last category.")); | 381 | mainClass->showStatMsg(i18n("Can't remove the last category.")); |
381 | return; | 382 | return; |
382 | } | 383 | } |
383 | if (KMessageBox::questionYesNo(this, | 384 | if (KMessageBox::questionYesNo(this, |
384 | i18n("Do you really want to\n" | 385 | i18n("Do you really want to\n" |
385 | "delete the selected\n" | 386 | "delete the selected\n" |
386 | "category? All password-\n" | 387 | "category? All password-\n" |
387 | "entries will be lost in\n" | 388 | "entries will be lost in\n" |
388 | "this category!\n"), | 389 | "this category!\n"), |
389 | i18n("Delete category?")) | 390 | i18n("Delete category?")) |
390 | == KMessageBox::No) { | 391 | == KMessageBox::No) { |
391 | return; | 392 | return; |
392 | } | 393 | } |
393 | document()->delCategory(getCurrentCategory()); | 394 | document()->delCategory(getCurrentCategory()); |
394 | } | 395 | } |
395 | 396 | ||
396 | void PwMView::copyPwToClip() | 397 | void PwMView::copyPwToClip() |
397 | { | 398 | { |
398 | if (doc->isDeepLocked()) | 399 | if (doc->isDeepLocked()) |
399 | return; | 400 | return; |
400 | unsigned int curIndex = 0; | 401 | unsigned int curIndex = 0; |
401 | if (!getCurEntryIndex(&curIndex)) | 402 | if (!getCurEntryIndex(&curIndex)) |
402 | return; | 403 | return; |
403 | PwMDataItem d; | 404 | PwMDataItem d; |
404 | document()->getDataChangedLock(); | 405 | document()->getDataChangedLock(); |
405 | document()->getEntry(getCurrentCategory(), curIndex, &d, true); | 406 | document()->getEntry(getCurrentCategory(), curIndex, &d, true); |
406 | document()->putDataChangedLock(); | 407 | document()->putDataChangedLock(); |
407 | PwM::copyToClipboard(d.pw.c_str()); | 408 | PwM::copyToClipboard(d.pw.c_str()); |
408 | } | 409 | } |
409 | 410 | ||
410 | void PwMView::copyNameToClip() | 411 | void PwMView::copyNameToClip() |
411 | { | 412 | { |
412 | if (doc->isDeepLocked()) | 413 | if (doc->isDeepLocked()) |
413 | return; | 414 | return; |
414 | unsigned int curIndex = 0; | 415 | unsigned int curIndex = 0; |
415 | if (!getCurEntryIndex(&curIndex)) | 416 | if (!getCurEntryIndex(&curIndex)) |
416 | return; | 417 | return; |
417 | PwMDataItem d; | 418 | PwMDataItem d; |
418 | document()->getEntry(getCurrentCategory(), curIndex, &d); | 419 | document()->getEntry(getCurrentCategory(), curIndex, &d); |
419 | PwM::copyToClipboard(d.name.c_str()); | 420 | PwM::copyToClipboard(d.name.c_str()); |
420 | } | 421 | } |
421 | 422 | ||
422 | void PwMView::copyDescToClip() | 423 | void PwMView::copyDescToClip() |
423 | { | 424 | { |
424 | if (doc->isDeepLocked()) | 425 | if (doc->isDeepLocked()) |
425 | return; | 426 | return; |
426 | unsigned int curIndex = 0; | 427 | unsigned int curIndex = 0; |
427 | if (!getCurEntryIndex(&curIndex)) | 428 | if (!getCurEntryIndex(&curIndex)) |
428 | return; | 429 | return; |
429 | PwMDataItem d; | 430 | PwMDataItem d; |
430 | document()->getEntry(getCurrentCategory(), curIndex, &d); | 431 | document()->getEntry(getCurrentCategory(), curIndex, &d); |
431 | PwM::copyToClipboard(d.desc.c_str()); | 432 | PwM::copyToClipboard(d.desc.c_str()); |
432 | } | 433 | } |
433 | 434 | ||
434 | void PwMView::copyUrlToClip() | 435 | void PwMView::copyUrlToClip() |
435 | { | 436 | { |
436 | if (doc->isDeepLocked()) | 437 | if (doc->isDeepLocked()) |
437 | return; | 438 | return; |
438 | unsigned int curIndex = 0; | 439 | unsigned int curIndex = 0; |
439 | if (!getCurEntryIndex(&curIndex)) | 440 | if (!getCurEntryIndex(&curIndex)) |
440 | return; | 441 | return; |
441 | PwMDataItem d; | 442 | PwMDataItem d; |
442 | document()->getEntry(getCurrentCategory(), curIndex, &d); | 443 | document()->getEntry(getCurrentCategory(), curIndex, &d); |
443 | PwM::copyToClipboard(d.url.c_str()); | 444 | PwM::copyToClipboard(d.url.c_str()); |
444 | } | 445 | } |
445 | 446 | ||
446 | void PwMView::copyLauncherToClip() | 447 | void PwMView::copyLauncherToClip() |
447 | { | 448 | { |
448 | if (doc->isDeepLocked()) | 449 | if (doc->isDeepLocked()) |
449 | return; | 450 | return; |
450 | unsigned int curIndex = 0; | 451 | unsigned int curIndex = 0; |
451 | if (!getCurEntryIndex(&curIndex)) | 452 | if (!getCurEntryIndex(&curIndex)) |
452 | return; | 453 | return; |
453 | PwMDataItem d; | 454 | PwMDataItem d; |
454 | document()->getEntry(getCurrentCategory(), curIndex, &d); | 455 | document()->getEntry(getCurrentCategory(), curIndex, &d); |
455 | PwM::copyToClipboard(d.launcher.c_str()); | 456 | PwM::copyToClipboard(d.launcher.c_str()); |
456 | } | 457 | } |
457 | 458 | ||
458 | void PwMView::copyCommentToClip() | 459 | void PwMView::copyCommentToClip() |
459 | { | 460 | { |
460 | if (doc->isDeepLocked()) | 461 | if (doc->isDeepLocked()) |
461 | return; | 462 | return; |
462 | unsigned int curIndex = 0; | 463 | unsigned int curIndex = 0; |
463 | if (!getCurEntryIndex(&curIndex)) | 464 | if (!getCurEntryIndex(&curIndex)) |
464 | return; | 465 | return; |
465 | PwMDataItem d; | 466 | PwMDataItem d; |
466 | document()->getEntry(getCurrentCategory(), curIndex, &d); | 467 | document()->getEntry(getCurrentCategory(), curIndex, &d); |
467 | PwM::copyToClipboard(d.comment.c_str()); | 468 | PwM::copyToClipboard(d.comment.c_str()); |
468 | } | 469 | } |
469 | 470 | ||
470 | /************************************************************************ | 471 | /************************************************************************ |
471 | * | 472 | * |
472 | * | 473 | * |
473 | * | 474 | * |
474 | ************************************************************************/ | 475 | ************************************************************************/ |
475 | 476 | ||
476 | 477 | ||
477 | PwMDataItemView::PwMDataItemView( QWidget *parent, const char *name ) | 478 | PwMDataItemView::PwMDataItemView( QWidget *parent, const char *name ) |
478 | : QTextBrowser( parent, name ) | 479 | : QTextBrowser( parent, name ) |
479 | 480 | ||
480 | 481 | ||
481 | { | 482 | { |
482 | //US setWrapPolicy( QTextEdit::AtWordBoundary ); | 483 | //US setWrapPolicy( QTextEdit::AtWordBoundary ); |
483 | setLinkUnderline( false ); | 484 | setLinkUnderline( false ); |
484 | // setVScrollBarMode( QScrollView::AlwaysOff ); | 485 | // setVScrollBarMode( QScrollView::AlwaysOff ); |
485 | //setHScrollBarMode( QScrollView::AlwaysOff ); | 486 | //setHScrollBarMode( QScrollView::AlwaysOff ); |
486 | 487 | ||
487 | //US QStyleSheet *sheet = styleSheet(); | 488 | //US QStyleSheet *sheet = styleSheet(); |
488 | //US QStyleSheetItem *link = sheet->item( "a" ); | 489 | //US QStyleSheetItem *link = sheet->item( "a" ); |
489 | //US link->setColor( KGlobalSettings::linkColor() ); | 490 | //US link->setColor( KGlobalSettings::linkColor() ); |
490 | 491 | ||
491 | } | 492 | } |
492 | 493 | ||
493 | void PwMDataItemView::setPwMDataItem( const PwMDataItem& a ) | 494 | void PwMDataItemView::setPwMDataItem( const PwMDataItem& a ) |
494 | 495 | ||
495 | { | 496 | { |
496 | mItem = a; | 497 | mItem = a; |
497 | // clear view | 498 | // clear view |
498 | setText( QString::null ); | 499 | setText( QString::null ); |
499 | 500 | ||
500 | 501 | ||
501 | QString dynamicPart; | 502 | QString dynamicPart; |
502 | QString format = "<tr><td align=\"right\"><b>%1</b></td>" | 503 | QString format = "<tr><td align=\"right\"><b>%1</b></td>" |
503 | "<td align=\"left\">%2</td></tr>"; | 504 | "<td align=\"left\">%2</td></tr>"; |
504 | 505 | ||
505 | dynamicPart += format | 506 | dynamicPart += format |
506 | .arg( i18n("LastUpdate") ) | 507 | .arg( i18n("LastUpdate") ) |
507 | .arg( mItem.meta.update.toString().latin1() ); | 508 | .arg( mItem.meta.update.toString().latin1() ); |
508 | 509 | ||
509 | dynamicPart += format | 510 | dynamicPart += format |
510 | .arg( i18n("Description") ) | 511 | .arg( i18n("Description") ) |
511 | .arg( mItem.desc.c_str() ); | 512 | .arg( mItem.desc.c_str() ); |
512 | 513 | ||
513 | dynamicPart += format | 514 | dynamicPart += format |
514 | .arg( i18n("Name") ) | 515 | .arg( i18n("Name") ) |
515 | .arg( mItem.name.c_str() ); | 516 | .arg( mItem.name.c_str() ); |
516 | 517 | ||
517 | dynamicPart += format | 518 | dynamicPart += format |
518 | .arg( i18n("Password") ) | 519 | .arg( i18n("Password") ) |
519 | .arg( mItem.pw.c_str() ); | 520 | .arg( mItem.pw.c_str() ); |
520 | 521 | ||
521 | QString comment(mItem.pw.c_str()); | 522 | QString comment(mItem.pw.c_str()); |
522 | dynamicPart += format | 523 | dynamicPart += format |
523 | .arg( i18n("Comment") ) | 524 | .arg( i18n("Comment") ) |
524 | .arg( comment.replace( QRegExp("\n"), "<br>" ) ); | 525 | .arg( comment.replace( QRegExp("\n"), "<br>" ) ); |
525 | 526 | ||
526 | dynamicPart += format | 527 | dynamicPart += format |
527 | .arg( i18n("URL") ) | 528 | .arg( i18n("URL") ) |
528 | .arg( mItem.url.c_str() ); | 529 | .arg( mItem.url.c_str() ); |
529 | 530 | ||
530 | dynamicPart += format | 531 | dynamicPart += format |
531 | .arg( i18n("Launcher") ) | 532 | .arg( i18n("Launcher") ) |
532 | .arg( mItem.launcher.c_str() ); | 533 | .arg( mItem.launcher.c_str() ); |
533 | 534 | ||
534 | QString mText = "<table><td colspan=\"2\"> </td>"; | 535 | QString mText = "<table><td colspan=\"2\"> </td>"; |
535 | 536 | ||
536 | mText += dynamicPart; | 537 | mText += dynamicPart; |
537 | mText += "</table>"; | 538 | mText += "</table>"; |
538 | 539 | ||
539 | // at last display it... | 540 | // at last display it... |
540 | setText( mText ); | 541 | setText( mText ); |
541 | 542 | ||
542 | } | 543 | } |
543 | 544 | ||
544 | PwMDataItem PwMDataItemView::pwmdataitem() const | 545 | PwMDataItem PwMDataItemView::pwmdataitem() const |
545 | { | 546 | { |
546 | return mItem; | 547 | return mItem; |
547 | } | 548 | } |
548 | 549 | ||
549 | /************************************************************************ | 550 | /************************************************************************ |
550 | * | 551 | * |
551 | * | 552 | * |
552 | * | 553 | * |
553 | ************************************************************************/ | 554 | ************************************************************************/ |
554 | 555 | ||
555 | 556 | ||
556 | PwMDataItemChooser::PwMDataItemChooser( PwMDataItem loc, PwMDataItem rem, bool takeloc, QWidget *parent, const char *name ) | 557 | PwMDataItemChooser::PwMDataItemChooser( PwMDataItem loc, PwMDataItem rem, bool takeloc, QWidget *parent, const char *name ) |
557 | : KDialogBase(parent, name, true , | 558 | : KDialogBase(parent, name, true , |
558 | i18n("Conflict! Please choose Entry!"),Ok|User1|Close,Close, false) | 559 | i18n("Conflict! Please choose Entry!"),Ok|User1|Close,Close, false) |
559 | { | 560 | { |
560 | findButton( Close )->setText( i18n("Cancel Sync")); | 561 | findButton( Close )->setText( i18n("Cancel Sync")); |
561 | findButton( Ok )->setText( i18n("Remote")); | 562 | findButton( Ok )->setText( i18n("Remote")); |
562 | findButton( User1 )->setText( i18n("Local")); | 563 | findButton( User1 )->setText( i18n("Local")); |
563 | QWidget* topframe = new QWidget( this ); | 564 | QWidget* topframe = new QWidget( this ); |
564 | setMainWidget( topframe ); | 565 | setMainWidget( topframe ); |
565 | QBoxLayout* bl; | 566 | QBoxLayout* bl; |
566 | if ( QApplication::desktop()->width() < 640 ) { | 567 | if ( QApplication::desktop()->width() < 640 ) { |
567 | bl = new QVBoxLayout( topframe ); | 568 | bl = new QVBoxLayout( topframe ); |
568 | } else { | 569 | } else { |
569 | bl = new QHBoxLayout( topframe ); | 570 | bl = new QHBoxLayout( topframe ); |
570 | } | 571 | } |
571 | QVBox* subframe = new QVBox( topframe ); | 572 | QVBox* subframe = new QVBox( topframe ); |
572 | bl->addWidget(subframe ); | 573 | bl->addWidget(subframe ); |
573 | QLabel* lab = new QLabel( i18n("Local Entry"), subframe ); | 574 | QLabel* lab = new QLabel( i18n("Local Entry"), subframe ); |
574 | if ( takeloc ) | 575 | if ( takeloc ) |
575 | lab->setBackgroundColor(Qt::green.light() ); | 576 | lab->setBackgroundColor(Qt::green.light() ); |
576 | PwMDataItemView * av = new PwMDataItemView( subframe ); | 577 | PwMDataItemView * av = new PwMDataItemView( subframe ); |
577 | av->setPwMDataItem( loc ); | 578 | av->setPwMDataItem( loc ); |
578 | subframe = new QVBox( topframe ); | 579 | subframe = new QVBox( topframe ); |
579 | bl->addWidget(subframe ); | 580 | bl->addWidget(subframe ); |
580 | lab = new QLabel( i18n("Remote Entry"), subframe ); | 581 | lab = new QLabel( i18n("Remote Entry"), subframe ); |
581 | if ( !takeloc ) | 582 | if ( !takeloc ) |
582 | lab->setBackgroundColor(Qt::green.light() ); | 583 | lab->setBackgroundColor(Qt::green.light() ); |
583 | av = new PwMDataItemView( subframe ); | 584 | av = new PwMDataItemView( subframe ); |
584 | av->setPwMDataItem( rem ); | 585 | av->setPwMDataItem( rem ); |
585 | QObject::connect(findButton( Ok ),SIGNAL(clicked()),this, SLOT(slot_remote())); | 586 | QObject::connect(findButton( Ok ),SIGNAL(clicked()),this, SLOT(slot_remote())); |
586 | QObject::connect(this,SIGNAL(user1Clicked()),this, SLOT(slot_local())); | 587 | QObject::connect(this,SIGNAL(user1Clicked()),this, SLOT(slot_local())); |
587 | #ifndef DESKTOP_VERSION | 588 | #ifndef DESKTOP_VERSION |
588 | showMaximized(); | 589 | showMaximized(); |
589 | #else | 590 | #else |
590 | resize ( 640, 400 ); | 591 | resize ( 640, 400 ); |
591 | #endif | 592 | #endif |
592 | } | 593 | } |
593 | 594 | ||
594 | int PwMDataItemChooser::executeD( bool local ) | 595 | int PwMDataItemChooser::executeD( bool local ) |
595 | { | 596 | { |
596 | mSyncResult = 3; | 597 | mSyncResult = 3; |
597 | if ( local ) | 598 | if ( local ) |
598 | findButton( User1 )->setFocus(); | 599 | findButton( User1 )->setFocus(); |
599 | else | 600 | else |
600 | findButton( Ok )->setFocus(); | 601 | findButton( Ok )->setFocus(); |
601 | exec(); | 602 | exec(); |
602 | return mSyncResult; | 603 | return mSyncResult; |
603 | } | 604 | } |
604 | void PwMDataItemChooser::slot_remote() | 605 | void PwMDataItemChooser::slot_remote() |
605 | { | 606 | { |
606 | mSyncResult = 2; | 607 | mSyncResult = 2; |
607 | accept(); | 608 | accept(); |
608 | } | 609 | } |
609 | void PwMDataItemChooser::slot_local() | 610 | void PwMDataItemChooser::slot_local() |
610 | { | 611 | { |
611 | mSyncResult = 1; | 612 | mSyncResult = 1; |
612 | accept(); | 613 | accept(); |
613 | } | 614 | } |
614 | 615 | ||
615 | 616 | ||
616 | 617 | ||
617 | #ifndef PWM_EMBEDDED | 618 | #ifndef PWM_EMBEDDED |
618 | #include "pwmview.moc" | 619 | #include "pwmview.moc" |
619 | #endif | 620 | #endif |