author | zautrix <zautrix> | 2005-03-03 14:48:33 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-03 14:48:33 (UTC) |
commit | a4ea625087ea7213419828e8decdff48ae231968 (patch) (unidiff) | |
tree | e29565039694702cdc471e76891b2d6c3ac89294 | |
parent | 91feaad38e5f81063fa496a4e2988aa791267fd1 (diff) | |
download | kdepimpi-a4ea625087ea7213419828e8decdff48ae231968.zip kdepimpi-a4ea625087ea7213419828e8decdff48ae231968.tar.gz kdepimpi-a4ea625087ea7213419828e8decdff48ae231968.tar.bz2 |
VINklumpen
-rw-r--r-- | bin/kdepim/WhatsNew.txt | 4 | ||||
-rw-r--r-- | bin/kdepim/pwmanager/germantranslation.txt | 2 | ||||
-rw-r--r-- | bin/kdepim/pwmanager/icons16/decrypted.png | bin | 1009 -> 855 bytes | |||
-rw-r--r-- | bin/kdepim/pwmanager/icons22/decrypted.png | bin | 939 -> 1117 bytes | |||
-rw-r--r-- | pwmanager/pwmanager/addentrywndimpl.cpp | 1 | ||||
-rw-r--r-- | pwmanager/pwmanager/pwm.cpp | 11 | ||||
-rw-r--r-- | pwmanager/pwmanager/pwmviewstyle_0.cpp | 22 | ||||
-rw-r--r-- | pwmanager/pwmanager/pwmviewstyle_1.cpp | 4 |
8 files changed, 29 insertions, 15 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index 11c50f8..657d1de 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt | |||
@@ -1,30 +1,32 @@ | |||
1 | Info about the changes in new versions of KDE-Pim/Pi | 1 | Info about the changes in new versions of KDE-Pim/Pi |
2 | 2 | ||
3 | ********** VERSION 2.0.14 ************ | 3 | ********** VERSION 2.0.14 ************ |
4 | 4 | ||
5 | Made Passwordmanager PwM/Pi more userfriendly: | 5 | Made Passwordmanager PwM/Pi more userfriendly: |
6 | Rearranged some toolbar icons and optimized setting of focus. | 6 | Rearranged some toolbar icons, optimized setting of focus, fixed layout problems and more. |
7 | Fixed bug in KO/Pi todo printing. | ||
8 | Made Qtopia calendar import possible on desktop . | ||
7 | 9 | ||
8 | ********** VERSION 2.0.13 ************ | 10 | ********** VERSION 2.0.13 ************ |
9 | 11 | ||
10 | Fixed a problem in the addressee select dialog and made it more user friendly by adding a minimize splitter. | 12 | Fixed a problem in the addressee select dialog and made it more user friendly by adding a minimize splitter. |
11 | 13 | ||
12 | In the search dialog you can switch now the focus from search line edit to the list view by pressing key "arrow down". | 14 | In the search dialog you can switch now the focus from search line edit to the list view by pressing key "arrow down". |
13 | 15 | ||
14 | OM/Pi: | 16 | OM/Pi: |
15 | Fixed a refresh problem of outgoing/sent/sendfailed folders after sending mails. | 17 | Fixed a refresh problem of outgoing/sent/sendfailed folders after sending mails. |
16 | Added missing German translation. | 18 | Added missing German translation. |
17 | Added warning if path is specified in local folder settings of account config. | 19 | Added warning if path is specified in local folder settings of account config. |
18 | 20 | ||
19 | ********** VERSION 2.0.12 ************ | 21 | ********** VERSION 2.0.12 ************ |
20 | 22 | ||
21 | KO/Pi: | 23 | KO/Pi: |
22 | Fixed a bug in todo start/due date handling for non recurring todos with a start and due date. | 24 | Fixed a bug in todo start/due date handling for non recurring todos with a start and due date. |
23 | Fixed some layout problems in the KO/Pi agenda view when there were many conflicting itmes. | 25 | Fixed some layout problems in the KO/Pi agenda view when there were many conflicting itmes. |
24 | Fixed several problems of the keyboard focus in the desktop versions when opening the search dialog/event viewer. | 26 | Fixed several problems of the keyboard focus in the desktop versions when opening the search dialog/event viewer. |
25 | 27 | ||
26 | Fixed problem in pi-sync mode when wrong password was sent. | 28 | Fixed problem in pi-sync mode when wrong password was sent. |
27 | 29 | ||
28 | OM/Pi: | 30 | OM/Pi: |
29 | Fixed a crash when displaying mails with "Show mail as html" was checked in the config. | 31 | Fixed a crash when displaying mails with "Show mail as html" was checked in the config. |
30 | Added a check before displaying the mail if the mail is in html format, if "Show mail as html" is enabled. | 32 | Added a check before displaying the mail if the mail is in html format, if "Show mail as html" is enabled. |
diff --git a/bin/kdepim/pwmanager/germantranslation.txt b/bin/kdepim/pwmanager/germantranslation.txt index a63be31..ccc9d83 100644 --- a/bin/kdepim/pwmanager/germantranslation.txt +++ b/bin/kdepim/pwmanager/germantranslation.txt | |||
@@ -328,29 +328,29 @@ | |||
328 | { "User defined:","Benutzer definiert:" }, | 328 | { "User defined:","Benutzer definiert:" }, |
329 | { "Password Length:","Passwort Länge:" }, | 329 | { "Password Length:","Passwort Länge:" }, |
330 | { "Enable Filtering to get better passwords","Enable Filtering to get better passwords" }, | 330 | { "Enable Filtering to get better passwords","Enable Filtering to get better passwords" }, |
331 | { "no password","Kein Passwort" }, | 331 | { "no password","Kein Passwort" }, |
332 | { "Sorry, you haven't set a password.","Sorry, Sie haben kein Passwort angegeben." }, | 332 | { "Sorry, you haven't set a password.","Sorry, Sie haben kein Passwort angegeben." }, |
333 | { "not saved, yet","not saved, yet" }, | 333 | { "not saved, yet","not saved, yet" }, |
334 | { "Can't deep-lock, because the document\nhasn't been saved, yet. Please save\nto a file and try again.","Kann nicht tiefsperren, weil das\nDokument noch nicht gespeichert wurde.\nBitte speichern und noch einmal versuchen." }, | 334 | { "Can't deep-lock, because the document\nhasn't been saved, yet. Please save\nto a file and try again.","Kann nicht tiefsperren, weil das\nDokument noch nicht gespeichert wurde.\nBitte speichern und noch einmal versuchen." }, |
335 | { "Find","Finde" }, | 335 | { "Find","Finde" }, |
336 | { "&Exact match","Genaue Übereinstimmung" }, | 336 | { "&Exact match","Genaue Übereinstimmung" }, |
337 | { "&Case sensitive","Großschrift abhängig" }, | 337 | { "&Case sensitive","Großschrift abhängig" }, |
338 | { "Search in Column","Suche in Spalten" }, | 338 | { "Search in Column","Suche in Spalten" }, |
339 | { "&Description","Beschreibung" }, | 339 | { "&Description","Beschreibung" }, |
340 | { "C&omment","Kommentar" }, | 340 | { "C&omment","Kommentar" }, |
341 | { "&Username","Benutzername" }, | 341 | { "&Username","Benutzername" }, |
342 | { "U&RL","URL" }, | 342 | { "U&RL","URL" }, |
343 | { "delete?","Löschen?" }, | 343 | { "delete?","Löschen?" }, |
344 | { "Do you really want to delete\nthe selected entry","Wollen Sie wirklich\nden Eintrag löschen:" }, | 344 | { "Do you really want to delete\nthe selected entry","Wollen Sie wirklich\nden Eintrag löschen:" }, |
345 | { "Save?","Speichern?" }, | 345 | { "Save?","Speichern?" }, |
346 | { ""\nhas been modified.\nDo you want to save it?",""\nwurde geändert.\nMöchten Sie speichern?" }, | 346 | { ""\nhas been modified.\nDo you want to save it?",""\nwurde geändert.\nMöchten Sie speichern?" }, |
347 | { "The list\n "","Die Liste\n "" }, | 347 | { "The list\n "","Die Liste\n "" }, |
348 | { "nothing to do","Nichts zu tun" }, | 348 | { "nothing to do","Nichts zu tun" }, |
349 | { "Sorry, there's nothing to save.\nPlease first add some passwords.","Sorry, es gibt nichts zu speichern.\nBitte erst Passwörter hinzufügen." }, | 349 | { "Sorry, there's nothing to save.\nPlease first add some passwords.","Sorry, es gibt nichts zu speichern.\nBitte erst Passwörter hinzufügen." }, |
350 | { "Add new password","Passwort hinzufügen" }, | 350 | { "Add new password","Passwort hinzufügen" }, |
351 | { "Successfully saved data.","Datei gespeichert." }, | 351 | { "Successfully saved data.","Datei gespeichert." }, |
352 | { "","" }, | 352 | { "Category:","Kategorie:" }, |
353 | { "","" }, | 353 | { "","" }, |
354 | { "","" }, | 354 | { "","" }, |
355 | { "","" }, | 355 | { "","" }, |
356 | 356 | ||
diff --git a/bin/kdepim/pwmanager/icons16/decrypted.png b/bin/kdepim/pwmanager/icons16/decrypted.png index a52d790..3777a12 100644 --- a/bin/kdepim/pwmanager/icons16/decrypted.png +++ b/bin/kdepim/pwmanager/icons16/decrypted.png | |||
Binary files differ | |||
diff --git a/bin/kdepim/pwmanager/icons22/decrypted.png b/bin/kdepim/pwmanager/icons22/decrypted.png index 2228639..ea770ea 100644 --- a/bin/kdepim/pwmanager/icons22/decrypted.png +++ b/bin/kdepim/pwmanager/icons22/decrypted.png | |||
Binary files differ | |||
diff --git a/pwmanager/pwmanager/addentrywndimpl.cpp b/pwmanager/pwmanager/addentrywndimpl.cpp index fa6b6c0..09efd1c 100644 --- a/pwmanager/pwmanager/addentrywndimpl.cpp +++ b/pwmanager/pwmanager/addentrywndimpl.cpp | |||
@@ -23,48 +23,49 @@ | |||
23 | #include "addentrywndimpl.h" | 23 | #include "addentrywndimpl.h" |
24 | #include "pwmexception.h" | 24 | #include "pwmexception.h" |
25 | #include "pwgenwndimpl.h" | 25 | #include "pwgenwndimpl.h" |
26 | #ifndef PWM_EMBEDDED | 26 | #ifndef PWM_EMBEDDED |
27 | #include "advcommeditimpl.h" | 27 | #include "advcommeditimpl.h" |
28 | #endif | 28 | #endif |
29 | #include "htmlgen.h" | 29 | #include "htmlgen.h" |
30 | 30 | ||
31 | #include <kmessagebox.h> | 31 | #include <kmessagebox.h> |
32 | #include <klocale.h> | 32 | #include <klocale.h> |
33 | 33 | ||
34 | #include <qpushbutton.h> | 34 | #include <qpushbutton.h> |
35 | #include <qlabel.h> | 35 | #include <qlabel.h> |
36 | #include <qlayout.h> | 36 | #include <qlayout.h> |
37 | 37 | ||
38 | 38 | ||
39 | #ifndef PWM_EMBEDDED | 39 | #ifndef PWM_EMBEDDED |
40 | AddEntryWndImpl::AddEntryWndImpl() | 40 | AddEntryWndImpl::AddEntryWndImpl() |
41 | : addEntryWnd( 0, "AddEntryWndImpl", TRUE) | 41 | : addEntryWnd( 0, "AddEntryWndImpl", TRUE) |
42 | #else | 42 | #else |
43 | AddEntryWndImpl::AddEntryWndImpl( PwMDoc* doc, QWidget* parent, const char* name) | 43 | AddEntryWndImpl::AddEntryWndImpl( PwMDoc* doc, QWidget* parent, const char* name) |
44 | : addEntryWnd( doc, parent, name) | 44 | : addEntryWnd( doc, parent, name) |
45 | #endif | 45 | #endif |
46 | { | 46 | { |
47 | categoryComboBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding,QSizePolicy::Preferred )); | ||
47 | #ifndef PWM_EMBEDDED | 48 | #ifndef PWM_EMBEDDED |
48 | editAdvCommentButton = 0; | 49 | editAdvCommentButton = 0; |
49 | commentTextEdit = 0; | 50 | commentTextEdit = 0; |
50 | #endif | 51 | #endif |
51 | switchComment(false); | 52 | switchComment(false); |
52 | pwGen = new PwGenWndImpl(this); | 53 | pwGen = new PwGenWndImpl(this); |
53 | } | 54 | } |
54 | 55 | ||
55 | AddEntryWndImpl::~AddEntryWndImpl() | 56 | AddEntryWndImpl::~AddEntryWndImpl() |
56 | { | 57 | { |
57 | #ifndef PWM_EMBEDDED | 58 | #ifndef PWM_EMBEDDED |
58 | delete_ifnot_null(editAdvCommentButton); | 59 | delete_ifnot_null(editAdvCommentButton); |
59 | delete_ifnot_null(commentTextEdit); | 60 | delete_ifnot_null(commentTextEdit); |
60 | #endif | 61 | #endif |
61 | delete pwGen; | 62 | delete pwGen; |
62 | } | 63 | } |
63 | 64 | ||
64 | #ifdef PWM_EMBEDDED | 65 | #ifdef PWM_EMBEDDED |
65 | void AddEntryWndImpl::slotOk() | 66 | void AddEntryWndImpl::slotOk() |
66 | { | 67 | { |
67 | slotApply(); | 68 | slotApply(); |
68 | 69 | ||
69 | if (pwLineEdit->text().isEmpty()) { | 70 | if (pwLineEdit->text().isEmpty()) { |
70 | KMessageBox::error(this, | 71 | KMessageBox::error(this, |
diff --git a/pwmanager/pwmanager/pwm.cpp b/pwmanager/pwmanager/pwm.cpp index 9187380..a751fce 100644 --- a/pwmanager/pwmanager/pwm.cpp +++ b/pwmanager/pwmanager/pwm.cpp | |||
@@ -228,53 +228,48 @@ void PwM::initMenubar() | |||
228 | syncManager->fillSyncMenu(); | 228 | syncManager->fillSyncMenu(); |
229 | 229 | ||
230 | #endif | 230 | #endif |
231 | filePopup = new KPopupMenu(this); | 231 | filePopup = new KPopupMenu(this); |
232 | importPopup = new KPopupMenu(filePopup); | 232 | importPopup = new KPopupMenu(filePopup); |
233 | exportPopup = new KPopupMenu(filePopup); | 233 | exportPopup = new KPopupMenu(filePopup); |
234 | managePopup = new KPopupMenu(this); | 234 | managePopup = new KPopupMenu(this); |
235 | #ifdef CONFIG_KEYCARD | 235 | #ifdef CONFIG_KEYCARD |
236 | chipcardPopup = new KPopupMenu(this); | 236 | chipcardPopup = new KPopupMenu(this); |
237 | #endif // CONFIG_KEYCARD | 237 | #endif // CONFIG_KEYCARD |
238 | viewPopup = new KPopupMenu(this); | 238 | viewPopup = new KPopupMenu(this); |
239 | optionsPopup = new KPopupMenu(this); | 239 | optionsPopup = new KPopupMenu(this); |
240 | 240 | ||
241 | // "file" popup menu | 241 | // "file" popup menu |
242 | filePopup->insertItem(QIconSet(picons->loadIcon("filenew", KIcon::Small)), | 242 | filePopup->insertItem(QIconSet(picons->loadIcon("filenew", KIcon::Small)), |
243 | i18n("&New"), this, | 243 | i18n("&New"), this, |
244 | SLOT(new_slot()), 0, BUTTON_POPUP_FILE_NEW); | 244 | SLOT(new_slot()), 0, BUTTON_POPUP_FILE_NEW); |
245 | filePopup->insertItem(QIconSet(picons->loadIcon("fileopen", KIcon::Small)), | 245 | filePopup->insertItem(QIconSet(picons->loadIcon("fileopen", KIcon::Small)), |
246 | i18n("&Open"), this, | 246 | i18n("&Open"), this, |
247 | SLOT(open_slot()), 0, BUTTON_POPUP_FILE_OPEN); | 247 | SLOT(open_slot()), 0, BUTTON_POPUP_FILE_OPEN); |
248 | filePopup->insertItem(QIconSet(picons->loadIcon("fileclose", KIcon::Small)), | 248 | filePopup->insertItem(QIconSet(picons->loadIcon("fileclose", KIcon::Small)), |
249 | i18n("&Close"), this, | 249 | i18n("&Close"), this, |
250 | SLOT(close_slot()), 0, BUTTON_POPUP_FILE_CLOSE); | 250 | SLOT(close_slot()), 0, BUTTON_POPUP_FILE_CLOSE); |
251 | filePopup->insertSeparator(); | 251 | filePopup->insertSeparator(); |
252 | filePopup->insertItem(QIconSet(picons->loadIcon("pencil", KIcon::Small)), | ||
253 | i18n("&Add password"), this, | ||
254 | SLOT(addPwd_slot()), 0, | ||
255 | BUTTON_POPUP_MANAGE_ADD); | ||
256 | filePopup->insertSeparator(); | ||
257 | filePopup->insertItem(QIconSet(picons->loadIcon("filesave", KIcon::Small)), | 252 | filePopup->insertItem(QIconSet(picons->loadIcon("filesave", KIcon::Small)), |
258 | i18n("&Save"), this, | 253 | i18n("&Save"), this, |
259 | SLOT(save_slot()), 0, BUTTON_POPUP_FILE_SAVE); | 254 | SLOT(save_slot()), 0, BUTTON_POPUP_FILE_SAVE); |
260 | filePopup->insertItem(QIconSet(picons->loadIcon("filesaveas", KIcon::Small)), | 255 | filePopup->insertItem(QIconSet(picons->loadIcon("filesaveas", KIcon::Small)), |
261 | i18n("Save &as..."), | 256 | i18n("Save &as..."), |
262 | this, SLOT(saveAs_slot()), 0, | 257 | this, SLOT(saveAs_slot()), 0, |
263 | BUTTON_POPUP_FILE_SAVEAS); | 258 | BUTTON_POPUP_FILE_SAVEAS); |
264 | filePopup->insertSeparator(); | 259 | filePopup->insertSeparator(); |
265 | // "file/export" popup menu | 260 | // "file/export" popup menu |
266 | exportPopup->insertItem(i18n("&Text-file..."), this, | 261 | exportPopup->insertItem(i18n("&Text-file..."), this, |
267 | SLOT(exportToText()), 0, BUTTON_POPUP_EXPORT_TEXT); | 262 | SLOT(exportToText()), 0, BUTTON_POPUP_EXPORT_TEXT); |
268 | exportPopup->insertItem(i18n("&Gpasman / Kpasman ..."), this, | 263 | exportPopup->insertItem(i18n("&Gpasman / Kpasman ..."), this, |
269 | SLOT(exportToGpasman()), 0, BUTTON_POPUP_EXPORT_GPASMAN); | 264 | SLOT(exportToGpasman()), 0, BUTTON_POPUP_EXPORT_GPASMAN); |
270 | exportPopup->insertItem(i18n("&CSV (Comma Separated Value) ..."), this, | 265 | exportPopup->insertItem(i18n("&CSV (Comma Separated Value) ..."), this, |
271 | SLOT(exportToCsv()), 0, BUTTON_POPUP_EXPORT_CSV); | 266 | SLOT(exportToCsv()), 0, BUTTON_POPUP_EXPORT_CSV); |
272 | #ifdef CONFIG_KWALLETIF | 267 | #ifdef CONFIG_KWALLETIF |
273 | exportPopup->insertItem(i18n("&KWallet..."), this, | 268 | exportPopup->insertItem(i18n("&KWallet..."), this, |
274 | SLOT(exportToKWallet()), 0, BUTTON_POPUP_EXPORT_KWALLET); | 269 | SLOT(exportToKWallet()), 0, BUTTON_POPUP_EXPORT_KWALLET); |
275 | #endif | 270 | #endif |
276 | filePopup->insertItem(QIconSet(picons->loadIcon("fileexport", KIcon::Small)), | 271 | filePopup->insertItem(QIconSet(picons->loadIcon("fileexport", KIcon::Small)), |
277 | i18n("E&xport"), exportPopup, | 272 | i18n("E&xport"), exportPopup, |
278 | BUTTON_POPUP_FILE_EXPORT); | 273 | BUTTON_POPUP_FILE_EXPORT); |
279 | // "file/import" popup menu | 274 | // "file/import" popup menu |
280 | importPopup->insertItem(i18n("&Text-file..."), this, | 275 | importPopup->insertItem(i18n("&Text-file..."), this, |
@@ -346,49 +341,53 @@ void PwM::initMenubar() | |||
346 | #endif // CONFIG_KEYCARD | 341 | #endif // CONFIG_KEYCARD |
347 | // "view" popup menu | 342 | // "view" popup menu |
348 | viewPopup->insertItem(QIconSet(picons->loadIcon("find", KIcon::Small)), | 343 | viewPopup->insertItem(QIconSet(picons->loadIcon("find", KIcon::Small)), |
349 | i18n("&Find"), this, | 344 | i18n("&Find"), this, |
350 | SLOT(find_slot()), 0, BUTTON_POPUP_VIEW_FIND); | 345 | SLOT(find_slot()), 0, BUTTON_POPUP_VIEW_FIND); |
351 | viewPopup->insertSeparator(); | 346 | viewPopup->insertSeparator(); |
352 | viewPopup->insertItem(QIconSet(picons->loadIcon("halfencrypted", KIcon::Small)), | 347 | viewPopup->insertItem(QIconSet(picons->loadIcon("halfencrypted", KIcon::Small)), |
353 | i18n("&Lock all entries"), this, | 348 | i18n("&Lock all entries"), this, |
354 | SLOT(lockWnd_slot()), 0, | 349 | SLOT(lockWnd_slot()), 0, |
355 | BUTTON_POPUP_VIEW_LOCK); | 350 | BUTTON_POPUP_VIEW_LOCK); |
356 | viewPopup->insertItem(QIconSet(picons->loadIcon("encrypted", KIcon::Small)), | 351 | viewPopup->insertItem(QIconSet(picons->loadIcon("encrypted", KIcon::Small)), |
357 | i18n("&Deep-lock all entries"), this, | 352 | i18n("&Deep-lock all entries"), this, |
358 | SLOT(deepLockWnd_slot()), 0, | 353 | SLOT(deepLockWnd_slot()), 0, |
359 | BUTTON_POPUP_VIEW_DEEPLOCK); | 354 | BUTTON_POPUP_VIEW_DEEPLOCK); |
360 | viewPopup->insertItem(QIconSet(picons->loadIcon("decrypted", KIcon::Small)), | 355 | viewPopup->insertItem(QIconSet(picons->loadIcon("decrypted", KIcon::Small)), |
361 | i18n("&Unlock all entries"), this, | 356 | i18n("&Unlock all entries"), this, |
362 | SLOT(unlockWnd_slot()), 0, | 357 | SLOT(unlockWnd_slot()), 0, |
363 | BUTTON_POPUP_VIEW_UNLOCK); | 358 | BUTTON_POPUP_VIEW_UNLOCK); |
364 | menuBar()->insertItem(i18n("&View"), viewPopup); | 359 | menuBar()->insertItem(i18n("&View"), viewPopup); |
365 | // "options" popup menu | 360 | // "options" popup menu |
366 | optionsPopup->insertItem(QIconSet(picons->loadIcon("configure", KIcon::Small)), | 361 | optionsPopup->insertItem(QIconSet(picons->loadIcon("configure", KIcon::Small)), |
367 | i18n("&Configure..."), this, | 362 | i18n("&Configure..."), this, |
368 | SLOT(config_slot()),0, | 363 | SLOT(config_slot()),0, |
369 | BUTTON_POPUP_OPTIONS_CONFIG); | 364 | BUTTON_POPUP_OPTIONS_CONFIG); |
370 | menuBar()->insertItem(i18n("&Options"), optionsPopup); | 365 | if ( QApplication::desktop()->width() <= 240 ) { |
366 | managePopup->insertSeparator(); | ||
367 | managePopup->insertItem(i18n("&Options"), optionsPopup); | ||
368 | } else | ||
369 | menuBar()->insertItem(i18n("&Options"), optionsPopup); | ||
371 | // "help" popup menu | 370 | // "help" popup menu |
372 | #ifndef PWM_EMBEDDED | 371 | #ifndef PWM_EMBEDDED |
373 | helpPopup = helpMenu(QString::null, false); | 372 | helpPopup = helpMenu(QString::null, false); |
374 | #else | 373 | #else |
375 | optionsPopup->insertItem(QIconSet(picons->loadIcon("configure", KIcon::Small)), | 374 | optionsPopup->insertItem(QIconSet(picons->loadIcon("configure", KIcon::Small)), |
376 | i18n("C&ategories..."), this, | 375 | i18n("C&ategories..."), this, |
377 | SLOT(category_slot()),0, | 376 | SLOT(category_slot()),0, |
378 | BUTTON_POPUP_OPTIONS_CATEGORY); | 377 | BUTTON_POPUP_OPTIONS_CATEGORY); |
379 | 378 | ||
380 | 379 | ||
381 | menuBar()->insertItem(i18n("&Sync"), syncPopup); | 380 | menuBar()->insertItem(i18n("&Sync"), syncPopup); |
382 | 381 | ||
383 | 382 | ||
384 | 383 | ||
385 | 384 | ||
386 | 385 | ||
387 | helpPopup = new KPopupMenu(this); | 386 | helpPopup = new KPopupMenu(this); |
388 | 387 | ||
389 | 388 | ||
390 | helpPopup->insertItem(i18n("&License"), this, | 389 | helpPopup->insertItem(i18n("&License"), this, |
391 | SLOT(showLicense_slot()), 0, | 390 | SLOT(showLicense_slot()), 0, |
392 | BUTTON_POPUP_HELP_LICENSE); | 391 | BUTTON_POPUP_HELP_LICENSE); |
393 | 392 | ||
394 | helpPopup->insertItem(i18n("&Faq"), this, | 393 | helpPopup->insertItem(i18n("&Faq"), this, |
diff --git a/pwmanager/pwmanager/pwmviewstyle_0.cpp b/pwmanager/pwmanager/pwmviewstyle_0.cpp index d82eb15..1d88a34 100644 --- a/pwmanager/pwmanager/pwmviewstyle_0.cpp +++ b/pwmanager/pwmanager/pwmviewstyle_0.cpp | |||
@@ -2,62 +2,74 @@ | |||
2 | * * | 2 | * * |
3 | * copyright (C) 2004 by Michael Buesch * | 3 | * copyright (C) 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 "pwmviewstyle_0.h" | 20 | #include "pwmviewstyle_0.h" |
21 | #include "pwmview.h" | 21 | #include "pwmview.h" |
22 | #include "listviewpwm.h" | 22 | #include "listviewpwm.h" |
23 | #include "commentbox.h" | 23 | #include "commentbox.h" |
24 | 24 | ||
25 | #include <klocale.h> | 25 | #include <klocale.h> |
26 | #include <kglobal.h> | ||
27 | #include <kiconloader.h> | ||
26 | #include "pwmprefs.h" | 28 | #include "pwmprefs.h" |
27 | 29 | ||
28 | PwMViewStyle_0::PwMViewStyle_0(PwMView *view) | 30 | PwMViewStyle_0::PwMViewStyle_0(PwMView *view) |
29 | : QObject() | 31 | : QObject() |
30 | { | 32 | { |
31 | vbox1 = new QVBox(view); | 33 | vbox1 = new QVBox(view); |
32 | vbox1->setSpacing(3); | 34 | vbox1->setSpacing(0); |
33 | hbox1 = new QHBox(vbox1); | 35 | hbox1 = new QHBox(vbox1); |
34 | hbox1->setSpacing(3); | 36 | hbox1->setSpacing(0); |
35 | categoriesTitle = new QLabel(hbox1); | 37 | categoriesTitle = new QLabel(hbox1); |
36 | categoriesTitle->setText(i18n("Categories:")); | 38 | categoriesTitle->setText(i18n("Category:")); |
37 | categoriesCombo = new QComboBox(hbox1); | 39 | categoriesCombo = new QComboBox(hbox1); |
38 | renCatButton = new QPushButton(i18n("&Rename"), hbox1); | 40 | categoriesCombo->setSizePolicy( QSizePolicy( QSizePolicy::Expanding,QSizePolicy::Preferred )); |
39 | delCatButton = new QPushButton(i18n("&Delete"), hbox1); | 41 | renCatButton = new QPushButton( hbox1); |
42 | renCatButton->setPixmap (KGlobal::iconLoader()->loadIcon("edit", KIcon::Small) ); | ||
43 | int maxsi = renCatButton->sizeHint().height()+4; | ||
44 | renCatButton->setMinimumSize( maxsi, maxsi ); | ||
45 | delCatButton = new QPushButton( hbox1); | ||
46 | delCatButton->setPixmap (KGlobal::iconLoader()->loadIcon("editdelete", KIcon::Small) ); | ||
47 | maxsi = delCatButton->sizeHint().height()+4; | ||
48 | delCatButton->setMinimumSize( maxsi, maxsi ); | ||
49 | delCatButton->setFocusPolicy( QWidget::NoFocus ); | ||
50 | renCatButton->setFocusPolicy( QWidget::NoFocus ); | ||
51 | |||
40 | #ifndef PWM_EMBEDDED | 52 | #ifndef PWM_EMBEDDED |
41 | splitter1 = new QSplitter(vbox1); | 53 | splitter1 = new QSplitter(vbox1); |
42 | splitter1->setOrientation(Qt::Vertical); | 54 | splitter1->setOrientation(Qt::Vertical); |
43 | #else | 55 | #else |
44 | splitter1 = new KDGanttMinimizeSplitter( Qt::Vertical, vbox1); | 56 | splitter1 = new KDGanttMinimizeSplitter( Qt::Vertical, vbox1); |
45 | splitter1->setMinimizeDirection ( KDGanttMinimizeSplitter::Down ); | 57 | splitter1->setMinimizeDirection ( KDGanttMinimizeSplitter::Down ); |
46 | 58 | ||
47 | //US topLayout->addWidget(mMiniSplitter ); | 59 | //US topLayout->addWidget(mMiniSplitter ); |
48 | #endif | 60 | #endif |
49 | lv = new ListViewPwM(splitter1); | 61 | lv = new ListViewPwM(splitter1); |
50 | commentBox = new CommentBox(splitter1); | 62 | commentBox = new CommentBox(splitter1); |
51 | // set sizes and styles | 63 | // set sizes and styles |
52 | commentBox->resize(commentBox->size().width(), 60); | 64 | commentBox->resize(commentBox->size().width(), 60); |
53 | categoriesTitle->setAlignment(Qt::AlignVCenter | Qt::AlignRight); | 65 | categoriesTitle->setAlignment(Qt::AlignVCenter | Qt::AlignRight); |
54 | // connections | 66 | // connections |
55 | connect(categoriesCombo, SIGNAL(activated(int)), | 67 | connect(categoriesCombo, SIGNAL(activated(int)), |
56 | view, SLOT(shiftToView())); | 68 | view, SLOT(shiftToView())); |
57 | connect(renCatButton, SIGNAL(clicked()), | 69 | connect(renCatButton, SIGNAL(clicked()), |
58 | view, SLOT(renCatButton_slot())); | 70 | view, SLOT(renCatButton_slot())); |
59 | connect(delCatButton, SIGNAL(clicked()), | 71 | connect(delCatButton, SIGNAL(clicked()), |
60 | view, SLOT(delCatButton_slot())); | 72 | view, SLOT(delCatButton_slot())); |
61 | connect(lv, SIGNAL(toggleOverview()), | 73 | connect(lv, SIGNAL(toggleOverview()), |
62 | this, SLOT(toggleSplitter())); | 74 | this, SLOT(toggleSplitter())); |
63 | } | 75 | } |
diff --git a/pwmanager/pwmanager/pwmviewstyle_1.cpp b/pwmanager/pwmanager/pwmviewstyle_1.cpp index 7294f34..e335a3f 100644 --- a/pwmanager/pwmanager/pwmviewstyle_1.cpp +++ b/pwmanager/pwmanager/pwmviewstyle_1.cpp | |||
@@ -62,51 +62,51 @@ PwMViewStyle_1::PwMViewStyle_1(PwMView *view) | |||
62 | splitter2->setOrientation(Qt::Vertical); | 62 | splitter2->setOrientation(Qt::Vertical); |
63 | #else | 63 | #else |
64 | splitter2 = new KDGanttMinimizeSplitter( Qt::Vertical, splitter); | 64 | splitter2 = new KDGanttMinimizeSplitter( Qt::Vertical, splitter); |
65 | splitter2->setMinimizeDirection ( KDGanttMinimizeSplitter::Down ); | 65 | splitter2->setMinimizeDirection ( KDGanttMinimizeSplitter::Down ); |
66 | 66 | ||
67 | //US topLayout->addWidget(mMiniSplitter ); | 67 | //US topLayout->addWidget(mMiniSplitter ); |
68 | #endif | 68 | #endif |
69 | lv = new ListViewPwM(splitter2); | 69 | lv = new ListViewPwM(splitter2); |
70 | commentBox = new CommentBox(splitter2); | 70 | commentBox = new CommentBox(splitter2); |
71 | // set sizes and styles | 71 | // set sizes and styles |
72 | //UScommentBox->resize(commentBox->size().width(), 60); | 72 | //UScommentBox->resize(commentBox->size().width(), 60); |
73 | QValueList<int> sizes; | 73 | QValueList<int> sizes; |
74 | #ifndef PWM_EMBEDDED | 74 | #ifndef PWM_EMBEDDED |
75 | sizes.push_back(INITIAL_CATEGORIES_WIDTH); | 75 | sizes.push_back(INITIAL_CATEGORIES_WIDTH); |
76 | sizes.push_back(view->height() - INITIAL_CATEGORIES_WIDTH); | 76 | sizes.push_back(view->height() - INITIAL_CATEGORIES_WIDTH); |
77 | #else | 77 | #else |
78 | sizes.append(INITIAL_CATEGORIES_WIDTH); | 78 | sizes.append(INITIAL_CATEGORIES_WIDTH); |
79 | sizes.append(view->height() - INITIAL_CATEGORIES_WIDTH); | 79 | sizes.append(view->height() - INITIAL_CATEGORIES_WIDTH); |
80 | #endif | 80 | #endif |
81 | //USsplitter->setSizes(sizes); | 81 | //USsplitter->setSizes(sizes); |
82 | categoriesTitle->setAlignment(Qt::AlignHCenter); | 82 | categoriesTitle->setAlignment(Qt::AlignHCenter); |
83 | #ifndef PWM_EMBEDDED | 83 | #ifndef PWM_EMBEDDED |
84 | categoriesTitle->setFrameShape(QFrame::MenuBarPanel); | 84 | categoriesTitle->setFrameShape(QFrame::MenuBarPanel); |
85 | #else | 85 | #else |
86 | categoriesTitle->setFrameShape(QFrame::StyledPanel); | 86 | //categoriesTitle->setFrameShape(QFrame::StyledPanel); |
87 | #endif | 87 | #endif |
88 | categoriesTitle->setText(i18n("Categories:")); | 88 | categoriesTitle->setText(i18n("Category:")); |
89 | catCtxMenu = new QPopupMenu(view); | 89 | catCtxMenu = new QPopupMenu(view); |
90 | catCtxMenu->insertItem(i18n("&Rename"), | 90 | catCtxMenu->insertItem(i18n("&Rename"), |
91 | view, SLOT(renCatButton_slot())); | 91 | view, SLOT(renCatButton_slot())); |
92 | catCtxMenu->insertItem(i18n("&Delete"), | 92 | catCtxMenu->insertItem(i18n("&Delete"), |
93 | view, SLOT(delCatButton_slot())); | 93 | view, SLOT(delCatButton_slot())); |
94 | 94 | ||
95 | #ifndef DESKTOP_VERSION | 95 | #ifndef DESKTOP_VERSION |
96 | QPEApplication::setStylusOperation( categoriesList->viewport(), QPEApplication::RightOnHold ); | 96 | QPEApplication::setStylusOperation( categoriesList->viewport(), QPEApplication::RightOnHold ); |
97 | #endif | 97 | #endif |
98 | 98 | ||
99 | // connections | 99 | // connections |
100 | connect(categoriesList, SIGNAL(highlighted(int)), | 100 | connect(categoriesList, SIGNAL(highlighted(int)), |
101 | view, SLOT(shiftToView())); | 101 | view, SLOT(shiftToView())); |
102 | connect(categoriesList, | 102 | connect(categoriesList, |
103 | SIGNAL(rightButtonClicked(QListBoxItem *, const QPoint &)), | 103 | SIGNAL(rightButtonClicked(QListBoxItem *, const QPoint &)), |
104 | this, | 104 | this, |
105 | SLOT(catRightClick(QListBoxItem *, const QPoint &))); | 105 | SLOT(catRightClick(QListBoxItem *, const QPoint &))); |
106 | 106 | ||
107 | connect(lv, SIGNAL(toggleOverview()), | 107 | connect(lv, SIGNAL(toggleOverview()), |
108 | this, SLOT(toggleSplitter())); | 108 | this, SLOT(toggleSplitter())); |
109 | } | 109 | } |
110 | 110 | ||
111 | PwMViewStyle_1::~PwMViewStyle_1() | 111 | PwMViewStyle_1::~PwMViewStyle_1() |
112 | { | 112 | { |