-rw-r--r--[-rwxr-xr-x] | noncore/apps/zsafe/extra/qsettings.cpp (renamed from noncore/apps/zsafe/qsettings.cpp) | 10 | ||||
-rw-r--r--[-rwxr-xr-x] | noncore/apps/zsafe/extra/qsettings.h (renamed from noncore/apps/zsafe/qsettings.h) | 0 | ||||
-rw-r--r-- | noncore/apps/zsafe/zsafe.cpp | 143 |
3 files changed, 92 insertions, 61 deletions
diff --git a/noncore/apps/zsafe/qsettings.cpp b/noncore/apps/zsafe/extra/qsettings.cpp index ee55339..def2e2d 100755..100644 --- a/noncore/apps/zsafe/qsettings.cpp +++ b/noncore/apps/zsafe/extra/qsettings.cpp | |||
@@ -7,12 +7,13 @@ | |||
7 | #include <qfile.h> | 7 | #include <qfile.h> |
8 | #include <qtextstream.h> | 8 | #include <qtextstream.h> |
9 | 9 | ||
10 | 10 | ||
11 | QSettings::QSettings(const QString &_fn) | 11 | QSettings::QSettings(const QString &_fn) |
12 | { | 12 | { |
13 | qWarning("Settings "+_fn); | ||
13 | // read the prefs from the file | 14 | // read the prefs from the file |
14 | fn = _fn; | 15 | fn = _fn; |
15 | 16 | ||
16 | QFile f(_fn); | 17 | QFile f(_fn); |
17 | if ( f.open(IO_ReadOnly) ) { // file opened successfully | 18 | if ( f.open(IO_ReadOnly) ) { // file opened successfully |
18 | QTextStream t( &f ); // use a text stream | 19 | QTextStream t( &f ); // use a text stream |
@@ -129,24 +130,27 @@ bool QSettings::removeEntry (const QString &key) | |||
129 | prefs.remove (key); | 130 | prefs.remove (key); |
130 | return true; | 131 | return true; |
131 | } | 132 | } |
132 | 133 | ||
133 | QStringList QSettings::entryList (const QString &key) const | 134 | QStringList QSettings::entryList (const QString &key) const |
134 | { | 135 | { |
135 | QAsciiDictIterator <QString> it( prefs ); // iterator for dict | 136 | qDebug("entryList: "+key); |
136 | QStringList list; | 137 | QStringList list; |
137 | 138 | if(!prefs.isEmpty()) { | |
139 | QAsciiDictIterator <QString> it( prefs ); // iterator for dict | ||
140 | qDebug("ready"); | ||
138 | while ( it.current() ) | 141 | while ( it.current() ) |
139 | { | 142 | { |
140 | char buf[512]; | 143 | char buf[512]; |
141 | sprintf (buf, "%s", (const char *) *( it.current())); | 144 | sprintf (buf, "%s", (const char *) *( it.current())); |
142 | QString *val = new QString(buf); | 145 | QString *val = new QString(buf); |
143 | sprintf(buf, "%s -> %s\n", it.currentKey(), (const char *)*val ); | 146 | sprintf(buf, "%s -> %s\n", it.currentKey(), (const char *)*val ); |
144 | QString *cat = new QString(it.currentKey()); | 147 | QString *cat = new QString(it.currentKey()); |
145 | if (cat->contains("-field", FALSE)) | 148 | if (cat->contains("-field", FALSE)) |
146 | list.append (it.currentKey()); | 149 | list.append (it.currentKey()); |
147 | ++it; | 150 | ++it; |
148 | |||
149 | } | 151 | } |
152 | } | ||
153 | qWarning("Return here"); | ||
150 | return list; | 154 | return list; |
151 | } | 155 | } |
152 | 156 | ||
diff --git a/noncore/apps/zsafe/qsettings.h b/noncore/apps/zsafe/extra/qsettings.h index 95e87b5..95e87b5 100755..100644 --- a/noncore/apps/zsafe/qsettings.h +++ b/noncore/apps/zsafe/extra/qsettings.h | |||
diff --git a/noncore/apps/zsafe/zsafe.cpp b/noncore/apps/zsafe/zsafe.cpp index 0864293..f3d57f8 100644 --- a/noncore/apps/zsafe/zsafe.cpp +++ b/noncore/apps/zsafe/zsafe.cpp | |||
@@ -8,15 +8,15 @@ | |||
8 | ** | 8 | ** |
9 | ** Homepage: http://home.t-online.de/home/CarstenSchneider/zsafe/index.html | 9 | ** Homepage: http://home.t-online.de/home/CarstenSchneider/zsafe/index.html |
10 | ** | 10 | ** |
11 | ** Compile Flags: | 11 | ** Compile Flags: |
12 | ** Zaurus arm : -DNO_OPIE | 12 | ** Zaurus arm : -DNO_OPIE |
13 | ** Zaurus Opie arm: none | 13 | ** Zaurus Opie arm: none |
14 | ** Linux Desktop : -DDESKTOP | 14 | ** Linux Desktop : -DDESKTOP -DNO_OPIE |
15 | ** Windows Desktop: -DDESKTOP -DWIN32 | 15 | ** Windows Desktop: -DDESKTOP -DNO_OPIE |
16 | ** | 16 | ** use qmake |
17 | ** for japanese version additional use: -DJPATCH_HDE | 17 | ** for japanese version additional use: -DJPATCH_HDE |
18 | ** | 18 | ** |
19 | ****************************************************************************/ | 19 | ****************************************************************************/ |
20 | #include "zsafe.h" | 20 | #include "zsafe.h" |
21 | #include "newdialog.h" | 21 | #include "newdialog.h" |
22 | #include "searchdialog.h" | 22 | #include "searchdialog.h" |
@@ -40,25 +40,25 @@ using namespace Opie::Ui; | |||
40 | #include <qclipboard.h> | 40 | #include <qclipboard.h> |
41 | 41 | ||
42 | #include <sys/types.h> | 42 | #include <sys/types.h> |
43 | #include <sys/stat.h> | 43 | #include <sys/stat.h> |
44 | #include <fcntl.h> | 44 | #include <fcntl.h> |
45 | #include <stdlib.h> | 45 | #include <stdlib.h> |
46 | #ifndef WIN32 | 46 | #ifndef Q_WS_WIN |
47 | #include <unistd.h> | 47 | #include <unistd.h> |
48 | #endif | 48 | #endif |
49 | #include <string.h> | 49 | #include <string.h> |
50 | #include <errno.h> | 50 | #include <errno.h> |
51 | 51 | ||
52 | #include <qmenubar.h> | 52 | #include <qmenubar.h> |
53 | #include <qpopupmenu.h> | 53 | #include <qpopupmenu.h> |
54 | 54 | ||
55 | #ifdef DESKTOP | 55 | #ifdef DESKTOP |
56 | #include <qfiledialog.h> | 56 | #include <qfiledialog.h> |
57 | #include <qdragobject.h> | 57 | #include <qdragobject.h> |
58 | #ifndef WIN32 | 58 | #ifndef Q_WS_WIN |
59 | #include <qsettings.h> | 59 | #include <qsettings.h> |
60 | #else | 60 | #else |
61 | #include "qsettings.h" | 61 | #include "qsettings.h" |
62 | #endif | 62 | #endif |
63 | #include <qapplication.h> | 63 | #include <qapplication.h> |
64 | #else | 64 | #else |
@@ -105,13 +105,13 @@ extern QPEApplication *appl; | |||
105 | #ifdef JPATCH_HDE | 105 | #ifdef JPATCH_HDE |
106 | #define tr(arg) arg | 106 | #define tr(arg) arg |
107 | #endif | 107 | #endif |
108 | 108 | ||
109 | 109 | ||
110 | #ifdef DESKTOP | 110 | #ifdef DESKTOP |
111 | #ifndef WIN32 | 111 | #ifndef Q_WS_WIN |
112 | const QString APP_KEY="/.zsafe/"; | 112 | const QString APP_KEY="/.zsafe/"; |
113 | #else | 113 | #else |
114 | const QString APP_KEY=""; | 114 | const QString APP_KEY=""; |
115 | #endif | 115 | #endif |
116 | #else | 116 | #else |
117 | const QString APP_KEY=""; | 117 | const QString APP_KEY=""; |
@@ -362,13 +362,13 @@ static const char* const general_data[] = { | |||
362 | { | 362 | { |
363 | if (conf) | 363 | if (conf) |
364 | { | 364 | { |
365 | delete conf; | 365 | delete conf; |
366 | 366 | ||
367 | #ifdef DESKTOP | 367 | #ifdef DESKTOP |
368 | #ifndef WIN32 | 368 | #ifndef Q_WS_WIN |
369 | conf = new QSettings (); | 369 | conf = new QSettings (); |
370 | conf->insertSearchPath (QSettings::Unix, QDir::homeDirPath()); | 370 | conf->insertSearchPath (QSettings::Unix, QDir::homeDirPath()); |
371 | #else | 371 | #else |
372 | conf = new QSettings (cfgFile); | 372 | conf = new QSettings (cfgFile); |
373 | conf->insertSearchPath (QSettings::Unix, cfgFile); | 373 | conf->insertSearchPath (QSettings::Unix, cfgFile); |
374 | #endif | 374 | #endif |
@@ -414,25 +414,25 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl ) | |||
414 | else | 414 | else |
415 | iconPath = qpedir + "/pics/"; | 415 | iconPath = qpedir + "/pics/"; |
416 | #endif | 416 | #endif |
417 | 417 | ||
418 | // create a zsafe configuration object | 418 | // create a zsafe configuration object |
419 | #ifdef DESKTOP | 419 | #ifdef DESKTOP |
420 | #ifndef WIN32 | 420 | #ifndef Q_WS_WIN |
421 | conf = new QSettings (); | 421 | conf = new QSettings (); |
422 | conf->insertSearchPath (QSettings::Unix, QDir::homeDirPath()); | 422 | conf->insertSearchPath (QSettings::Unix, QDir::homeDirPath()); |
423 | #else | 423 | #else |
424 | conf = new QSettings (cfgFile); | 424 | conf = new QSettings (cfgFile); |
425 | conf->insertSearchPath (QSettings::Unix, cfgFile); | 425 | conf->insertSearchPath (QSettings::Unix, cfgFile); |
426 | #endif | 426 | #endif |
427 | #else | 427 | #else |
428 | conf = new Config (cfgFile, Config::File); | 428 | conf = new Config (cfgFile, Config::File); |
429 | conf->setGroup ("zsafePrefs"); | 429 | conf->setGroup ("zsafePrefs"); |
430 | #endif | 430 | #endif |
431 | #ifdef DESKTOP | 431 | #ifdef DESKTOP |
432 | // #ifndef WIN32 | 432 | // #ifndef Q_WS_WIN |
433 | expandTree = conf->readBoolEntry(APP_KEY+"expandTree", false); | 433 | expandTree = conf->readBoolEntry(APP_KEY+"expandTree", false); |
434 | // #endif | 434 | // #endif |
435 | #else | 435 | #else |
436 | expandTree = conf->readNumEntry(APP_KEY+"expandTree", 0); | 436 | expandTree = conf->readNumEntry(APP_KEY+"expandTree", 0); |
437 | #endif | 437 | #endif |
438 | #ifndef DESKTOP | 438 | #ifndef DESKTOP |
@@ -461,13 +461,13 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl ) | |||
461 | QPixmap general( ( const char** ) general_data ); | 461 | QPixmap general( ( const char** ) general_data ); |
462 | QPixmap image0( ( const char** ) zsafe_xpm ); | 462 | QPixmap image0( ( const char** ) zsafe_xpm ); |
463 | if ( !name ) | 463 | if ( !name ) |
464 | setName( "ZSafe" ); | 464 | setName( "ZSafe" ); |
465 | 465 | ||
466 | #ifdef DESKTOP | 466 | #ifdef DESKTOP |
467 | #ifdef WIN32 | 467 | #ifdef Q_WS_WIN |
468 | setGeometry(100, 150, DeskW, DeskH-30 ); | 468 | setGeometry(100, 150, DeskW, DeskH-30 ); |
469 | #else | 469 | #else |
470 | resize( DeskW, DeskH-30 ); | 470 | resize( DeskW, DeskH-30 ); |
471 | #endif | 471 | #endif |
472 | 472 | ||
473 | #else | 473 | #else |
@@ -495,13 +495,13 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl ) | |||
495 | QString filename = conf->readEntry(APP_KEY+"document"); | 495 | QString filename = conf->readEntry(APP_KEY+"document"); |
496 | if (filename.isEmpty() || filename.isNull()) | 496 | if (filename.isEmpty() || filename.isNull()) |
497 | { | 497 | { |
498 | 498 | ||
499 | // check if the directory application exists, if not | 499 | // check if the directory application exists, if not |
500 | // create it | 500 | // create it |
501 | // #ifndef WIN32 | 501 | // #ifndef Q_WS_WIN |
502 | // QString d1("Documents/application"); | 502 | // QString d1("Documents/application"); |
503 | // #else | 503 | // #else |
504 | QString d1(QDir::homeDirPath() + "/Documents/application"); | 504 | QString d1(QDir::homeDirPath() + "/Documents/application"); |
505 | // #endif | 505 | // #endif |
506 | QDir pd1(d1); | 506 | QDir pd1(d1); |
507 | if (!pd1.exists()) | 507 | if (!pd1.exists()) |
@@ -522,13 +522,13 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl ) | |||
522 | #else | 522 | #else |
523 | tr("<P>Can't create directory %1</P><P>ZSafe will now exit.</P>").arg(d1)); | 523 | tr("<P>Can't create directory %1</P><P>ZSafe will now exit.</P>").arg(d1)); |
524 | #endif | 524 | #endif |
525 | exitZs (1); | 525 | exitZs (1); |
526 | } | 526 | } |
527 | } | 527 | } |
528 | // #ifndef WIN32 | 528 | // #ifndef Q_WS_WIN |
529 | // QString d2("Documents/application/zsafe"); | 529 | // QString d2("Documents/application/zsafe"); |
530 | // #else | 530 | // #else |
531 | QString d2(QDir::homeDirPath() + "/Documents/application/zsafe"); | 531 | QString d2(QDir::homeDirPath() + "/Documents/application/zsafe"); |
532 | // #endif | 532 | // #endif |
533 | QDir pd2(d2); | 533 | QDir pd2(d2); |
534 | if (!pd2.exists()) | 534 | if (!pd2.exists()) |
@@ -553,26 +553,26 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl ) | |||
553 | saveConf(); | 553 | saveConf(); |
554 | } | 554 | } |
555 | //if (filename == "INVALIDPWD") | 555 | //if (filename == "INVALIDPWD") |
556 | //filename = ""; | 556 | //filename = ""; |
557 | 557 | ||
558 | QString ti = filename.right (filename.length() - filename.findRev ('/') - 1); | 558 | QString ti = filename.right (filename.length() - filename.findRev ('/') - 1); |
559 | #ifdef WIN32 | 559 | #ifdef Q_WS_WIN |
560 | this->setCaption("Qt ZSafe: " + ti); | 560 | this->setCaption("Qt ZSafe: " + ti); |
561 | #else | 561 | #else |
562 | this->setCaption("ZSafe: " + ti); | 562 | this->setCaption("ZSafe: " + ti); |
563 | #endif | 563 | #endif |
564 | 564 | ||
565 | selectedItem = NULL; | 565 | selectedItem = NULL; |
566 | lastSearchedCategory = NULL; | 566 | lastSearchedCategory = NULL; |
567 | lastSearchedItem = NULL; | 567 | lastSearchedItem = NULL; |
568 | lastSearchedName = ""; | 568 | lastSearchedName = ""; |
569 | lastSearchedUsername = ""; | 569 | lastSearchedUsername = ""; |
570 | lastSearchedComment = ""; | 570 | lastSearchedComment = ""; |
571 | 571 | ||
572 | infoForm = new InfoForm(); | 572 | infoForm = new InfoForm(this, "show_info", TRUE); |
573 | categoryDialog = NULL; | 573 | categoryDialog = NULL; |
574 | infoForm->setIcon( image0); | 574 | infoForm->setIcon( image0); |
575 | 575 | ||
576 | // add a menu bar | 576 | // add a menu bar |
577 | QMenuBar *menu = new QMenuBar( this ); | 577 | QMenuBar *menu = new QMenuBar( this ); |
578 | 578 | ||
@@ -767,14 +767,14 @@ void ZSafe::editPwd() | |||
767 | { | 767 | { |
768 | if (!selectedItem) | 768 | if (!selectedItem) |
769 | return; | 769 | return; |
770 | if (!isCategory(selectedItem)) | 770 | if (!isCategory(selectedItem)) |
771 | { | 771 | { |
772 | // open the 'New Entry' dialog | 772 | // open the 'New Entry' dialog |
773 | NewDialog *dialog = new NewDialog(this, tr("Edit Entry"), TRUE); | 773 | NewDialog *dialog = new NewDialog(this, "edit_entry", TRUE); |
774 | #ifdef WIN32 | 774 | #ifdef Q_WS_WIN |
775 | dialog->setCaption ("Qt " + tr("Edit Entry")); | 775 | dialog->setCaption ("Qt " + tr("Edit Entry")); |
776 | dialog->setGeometry(200, 250, 220, 310 ); | 776 | dialog->setGeometry(200, 250, 220, 310 ); |
777 | #endif | 777 | #endif |
778 | 778 | ||
779 | // set the labels | 779 | // set the labels |
780 | dialog->Name->setText(getFieldLabel (selectedItem, "1", tr("Name"))); | 780 | dialog->Name->setText(getFieldLabel (selectedItem, "1", tr("Name"))); |
@@ -792,16 +792,26 @@ void ZSafe::editPwd() | |||
792 | comment.replace (QRegExp("<br>"), "\n"); | 792 | comment.replace (QRegExp("<br>"), "\n"); |
793 | dialog->Field5->setText(selectedItem->text (4)); | 793 | dialog->Field5->setText(selectedItem->text (4)); |
794 | dialog->Field6->setText(selectedItem->text (5)); | 794 | dialog->Field6->setText(selectedItem->text (5)); |
795 | dialog->CommentField->insertLine(comment); | 795 | dialog->CommentField->insertLine(comment); |
796 | dialog->CommentField->setCursorPosition(0,0); | 796 | dialog->CommentField->setCursorPosition(0,0); |
797 | 797 | ||
798 | #ifdef Q_WS_QWS | ||
798 | DialogCode result = (DialogCode) QPEApplication::execDialog( dialog ); | 799 | DialogCode result = (DialogCode) QPEApplication::execDialog( dialog ); |
800 | #endif | ||
799 | 801 | ||
800 | #ifdef DESKTOP | 802 | #ifdef DESKTOP |
801 | result = Accepted; | 803 | #ifndef Q_QW_QWIN |
804 | dialog->show(); | ||
805 | #endif | ||
806 | #else | ||
807 | dialog->showMaximized(); | ||
808 | #endif | ||
809 | int result = dialog->exec(); | ||
810 | #ifdef DESKTOP | ||
811 | // result = QDialog::Accepted; | ||
802 | #endif | 812 | #endif |
803 | if (result == Accepted) | 813 | if (result == Accepted) |
804 | { | 814 | { |
805 | modified = true; | 815 | modified = true; |
806 | // edit the selected item | 816 | // edit the selected item |
807 | QString name = dialog->NameField->text(); | 817 | QString name = dialog->NameField->text(); |
@@ -837,29 +847,40 @@ void ZSafe::newPwd() | |||
837 | 847 | ||
838 | if (isCategory(selectedItem)) | 848 | if (isCategory(selectedItem)) |
839 | { | 849 | { |
840 | QString cat = selectedItem->text(0); | 850 | QString cat = selectedItem->text(0); |
841 | 851 | ||
842 | // open the 'New Entry' dialog | 852 | // open the 'New Entry' dialog |
843 | NewDialog *dialog = new NewDialog(this, tr("New Entry"), TRUE); | 853 | NewDialog *dialog = new NewDialog(this, "new_entry", TRUE); |
844 | #ifdef WIN32 | 854 | #ifdef Q_WS_WIN |
845 | dialog->setCaption ("Qt " + tr("New Entry")); | 855 | dialog->setCaption ("Qt " + tr("New Entry")); |
846 | dialog->setGeometry(200, 250, 220, 310 ); | 856 | dialog->setGeometry(200, 250, 220, 310 ); |
847 | #endif | 857 | #endif |
848 | // set the labels | 858 | // set the labels |
849 | dialog->Name->setText(getFieldLabel (selectedItem, "1", tr("Name"))); | 859 | dialog->Name->setText(getFieldLabel (selectedItem, "1", tr("Name"))); |
850 | dialog->Username->setText(getFieldLabel (selectedItem, "2", tr("Username"))); | 860 | dialog->Username->setText(getFieldLabel (selectedItem, "2", tr("Username"))); |
851 | dialog->Password->setText(getFieldLabel (selectedItem, "3", tr("Password"))); | 861 | dialog->Password->setText(getFieldLabel (selectedItem, "3", tr("Password"))); |
852 | dialog->Comment->setText(getFieldLabel (selectedItem, "4", tr("Comment"))); | 862 | dialog->Comment->setText(getFieldLabel (selectedItem, "4", tr("Comment"))); |
853 | dialog->Field5Label->setText(getFieldLabel (selectedItem,"5", tr("Field 4"))); | 863 | dialog->Field5Label->setText(getFieldLabel (selectedItem,"5", tr("Field 4"))); |
854 | dialog->Field6Label->setText(getFieldLabel (selectedItem,"6", tr("Field 5"))); | 864 | dialog->Field6Label->setText(getFieldLabel (selectedItem,"6", tr("Field 5"))); |
855 | retype: | 865 | retype: |
856 | 866 | ||
867 | #ifdef Q_WS_QWS | ||
857 | DialogCode result = (DialogCode) QPEApplication::execDialog( dialog ); | 868 | DialogCode result = (DialogCode) QPEApplication::execDialog( dialog ); |
869 | #endif | ||
870 | |||
858 | #ifdef DESKTOP | 871 | #ifdef DESKTOP |
859 | result = Accepted; | 872 | #ifndef Q_QW_QWIN |
873 | dialog->show(); | ||
874 | #endif | ||
875 | #else | ||
876 | dialog->showMaximized(); | ||
877 | #endif | ||
878 | #ifdef DESKTOP | ||
879 | int result = dialog->exec(); | ||
880 | // result = QDialog::Accepted; | ||
860 | #endif | 881 | #endif |
861 | 882 | ||
862 | if (result == Accepted) | 883 | if (result == Accepted) |
863 | { | 884 | { |
864 | 885 | ||
865 | QString name = dialog->NameField->text(); | 886 | QString name = dialog->NameField->text(); |
@@ -895,13 +916,13 @@ retype: | |||
895 | 916 | ||
896 | void ZSafe::findPwd() | 917 | void ZSafe::findPwd() |
897 | { | 918 | { |
898 | 919 | ||
899 | // open the 'Search' dialog | 920 | // open the 'Search' dialog |
900 | SearchDialog *dialog = new SearchDialog(this, tr("Search"), TRUE); | 921 | SearchDialog *dialog = new SearchDialog(this, tr("Search"), TRUE); |
901 | #ifdef WIN32 | 922 | #ifdef Q_WS_WIN |
902 | dialog->setCaption ("Qt " + tr("Search")); | 923 | dialog->setCaption ("Qt " + tr("Search")); |
903 | #endif | 924 | #endif |
904 | 925 | ||
905 | #ifdef DESKTOP | 926 | #ifdef DESKTOP |
906 | #endif | 927 | #endif |
907 | if (lastSearchedName) | 928 | if (lastSearchedName) |
@@ -1075,21 +1096,21 @@ QString ZSafe::getFieldLabel (QListViewItem *_item, QString field, QString def) | |||
1075 | { | 1096 | { |
1076 | return def; | 1097 | return def; |
1077 | } | 1098 | } |
1078 | 1099 | ||
1079 | QString app_key = APP_KEY; | 1100 | QString app_key = APP_KEY; |
1080 | #ifndef DESKTOP | 1101 | #ifndef DESKTOP |
1081 | #ifndef WIN32 | 1102 | #ifndef Q_WS_WIN |
1082 | conf->setGroup ("fieldDefs"); | 1103 | conf->setGroup ("fieldDefs"); |
1083 | #endif | 1104 | #endif |
1084 | #else | 1105 | #else |
1085 | #ifndef WIN32 | 1106 | #ifndef Q_WS_WIN |
1086 | app_key += "/fieldDefs/"; | 1107 | app_key += "/fieldDefs/"; |
1087 | #endif | 1108 | #endif |
1088 | #endif | 1109 | #endif |
1089 | // #ifndef WIN32 | 1110 | // #ifndef Q_WS_WIN |
1090 | QString label = conf->readEntry(app_key+category+"-field"+field,def); | 1111 | QString label = conf->readEntry(app_key+category+"-field"+field,def); |
1091 | // #else | 1112 | // #else |
1092 | // QString label(def); | 1113 | // QString label(def); |
1093 | // #endif | 1114 | // #endif |
1094 | 1115 | ||
1095 | #ifndef DESKTOP | 1116 | #ifndef DESKTOP |
@@ -1101,17 +1122,17 @@ QString ZSafe::getFieldLabel (QListViewItem *_item, QString field, QString def) | |||
1101 | QString ZSafe::getFieldLabel (QString category, QString field, QString def) | 1122 | QString ZSafe::getFieldLabel (QString category, QString field, QString def) |
1102 | { | 1123 | { |
1103 | QString app_key = APP_KEY; | 1124 | QString app_key = APP_KEY; |
1104 | #ifndef DESKTOP | 1125 | #ifndef DESKTOP |
1105 | conf->setGroup ("fieldDefs"); | 1126 | conf->setGroup ("fieldDefs"); |
1106 | #else | 1127 | #else |
1107 | #ifndef WIN32 | 1128 | #ifndef Q_WS_WIN |
1108 | app_key += "/fieldDefs/"; | 1129 | app_key += "/fieldDefs/"; |
1109 | #endif | 1130 | #endif |
1110 | #endif | 1131 | #endif |
1111 | // #ifndef WIN32 | 1132 | // #ifndef Q_WS_WIN |
1112 | QString label = conf->readEntry(app_key+category+"-field"+field, | 1133 | QString label = conf->readEntry(app_key+category+"-field"+field, |
1113 | def); | 1134 | def); |
1114 | // #else | 1135 | // #else |
1115 | // QString label(def); | 1136 | // QString label(def); |
1116 | // #endif | 1137 | // #endif |
1117 | #ifndef DESKTOP | 1138 | #ifndef DESKTOP |
@@ -1205,14 +1226,20 @@ void ZSafe::showInfo( QListViewItem *_item) | |||
1205 | // text += "<br>"; | 1226 | // text += "<br>"; |
1206 | } | 1227 | } |
1207 | 1228 | ||
1208 | text += "</body></html>"; | 1229 | text += "</body></html>"; |
1209 | 1230 | ||
1210 | infoForm->InfoText->setText(text); | 1231 | infoForm->InfoText->setText(text); |
1211 | infoForm->hide(); | 1232 | // infoForm->hide(); |
1233 | #ifdef Q_WS_QWS | ||
1212 | QPEApplication::showDialog( infoForm ); | 1234 | QPEApplication::showDialog( infoForm ); |
1235 | #endif | ||
1236 | |||
1237 | #ifdef DESKTOP | ||
1238 | infoForm->show(); | ||
1239 | #endif | ||
1213 | } | 1240 | } |
1214 | } | 1241 | } |
1215 | 1242 | ||
1216 | void ZSafe::listViewSelected( QListViewItem *_item) | 1243 | void ZSafe::listViewSelected( QListViewItem *_item) |
1217 | { | 1244 | { |
1218 | if (!_item) | 1245 | if (!_item) |
@@ -1228,13 +1255,13 @@ void ZSafe::listViewSelected( QListViewItem *_item) | |||
1228 | ListView->setColumnText(1, getFieldLabel (selectedItem, "2", tr("Field 2"))); | 1255 | ListView->setColumnText(1, getFieldLabel (selectedItem, "2", tr("Field 2"))); |
1229 | ListView->setColumnText(2, getFieldLabel (selectedItem, "3", tr("Field 3"))); | 1256 | ListView->setColumnText(2, getFieldLabel (selectedItem, "3", tr("Field 3"))); |
1230 | ListView->setColumnText(3, getFieldLabel (selectedItem, "4", tr("Comment"))); | 1257 | ListView->setColumnText(3, getFieldLabel (selectedItem, "4", tr("Comment"))); |
1231 | ListView->setColumnText(4, getFieldLabel (selectedItem, "5", tr("Field 4"))); | 1258 | ListView->setColumnText(4, getFieldLabel (selectedItem, "5", tr("Field 4"))); |
1232 | ListView->setColumnText(5, getFieldLabel (selectedItem, "6", tr("Field 5"))); | 1259 | ListView->setColumnText(5, getFieldLabel (selectedItem, "6", tr("Field 5"))); |
1233 | #endif | 1260 | #endif |
1234 | #ifdef WIN32 | 1261 | #ifdef Q_WS_WIN |
1235 | // set the column text dependent on the selected item | 1262 | // set the column text dependent on the selected item |
1236 | ListView->setColumnText(0, getFieldLabel (selectedItem, "1", tr("Name"))); | 1263 | ListView->setColumnText(0, getFieldLabel (selectedItem, "1", tr("Name"))); |
1237 | ListView->setColumnText(1, getFieldLabel (selectedItem, "2", tr("Field 2"))); | 1264 | ListView->setColumnText(1, getFieldLabel (selectedItem, "2", tr("Field 2"))); |
1238 | ListView->setColumnText(2, getFieldLabel (selectedItem, "3", tr("Field 3"))); | 1265 | ListView->setColumnText(2, getFieldLabel (selectedItem, "3", tr("Field 3"))); |
1239 | ListView->setColumnText(3, getFieldLabel (selectedItem, "4", tr("Comment"))); | 1266 | ListView->setColumnText(3, getFieldLabel (selectedItem, "4", tr("Comment"))); |
1240 | ListView->setColumnText(4, getFieldLabel (selectedItem, "5", tr("Field 4"))); | 1267 | ListView->setColumnText(4, getFieldLabel (selectedItem, "5", tr("Field 4"))); |
@@ -1483,13 +1510,13 @@ void ZSafe::readAllEntries() | |||
1483 | QTextStream t(&f); | 1510 | QTextStream t(&f); |
1484 | while ( !t.eof() ) | 1511 | while ( !t.eof() ) |
1485 | { | 1512 | { |
1486 | QString s = t.readLine(); | 1513 | QString s = t.readLine(); |
1487 | s.replace (QRegExp("\";\""), "\"|\""); | 1514 | s.replace (QRegExp("\";\""), "\"|\""); |
1488 | // char buffer[1024]; | 1515 | // char buffer[1024]; |
1489 | #ifndef WIN32 | 1516 | #ifndef Q_WS_WIN |
1490 | char buffer[s.length()+1]; | 1517 | char buffer[s.length()+1]; |
1491 | #else | 1518 | #else |
1492 | char buffer[4048]; | 1519 | char buffer[4048]; |
1493 | #endif | 1520 | #endif |
1494 | 1521 | ||
1495 | 1522 | ||
@@ -1582,13 +1609,13 @@ void ZSafe::readAllEntries() | |||
1582 | Category *c1 = new Category(); | 1609 | Category *c1 = new Category(); |
1583 | c1->setCategoryName(category); | 1610 | c1->setCategoryName(category); |
1584 | 1611 | ||
1585 | QString icon; | 1612 | QString icon; |
1586 | QString fullIconPath; | 1613 | QString fullIconPath; |
1587 | QPixmap *pix; | 1614 | QPixmap *pix; |
1588 | // #ifndef WIN32 | 1615 | // #ifndef Q_WS_WIN |
1589 | icon = conf->readEntry(APP_KEY+category); | 1616 | icon = conf->readEntry(APP_KEY+category); |
1590 | // #endif | 1617 | // #endif |
1591 | bool isIconAv = false; | 1618 | bool isIconAv = false; |
1592 | if (!icon.isEmpty() && !icon.isNull()) | 1619 | if (!icon.isEmpty() && !icon.isNull()) |
1593 | { | 1620 | { |
1594 | // build the full path | 1621 | // build the full path |
@@ -1735,13 +1762,13 @@ void ZSafe::readAllEntries() | |||
1735 | while ( !t.eof() ) | 1762 | while ( !t.eof() ) |
1736 | { | 1763 | { |
1737 | QString s = t.readLine(); | 1764 | QString s = t.readLine(); |
1738 | s.replace (QRegExp("\";\""), "\"|\""); | 1765 | s.replace (QRegExp("\";\""), "\"|\""); |
1739 | // char buffer[1024]; | 1766 | // char buffer[1024]; |
1740 | int len=s.length()+1; | 1767 | int len=s.length()+1; |
1741 | #ifdef WIN32 | 1768 | #ifdef Q_WS_WIN |
1742 | char buffer[512]; | 1769 | char buffer[512]; |
1743 | #else | 1770 | #else |
1744 | char buffer[len]; | 1771 | char buffer[len]; |
1745 | #endif | 1772 | #endif |
1746 | strcpy (buffer, s); | 1773 | strcpy (buffer, s); |
1747 | 1774 | ||
@@ -1815,13 +1842,13 @@ void ZSafe::readAllEntries() | |||
1815 | Category *c1 = new Category(); | 1842 | Category *c1 = new Category(); |
1816 | c1->setCategoryName(category); | 1843 | c1->setCategoryName(category); |
1817 | 1844 | ||
1818 | QString icon; | 1845 | QString icon; |
1819 | QString fullIconPath; | 1846 | QString fullIconPath; |
1820 | QPixmap *pix; | 1847 | QPixmap *pix; |
1821 | // #ifndef WIN32 | 1848 | // #ifndef Q_WS_WIN |
1822 | icon = conf->readEntry(APP_KEY+category); | 1849 | icon = conf->readEntry(APP_KEY+category); |
1823 | // #endif | 1850 | // #endif |
1824 | bool isIconAv = false; | 1851 | bool isIconAv = false; |
1825 | if (!icon.isEmpty() && !icon.isNull()) | 1852 | if (!icon.isEmpty() && !icon.isNull()) |
1826 | { | 1853 | { |
1827 | // build the full path | 1854 | // build the full path |
@@ -1893,13 +1920,13 @@ void ZSafe::resume(int) | |||
1893 | 1920 | ||
1894 | 1921 | ||
1895 | bool ZSafe::openDocument(const char* _filename, const char* ) | 1922 | bool ZSafe::openDocument(const char* _filename, const char* ) |
1896 | { | 1923 | { |
1897 | int retval; | 1924 | int retval; |
1898 | char* entry[FIELD_SIZE]; | 1925 | char* entry[FIELD_SIZE]; |
1899 | // #ifndef WIN32 | 1926 | // #ifndef Q_WS_WIN |
1900 | int validationFlag = conf->readNumEntry(APP_KEY+"valzsafe", 1); | 1927 | int validationFlag = conf->readNumEntry(APP_KEY+"valzsafe", 1); |
1901 | // #else | 1928 | // #else |
1902 | // int validationFlag = 1; | 1929 | // int validationFlag = 1; |
1903 | // #endif | 1930 | // #endif |
1904 | 1931 | ||
1905 | int pwdOk = 0; | 1932 | int pwdOk = 0; |
@@ -1934,13 +1961,13 @@ bool ZSafe::openDocument(const char* _filename, const char* ) | |||
1934 | #endif | 1961 | #endif |
1935 | return false; | 1962 | return false; |
1936 | } | 1963 | } |
1937 | } | 1964 | } |
1938 | else | 1965 | else |
1939 | { | 1966 | { |
1940 | #ifdef WIN32 | 1967 | #ifdef Q_WS_WIN |
1941 | this->setCaption("Qt ZSafe"); | 1968 | this->setCaption("Qt ZSafe"); |
1942 | #else | 1969 | #else |
1943 | this->setCaption("ZSafe"); | 1970 | this->setCaption("ZSafe"); |
1944 | #endif | 1971 | #endif |
1945 | filename = ""; | 1972 | filename = ""; |
1946 | return false; | 1973 | return false; |
@@ -2051,13 +2078,13 @@ bool ZSafe::openDocument(const char* _filename, const char* ) | |||
2051 | Category *c1 = new Category(); | 2078 | Category *c1 = new Category(); |
2052 | c1->setCategoryName(category); | 2079 | c1->setCategoryName(category); |
2053 | 2080 | ||
2054 | QString icon; | 2081 | QString icon; |
2055 | QString fullIconPath; | 2082 | QString fullIconPath; |
2056 | QPixmap *pix; | 2083 | QPixmap *pix; |
2057 | // #ifndef WIN32 | 2084 | // #ifndef Q_WS_WIN |
2058 | icon = conf->readEntry(APP_KEY+category); | 2085 | icon = conf->readEntry(APP_KEY+category); |
2059 | // #endif | 2086 | // #endif |
2060 | bool isIconAv = false; | 2087 | bool isIconAv = false; |
2061 | if (!icon.isEmpty() && !icon.isNull()) | 2088 | if (!icon.isEmpty() && !icon.isNull()) |
2062 | { | 2089 | { |
2063 | // build the full path | 2090 | // build the full path |
@@ -2137,13 +2164,13 @@ int ZSafe::loadInit(const char* _filename, const char *password) | |||
2137 | for (j = 0; password[j] != '\0'; j++) { | 2164 | for (j = 0; password[j] != '\0'; j++) { |
2138 | key[j] = password[j]; | 2165 | key[j] = password[j]; |
2139 | } | 2166 | } |
2140 | keylength = j; | 2167 | keylength = j; |
2141 | krc2->rc2_expandkey (key, keylength, 128); | 2168 | krc2->rc2_expandkey (key, keylength, 128); |
2142 | 2169 | ||
2143 | #ifndef WIN32 | 2170 | #ifndef Q_WS_WIN |
2144 | size = read(fileno (fd), (unsigned char *) (charbuf + count), 8); | 2171 | size = read(fileno (fd), (unsigned char *) (charbuf + count), 8); |
2145 | #else | 2172 | #else |
2146 | size = fread ((unsigned char *) (charbuf + count), sizeof(unsigned char), 8, fd); | 2173 | size = fread ((unsigned char *) (charbuf + count), sizeof(unsigned char), 8, fd); |
2147 | #endif | 2174 | #endif |
2148 | 2175 | ||
2149 | if (size < 8) | 2176 | if (size < 8) |
@@ -2154,13 +2181,13 @@ int ZSafe::loadInit(const char* _filename, const char *password) | |||
2154 | iv[count] = charbuf[count2] << 8; | 2181 | iv[count] = charbuf[count2] << 8; |
2155 | iv[count] += charbuf[count2 + 1]; | 2182 | iv[count] += charbuf[count2 + 1]; |
2156 | } | 2183 | } |
2157 | 2184 | ||
2158 | size = 0; | 2185 | size = 0; |
2159 | bufferIndex = 0; | 2186 | bufferIndex = 0; |
2160 | #ifndef WIN32 | 2187 | #ifndef Q_WS_WIN |
2161 | while ((count = read (fileno (fd), (unsigned char *) charbuf, 8)) > 0) { | 2188 | while ((count = read (fileno (fd), (unsigned char *) charbuf, 8)) > 0) { |
2162 | while (count < 8) { | 2189 | while (count < 8) { |
2163 | count2 = read (fileno (fd), (unsigned char *) (charbuf + count), 8); | 2190 | count2 = read (fileno (fd), (unsigned char *) (charbuf + count), 8); |
2164 | #else | 2191 | #else |
2165 | while ((count = fread ((unsigned char *) (charbuf), sizeof(unsigned char), 8, fd)) > 0) { | 2192 | while ((count = fread ((unsigned char *) (charbuf), sizeof(unsigned char), 8, fd)) > 0) { |
2166 | while (count < 8) { | 2193 | while (count < 8) { |
@@ -2336,13 +2363,13 @@ bool ZSafe::saveDocument(const char* _filename, | |||
2336 | #else | 2363 | #else |
2337 | qWarning("1: Error writing file, contents not saved"); | 2364 | qWarning("1: Error writing file, contents not saved"); |
2338 | #endif | 2365 | #endif |
2339 | saveFinalize(); | 2366 | saveFinalize(); |
2340 | return false; | 2367 | return false; |
2341 | } | 2368 | } |
2342 | // #ifndef WIN32 | 2369 | // #ifndef Q_WS_WIN |
2343 | conf->writeEntry(APP_KEY+"valzsafe", 1); | 2370 | conf->writeEntry(APP_KEY+"valzsafe", 1); |
2344 | // #endif | 2371 | // #endif |
2345 | saveConf(); | 2372 | saveConf(); |
2346 | } | 2373 | } |
2347 | 2374 | ||
2348 | QListViewItem *i; | 2375 | QListViewItem *i; |
@@ -2431,13 +2458,13 @@ void ZSafe::getDocPassword(QString title) | |||
2431 | connect( dialog->PasswordField, SIGNAL( returnPressed() ), | 2458 | connect( dialog->PasswordField, SIGNAL( returnPressed() ), |
2432 | this, SLOT( setPasswordDialogDone() ) ); | 2459 | this, SLOT( setPasswordDialogDone() ) ); |
2433 | 2460 | ||
2434 | // CS: !!! | 2461 | // CS: !!! |
2435 | // int pos = filename.findRev ('/'); | 2462 | // int pos = filename.findRev ('/'); |
2436 | QString ti = filename.right (filename.length() - filename.findRev ('/') - 1); | 2463 | QString ti = filename.right (filename.length() - filename.findRev ('/') - 1); |
2437 | #ifdef WIN32 | 2464 | #ifdef Q_WS_WIN |
2438 | dialog->setCaption("Qt " + ti); | 2465 | dialog->setCaption("Qt " + ti); |
2439 | #else | 2466 | #else |
2440 | dialog->setCaption(ti); | 2467 | dialog->setCaption(ti); |
2441 | #endif | 2468 | #endif |
2442 | // dialog->setCaption(title); | 2469 | // dialog->setCaption(title); |
2443 | 2470 | ||
@@ -2661,24 +2688,24 @@ void ZSafe::addCategory() | |||
2661 | { | 2688 | { |
2662 | dialog = categoryDialog; | 2689 | dialog = categoryDialog; |
2663 | } | 2690 | } |
2664 | else | 2691 | else |
2665 | { | 2692 | { |
2666 | categoryDialog = new CategoryDialog(this, tr("Category"), TRUE); | 2693 | categoryDialog = new CategoryDialog(this, tr("Category"), TRUE); |
2667 | #ifdef WIN32 | 2694 | #ifdef Q_WS_WIN |
2668 | categoryDialog->setCaption ("Qt " + tr("Category")); | 2695 | categoryDialog->setCaption ("Qt " + tr("Category")); |
2669 | #endif | 2696 | #endif |
2670 | dialog = categoryDialog; | 2697 | dialog = categoryDialog; |
2671 | connect( dialog->CategoryField, | 2698 | connect( dialog->CategoryField, |
2672 | SIGNAL( activated(const QString&)), | 2699 | SIGNAL( activated(const QString&)), |
2673 | this, SLOT( categoryFieldActivated(const QString&) ) ); | 2700 | this, SLOT( categoryFieldActivated(const QString&) ) ); |
2674 | initIcons = true; | 2701 | initIcons = true; |
2675 | } | 2702 | } |
2676 | 2703 | ||
2677 | #ifdef DESKTOP | 2704 | #ifdef DESKTOP |
2678 | #ifndef WIN32 | 2705 | #ifndef Q_WS_WIN |
2679 | QStringList list = conf->entryList( APP_KEY+"/fieldDefs" ); | 2706 | QStringList list = conf->entryList( APP_KEY+"/fieldDefs" ); |
2680 | #else | 2707 | #else |
2681 | // read all categories from the config file and store | 2708 | // read all categories from the config file and store |
2682 | // into a list | 2709 | // into a list |
2683 | QFile f (cfgFile); | 2710 | QFile f (cfgFile); |
2684 | QStringList list; | 2711 | QStringList list; |
@@ -2715,13 +2742,13 @@ void ZSafe::addCategory() | |||
2715 | while( it != list.end() ) | 2742 | while( it != list.end() ) |
2716 | { | 2743 | { |
2717 | QString *cat = new QString (*it); | 2744 | QString *cat = new QString (*it); |
2718 | if (cat->contains("-field1", FALSE)) | 2745 | if (cat->contains("-field1", FALSE)) |
2719 | { | 2746 | { |
2720 | #ifdef DESKTOP | 2747 | #ifdef DESKTOP |
2721 | #ifndef WIN32 | 2748 | #ifndef Q_WS_WIN |
2722 | categ = cat->section ("-field1", 0, 0); | 2749 | categ = cat->section ("-field1", 0, 0); |
2723 | #else | 2750 | #else |
2724 | int pos = cat->find ("-field1"); | 2751 | int pos = cat->find ("-field1"); |
2725 | categ = cat->left (pos); | 2752 | categ = cat->left (pos); |
2726 | #endif | 2753 | #endif |
2727 | #else | 2754 | #else |
@@ -2783,13 +2810,13 @@ void ZSafe::addCategory() | |||
2783 | } | 2810 | } |
2784 | ++it; | 2811 | ++it; |
2785 | } | 2812 | } |
2786 | waitDialog.hide(); | 2813 | waitDialog.hide(); |
2787 | } | 2814 | } |
2788 | 2815 | ||
2789 | #ifndef WIN32 | 2816 | #ifndef Q_WS_WIN |
2790 | dialog->show(); | 2817 | dialog->show(); |
2791 | #endif | 2818 | #endif |
2792 | #ifndef DESKTOP | 2819 | #ifndef DESKTOP |
2793 | // dialog->move (20, 100); | 2820 | // dialog->move (20, 100); |
2794 | #endif | 2821 | #endif |
2795 | DialogCode result = (DialogCode) dialog->exec(); | 2822 | DialogCode result = (DialogCode) dialog->exec(); |
@@ -2822,13 +2849,13 @@ void ZSafe::addCategory() | |||
2822 | fullIconPath = iconPath + icon; | 2849 | fullIconPath = iconPath + icon; |
2823 | pix = new QPixmap (fullIconPath); | 2850 | pix = new QPixmap (fullIconPath); |
2824 | // pix->resize(14, 14); | 2851 | // pix->resize(14, 14); |
2825 | if (!pix->isNull()) | 2852 | if (!pix->isNull()) |
2826 | { | 2853 | { |
2827 | // save the full pixmap name into the config file | 2854 | // save the full pixmap name into the config file |
2828 | // #ifndef WIN32 | 2855 | // #ifndef Q_WS_WIN |
2829 | conf->writeEntry(APP_KEY+category, icon); | 2856 | conf->writeEntry(APP_KEY+category, icon); |
2830 | // #endif | 2857 | // #endif |
2831 | saveConf(); | 2858 | saveConf(); |
2832 | QImage img = pix->convertToImage(); | 2859 | QImage img = pix->convertToImage(); |
2833 | pix->convertFromImage(img.smoothScale(14,14)); | 2860 | pix->convertFromImage(img.smoothScale(14,14)); |
2834 | c1->setIcon (*pix); | 2861 | c1->setIcon (*pix); |
@@ -2874,13 +2901,13 @@ void ZSafe::delCategory() | |||
2874 | 0 // Enter == button 0 | 2901 | 0 // Enter == button 0 |
2875 | ) ) { // Escape == button 2 | 2902 | ) ) { // Escape == button 2 |
2876 | case 0: // Delete clicked, Alt-S or Enter pressed. | 2903 | case 0: // Delete clicked, Alt-S or Enter pressed. |
2877 | // Delete from the category list | 2904 | // Delete from the category list |
2878 | modified = true; | 2905 | modified = true; |
2879 | categories.remove (selectedItem->text(0)); | 2906 | categories.remove (selectedItem->text(0)); |
2880 | // #ifndef WIN32 | 2907 | // #ifndef Q_WS_WIN |
2881 | conf->removeEntry (selectedItem->text(0)); | 2908 | conf->removeEntry (selectedItem->text(0)); |
2882 | // #endif | 2909 | // #endif |
2883 | saveConf(); | 2910 | saveConf(); |
2884 | 2911 | ||
2885 | // Delete the selected item and all subitems | 2912 | // Delete the selected item and all subitems |
2886 | // step through all subitems | 2913 | // step through all subitems |
@@ -3034,18 +3061,18 @@ void ZSafe::setCategoryDialogFields(CategoryDialog *dialog, QString category) | |||
3034 | void ZSafe::saveCategoryDialogFields(CategoryDialog *dialog) | 3061 | void ZSafe::saveCategoryDialogFields(CategoryDialog *dialog) |
3035 | { | 3062 | { |
3036 | QString app_key = APP_KEY; | 3063 | QString app_key = APP_KEY; |
3037 | #ifndef DESKTOP | 3064 | #ifndef DESKTOP |
3038 | conf->setGroup ("fieldDefs"); | 3065 | conf->setGroup ("fieldDefs"); |
3039 | #else | 3066 | #else |
3040 | #ifndef WIN32 | 3067 | #ifndef Q_WS_WIN |
3041 | app_key += "/fieldDefs/"; | 3068 | app_key += "/fieldDefs/"; |
3042 | #endif | 3069 | #endif |
3043 | #endif | 3070 | #endif |
3044 | QString category = dialog->CategoryField->currentText(); | 3071 | QString category = dialog->CategoryField->currentText(); |
3045 | // #ifndef WIN32 | 3072 | // #ifndef Q_WS_WIN |
3046 | conf->writeEntry(app_key+category+"-field1", dialog->Field1->text()); | 3073 | conf->writeEntry(app_key+category+"-field1", dialog->Field1->text()); |
3047 | conf->writeEntry(app_key+category+"-field2", dialog->Field2->text()); | 3074 | conf->writeEntry(app_key+category+"-field2", dialog->Field2->text()); |
3048 | conf->writeEntry(app_key+category+"-field3", dialog->Field3->text()); | 3075 | conf->writeEntry(app_key+category+"-field3", dialog->Field3->text()); |
3049 | conf->writeEntry(app_key+category+"-field4", dialog->Field4->text()); | 3076 | conf->writeEntry(app_key+category+"-field4", dialog->Field4->text()); |
3050 | conf->writeEntry(app_key+category+"-field5", dialog->Field5->text()); | 3077 | conf->writeEntry(app_key+category+"-field5", dialog->Field5->text()); |
3051 | conf->writeEntry(app_key+category+"-field6", dialog->Field6->text()); | 3078 | conf->writeEntry(app_key+category+"-field6", dialog->Field6->text()); |
@@ -3070,25 +3097,25 @@ void ZSafe::editCategory() | |||
3070 | { | 3097 | { |
3071 | dialog = categoryDialog; | 3098 | dialog = categoryDialog; |
3072 | } | 3099 | } |
3073 | else | 3100 | else |
3074 | { | 3101 | { |
3075 | categoryDialog = new CategoryDialog(this, tr("Category"), TRUE); | 3102 | categoryDialog = new CategoryDialog(this, tr("Category"), TRUE); |
3076 | #ifdef WIN32 | 3103 | #ifdef Q_WS_WIN |
3077 | categoryDialog->setCaption ("Qt " + tr("Category")); | 3104 | categoryDialog->setCaption ("Qt " + tr("Category")); |
3078 | #endif | 3105 | #endif |
3079 | dialog = categoryDialog; | 3106 | dialog = categoryDialog; |
3080 | connect( dialog->CategoryField, | 3107 | connect( dialog->CategoryField, |
3081 | SIGNAL( activated(const QString&)), | 3108 | SIGNAL( activated(const QString&)), |
3082 | this, SLOT( categoryFieldActivated(const QString&) ) ); | 3109 | this, SLOT( categoryFieldActivated(const QString&) ) ); |
3083 | initIcons = true; | 3110 | initIcons = true; |
3084 | } | 3111 | } |
3085 | setCategoryDialogFields(dialog); | 3112 | setCategoryDialogFields(dialog); |
3086 | 3113 | ||
3087 | #ifdef DESKTOP | 3114 | #ifdef DESKTOP |
3088 | #ifndef WIN32 | 3115 | #ifndef Q_WS_WIN |
3089 | QStringList list = conf->entryList( APP_KEY+"/fieldDefs" ); | 3116 | QStringList list = conf->entryList( APP_KEY+"/fieldDefs" ); |
3090 | #else | 3117 | #else |
3091 | // read all categories from the config file and store | 3118 | // read all categories from the config file and store |
3092 | // into a list | 3119 | // into a list |
3093 | QFile f (cfgFile); | 3120 | QFile f (cfgFile); |
3094 | QStringList list; | 3121 | QStringList list; |
@@ -3126,13 +3153,13 @@ void ZSafe::editCategory() | |||
3126 | while( it != list.end() ) | 3153 | while( it != list.end() ) |
3127 | { | 3154 | { |
3128 | QString *cat = new QString (*it); | 3155 | QString *cat = new QString (*it); |
3129 | if (cat->contains("-field1", FALSE)) | 3156 | if (cat->contains("-field1", FALSE)) |
3130 | { | 3157 | { |
3131 | #ifdef DESKTOP | 3158 | #ifdef DESKTOP |
3132 | #ifndef WIN32 | 3159 | #ifndef Q_WS_WIN |
3133 | categ = cat->section ("-field1", 0, 0); | 3160 | categ = cat->section ("-field1", 0, 0); |
3134 | #else | 3161 | #else |
3135 | int pos = cat->find ("-field1"); | 3162 | int pos = cat->find ("-field1"); |
3136 | categ = cat->left (pos); | 3163 | categ = cat->left (pos); |
3137 | #endif | 3164 | #endif |
3138 | #else | 3165 | #else |
@@ -3269,13 +3296,13 @@ void ZSafe::editCategory() | |||
3269 | if (result == Accepted) | 3296 | if (result == Accepted) |
3270 | { | 3297 | { |
3271 | modified = true; | 3298 | modified = true; |
3272 | if (category != dialog->CategoryField->currentText()) | 3299 | if (category != dialog->CategoryField->currentText()) |
3273 | { | 3300 | { |
3274 | categories.remove (category); | 3301 | categories.remove (category); |
3275 | // #ifndef WIN32 | 3302 | // #ifndef Q_WS_WIN |
3276 | conf->removeEntry(category); | 3303 | conf->removeEntry(category); |
3277 | // #endif | 3304 | // #endif |
3278 | saveConf(); | 3305 | saveConf(); |
3279 | } | 3306 | } |
3280 | 3307 | ||
3281 | category = dialog->CategoryField->currentText(); | 3308 | category = dialog->CategoryField->currentText(); |
@@ -3295,25 +3322,25 @@ void ZSafe::editCategory() | |||
3295 | // build the full path | 3322 | // build the full path |
3296 | fullIconPath = iconPath + icon; | 3323 | fullIconPath = iconPath + icon; |
3297 | pix = new QPixmap (fullIconPath); | 3324 | pix = new QPixmap (fullIconPath); |
3298 | if (!pix->isNull()) | 3325 | if (!pix->isNull()) |
3299 | { | 3326 | { |
3300 | // save the full pixmap name into the config file | 3327 | // save the full pixmap name into the config file |
3301 | // #ifndef WIN32 | 3328 | // #ifndef Q_WS_WIN |
3302 | conf->writeEntry(APP_KEY+category, icon); | 3329 | conf->writeEntry(APP_KEY+category, icon); |
3303 | // #endif | 3330 | // #endif |
3304 | saveConf(); | 3331 | saveConf(); |
3305 | QImage img = pix->convertToImage(); | 3332 | QImage img = pix->convertToImage(); |
3306 | pix->convertFromImage(img.smoothScale(14,14)); | 3333 | pix->convertFromImage(img.smoothScale(14,14)); |
3307 | cat->setIconName (icon); | 3334 | cat->setIconName (icon); |
3308 | cat->setIcon (*pix); | 3335 | cat->setIcon (*pix); |
3309 | } | 3336 | } |
3310 | } | 3337 | } |
3311 | else | 3338 | else |
3312 | { | 3339 | { |
3313 | // #ifndef WIN32 | 3340 | // #ifndef Q_WS_WIN |
3314 | conf->removeEntry (category); | 3341 | conf->removeEntry (category); |
3315 | // #endif | 3342 | // #endif |
3316 | saveConf(); | 3343 | saveConf(); |
3317 | cat->setIcon (*getPredefinedIcon(category)); | 3344 | cat->setIcon (*getPredefinedIcon(category)); |
3318 | } | 3345 | } |
3319 | 3346 | ||
@@ -3486,13 +3513,13 @@ void ZSafe::newDocument() | |||
3486 | filename = newFile; | 3513 | filename = newFile; |
3487 | 3514 | ||
3488 | // save the current filename to the config file | 3515 | // save the current filename to the config file |
3489 | conf->writeEntry(APP_KEY+"document", filename); | 3516 | conf->writeEntry(APP_KEY+"document", filename); |
3490 | saveConf(); | 3517 | saveConf(); |
3491 | QString ti = filename.right (filename.length() - filename.findRev ('/') - 1); | 3518 | QString ti = filename.right (filename.length() - filename.findRev ('/') - 1); |
3492 | #ifdef WIN32 | 3519 | #ifdef Q_WS_WIN |
3493 | this->setCaption("Qt ZSafe: " + ti); | 3520 | this->setCaption("Qt ZSafe: " + ti); |
3494 | #else | 3521 | #else |
3495 | this->setCaption("ZSafe: " + ti); | 3522 | this->setCaption("ZSafe: " + ti); |
3496 | #endif | 3523 | #endif |
3497 | 3524 | ||
3498 | // openDocument(filename); | 3525 | // openDocument(filename); |
@@ -3570,13 +3597,13 @@ void ZSafe::loadDocument() | |||
3570 | filename = newFile; | 3597 | filename = newFile; |
3571 | 3598 | ||
3572 | // save the current filename to the config file | 3599 | // save the current filename to the config file |
3573 | conf->writeEntry(APP_KEY+"document", filename); | 3600 | conf->writeEntry(APP_KEY+"document", filename); |
3574 | saveConf(); | 3601 | saveConf(); |
3575 | QString ti = filename.right (filename.length() - filename.findRev ('/') - 1); | 3602 | QString ti = filename.right (filename.length() - filename.findRev ('/') - 1); |
3576 | #ifdef WIN32 | 3603 | #ifdef Q_WS_WIN |
3577 | this->setCaption("Qt ZSafe: " + ti); | 3604 | this->setCaption("Qt ZSafe: " + ti); |
3578 | #else | 3605 | #else |
3579 | this->setCaption("ZSafe: " + ti); | 3606 | this->setCaption("ZSafe: " + ti); |
3580 | #endif | 3607 | #endif |
3581 | 3608 | ||
3582 | openDocument(filename); | 3609 | openDocument(filename); |
@@ -3624,13 +3651,13 @@ void ZSafe::saveDocumentAs() | |||
3624 | filename = newFile; | 3651 | filename = newFile; |
3625 | 3652 | ||
3626 | // save the current filename to the config file | 3653 | // save the current filename to the config file |
3627 | conf->writeEntry(APP_KEY+"document", filename); | 3654 | conf->writeEntry(APP_KEY+"document", filename); |
3628 | saveConf(); | 3655 | saveConf(); |
3629 | QString ti = filename.right (filename.length() - filename.findRev ('/') - 1); | 3656 | QString ti = filename.right (filename.length() - filename.findRev ('/') - 1); |
3630 | #ifdef WIN32 | 3657 | #ifdef Q_WS_WIN |
3631 | this->setCaption("Qt ZSafe: " + ti); | 3658 | this->setCaption("Qt ZSafe: " + ti); |
3632 | #else | 3659 | #else |
3633 | this->setCaption("ZSafe: " + ti); | 3660 | this->setCaption("ZSafe: " + ti); |
3634 | #endif | 3661 | #endif |
3635 | 3662 | ||
3636 | QMessageBox::information( this, tr("ZSafe"), | 3663 | QMessageBox::information( this, tr("ZSafe"), |
@@ -3703,13 +3730,13 @@ void ZSafe::setExpandFlag() | |||
3703 | { | 3730 | { |
3704 | expandTree = !expandTree; | 3731 | expandTree = !expandTree; |
3705 | file->setItemChecked('o', expandTree); | 3732 | file->setItemChecked('o', expandTree); |
3706 | #ifndef DESKTOP | 3733 | #ifndef DESKTOP |
3707 | conf->setGroup ("zsafePrefs"); | 3734 | conf->setGroup ("zsafePrefs"); |
3708 | #endif | 3735 | #endif |
3709 | // #ifndef WIN32 | 3736 | // #ifndef Q_WS_WIN |
3710 | conf->writeEntry (APP_KEY+"expandTree", expandTree); | 3737 | conf->writeEntry (APP_KEY+"expandTree", expandTree); |
3711 | // #endif | 3738 | // #endif |
3712 | saveConf(); | 3739 | saveConf(); |
3713 | 3740 | ||
3714 | } | 3741 | } |
3715 | 3742 | ||
@@ -3788,13 +3815,13 @@ void ZSafe::setDocument(const QString& fileref) | |||
3788 | filename = fileref; | 3815 | filename = fileref; |
3789 | } | 3816 | } |
3790 | // save the current filename to the config file | 3817 | // save the current filename to the config file |
3791 | conf->writeEntry(APP_KEY+"document", filename); | 3818 | conf->writeEntry(APP_KEY+"document", filename); |
3792 | saveConf(); | 3819 | saveConf(); |
3793 | QString ti = filename.right (filename.length() - filename.findRev ('/') - 1); | 3820 | QString ti = filename.right (filename.length() - filename.findRev ('/') - 1); |
3794 | #ifdef WIN32 | 3821 | #ifdef Q_WS_WIN |
3795 | this->setCaption("Qt ZSafe: " + ti); | 3822 | this->setCaption("Qt ZSafe: " + ti); |
3796 | #else | 3823 | #else |
3797 | this->setCaption("ZSafe: " + ti); | 3824 | this->setCaption("ZSafe: " + ti); |
3798 | #endif | 3825 | #endif |
3799 | 3826 | ||
3800 | // clear the password list | 3827 | // clear the password list |