author | llornkcor <llornkcor> | 2004-07-13 10:35:23 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2004-07-13 10:35:23 (UTC) |
commit | 37e0e077b51841971c3d4c25b287f4d39e750e2d (patch) (unidiff) | |
tree | c1b499dd6e544207c6ff7047acd8170d6ea63f94 /noncore/apps/zsafe | |
parent | 5d2ec2e9b1dce49e914c260fe16a82ddccbaa92d (diff) | |
download | opie-37e0e077b51841971c3d4c25b287f4d39e750e2d.zip opie-37e0e077b51841971c3d4c25b287f4d39e750e2d.tar.gz opie-37e0e077b51841971c3d4c25b287f4d39e750e2d.tar.bz2 |
fix ups, and move qsettings files away
-rw-r--r--[-rwxr-xr-x] | noncore/apps/zsafe/extra/qsettings.cpp (renamed from noncore/apps/zsafe/qsettings.cpp) | 308 | ||||
-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 | 147 |
3 files changed, 243 insertions, 212 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 | |||
@@ -1,152 +1,156 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id$ | 2 | ** $Id$ |
3 | */ | 3 | */ |
4 | 4 | ||
5 | #include "qsettings.h" | 5 | #include "qsettings.h" |
6 | #include <stdio.h> | 6 | #include <stdio.h> |
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 | // read the prefs from the file | 13 | qWarning("Settings "+_fn); |
14 | fn = _fn; | 14 | // read the prefs from the file |
15 | 15 | fn = _fn; | |
16 | QFile f(_fn); | 16 | |
17 | if ( f.open(IO_ReadOnly) ) { // file opened successfully | 17 | QFile f(_fn); |
18 | QTextStream t( &f ); // use a text stream | 18 | if ( f.open(IO_ReadOnly) ) { // file opened successfully |
19 | QString s; | 19 | QTextStream t( &f ); // use a text stream |
20 | while ( !t.eof() ) { // until end of file... | 20 | QString s; |
21 | s = t.readLine(); // line of text excluding '\n' | 21 | while ( !t.eof() ) { // until end of file... |
22 | char buf[256]; | 22 | s = t.readLine(); // line of text excluding '\n' |
23 | sprintf (buf, "%s", (const char *) s); | 23 | char buf[256]; |
24 | int pos = s.find (" = "); | 24 | sprintf (buf, "%s", (const char *) s); |
25 | QString key = s.left (pos); | 25 | int pos = s.find (" = "); |
26 | QString val = s.right (s.length() - pos - 3); | 26 | QString key = s.left (pos); |
27 | writeEntry (key, val); | 27 | QString val = s.right (s.length() - pos - 3); |
28 | 28 | writeEntry (key, val); | |
29 | sprintf (buf, "%s|%s", (const char *)key, (const char *)val); | 29 | |
30 | } | 30 | sprintf (buf, "%s|%s", (const char *)key, (const char *)val); |
31 | f.close(); | 31 | } |
32 | } | 32 | f.close(); |
33 | 33 | } | |
34 | 34 | ||
35 | } | 35 | |
36 | 36 | } | |
37 | QSettings::~QSettings() | 37 | |
38 | { | 38 | QSettings::~QSettings() |
39 | // write out the prefs to the file | 39 | { |
40 | QAsciiDictIterator <QString> it( prefs ); // iterator for dict | 40 | // write out the prefs to the file |
41 | QFile f(fn); | 41 | QAsciiDictIterator <QString> it( prefs ); // iterator for dict |
42 | f.open(IO_WriteOnly); | 42 | QFile f(fn); |
43 | QTextStream ts( &f ); | 43 | f.open(IO_WriteOnly); |
44 | 44 | QTextStream ts( &f ); | |
45 | while ( it.current() ) | 45 | |
46 | { | 46 | while ( it.current() ) |
47 | QString *key = new QString(it.currentKey()); | 47 | { |
48 | char buf[256]; | 48 | QString *key = new QString(it.currentKey()); |
49 | sprintf (buf, "%s", (const char *) *( it.current())); | 49 | char buf[256]; |
50 | QString *val = new QString(buf); | 50 | sprintf (buf, "%s", (const char *) *( it.current())); |
51 | sprintf (buf, "%s %s", (const char *)*key, (const char *)*val); | 51 | QString *val = new QString(buf); |
52 | ts << *key << " = " << *val << endl; | 52 | sprintf (buf, "%s %s", (const char *)*key, (const char *)*val); |
53 | ++it; | 53 | ts << *key << " = " << *val << endl; |
54 | } | 54 | ++it; |
55 | 55 | } | |
56 | f.close(); | 56 | |
57 | prefs.clear(); | 57 | f.close(); |
58 | } | 58 | prefs.clear(); |
59 | 59 | } | |
60 | void QSettings::insertSearchPath (System sys, const QString &str) | 60 | |
61 | { | 61 | void QSettings::insertSearchPath (System sys, const QString &str) |
62 | fn = str; | 62 | { |
63 | } | 63 | fn = str; |
64 | 64 | } | |
65 | QString QSettings::readEntry (const QString &key, const QString &def) | 65 | |
66 | { | 66 | QString QSettings::readEntry (const QString &key, const QString &def) |
67 | 67 | { | |
68 | QString *s = prefs.find((const char *)key); | 68 | |
69 | if (!s) | 69 | QString *s = prefs.find((const char *)key); |
70 | return def; | 70 | if (!s) |
71 | else | 71 | return def; |
72 | return *s; | 72 | else |
73 | 73 | return *s; | |
74 | } | 74 | |
75 | 75 | } | |
76 | int QSettings::readNumEntry (const QString &key, int def) | 76 | |
77 | { | 77 | int QSettings::readNumEntry (const QString &key, int def) |
78 | QString *s = prefs[key]; | 78 | { |
79 | if (!s) return def; | 79 | QString *s = prefs[key]; |
80 | return s->toInt(); | 80 | if (!s) return def; |
81 | } | 81 | return s->toInt(); |
82 | 82 | } | |
83 | bool QSettings::readBoolEntry (const QString &key, bool def) | 83 | |
84 | { | 84 | bool QSettings::readBoolEntry (const QString &key, bool def) |
85 | QString *s = prefs[key]; | 85 | { |
86 | if (!s) return def; | 86 | QString *s = prefs[key]; |
87 | if (*s == "1") | 87 | if (!s) return def; |
88 | return true; | 88 | if (*s == "1") |
89 | else | 89 | return true; |
90 | return false; | 90 | else |
91 | } | 91 | return false; |
92 | 92 | } | |
93 | bool QSettings::writeEntry (const QString &key, int val) | 93 | |
94 | { | 94 | bool QSettings::writeEntry (const QString &key, int val) |
95 | char buf[64]; | 95 | { |
96 | sprintf (buf, "%d", val); | 96 | char buf[64]; |
97 | QString *v = new QString(buf); | 97 | sprintf (buf, "%d", val); |
98 | prefs.replace ((const char *)key, v); | 98 | QString *v = new QString(buf); |
99 | return true; | 99 | prefs.replace ((const char *)key, v); |
100 | } | 100 | return true; |
101 | 101 | } | |
102 | bool QSettings::writeEntry (const QString &key, bool val) | 102 | |
103 | { | 103 | bool QSettings::writeEntry (const QString &key, bool val) |
104 | QString *v; | 104 | { |
105 | if (val) | 105 | QString *v; |
106 | v = new QString("1"); | 106 | if (val) |
107 | else | 107 | v = new QString("1"); |
108 | v = new QString("0"); | 108 | else |
109 | prefs.replace ((const char *)key, v); | 109 | v = new QString("0"); |
110 | return true; | 110 | prefs.replace ((const char *)key, v); |
111 | } | 111 | return true; |
112 | 112 | } | |
113 | bool QSettings::writeEntry (const QString &key, const QString &val) | 113 | |
114 | { | 114 | bool QSettings::writeEntry (const QString &key, const QString &val) |
115 | QString *v = new QString (val); | 115 | { |
116 | prefs.replace ((const char *)key, v); | 116 | QString *v = new QString (val); |
117 | return true; | 117 | prefs.replace ((const char *)key, v); |
118 | } | 118 | return true; |
119 | 119 | } | |
120 | bool QSettings::writeEntry (const QString &key, const char *val) | 120 | |
121 | { | 121 | bool QSettings::writeEntry (const QString &key, const char *val) |
122 | QString *v = new QString (val); | 122 | { |
123 | prefs.replace ((const char *)key, v); | 123 | QString *v = new QString (val); |
124 | return true; | 124 | prefs.replace ((const char *)key, v); |
125 | } | 125 | return true; |
126 | 126 | } | |
127 | bool QSettings::removeEntry (const QString &key) | 127 | |
128 | { | 128 | bool QSettings::removeEntry (const QString &key) |
129 | prefs.remove (key); | 129 | { |
130 | return true; | 130 | prefs.remove (key); |
131 | } | 131 | return true; |
132 | 132 | } | |
133 | QStringList QSettings::entryList (const QString &key) const | 133 | |
134 | { | 134 | QStringList QSettings::entryList (const QString &key) const |
135 | QAsciiDictIterator <QString> it( prefs ); // iterator for dict | 135 | { |
136 | QStringList list; | 136 | qDebug("entryList: "+key); |
137 | 137 | QStringList list; | |
138 | while ( it.current() ) | 138 | if(!prefs.isEmpty()) { |
139 | { | 139 | QAsciiDictIterator <QString> it( prefs ); // iterator for dict |
140 | char buf[512]; | 140 | qDebug("ready"); |
141 | sprintf (buf, "%s", (const char *) *( it.current())); | 141 | while ( it.current() ) |
142 | QString *val = new QString(buf); | 142 | { |
143 | sprintf(buf, "%s -> %s\n", it.currentKey(), (const char *)*val ); | 143 | char buf[512]; |
144 | QString *cat = new QString(it.currentKey()); | 144 | sprintf(buf, "%s", (const char *) *( it.current())); |
145 | if (cat->contains("-field", FALSE)) | 145 | QString *val = new QString(buf); |
146 | list.append (it.currentKey()); | 146 | sprintf(buf, "%s -> %s\n", it.currentKey(), (const char *)*val ); |
147 | ++it; | 147 | QString *cat = new QString(it.currentKey()); |
148 | 148 | if (cat->contains("-field", FALSE)) | |
149 | } | 149 | list.append (it.currentKey()); |
150 | return list; | 150 | ++it; |
151 | } | 151 | } |
152 | 152 | } | |
153 | qWarning("Return here"); | ||
154 | return list; | ||
155 | } | ||
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 | |||
@@ -13,5 +13,5 @@ | |||
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 |
@@ -45,3 +45,3 @@ using namespace Opie::Ui; | |||
45 | #include <stdlib.h> | 45 | #include <stdlib.h> |
46 | #ifndef WIN32 | 46 | #ifndef Q_WS_WIN |
47 | #include <unistd.h> | 47 | #include <unistd.h> |
@@ -57,3 +57,3 @@ using namespace Opie::Ui; | |||
57 | #include <qdragobject.h> | 57 | #include <qdragobject.h> |
58 | #ifndef WIN32 | 58 | #ifndef Q_WS_WIN |
59 | #include <qsettings.h> | 59 | #include <qsettings.h> |
@@ -99,3 +99,3 @@ extern int DeskW, DeskH; | |||
99 | #ifdef DESKTOP | 99 | #ifdef DESKTOP |
100 | extern QApplication *appl; | 100 | extern QApplication *appl; |
101 | #else | 101 | #else |
@@ -110,3 +110,3 @@ extern QPEApplication *appl; | |||
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/"; |
@@ -367,3 +367,3 @@ static const char* const general_data[] = { | |||
367 | #ifdef DESKTOP | 367 | #ifdef DESKTOP |
368 | #ifndef WIN32 | 368 | #ifndef Q_WS_WIN |
369 | conf = new QSettings (); | 369 | conf = new QSettings (); |
@@ -419,3 +419,3 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl ) | |||
419 | #ifdef DESKTOP | 419 | #ifdef DESKTOP |
420 | #ifndef WIN32 | 420 | #ifndef Q_WS_WIN |
421 | conf = new QSettings (); | 421 | conf = new QSettings (); |
@@ -431,3 +431,3 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl ) | |||
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); |
@@ -466,3 +466,3 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl ) | |||
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 ); |
@@ -500,3 +500,3 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl ) | |||
500 | // create it | 500 | // create it |
501 | // #ifndef WIN32 | 501 | // #ifndef Q_WS_WIN |
502 | // QString d1("Documents/application"); | 502 | // QString d1("Documents/application"); |
@@ -527,3 +527,3 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl ) | |||
527 | } | 527 | } |
528 | // #ifndef WIN32 | 528 | // #ifndef Q_WS_WIN |
529 | // QString d2("Documents/application/zsafe"); | 529 | // QString d2("Documents/application/zsafe"); |
@@ -558,3 +558,3 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl ) | |||
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); |
@@ -571,3 +571,3 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl ) | |||
571 | 571 | ||
572 | infoForm = new InfoForm(); | 572 | infoForm = new InfoForm(this, "show_info", TRUE); |
573 | categoryDialog = NULL; | 573 | categoryDialog = NULL; |
@@ -772,4 +772,4 @@ void ZSafe::editPwd() | |||
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")); |
@@ -797,6 +797,16 @@ void ZSafe::editPwd() | |||
797 | 797 | ||
798 | #ifdef Q_WS_QWS | ||
798 | DialogCode result = (DialogCode) QPEApplication::execDialog( dialog ); | 799 | DialogCode result = (DialogCode) QPEApplication::execDialog( dialog ); |
799 | 800 | #endif | |
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 |
@@ -842,4 +852,4 @@ void ZSafe::newPwd() | |||
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")); |
@@ -856,5 +866,16 @@ 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 |
@@ -900,3 +921,3 @@ void ZSafe::findPwd() | |||
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")); |
@@ -1080,3 +1101,3 @@ QString ZSafe::getFieldLabel (QListViewItem *_item, QString field, QString def) | |||
1080 | #ifndef DESKTOP | 1101 | #ifndef DESKTOP |
1081 | #ifndef WIN32 | 1102 | #ifndef Q_WS_WIN |
1082 | conf->setGroup ("fieldDefs"); | 1103 | conf->setGroup ("fieldDefs"); |
@@ -1084,3 +1105,3 @@ QString ZSafe::getFieldLabel (QListViewItem *_item, QString field, QString def) | |||
1084 | #else | 1105 | #else |
1085 | #ifndef WIN32 | 1106 | #ifndef Q_WS_WIN |
1086 | app_key += "/fieldDefs/"; | 1107 | app_key += "/fieldDefs/"; |
@@ -1088,3 +1109,3 @@ QString ZSafe::getFieldLabel (QListViewItem *_item, QString field, QString def) | |||
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); |
@@ -1106,3 +1127,3 @@ QString ZSafe::getFieldLabel (QString category, QString field, QString def) | |||
1106 | #else | 1127 | #else |
1107 | #ifndef WIN32 | 1128 | #ifndef Q_WS_WIN |
1108 | app_key += "/fieldDefs/"; | 1129 | app_key += "/fieldDefs/"; |
@@ -1110,3 +1131,3 @@ QString ZSafe::getFieldLabel (QString category, QString field, QString def) | |||
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, |
@@ -1210,4 +1231,10 @@ void ZSafe::showInfo( QListViewItem *_item) | |||
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 | } |
@@ -1233,3 +1260,3 @@ void ZSafe::listViewSelected( QListViewItem *_item) | |||
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 |
@@ -1488,3 +1515,3 @@ void ZSafe::readAllEntries() | |||
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]; |
@@ -1587,3 +1614,3 @@ void ZSafe::readAllEntries() | |||
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); |
@@ -1740,3 +1767,3 @@ void ZSafe::readAllEntries() | |||
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]; |
@@ -1820,3 +1847,3 @@ void ZSafe::readAllEntries() | |||
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); |
@@ -1898,3 +1925,3 @@ bool ZSafe::openDocument(const char* _filename, const char* ) | |||
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); |
@@ -1939,3 +1966,3 @@ bool ZSafe::openDocument(const char* _filename, const char* ) | |||
1939 | { | 1966 | { |
1940 | #ifdef WIN32 | 1967 | #ifdef Q_WS_WIN |
1941 | this->setCaption("Qt ZSafe"); | 1968 | this->setCaption("Qt ZSafe"); |
@@ -2056,3 +2083,3 @@ bool ZSafe::openDocument(const char* _filename, const char* ) | |||
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); |
@@ -2142,3 +2169,3 @@ int ZSafe::loadInit(const char* _filename, const char *password) | |||
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); |
@@ -2159,3 +2186,3 @@ int ZSafe::loadInit(const char* _filename, const char *password) | |||
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) { |
@@ -2341,3 +2368,3 @@ bool ZSafe::saveDocument(const char* _filename, | |||
2341 | } | 2368 | } |
2342 | // #ifndef WIN32 | 2369 | // #ifndef Q_WS_WIN |
2343 | conf->writeEntry(APP_KEY+"valzsafe", 1); | 2370 | conf->writeEntry(APP_KEY+"valzsafe", 1); |
@@ -2436,3 +2463,3 @@ void ZSafe::getDocPassword(QString title) | |||
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); |
@@ -2666,3 +2693,3 @@ void ZSafe::addCategory() | |||
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")); |
@@ -2677,3 +2704,3 @@ void ZSafe::addCategory() | |||
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" ); |
@@ -2720,3 +2747,3 @@ void ZSafe::addCategory() | |||
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); |
@@ -2788,3 +2815,3 @@ void ZSafe::addCategory() | |||
2788 | 2815 | ||
2789 | #ifndef WIN32 | 2816 | #ifndef Q_WS_WIN |
2790 | dialog->show(); | 2817 | dialog->show(); |
@@ -2827,3 +2854,3 @@ void ZSafe::addCategory() | |||
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); |
@@ -2879,3 +2906,3 @@ void ZSafe::delCategory() | |||
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)); |
@@ -3039,3 +3066,3 @@ void ZSafe::saveCategoryDialogFields(CategoryDialog *dialog) | |||
3039 | #else | 3066 | #else |
3040 | #ifndef WIN32 | 3067 | #ifndef Q_WS_WIN |
3041 | app_key += "/fieldDefs/"; | 3068 | app_key += "/fieldDefs/"; |
@@ -3044,3 +3071,3 @@ void ZSafe::saveCategoryDialogFields(CategoryDialog *dialog) | |||
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()); |
@@ -3075,3 +3102,3 @@ void ZSafe::editCategory() | |||
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")); |
@@ -3087,3 +3114,3 @@ void ZSafe::editCategory() | |||
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" ); |
@@ -3131,3 +3158,3 @@ void ZSafe::editCategory() | |||
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); |
@@ -3274,3 +3301,3 @@ void ZSafe::editCategory() | |||
3274 | categories.remove (category); | 3301 | categories.remove (category); |
3275 | // #ifndef WIN32 | 3302 | // #ifndef Q_WS_WIN |
3276 | conf->removeEntry(category); | 3303 | conf->removeEntry(category); |
@@ -3300,3 +3327,3 @@ void ZSafe::editCategory() | |||
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); |
@@ -3312,3 +3339,3 @@ void ZSafe::editCategory() | |||
3312 | { | 3339 | { |
3313 | // #ifndef WIN32 | 3340 | // #ifndef Q_WS_WIN |
3314 | conf->removeEntry (category); | 3341 | conf->removeEntry (category); |
@@ -3491,3 +3518,3 @@ void ZSafe::newDocument() | |||
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); |
@@ -3575,3 +3602,3 @@ void ZSafe::loadDocument() | |||
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); |
@@ -3629,3 +3656,3 @@ void ZSafe::saveDocumentAs() | |||
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); |
@@ -3708,3 +3735,3 @@ void ZSafe::setExpandFlag() | |||
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); |
@@ -3793,3 +3820,3 @@ void ZSafe::setDocument(const QString& fileref) | |||
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); |