-rw-r--r-- | noncore/apps/opie-write/qrichtext_p.h | 5 | ||||
-rw-r--r-- | noncore/apps/tableviewer/browsekeyentry.cpp | 11 | ||||
-rw-r--r-- | noncore/apps/tableviewer/db/common.cpp | 7 | ||||
-rw-r--r-- | noncore/apps/tableviewer/db/datacache.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/tableviewer/db/datacache.h | 12 | ||||
-rw-r--r-- | noncore/apps/tableviewer/ui/browsekeyentry.cpp | 9 | ||||
-rw-r--r-- | noncore/apps/tableviewer/ui/filterkeyentry.cpp | 8 | ||||
-rw-r--r-- | noncore/apps/tableviewer/ui/tvfilterview.cpp | 11 | ||||
-rw-r--r-- | noncore/apps/tinykate/libkate/kateconfig.cpp | 4 | ||||
-rw-r--r-- | noncore/apps/zsafe/main.cpp | 15 | ||||
-rw-r--r-- | noncore/apps/zsafe/zlistview.cpp | 11 | ||||
-rw-r--r-- | noncore/apps/zsafe/zsafe.cpp | 51 |
12 files changed, 82 insertions, 64 deletions
diff --git a/noncore/apps/opie-write/qrichtext_p.h b/noncore/apps/opie-write/qrichtext_p.h index e368edb..3778feb 100644 --- a/noncore/apps/opie-write/qrichtext_p.h +++ b/noncore/apps/opie-write/qrichtext_p.h | |||
@@ -41,24 +41,27 @@ | |||
41 | // | 41 | // |
42 | // W A R N I N G | 42 | // W A R N I N G |
43 | // ------------- | 43 | // ------------- |
44 | // | 44 | // |
45 | // This file is not part of the Qt API. It exists for the convenience | 45 | // This file is not part of the Qt API. It exists for the convenience |
46 | // of a number of Qt sources files. This header file may change from | 46 | // of a number of Qt sources files. This header file may change from |
47 | // version to version without notice, or even be removed. | 47 | // version to version without notice, or even be removed. |
48 | // | 48 | // |
49 | // We mean it. | 49 | // We mean it. |
50 | // | 50 | // |
51 | // | 51 | // |
52 | 52 | ||
53 | #include <opie2/odebug.h> | ||
54 | using namespace Opie::Core; | ||
55 | |||
53 | #ifndef QT_H | 56 | #ifndef QT_H |
54 | #include "qstring.h" | 57 | #include "qstring.h" |
55 | #include "qlist.h" | 58 | #include "qlist.h" |
56 | #include "qrect.h" | 59 | #include "qrect.h" |
57 | #include "qfontmetrics.h" | 60 | #include "qfontmetrics.h" |
58 | #include "qintdict.h" | 61 | #include "qintdict.h" |
59 | #include "qmap.h" | 62 | #include "qmap.h" |
60 | #include "qstringlist.h" | 63 | #include "qstringlist.h" |
61 | #include "qfont.h" | 64 | #include "qfont.h" |
62 | #include "qcolor.h" | 65 | #include "qcolor.h" |
63 | #include "qsize.h" | 66 | #include "qsize.h" |
64 | #include "qvaluelist.h" | 67 | #include "qvaluelist.h" |
@@ -1874,25 +1877,25 @@ inline int QTextParagraph::endState() const | |||
1874 | { | 1877 | { |
1875 | return state; | 1878 | return state; |
1876 | } | 1879 | } |
1877 | 1880 | ||
1878 | inline void QTextParagraph::setParagId( int i ) | 1881 | inline void QTextParagraph::setParagId( int i ) |
1879 | { | 1882 | { |
1880 | id = i; | 1883 | id = i; |
1881 | } | 1884 | } |
1882 | 1885 | ||
1883 | inline int QTextParagraph::paragId() const | 1886 | inline int QTextParagraph::paragId() const |
1884 | { | 1887 | { |
1885 | if ( id == -1 ) | 1888 | if ( id == -1 ) |
1886 | qWarning( "invalid parag id!!!!!!!! (%p)", (void*)this ); | 1889 | owarn << "invalid parag id!!!!!!!! (" << (void*)this << ")" << oendl; |
1887 | return id; | 1890 | return id; |
1888 | } | 1891 | } |
1889 | 1892 | ||
1890 | inline bool QTextParagraph::firstPreProcess() const | 1893 | inline bool QTextParagraph::firstPreProcess() const |
1891 | { | 1894 | { |
1892 | return firstPProcess; | 1895 | return firstPProcess; |
1893 | } | 1896 | } |
1894 | 1897 | ||
1895 | inline void QTextParagraph::setFirstPreProcess( bool b ) | 1898 | inline void QTextParagraph::setFirstPreProcess( bool b ) |
1896 | { | 1899 | { |
1897 | firstPProcess = b; | 1900 | firstPProcess = b; |
1898 | } | 1901 | } |
diff --git a/noncore/apps/tableviewer/browsekeyentry.cpp b/noncore/apps/tableviewer/browsekeyentry.cpp index 04e7902..bab9af6 100644 --- a/noncore/apps/tableviewer/browsekeyentry.cpp +++ b/noncore/apps/tableviewer/browsekeyentry.cpp | |||
@@ -10,36 +10,38 @@ | |||
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include "browsekeyentry.h" | 20 | #include "browsekeyentry.h" |
21 | 21 | ||
22 | /* OPIE */ | ||
23 | #include <opie2/odebug.h> | ||
24 | using namespace Opie::Core; | ||
25 | |||
26 | /* QT */ | ||
22 | #include <qtoolbutton.h> | 27 | #include <qtoolbutton.h> |
23 | #include <qwidgetstack.h> | 28 | #include <qwidgetstack.h> |
24 | #include <qlayout.h> | 29 | #include <qlayout.h> |
25 | #include <qlineedit.h> | 30 | #include <qlineedit.h> |
26 | #include <qpushbutton.h> | 31 | #include <qpushbutton.h> |
27 | #include <qpopupmenu.h> | 32 | #include <qpopupmenu.h> |
28 | #include <qhbox.h> | 33 | #include <qhbox.h> |
29 | #include <qdatetime.h> | 34 | #include <qdatetime.h> |
30 | 35 | ||
31 | //#include <iostream.h> | ||
32 | #include <qheader.h> | ||
33 | // For qWarning(const char *) | ||
34 | 36 | ||
35 | /*! | 37 | /*! |
36 | \class TVBrowseKeyEntry | 38 | \class TVBrowseKeyEntry |
37 | \brief a Widget used enter keys into the TVBrowseViewWidget | 39 | \brief a Widget used enter keys into the TVBrowseViewWidget |
38 | 40 | ||
39 | The TVBrowseKeyEntry Widget provides the facility to enter | 41 | The TVBrowseKeyEntry Widget provides the facility to enter |
40 | various key types to be search on in the table. The key can be changed | 42 | various key types to be search on in the table. The key can be changed |
41 | and the entry field will update to the correct sort of widget appropriately | 43 | and the entry field will update to the correct sort of widget appropriately |
42 | */ | 44 | */ |
43 | 45 | ||
44 | /*! | 46 | /*! |
45 | Constructs the widget | 47 | Constructs the widget |
@@ -219,24 +221,23 @@ void TVBrowseKeyEntry::searchOnText() | |||
219 | m = monthKey->text().toInt(&ok); | 221 | m = monthKey->text().toInt(&ok); |
220 | if (!ok) | 222 | if (!ok) |
221 | return; | 223 | return; |
222 | y = yearKey->text().toInt(&ok); | 224 | y = yearKey->text().toInt(&ok); |
223 | if (!ok) | 225 | if (!ok) |
224 | return; | 226 | return; |
225 | if(!QDate::isValid(y, m, d)) | 227 | if(!QDate::isValid(y, m, d)) |
226 | return; | 228 | return; |
227 | sendkey = (void *) new QDate(y, m, d); | 229 | sendkey = (void *) new QDate(y, m, d); |
228 | break; | 230 | break; |
229 | } | 231 | } |
230 | default: | 232 | default: |
231 | qWarning("TVBrowseKeyEntry::searchOnText() " | 233 | owarn << "TVBrowseKeyEntry::searchOnText() cannot work out data type" << oendl; |
232 | "cannot work out data type"); | ||
233 | return; | 234 | return; |
234 | } | 235 | } |
235 | emit searchOnKey(ts->current_column, sendkey); | 236 | emit searchOnKey(ts->current_column, sendkey); |
236 | } | 237 | } |
237 | 238 | ||
238 | /*! \fn void TVBrowseKeyEntry::searchOnKey(int currentKeyId, void *v) | 239 | /*! \fn void TVBrowseKeyEntry::searchOnKey(int currentKeyId, void *v) |
239 | 240 | ||
240 | This signal indicates that a search on key index currentKeyId should be | 241 | This signal indicates that a search on key index currentKeyId should be |
241 | done searching for the value v. | 242 | done searching for the value v. |
242 | */ | 243 | */ |
diff --git a/noncore/apps/tableviewer/db/common.cpp b/noncore/apps/tableviewer/db/common.cpp index b58af85..c35dbea 100644 --- a/noncore/apps/tableviewer/db/common.cpp +++ b/noncore/apps/tableviewer/db/common.cpp | |||
@@ -851,26 +851,25 @@ int KeyList::addKey(QString name, TVVariant::KeyType type) | |||
851 | return addKey(name, TVVariant("<undefined>").asString()); | 851 | return addKey(name, TVVariant("<undefined>").asString()); |
852 | break; | 852 | break; |
853 | case TVVariant::Date: | 853 | case TVVariant::Date: |
854 | return addKey(name, TVVariant(QDate::currentDate()).asDate()); | 854 | return addKey(name, TVVariant(QDate::currentDate()).asDate()); |
855 | break; | 855 | break; |
856 | case TVVariant::Time: | 856 | case TVVariant::Time: |
857 | return addKey(name, TVVariant(QTime(0,0,0)).toTime()); | 857 | return addKey(name, TVVariant(QTime(0,0,0)).toTime()); |
858 | break; | 858 | break; |
859 | case TVVariant::Int: | 859 | case TVVariant::Int: |
860 | return addKey(name, TVVariant(0).toInt()); | 860 | return addKey(name, TVVariant(0).toInt()); |
861 | break; | 861 | break; |
862 | default: | 862 | default: |
863 | qWarning(QObject::tr("KeyList::addKey() Cannot make default " | 863 | owarn << "KeyList::addKey() Cannot make default value for type " << type << ", Key not added." << oendl; |
864 | "value for type %1, Key not added.").arg(type)); | ||
865 | break; | 864 | break; |
866 | } | 865 | } |
867 | return -1; | 866 | return -1; |
868 | } | 867 | } |
869 | 868 | ||
870 | void KeyList::setKeyFlags(int i, int flag) | 869 | void KeyList::setKeyFlags(int i, int flag) |
871 | { | 870 | { |
872 | if(find(i)) | 871 | if(find(i)) |
873 | find(i)->setFlags(flag); | 872 | find(i)->setFlags(flag); |
874 | } | 873 | } |
875 | 874 | ||
876 | int KeyList::getKeyFlags(int i) const | 875 | int KeyList::getKeyFlags(int i) const |
@@ -1199,27 +1198,25 @@ void DataElem::setField(int i, QString q) | |||
1199 | } | 1198 | } |
1200 | case TVVariant::Date: { | 1199 | case TVVariant::Date: { |
1201 | t.asDate(); | 1200 | t.asDate(); |
1202 | setField(i, t); | 1201 | setField(i, t); |
1203 | return; | 1202 | return; |
1204 | } | 1203 | } |
1205 | case TVVariant::Time: { | 1204 | case TVVariant::Time: { |
1206 | t.asTime(); | 1205 | t.asTime(); |
1207 | setField(i, t); | 1206 | setField(i, t); |
1208 | return; | 1207 | return; |
1209 | } | 1208 | } |
1210 | default: | 1209 | default: |
1211 | qWarning( | 1210 | owarn << "DataElem::setField(" << i << ", " << q << ") No valid type found" << oendl; |
1212 | QObject::tr("DataElem::setField(%1, %2) No valid type found").arg(i).arg(q) | ||
1213 | ); | ||
1214 | } | 1211 | } |
1215 | } | 1212 | } |
1216 | 1213 | ||
1217 | /*! | 1214 | /*! |
1218 | Sets the value of the elements field index i to the value at the pointer | 1215 | Sets the value of the elements field index i to the value at the pointer |
1219 | value. | 1216 | value. |
1220 | 1217 | ||
1221 | \param i index of the field to set | 1218 | \param i index of the field to set |
1222 | \param value a pointer to the (already allocated) value to set | 1219 | \param value a pointer to the (already allocated) value to set |
1223 | */ | 1220 | */ |
1224 | void DataElem::setField(int i, TVVariant value) | 1221 | void DataElem::setField(int i, TVVariant value) |
1225 | { | 1222 | { |
diff --git a/noncore/apps/tableviewer/db/datacache.cpp b/noncore/apps/tableviewer/db/datacache.cpp index 6380e1b..de57961 100644 --- a/noncore/apps/tableviewer/db/datacache.cpp +++ b/noncore/apps/tableviewer/db/datacache.cpp | |||
@@ -147,25 +147,25 @@ bool DBStore::saveSource(QIODevice *outDev, const QString &source) | |||
147 | has already reached the maximum allowable size this function does not alter | 147 | has already reached the maximum allowable size this function does not alter |
148 | the database. | 148 | the database. |
149 | 149 | ||
150 | \param delm An already allocated and initialized data element to be added | 150 | \param delm An already allocated and initialized data element to be added |
151 | */ | 151 | */ |
152 | void DBStore::addItem(DataElem *delem) | 152 | void DBStore::addItem(DataElem *delem) |
153 | { | 153 | { |
154 | addItemInternal(delem); | 154 | addItemInternal(delem); |
155 | } | 155 | } |
156 | 156 | ||
157 | void DBStore::addItemInternal(DataElem *delem) | 157 | void DBStore::addItemInternal(DataElem *delem) |
158 | { | 158 | { |
159 | /* if already full, don't over fill, do a qWarning though */ | 159 | /* if already full, don't over fill, do a owarn though */ |
160 | if (full) { | 160 | if (full) { |
161 | owarn << "Attempted to add items to already full table" << oendl; | 161 | owarn << "Attempted to add items to already full table" << oendl; |
162 | return; | 162 | return; |
163 | } | 163 | } |
164 | 164 | ||
165 | master_table.insert(number_elems, delem); | 165 | master_table.insert(number_elems, delem); |
166 | 166 | ||
167 | current_elem = number_elems; | 167 | current_elem = number_elems; |
168 | number_elems++; | 168 | number_elems++; |
169 | 169 | ||
170 | if(number_elems >= table_size) { | 170 | if(number_elems >= table_size) { |
171 | /* filled current table, double if we can */ | 171 | /* filled current table, double if we can */ |
diff --git a/noncore/apps/tableviewer/db/datacache.h b/noncore/apps/tableviewer/db/datacache.h index c5dc637..e38050c 100644 --- a/noncore/apps/tableviewer/db/datacache.h +++ b/noncore/apps/tableviewer/db/datacache.h | |||
@@ -18,48 +18,54 @@ | |||
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | /* | 21 | /* |
22 | * This file is used to load the xml files that represent the database. | 22 | * This file is used to load the xml files that represent the database. |
23 | * The main requirment for said file is each data entry must contain a key, | 23 | * The main requirment for said file is each data entry must contain a key, |
24 | * otherwise any other data headings are allowed. | 24 | * otherwise any other data headings are allowed. |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #ifndef __DATACACHE_H__ | 27 | #ifndef __DATACACHE_H__ |
28 | #define __DATACACHE_H__ | 28 | #define __DATACACHE_H__ |
29 | 29 | ||
30 | #include "common.h" | ||
31 | |||
32 | /* OPIE */ | ||
33 | #include <opie2/odebug.h> | ||
34 | using namespace Opie::Core; | ||
35 | |||
36 | /* QT */ | ||
30 | #include <qstring.h> | 37 | #include <qstring.h> |
31 | #include <qvector.h> | 38 | #include <qvector.h> |
32 | #include "common.h" | ||
33 | 39 | ||
34 | class DBStore; | 40 | class DBStore; |
35 | 41 | ||
36 | /*! Abstract class that defines how database stuff can be accessed */ | 42 | /*! Abstract class that defines how database stuff can be accessed */ |
37 | class DBAccess { | 43 | class DBAccess { |
38 | public: | 44 | public: |
39 | 45 | ||
40 | // DBAccess(DBStore *d) { dstore = d; } | 46 | // DBAccess(DBStore *d) { dstore = d; } |
41 | virtual ~DBAccess() {} | 47 | virtual ~DBAccess() {} |
42 | 48 | ||
43 | virtual QString type() { | 49 | virtual QString type() { |
44 | return QString(); | 50 | return QString(); |
45 | } | 51 | } |
46 | 52 | ||
47 | virtual bool openSource(QIODevice *) { | 53 | virtual bool openSource(QIODevice *) { |
48 | qWarning("DBAccess::openSource not yet implemented"); | 54 | owarn << "DBAccess::openSource not yet implemented" << oendl; |
49 | return false; | 55 | return false; |
50 | } | 56 | } |
51 | 57 | ||
52 | virtual bool saveSource(QIODevice *) { | 58 | virtual bool saveSource(QIODevice *) { |
53 | qWarning("DBAccess::saveSource(QString) not yet implemented"); | 59 | owarn << "DBAccess::saveSource(QString) not yet implemented" << oendl; |
54 | return false; | 60 | return false; |
55 | } | 61 | } |
56 | 62 | ||
57 | protected: | 63 | protected: |
58 | DBStore *dstore; | 64 | DBStore *dstore; |
59 | QString source_name; | 65 | QString source_name; |
60 | }; | 66 | }; |
61 | 67 | ||
62 | class DBStore { | 68 | class DBStore { |
63 | public: | 69 | public: |
64 | DBStore(); | 70 | DBStore(); |
65 | ~DBStore(); | 71 | ~DBStore(); |
diff --git a/noncore/apps/tableviewer/ui/browsekeyentry.cpp b/noncore/apps/tableviewer/ui/browsekeyentry.cpp index 42e24dd..6b78437 100644 --- a/noncore/apps/tableviewer/ui/browsekeyentry.cpp +++ b/noncore/apps/tableviewer/ui/browsekeyentry.cpp | |||
@@ -11,36 +11,36 @@ | |||
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include "browsekeyentry.h" | 20 | #include "browsekeyentry.h" |
21 | #include "commonwidgets.h" | 21 | #include "commonwidgets.h" |
22 | 22 | ||
23 | #include <opie2/odebug.h> | ||
24 | using namespace Opie::Core; | ||
25 | |||
23 | #include <qtoolbutton.h> | 26 | #include <qtoolbutton.h> |
24 | #include <qwidgetstack.h> | 27 | #include <qwidgetstack.h> |
25 | #include <qlayout.h> | 28 | #include <qlayout.h> |
26 | #include <qlineedit.h> | 29 | #include <qlineedit.h> |
27 | #include <qpushbutton.h> | 30 | #include <qpushbutton.h> |
28 | #include <qpopupmenu.h> | 31 | #include <qpopupmenu.h> |
29 | #include <qhbox.h> | 32 | #include <qhbox.h> |
30 | #include <qdatetime.h> | 33 | #include <qdatetime.h> |
31 | 34 | ||
32 | #include <qheader.h> | ||
33 | // For qWarning(const char *) | ||
34 | |||
35 | /*! | 35 | /*! |
36 | \class TVBrowseKeyEntry | 36 | \class TVBrowseKeyEntry |
37 | \brief a Widget used enter keys into the TVBrowseViewWidget | 37 | \brief a Widget used enter keys into the TVBrowseViewWidget |
38 | 38 | ||
39 | The TVBrowseKeyEntry Widget provides the facility to enter | 39 | The TVBrowseKeyEntry Widget provides the facility to enter |
40 | various key types to be search on in the table. The key can be changed | 40 | various key types to be search on in the table. The key can be changed |
41 | and the entry field will update to the correct sort of widget appropriately | 41 | and the entry field will update to the correct sort of widget appropriately |
42 | */ | 42 | */ |
43 | 43 | ||
44 | /*! | 44 | /*! |
45 | Constructs the widget | 45 | Constructs the widget |
46 | */ | 46 | */ |
@@ -183,24 +183,23 @@ void TVBrowseKeyEntry::searchOnText() | |||
183 | } | 183 | } |
184 | case TVVariant::Time: { | 184 | case TVVariant::Time: { |
185 | sendkey = TVVariant(QTime(timeKey->time())); | 185 | sendkey = TVVariant(QTime(timeKey->time())); |
186 | break; | 186 | break; |
187 | } | 187 | } |
188 | case TVVariant::Date: { | 188 | case TVVariant::Date: { |
189 | sendkey = TVVariant(QDate(dateKey->date())); | 189 | sendkey = TVVariant(QDate(dateKey->date())); |
190 | break; | 190 | break; |
191 | } | 191 | } |
192 | case TVVariant::Invalid: | 192 | case TVVariant::Invalid: |
193 | break; | 193 | break; |
194 | default: | 194 | default: |
195 | qWarning("TVBrowseKeyEntry::searchOnText() " | 195 | owarn << "TVBrowseKeyEntry::searchOnText() cannot work out data type" << oendl; |
196 | "cannot work out data type"); | ||
197 | return; | 196 | return; |
198 | } | 197 | } |
199 | emit searchOnKey(ts->current_column, sendkey); | 198 | emit searchOnKey(ts->current_column, sendkey); |
200 | } | 199 | } |
201 | 200 | ||
202 | /*! \fn void TVBrowseKeyEntry::searchOnKey(int currentKeyId, TVVariant) | 201 | /*! \fn void TVBrowseKeyEntry::searchOnKey(int currentKeyId, TVVariant) |
203 | 202 | ||
204 | This signal indicates that a search on key index currentKeyId should be | 203 | This signal indicates that a search on key index currentKeyId should be |
205 | done searching for the value v. | 204 | done searching for the value v. |
206 | */ | 205 | */ |
diff --git a/noncore/apps/tableviewer/ui/filterkeyentry.cpp b/noncore/apps/tableviewer/ui/filterkeyentry.cpp index d108fbd..4d74d6b 100644 --- a/noncore/apps/tableviewer/ui/filterkeyentry.cpp +++ b/noncore/apps/tableviewer/ui/filterkeyentry.cpp | |||
@@ -11,24 +11,29 @@ | |||
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include "filterkeyentry.h" | 20 | #include "filterkeyentry.h" |
21 | #include "commonwidgets.h" | 21 | #include "commonwidgets.h" |
22 | 22 | ||
23 | /* OPIE */ | ||
24 | #include <opie2/odebug.h> | ||
25 | using namespace Opie::Core; | ||
26 | |||
27 | /* QT */ | ||
23 | #include <qwidgetstack.h> | 28 | #include <qwidgetstack.h> |
24 | #include <qcombobox.h> | 29 | #include <qcombobox.h> |
25 | #include <qlayout.h> | 30 | #include <qlayout.h> |
26 | #include <qlineedit.h> | 31 | #include <qlineedit.h> |
27 | #include <qsizepolicy.h> | 32 | #include <qsizepolicy.h> |
28 | #include <qdatetime.h> | 33 | #include <qdatetime.h> |
29 | #include <qhbox.h> | 34 | #include <qhbox.h> |
30 | 35 | ||
31 | TVFilterKeyEntry::TVFilterKeyEntry(QWidget *parent, const char *name, WFlags f) | 36 | TVFilterKeyEntry::TVFilterKeyEntry(QWidget *parent, const char *name, WFlags f) |
32 | : QWidget(parent, name, f) | 37 | : QWidget(parent, name, f) |
33 | { | 38 | { |
34 | int stack_elem = 0; | 39 | int stack_elem = 0; |
@@ -191,18 +196,17 @@ TVVariant TVFilterKeyEntry::getCompareValue() | |||
191 | break; | 196 | break; |
192 | } | 197 | } |
193 | case TVVariant::Time: { | 198 | case TVVariant::Time: { |
194 | sendkey = TVVariant(QTime(timeKey->time())); | 199 | sendkey = TVVariant(QTime(timeKey->time())); |
195 | break; | 200 | break; |
196 | } | 201 | } |
197 | case TVVariant::Date: { | 202 | case TVVariant::Date: { |
198 | sendkey = TVVariant(QDate(dateKey->date())); | 203 | sendkey = TVVariant(QDate(dateKey->date())); |
199 | break; | 204 | break; |
200 | } | 205 | } |
201 | default: { | 206 | default: { |
202 | sendkey = TVVariant(0); | 207 | sendkey = TVVariant(0); |
203 | qWarning("TVFilterKeyEntry::getCompareValue() " | 208 | owarn << "TVFilterKeyEntry::getCompareValue() cannot work out data type" << oendl; |
204 | "cannot work out data type"); | ||
205 | } | 209 | } |
206 | } | 210 | } |
207 | return sendkey; | 211 | return sendkey; |
208 | } | 212 | } |
diff --git a/noncore/apps/tableviewer/ui/tvfilterview.cpp b/noncore/apps/tableviewer/ui/tvfilterview.cpp index 22f1fb7..198c8b5 100644 --- a/noncore/apps/tableviewer/ui/tvfilterview.cpp +++ b/noncore/apps/tableviewer/ui/tvfilterview.cpp | |||
@@ -9,33 +9,39 @@ | |||
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include "tvfilterview.h" | 20 | #include "tvfilterview.h" |
21 | |||
22 | /* OPIE */ | ||
23 | #include <opie2/odebug.h> | ||
24 | #include <qpe/qpeapplication.h> | ||
25 | using namespace Opie::Core; | ||
26 | |||
27 | /* QT */ | ||
21 | #include <qtoolbutton.h> | 28 | #include <qtoolbutton.h> |
22 | #include <qcombobox.h> | 29 | #include <qcombobox.h> |
23 | #include <qlistview.h> | 30 | #include <qlistview.h> |
24 | #include <qlayout.h> | 31 | #include <qlayout.h> |
25 | #include <qheader.h> | 32 | #include <qheader.h> |
26 | #include <qpushbutton.h> | 33 | #include <qpushbutton.h> |
27 | #include <qlabel.h> | 34 | #include <qlabel.h> |
28 | 35 | ||
29 | #include <qpe/qpeapplication.h> | ||
30 | 36 | ||
31 | TVFilterView::TVFilterView(TableState *t, QWidget* parent, | 37 | TVFilterView::TVFilterView(TableState *t, QWidget* parent, |
32 | const char *name, WFlags fl ) : QDialog(parent, name, TRUE, fl) | 38 | const char *name, WFlags fl ) : QDialog(parent, name, TRUE, fl) |
33 | { | 39 | { |
34 | if ( !name ) | 40 | if ( !name ) |
35 | setName( "Filter View" ); | 41 | setName( "Filter View" ); |
36 | 42 | ||
37 | QVBoxLayout *vlayout = new QVBoxLayout(this); | 43 | QVBoxLayout *vlayout = new QVBoxLayout(this); |
38 | 44 | ||
39 | display = new QListView(this, "display"); | 45 | display = new QListView(this, "display"); |
40 | display->addColumn("Key"); | 46 | display->addColumn("Key"); |
41 | display->addColumn("Constraint"); | 47 | display->addColumn("Constraint"); |
@@ -166,26 +172,25 @@ bool TVFilterView::passesFilter(DataElem *d) { | |||
166 | if (!d->contains(t->keyIndex, t->value)) | 172 | if (!d->contains(t->keyIndex, t->value)) |
167 | return false; | 173 | return false; |
168 | break; | 174 | break; |
169 | case ct_startswith: | 175 | case ct_startswith: |
170 | if (!d->startsWith(t->keyIndex, t->value)) | 176 | if (!d->startsWith(t->keyIndex, t->value)) |
171 | return false; | 177 | return false; |
172 | break; | 178 | break; |
173 | case ct_endswith: | 179 | case ct_endswith: |
174 | if (!d->endsWith(t->keyIndex, t->value)) | 180 | if (!d->endsWith(t->keyIndex, t->value)) |
175 | return false; | 181 | return false; |
176 | break; | 182 | break; |
177 | default: | 183 | default: |
178 | qWarning("TVFilterView::passesFilter() " | 184 | owarn << "TVFilterView::passesFilter() unrecognized filter type" << oendl; |
179 | "unrecognized filter type"); | ||
180 | return false; | 185 | return false; |
181 | } | 186 | } |
182 | } | 187 | } |
183 | return true; | 188 | return true; |
184 | } | 189 | } |
185 | 190 | ||
186 | bool TVFilterView::filterActive() const | 191 | bool TVFilterView::filterActive() const |
187 | { | 192 | { |
188 | /* when button operated, also check the do_filter value | 193 | /* when button operated, also check the do_filter value |
189 | return do_filter; | 194 | return do_filter; |
190 | */ | 195 | */ |
191 | if (terms.isEmpty()) | 196 | if (terms.isEmpty()) |
diff --git a/noncore/apps/tinykate/libkate/kateconfig.cpp b/noncore/apps/tinykate/libkate/kateconfig.cpp index 782b629..4b8ce78 100644 --- a/noncore/apps/tinykate/libkate/kateconfig.cpp +++ b/noncore/apps/tinykate/libkate/kateconfig.cpp | |||
@@ -15,24 +15,25 @@ | |||
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #define QTOPIA_INTERNAL_LANGLIST | 21 | #define QTOPIA_INTERNAL_LANGLIST |
22 | #include "kateconfig.h" | 22 | #include "kateconfig.h" |
23 | 23 | ||
24 | /* OPIE */ | 24 | /* OPIE */ |
25 | #include <opie2/odebug.h> | 25 | #include <opie2/odebug.h> |
26 | #include <qpe/global.h> | 26 | #include <qpe/global.h> |
27 | using namespace Opie::Core; | ||
27 | 28 | ||
28 | /* QT */ | 29 | /* QT */ |
29 | #include <qdir.h> | 30 | #include <qdir.h> |
30 | #include <qmessagebox.h> | 31 | #include <qmessagebox.h> |
31 | #if QT_VERSION <= 230 && defined(QT_NO_CODECS) | 32 | #if QT_VERSION <= 230 && defined(QT_NO_CODECS) |
32 | #include <qtextcodec.h> | 33 | #include <qtextcodec.h> |
33 | #endif | 34 | #endif |
34 | #include <qtextstream.h> | 35 | #include <qtextstream.h> |
35 | 36 | ||
36 | /* STD */ | 37 | /* STD */ |
37 | #include <sys/stat.h> | 38 | #include <sys/stat.h> |
38 | #include <sys/types.h> | 39 | #include <sys/types.h> |
@@ -547,26 +548,25 @@ void KateConfig::write( const QString &fn ) | |||
547 | total_length = f.writeBlock( cstr.data(), cstr.length() ); | 548 | total_length = f.writeBlock( cstr.data(), cstr.length() ); |
548 | if ( total_length != int(cstr.length()) ) { | 549 | if ( total_length != int(cstr.length()) ) { |
549 | QMessageBox::critical( 0, QObject::tr("Out of Space"), | 550 | QMessageBox::critical( 0, QObject::tr("Out of Space"), |
550 | QObject::tr("There was a problem creating\nKateConfiguration Information \nfor this program.\n\nPlease free up some space and\ntry again.") ); | 551 | QObject::tr("There was a problem creating\nKateConfiguration Information \nfor this program.\n\nPlease free up some space and\ntry again.") ); |
551 | f.close(); | 552 | f.close(); |
552 | QFile::remove( strNewFile ); | 553 | QFile::remove( strNewFile ); |
553 | return; | 554 | return; |
554 | } | 555 | } |
555 | 556 | ||
556 | f.close(); | 557 | f.close(); |
557 | // now rename the file... | 558 | // now rename the file... |
558 | if ( rename( strNewFile, filename ) < 0 ) { | 559 | if ( rename( strNewFile, filename ) < 0 ) { |
559 | qWarning( "problem renaming the file %s to %s", strNewFile.latin1(), | 560 | owarn << "problem renaming the file " << strNewFile.latin1() << " to " << filename.latin1() << oendl; |
560 | filename.latin1() ); | ||
561 | QFile::remove( strNewFile ); | 561 | QFile::remove( strNewFile ); |
562 | } | 562 | } |
563 | } | 563 | } |
564 | 564 | ||
565 | /*! | 565 | /*! |
566 | Returns whether the KateConfig is in a valid state. | 566 | Returns whether the KateConfig is in a valid state. |
567 | */ | 567 | */ |
568 | bool KateConfig::isValid() const | 568 | bool KateConfig::isValid() const |
569 | { | 569 | { |
570 | return groups.end() != git; | 570 | return groups.end() != git; |
571 | } | 571 | } |
572 | 572 | ||
diff --git a/noncore/apps/zsafe/main.cpp b/noncore/apps/zsafe/main.cpp index 4fe319b..5f48f77 100644 --- a/noncore/apps/zsafe/main.cpp +++ b/noncore/apps/zsafe/main.cpp | |||
@@ -1,27 +1,35 @@ | |||
1 | /* | 1 | /* |
2 | ** Author: Carsten Schneider <CarstenSchneider@t-online.de> | 2 | ** Author: Carsten Schneider <CarstenSchneider@t-online.de> |
3 | ** | 3 | ** |
4 | ** $Id$ | 4 | ** $Id$ |
5 | ** | 5 | ** |
6 | ** Homepage: http://home.t-online.de/home/CarstenSchneider/zsafe/index.html | 6 | ** Homepage: http://home.t-online.de/home/CarstenSchneider/zsafe/index.html |
7 | */ | 7 | */ |
8 | 8 | ||
9 | 9 | ||
10 | #include "zsafe.h" | 10 | #include "zsafe.h" |
11 | |||
12 | /* OPIE */ | ||
13 | #include <opie2/odebug.h> | ||
14 | using namespace Opie::Core; | ||
15 | |||
16 | /* QT */ | ||
11 | #ifdef DESKTOP | 17 | #ifdef DESKTOP |
12 | #include <qapplication.h> | 18 | #include <qapplication.h> |
13 | #else | 19 | #else |
14 | #include <qpe/qpeapplication.h> | 20 | #include <qpe/qpeapplication.h> |
15 | #endif | 21 | #endif |
22 | |||
23 | /* STD */ | ||
16 | #include <stdio.h> | 24 | #include <stdio.h> |
17 | #include <signal.h> | 25 | #include <signal.h> |
18 | 26 | ||
19 | ZSafe *zs; | 27 | ZSafe *zs; |
20 | #ifdef DESKTOP | 28 | #ifdef DESKTOP |
21 | QApplication *appl; | 29 | QApplication *appl; |
22 | #else | 30 | #else |
23 | QPEApplication *appl; | 31 | QPEApplication *appl; |
24 | #endif | 32 | #endif |
25 | 33 | ||
26 | int DeskW; | 34 | int DeskW; |
27 | int DeskH; | 35 | int DeskH; |
@@ -65,37 +73,34 @@ int main( int argc, char ** argv ) | |||
65 | DeskH = h; | 73 | DeskH = h; |
66 | #endif | 74 | #endif |
67 | } | 75 | } |
68 | else | 76 | else |
69 | { | 77 | { |
70 | DeskW = 600; | 78 | DeskW = 600; |
71 | DeskH = 400; | 79 | DeskH = 400; |
72 | } | 80 | } |
73 | #else | 81 | #else |
74 | DeskW = a.desktop()->width(); | 82 | DeskW = a.desktop()->width(); |
75 | DeskH = a.desktop()->height(); | 83 | DeskH = a.desktop()->height(); |
76 | 84 | ||
77 | char buf[128]; | 85 | owarn << "Width: " << DeskW << " Height: " << DeskH << oendl; |
78 | sprintf (buf, "Width: %d Height: %d\n", DeskW, DeskH); | ||
79 | qWarning (buf); | ||
80 | 86 | ||
81 | #ifdef JPATCH_HDE | 87 | #ifdef JPATCH_HDE |
82 | // nothings | 88 | // nothings |
83 | #else | 89 | #else |
84 | if (DeskW > 240) | 90 | if (DeskW > 240) |
85 | { | 91 | { |
86 | DeskW -= 20; | 92 | DeskW -= 20; |
87 | DeskH += 25; | 93 | DeskH += 25; |
88 | sprintf (buf, "Changed width: %d Height: %d\n", DeskW, DeskH); | 94 | owarn << "Changed width: " << DeskW << " Height: " << DeskH << oendl; |
89 | qWarning (buf); | ||
90 | } | 95 | } |
91 | #endif | 96 | #endif |
92 | 97 | ||
93 | #endif | 98 | #endif |
94 | 99 | ||
95 | ZSafe mw; | 100 | ZSafe mw; |
96 | zs = &mw; | 101 | zs = &mw; |
97 | 102 | ||
98 | #ifndef WIN32 | 103 | #ifndef WIN32 |
99 | signal (SIGCONT, resume); | 104 | signal (SIGCONT, resume); |
100 | #endif | 105 | #endif |
101 | #ifdef DESKTOP | 106 | #ifdef DESKTOP |
diff --git a/noncore/apps/zsafe/zlistview.cpp b/noncore/apps/zsafe/zlistview.cpp index ba02a15..7d0b8c2 100644 --- a/noncore/apps/zsafe/zlistview.cpp +++ b/noncore/apps/zsafe/zlistview.cpp | |||
@@ -1,35 +1,38 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id$ | 2 | ** $Id$ |
3 | */ | 3 | */ |
4 | 4 | ||
5 | #include "zlistview.h" | 5 | #include "zlistview.h" |
6 | #include <stdio.h> | ||
7 | #include "zsafe.h" | 6 | #include "zsafe.h" |
8 | 7 | ||
8 | /* OPIE */ | ||
9 | //#include <opie2/odebug.h> | ||
10 | |||
11 | /* STD */ | ||
12 | #include <stdio.h> | ||
13 | |||
9 | ZListView::ZListView (ZSafe *zsafe, const char *id) : QListView(zsafe, id) | 14 | ZListView::ZListView (ZSafe *zsafe, const char *id) : QListView(zsafe, id) |
10 | { | 15 | { |
11 | zs = zsafe; | 16 | zs = zsafe; |
12 | } | 17 | } |
13 | 18 | ||
14 | ZListView::~ZListView() | 19 | ZListView::~ZListView() |
15 | { | 20 | { |
16 | } | 21 | } |
17 | 22 | ||
18 | void ZListView::keyPressEvent ( QKeyEvent *e ) | 23 | void ZListView::keyPressEvent ( QKeyEvent *e ) |
19 | { | 24 | { |
20 | /* | 25 | /* |
21 | char buf[64]; | 26 | owarn << "key: " << e->key() << oendl; |
22 | sprintf (buf, "key: %d\n", e->key()); | ||
23 | qWarning (buf); | ||
24 | */ | 27 | */ |
25 | 28 | ||
26 | switch (e->key()) | 29 | switch (e->key()) |
27 | { | 30 | { |
28 | case 32: // middle cursor key pressed | 31 | case 32: // middle cursor key pressed |
29 | zs->showInfo (zs->selectedItem); | 32 | zs->showInfo (zs->selectedItem); |
30 | break; | 33 | break; |
31 | default: | 34 | default: |
32 | QListView::keyPressEvent( e ); | 35 | QListView::keyPressEvent( e ); |
33 | } | 36 | } |
34 | 37 | ||
35 | } | 38 | } |
diff --git a/noncore/apps/zsafe/zsafe.cpp b/noncore/apps/zsafe/zsafe.cpp index 6ff05ac..ca3ff52 100644 --- a/noncore/apps/zsafe/zsafe.cpp +++ b/noncore/apps/zsafe/zsafe.cpp | |||
@@ -872,25 +872,25 @@ void ZSafe::findPwd() | |||
872 | #ifdef DESKTOP | 872 | #ifdef DESKTOP |
873 | result = Accepted; | 873 | result = Accepted; |
874 | #endif | 874 | #endif |
875 | 875 | ||
876 | QString name; | 876 | QString name; |
877 | QString username; | 877 | QString username; |
878 | QString comment; | 878 | QString comment; |
879 | if (result == Accepted) | 879 | if (result == Accepted) |
880 | { | 880 | { |
881 | name = dialog->NameField->text(); | 881 | name = dialog->NameField->text(); |
882 | username = dialog->UsernameField->text(); | 882 | username = dialog->UsernameField->text(); |
883 | comment = dialog->CommentField->text(); | 883 | comment = dialog->CommentField->text(); |
884 | qWarning (name); | 884 | owarn << name << oendl; |
885 | } | 885 | } |
886 | else | 886 | else |
887 | { | 887 | { |
888 | delete dialog; | 888 | delete dialog; |
889 | return; | 889 | return; |
890 | } | 890 | } |
891 | 891 | ||
892 | if (!name.isEmpty() && name != lastSearchedName || | 892 | if (!name.isEmpty() && name != lastSearchedName || |
893 | lastSearchedName.isEmpty() && !name.isEmpty()) | 893 | lastSearchedName.isEmpty() && !name.isEmpty()) |
894 | { | 894 | { |
895 | // set search at the beginning if a new name is given | 895 | // set search at the beginning if a new name is given |
896 | lastSearchedCategory = NULL; | 896 | lastSearchedCategory = NULL; |
@@ -918,56 +918,56 @@ void ZSafe::findPwd() | |||
918 | 918 | ||
919 | bool found=FALSE; | 919 | bool found=FALSE; |
920 | // step through all categories | 920 | // step through all categories |
921 | QListViewItem *i; | 921 | QListViewItem *i; |
922 | if (lastSearchedCategory) | 922 | if (lastSearchedCategory) |
923 | i = lastSearchedCategory; | 923 | i = lastSearchedCategory; |
924 | else | 924 | else |
925 | i = ListView->firstChild(); | 925 | i = ListView->firstChild(); |
926 | for (; | 926 | for (; |
927 | i != NULL; | 927 | i != NULL; |
928 | i = i->nextSibling()) | 928 | i = i->nextSibling()) |
929 | { | 929 | { |
930 | qWarning (i->text(0)); | 930 | owarn << i->text(0) << oendl; |
931 | i->setSelected(FALSE); | 931 | i->setSelected(FALSE); |
932 | 932 | ||
933 | // step through all subitems | 933 | // step through all subitems |
934 | QListViewItem *si; | 934 | QListViewItem *si; |
935 | if (lastSearchedItem) | 935 | if (lastSearchedItem) |
936 | si = lastSearchedItem; | 936 | si = lastSearchedItem; |
937 | else | 937 | else |
938 | si = i->firstChild(); | 938 | si = i->firstChild(); |
939 | // for (si = i->firstChild(); | 939 | // for (si = i->firstChild(); |
940 | for (; | 940 | for (; |
941 | si != NULL; | 941 | si != NULL; |
942 | si = si->nextSibling()) | 942 | si = si->nextSibling()) |
943 | { | 943 | { |
944 | qWarning (si->text(0)); | 944 | owarn << si->text(0) << oendl; |
945 | if (si->isSelected()) | 945 | if (si->isSelected()) |
946 | si->setSelected(FALSE); | 946 | si->setSelected(FALSE); |
947 | // ListView->repaintItem(si); | 947 | // ListView->repaintItem(si); |
948 | 948 | ||
949 | bool n=TRUE; | 949 | bool n=TRUE; |
950 | bool u=TRUE; | 950 | bool u=TRUE; |
951 | bool c=TRUE; | 951 | bool c=TRUE; |
952 | if (!name.isEmpty()) | 952 | if (!name.isEmpty()) |
953 | n = (si->text(0)).contains (name, FALSE); | 953 | n = (si->text(0)).contains (name, FALSE); |
954 | if (!username.isEmpty()) | 954 | if (!username.isEmpty()) |
955 | u = (si->text(1)).contains (username, FALSE); | 955 | u = (si->text(1)).contains (username, FALSE); |
956 | if (!comment.isEmpty()) | 956 | if (!comment.isEmpty()) |
957 | c = (si->text(3)).contains (comment, FALSE); | 957 | c = (si->text(3)).contains (comment, FALSE); |
958 | 958 | ||
959 | if ((n && u && c ) && !found) | 959 | if ((n && u && c ) && !found) |
960 | { | 960 | { |
961 | qWarning ("Found"); | 961 | owarn << "Found" << oendl; |
962 | selectedItem = si; | 962 | selectedItem = si; |
963 | si->setSelected(TRUE); | 963 | si->setSelected(TRUE); |
964 | ListView->setCurrentItem(si); | 964 | ListView->setCurrentItem(si); |
965 | ListView->ensureItemVisible(si); | 965 | ListView->ensureItemVisible(si); |
966 | ListView->triggerUpdate(); | 966 | ListView->triggerUpdate(); |
967 | 967 | ||
968 | lastSearchedCategory = i; | 968 | lastSearchedCategory = i; |
969 | // set to the next item | 969 | // set to the next item |
970 | lastSearchedItem = si->nextSibling(); | 970 | lastSearchedItem = si->nextSibling(); |
971 | if (!lastSearchedItem) | 971 | if (!lastSearchedItem) |
972 | { | 972 | { |
973 | // no next item within category -> set next category | 973 | // no next item within category -> set next category |
@@ -1219,26 +1219,25 @@ void ZSafe::removeAsciiFile() | |||
1219 | QDir::homeDirPath() + "/Documents/application/zsafe", | 1219 | QDir::homeDirPath() + "/Documents/application/zsafe", |
1220 | "ZSafe (*.txt)", | 1220 | "ZSafe (*.txt)", |
1221 | this, | 1221 | this, |
1222 | "ZSafe File Dialog" | 1222 | "ZSafe File Dialog" |
1223 | "Choose a text file" ); | 1223 | "Choose a text file" ); |
1224 | #endif | 1224 | #endif |
1225 | 1225 | ||
1226 | if (fn && fn.length() > 0 ) | 1226 | if (fn && fn.length() > 0 ) |
1227 | { | 1227 | { |
1228 | QFile f( fn ); | 1228 | QFile f( fn ); |
1229 | if ( !f.remove() ) | 1229 | if ( !f.remove() ) |
1230 | { | 1230 | { |
1231 | qWarning( QString("Could not remove file %1").arg(fn), | 1231 | owarn << "Could not remove file " << fn << oendl; |
1232 | 2000 ); | ||
1233 | QMessageBox::critical( 0, tr("ZSafe"), | 1232 | QMessageBox::critical( 0, tr("ZSafe"), |
1234 | tr("Could not remove text file.") ); | 1233 | tr("Could not remove text file.") ); |
1235 | return; | 1234 | return; |
1236 | } | 1235 | } |
1237 | } | 1236 | } |
1238 | } | 1237 | } |
1239 | 1238 | ||
1240 | void ZSafe::writeAllEntries() | 1239 | void ZSafe::writeAllEntries() |
1241 | { | 1240 | { |
1242 | if (filename.isEmpty()) | 1241 | if (filename.isEmpty()) |
1243 | { | 1242 | { |
1244 | QMessageBox::critical( 0, tr("ZSafe"), | 1243 | QMessageBox::critical( 0, tr("ZSafe"), |
@@ -1269,26 +1268,25 @@ void ZSafe::writeAllEntries() | |||
1269 | QDir::homeDirPath() + "/Documents/application/zsafe", | 1268 | QDir::homeDirPath() + "/Documents/application/zsafe", |
1270 | "ZSafe (*.txt)", | 1269 | "ZSafe (*.txt)", |
1271 | this, | 1270 | this, |
1272 | "ZSafe File Dialog" | 1271 | "ZSafe File Dialog" |
1273 | "Choose a text file" ); | 1272 | "Choose a text file" ); |
1274 | #endif | 1273 | #endif |
1275 | 1274 | ||
1276 | // open the new document | 1275 | // open the new document |
1277 | if (fn && fn.length() > 0 ) | 1276 | if (fn && fn.length() > 0 ) |
1278 | { | 1277 | { |
1279 | QFile f( fn ); | 1278 | QFile f( fn ); |
1280 | if ( !f.open( IO_WriteOnly ) ) { | 1279 | if ( !f.open( IO_WriteOnly ) ) { |
1281 | qWarning( QString("Could not write to file %1").arg(fn), | 1280 | owarn << "Could not write to file " << fn << oendl; |
1282 | 2000 ); | ||
1283 | QMessageBox::critical( 0, "ZSafe", | 1281 | QMessageBox::critical( 0, "ZSafe", |
1284 | QString("Could not export to text file.") ); | 1282 | QString("Could not export to text file.") ); |
1285 | return; | 1283 | return; |
1286 | } | 1284 | } |
1287 | QTextStream t( &f ); | 1285 | QTextStream t( &f ); |
1288 | 1286 | ||
1289 | QListViewItem *i; | 1287 | QListViewItem *i; |
1290 | // step through all categories | 1288 | // step through all categories |
1291 | for (i = ListView->firstChild(); | 1289 | for (i = ListView->firstChild(); |
1292 | i != NULL; | 1290 | i != NULL; |
1293 | i = i->nextSibling()) | 1291 | i = i->nextSibling()) |
1294 | { | 1292 | { |
@@ -1313,28 +1311,28 @@ void ZSafe::writeAllEntries() | |||
1313 | oneEntry += "\";"; | 1311 | oneEntry += "\";"; |
1314 | oneEntry += "\""; | 1312 | oneEntry += "\""; |
1315 | QString comment = si->text(3); | 1313 | QString comment = si->text(3); |
1316 | comment.replace (QRegExp("\n"), "<br>"); | 1314 | comment.replace (QRegExp("\n"), "<br>"); |
1317 | oneEntry += comment; | 1315 | oneEntry += comment; |
1318 | oneEntry += "\";"; | 1316 | oneEntry += "\";"; |
1319 | oneEntry += "\""; | 1317 | oneEntry += "\""; |
1320 | oneEntry += si->text(4); | 1318 | oneEntry += si->text(4); |
1321 | oneEntry += "\";"; | 1319 | oneEntry += "\";"; |
1322 | oneEntry += "\""; | 1320 | oneEntry += "\""; |
1323 | oneEntry += si->text(5); | 1321 | oneEntry += si->text(5); |
1324 | oneEntry += "\""; | 1322 | oneEntry += "\""; |
1325 | // qWarning (oneEntry); | 1323 | // owarn << oneEntry << oendl; |
1326 | t << oneEntry << endl; | 1324 | t << oneEntry << endl; |
1327 | 1325 | ||
1328 | // qWarning (si->text(0)); | 1326 | // owarn << si->text(0) << oendl; |
1329 | } | 1327 | } |
1330 | } | 1328 | } |
1331 | f.close(); | 1329 | f.close(); |
1332 | } | 1330 | } |
1333 | } | 1331 | } |
1334 | 1332 | ||
1335 | void ZSafe::readAllEntries() | 1333 | void ZSafe::readAllEntries() |
1336 | { | 1334 | { |
1337 | if (filename.isEmpty()) | 1335 | if (filename.isEmpty()) |
1338 | { | 1336 | { |
1339 | QMessageBox::critical( 0, tr("ZSafe"), | 1337 | QMessageBox::critical( 0, tr("ZSafe"), |
1340 | tr("No document defined.\nYou have to create a new document")); | 1338 | tr("No document defined.\nYou have to create a new document")); |
@@ -1364,26 +1362,25 @@ void ZSafe::readAllEntries() | |||
1364 | QDir::homeDirPath() + "/Documents/application/zsafe", | 1362 | QDir::homeDirPath() + "/Documents/application/zsafe", |
1365 | "ZSafe (*.txt)", | 1363 | "ZSafe (*.txt)", |
1366 | this, | 1364 | this, |
1367 | "ZSafe File Dialog" | 1365 | "ZSafe File Dialog" |
1368 | "Choose a text file" ); | 1366 | "Choose a text file" ); |
1369 | #endif | 1367 | #endif |
1370 | 1368 | ||
1371 | if (fn && fn.length() > 0 ) | 1369 | if (fn && fn.length() > 0 ) |
1372 | { | 1370 | { |
1373 | QFile f( fn ); | 1371 | QFile f( fn ); |
1374 | if ( !f.open( IO_ReadOnly ) ) | 1372 | if ( !f.open( IO_ReadOnly ) ) |
1375 | { | 1373 | { |
1376 | qWarning( QString("Could not read file %1").arg(fn), | 1374 | owarn << "Could not read file " << fn << oendl; |
1377 | 2000 ); | ||
1378 | QMessageBox::critical( 0, "ZSafe", | 1375 | QMessageBox::critical( 0, "ZSafe", |
1379 | QString("Could not import text file.") ); | 1376 | QString("Could not import text file.") ); |
1380 | return; | 1377 | return; |
1381 | } | 1378 | } |
1382 | 1379 | ||
1383 | modified = true; | 1380 | modified = true; |
1384 | 1381 | ||
1385 | // clear the password list | 1382 | // clear the password list |
1386 | selectedItem = NULL; | 1383 | selectedItem = NULL; |
1387 | QListViewItem *i; | 1384 | QListViewItem *i; |
1388 | // step through all categories | 1385 | // step through all categories |
1389 | for (i = ListView->firstChild(); | 1386 | for (i = ListView->firstChild(); |
@@ -1394,25 +1391,25 @@ void ZSafe::readAllEntries() | |||
1394 | QListViewItem *si; | 1391 | QListViewItem *si; |
1395 | for (si = i->firstChild(); | 1392 | for (si = i->firstChild(); |
1396 | si != NULL; ) | 1393 | si != NULL; ) |
1397 | // si = si->nextSibling()) | 1394 | // si = si->nextSibling()) |
1398 | { | 1395 | { |
1399 | QListViewItem *_si = si; | 1396 | QListViewItem *_si = si; |
1400 | si = si->nextSibling(); | 1397 | si = si->nextSibling(); |
1401 | i->takeItem(_si); // remove from view list | 1398 | i->takeItem(_si); // remove from view list |
1402 | if (_si) delete _si; | 1399 | if (_si) delete _si; |
1403 | } | 1400 | } |
1404 | } | 1401 | } |
1405 | 1402 | ||
1406 | qWarning ("ReadAllEntries(): "); | 1403 | owarn << "ReadAllEntries(): " << oendl; |
1407 | 1404 | ||
1408 | QTextStream t(&f); | 1405 | QTextStream t(&f); |
1409 | while ( !t.eof() ) | 1406 | while ( !t.eof() ) |
1410 | { | 1407 | { |
1411 | QString s = t.readLine(); | 1408 | QString s = t.readLine(); |
1412 | s.replace (QRegExp("\";\""), "\"|\""); | 1409 | s.replace (QRegExp("\";\""), "\"|\""); |
1413 | // char buffer[1024]; | 1410 | // char buffer[1024]; |
1414 | #ifndef WIN32 | 1411 | #ifndef WIN32 |
1415 | char buffer[s.length()+1]; | 1412 | char buffer[s.length()+1]; |
1416 | #else | 1413 | #else |
1417 | char buffer[4048]; | 1414 | char buffer[4048]; |
1418 | #endif | 1415 | #endif |
@@ -1545,26 +1542,25 @@ void ZSafe::readAllEntries() | |||
1545 | { | 1542 | { |
1546 | } | 1543 | } |
1547 | 1544 | ||
1548 | } | 1545 | } |
1549 | 1546 | ||
1550 | #ifdef UNUSED | 1547 | #ifdef UNUSED |
1551 | void ZSafe::writeAllEntries() | 1548 | void ZSafe::writeAllEntries() |
1552 | { | 1549 | { |
1553 | // open the file for writing | 1550 | // open the file for writing |
1554 | QString fn = filename + ".txt"; | 1551 | QString fn = filename + ".txt"; |
1555 | QFile f( fn ); | 1552 | QFile f( fn ); |
1556 | if ( !f.open( IO_WriteOnly ) ) { | 1553 | if ( !f.open( IO_WriteOnly ) ) { |
1557 | qWarning( QString("Could not write to file %1").arg(fn), | 1554 | owarn << "Could not write to file " << fn << oendl; |
1558 | 2000 ); | ||
1559 | QMessageBox::critical( 0, tr("ZSafe"), | 1555 | QMessageBox::critical( 0, tr("ZSafe"), |
1560 | tr("Could not export to text file.") ); | 1556 | tr("Could not export to text file.") ); |
1561 | return; | 1557 | return; |
1562 | } | 1558 | } |
1563 | QTextStream t( &f ); | 1559 | QTextStream t( &f ); |
1564 | 1560 | ||
1565 | QListViewItem *i; | 1561 | QListViewItem *i; |
1566 | // step through all categories | 1562 | // step through all categories |
1567 | for (i = ListView->firstChild(); | 1563 | for (i = ListView->firstChild(); |
1568 | i != NULL; | 1564 | i != NULL; |
1569 | i = i->nextSibling()) | 1565 | i = i->nextSibling()) |
1570 | { | 1566 | { |
@@ -1584,41 +1580,40 @@ void ZSafe::writeAllEntries() | |||
1584 | oneEntry += "\""; | 1580 | oneEntry += "\""; |
1585 | oneEntry += si->text(1); | 1581 | oneEntry += si->text(1); |
1586 | oneEntry += "\";"; | 1582 | oneEntry += "\";"; |
1587 | oneEntry += "\""; | 1583 | oneEntry += "\""; |
1588 | oneEntry += si->text(2); | 1584 | oneEntry += si->text(2); |
1589 | oneEntry += "\";"; | 1585 | oneEntry += "\";"; |
1590 | oneEntry += "\""; | 1586 | oneEntry += "\""; |
1591 | // oneEntry += si->text(3); | 1587 | // oneEntry += si->text(3); |
1592 | QString comment = si->text(3); | 1588 | QString comment = si->text(3); |
1593 | comment.replace (QRegExp("\n"), "<br>"); | 1589 | comment.replace (QRegExp("\n"), "<br>"); |
1594 | oneEntry += comment; | 1590 | oneEntry += comment; |
1595 | oneEntry += "\""; | 1591 | oneEntry += "\""; |
1596 | // qWarning (oneEntry); | 1592 | // owarn << oneEntry << oendl; |
1597 | t << oneEntry << endl; | 1593 | t << oneEntry << endl; |
1598 | 1594 | ||
1599 | // qWarning (si->text(0)); | 1595 | // owarn << si->text(0) << oendl; |
1600 | } | 1596 | } |
1601 | } | 1597 | } |
1602 | f.close(); | 1598 | f.close(); |
1603 | } | 1599 | } |
1604 | 1600 | ||
1605 | void ZSafe::readAllEntries() | 1601 | void ZSafe::readAllEntries() |
1606 | { | 1602 | { |
1607 | QString fn = filename + ".txt"; | 1603 | QString fn = filename + ".txt"; |
1608 | QFile f( fn ); | 1604 | QFile f( fn ); |
1609 | if ( !f.open( IO_ReadOnly ) ) | 1605 | if ( !f.open( IO_ReadOnly ) ) |
1610 | { | 1606 | { |
1611 | qWarning( QString("Could not read file %1").arg(fn), | 1607 | owarn << "Could not read file " << fn << oendl; |
1612 | 2000 ); | ||
1613 | QMessageBox::critical( 0, tr("ZSafe"), | 1608 | QMessageBox::critical( 0, tr("ZSafe"), |
1614 | tr("Could not import text file.") ); | 1609 | tr("Could not import text file.") ); |
1615 | return; | 1610 | return; |
1616 | } | 1611 | } |
1617 | 1612 | ||
1618 | modified = true; | 1613 | modified = true; |
1619 | 1614 | ||
1620 | // clear the password list | 1615 | // clear the password list |
1621 | selectedItem = NULL; | 1616 | selectedItem = NULL; |
1622 | QListViewItem *i; | 1617 | QListViewItem *i; |
1623 | // step through all categories | 1618 | // step through all categories |
1624 | for (i = ListView->firstChild(); | 1619 | for (i = ListView->firstChild(); |
@@ -1629,25 +1624,25 @@ void ZSafe::readAllEntries() | |||
1629 | QListViewItem *si; | 1624 | QListViewItem *si; |
1630 | for (si = i->firstChild(); | 1625 | for (si = i->firstChild(); |
1631 | si != NULL; ) | 1626 | si != NULL; ) |
1632 | // si = si->nextSibling()) | 1627 | // si = si->nextSibling()) |
1633 | { | 1628 | { |
1634 | QListViewItem *_si = si; | 1629 | QListViewItem *_si = si; |
1635 | si = si->nextSibling(); | 1630 | si = si->nextSibling(); |
1636 | i->takeItem(_si); // remove from view list | 1631 | i->takeItem(_si); // remove from view list |
1637 | if (_si) delete _si; | 1632 | if (_si) delete _si; |
1638 | } | 1633 | } |
1639 | } | 1634 | } |
1640 | 1635 | ||
1641 | qWarning ("ReadAllEntries(): "); | 1636 | owarn << "ReadAllEntries(): " << oendl; |
1642 | 1637 | ||
1643 | QTextStream t(&f); | 1638 | QTextStream t(&f); |
1644 | while ( !t.eof() ) | 1639 | while ( !t.eof() ) |
1645 | { | 1640 | { |
1646 | QString s = t.readLine(); | 1641 | QString s = t.readLine(); |
1647 | s.replace (QRegExp("\";\""), "\"|\""); | 1642 | s.replace (QRegExp("\";\""), "\"|\""); |
1648 | // char buffer[1024]; | 1643 | // char buffer[1024]; |
1649 | int len=s.length()+1; | 1644 | int len=s.length()+1; |
1650 | #ifdef WIN32 | 1645 | #ifdef WIN32 |
1651 | char buffer[512]; | 1646 | char buffer[512]; |
1652 | #else | 1647 | #else |
1653 | char buffer[len]; | 1648 | char buffer[len]; |
@@ -1753,25 +1748,25 @@ void ZSafe::readAllEntries() | |||
1753 | c1->initListItem(); | 1748 | c1->initListItem(); |
1754 | categories.insert (c1->getCategoryName(), c1); | 1749 | categories.insert (c1->getCategoryName(), c1); |
1755 | } | 1750 | } |
1756 | 1751 | ||
1757 | } | 1752 | } |
1758 | f.close(); | 1753 | f.close(); |
1759 | 1754 | ||
1760 | } | 1755 | } |
1761 | #endif // UNUSED | 1756 | #endif // UNUSED |
1762 | 1757 | ||
1763 | void ZSafe::resume(int) | 1758 | void ZSafe::resume(int) |
1764 | { | 1759 | { |
1765 | qWarning ("Resume"); | 1760 | owarn << "Resume" << oendl; |
1766 | // hide the main window | 1761 | // hide the main window |
1767 | 1762 | ||
1768 | infoForm->hide(); | 1763 | infoForm->hide(); |
1769 | // open zsafe again | 1764 | // open zsafe again |
1770 | m_password = ""; | 1765 | m_password = ""; |
1771 | selectedItem = NULL; | 1766 | selectedItem = NULL; |
1772 | 1767 | ||
1773 | // clear the password list | 1768 | // clear the password list |
1774 | QListViewItem *i; | 1769 | QListViewItem *i; |
1775 | // step through all categories | 1770 | // step through all categories |
1776 | for (i = ListView->firstChild(); | 1771 | for (i = ListView->firstChild(); |
1777 | i != NULL; | 1772 | i != NULL; |
@@ -1809,34 +1804,34 @@ bool ZSafe::openDocument(const char* _filename, const char* ) | |||
1809 | int pwdOk = 0; | 1804 | int pwdOk = 0; |
1810 | int numberOfTries = 3; | 1805 | int numberOfTries = 3; |
1811 | for (int i=0; i < numberOfTries; i++) | 1806 | for (int i=0; i < numberOfTries; i++) |
1812 | { | 1807 | { |
1813 | QFile f(_filename); | 1808 | QFile f(_filename); |
1814 | if (f.exists()) | 1809 | if (f.exists()) |
1815 | { | 1810 | { |
1816 | // ask with a dialog for the password | 1811 | // ask with a dialog for the password |
1817 | if (m_password.isEmpty()) | 1812 | if (m_password.isEmpty()) |
1818 | getDocPassword(tr("Enter Password")); | 1813 | getDocPassword(tr("Enter Password")); |
1819 | if (m_password.isEmpty() && validationFlag == 0) | 1814 | if (m_password.isEmpty() && validationFlag == 0) |
1820 | { | 1815 | { |
1821 | qWarning ("Wrong password"); | 1816 | owarn << "Wrong password" << oendl; |
1822 | QMessageBox::critical( 0, tr("ZSafe"), | 1817 | QMessageBox::critical( 0, tr("ZSafe"), |
1823 | tr("Wrong password.\n\nZSafe will now exit.") ); | 1818 | tr("Wrong password.\n\nZSafe will now exit.") ); |
1824 | exitZs (1); | 1819 | exitZs (1); |
1825 | } | 1820 | } |
1826 | 1821 | ||
1827 | retval = loadInit(_filename, m_password); | 1822 | retval = loadInit(_filename, m_password); |
1828 | if (retval != PWERR_GOOD) | 1823 | if (retval != PWERR_GOOD) |
1829 | { | 1824 | { |
1830 | qWarning ("Error loading Document"); | 1825 | owarn << "Error loading Document" << oendl; |
1831 | return false; | 1826 | return false; |
1832 | } | 1827 | } |
1833 | } | 1828 | } |
1834 | else | 1829 | else |
1835 | { | 1830 | { |
1836 | #ifdef WIN32 | 1831 | #ifdef WIN32 |
1837 | this->setCaption("Qt ZSafe"); | 1832 | this->setCaption("Qt ZSafe"); |
1838 | #else | 1833 | #else |
1839 | this->setCaption("ZSafe"); | 1834 | this->setCaption("ZSafe"); |
1840 | #endif | 1835 | #endif |
1841 | filename = ""; | 1836 | filename = ""; |
1842 | return false; | 1837 | return false; |
@@ -2292,25 +2287,25 @@ bool ZSafe::saveDocument(const char* _filename, | |||
2292 | } | 2287 | } |
2293 | 2288 | ||
2294 | PasswordForm *newPwdDialog; | 2289 | PasswordForm *newPwdDialog; |
2295 | bool newPwdDialogResult = false; | 2290 | bool newPwdDialogResult = false; |
2296 | void ZSafe::setPasswordDialogDone() | 2291 | void ZSafe::setPasswordDialogDone() |
2297 | { | 2292 | { |
2298 | newPwdDialogResult = true; | 2293 | newPwdDialogResult = true; |
2299 | newPwdDialog->close(); | 2294 | newPwdDialog->close(); |
2300 | } | 2295 | } |
2301 | 2296 | ||
2302 | void ZSafe::getDocPassword(QString title) | 2297 | void ZSafe::getDocPassword(QString title) |
2303 | { | 2298 | { |
2304 | qWarning ("getDocPassword"); | 2299 | owarn << "getDocPassword" << oendl; |
2305 | // open the 'Password' dialog | 2300 | // open the 'Password' dialog |
2306 | PasswordForm *dialog = new PasswordForm(this, title, TRUE); | 2301 | PasswordForm *dialog = new PasswordForm(this, title, TRUE); |
2307 | newPwdDialog = dialog; | 2302 | newPwdDialog = dialog; |
2308 | newPwdDialogResult = false; | 2303 | newPwdDialogResult = false; |
2309 | 2304 | ||
2310 | connect( dialog->PasswordField, SIGNAL( returnPressed() ), | 2305 | connect( dialog->PasswordField, SIGNAL( returnPressed() ), |
2311 | this, SLOT( setPasswordDialogDone() ) ); | 2306 | this, SLOT( setPasswordDialogDone() ) ); |
2312 | 2307 | ||
2313 | // CS: !!! | 2308 | // CS: !!! |
2314 | // int pos = filename.findRev ('/'); | 2309 | // int pos = filename.findRev ('/'); |
2315 | QString ti = filename.right (filename.length() - filename.findRev ('/') - 1); | 2310 | QString ti = filename.right (filename.length() - filename.findRev ('/') - 1); |
2316 | #ifdef WIN32 | 2311 | #ifdef WIN32 |
@@ -2471,25 +2466,25 @@ int ZSafe::saveFinalize(void) | |||
2471 | ciphertext[count1] = iv[count1] ^ plaintext[count1]; | 2466 | ciphertext[count1] = iv[count1] ^ plaintext[count1]; |
2472 | if (putc ((unsigned char) (ciphertext[count1] >> 8), fd) == EOF) retval = PWERR_DATA; | 2467 | if (putc ((unsigned char) (ciphertext[count1] >> 8), fd) == EOF) retval = PWERR_DATA; |
2473 | if (putc ((unsigned char) (ciphertext[count1] & 0xff), fd) == EOF) retval = PWERR_DATA; | 2468 | if (putc ((unsigned char) (ciphertext[count1] & 0xff), fd) == EOF) retval = PWERR_DATA; |
2474 | } | 2469 | } |
2475 | 2470 | ||
2476 | fclose (fd); | 2471 | fclose (fd); |
2477 | free(buffer); | 2472 | free(buffer); |
2478 | return retval; | 2473 | return retval; |
2479 | } | 2474 | } |
2480 | 2475 | ||
2481 | void ZSafe::quitMe () | 2476 | void ZSafe::quitMe () |
2482 | { | 2477 | { |
2483 | qWarning ("QUIT..."); | 2478 | owarn << "QUIT..." << oendl; |
2484 | 2479 | ||
2485 | if (modified) | 2480 | if (modified) |
2486 | { | 2481 | { |
2487 | switch( QMessageBox::information( this, tr("ZSafe"), | 2482 | switch( QMessageBox::information( this, tr("ZSafe"), |
2488 | tr("Do you want to save\nbefore exiting?"), | 2483 | tr("Do you want to save\nbefore exiting?"), |
2489 | tr("&Save"), | 2484 | tr("&Save"), |
2490 | tr("S&ave with\nnew\npassword"), | 2485 | tr("S&ave with\nnew\npassword"), |
2491 | tr("&Don't Save"), | 2486 | tr("&Don't Save"), |
2492 | 0 // Enter == button 0 | 2487 | 0 // Enter == button 0 |
2493 | ) ) | 2488 | ) ) |
2494 | { // Escape == button 2 | 2489 | { // Escape == button 2 |
2495 | case 0: // Save clicked, Alt-S or Enter pressed. | 2490 | case 0: // Save clicked, Alt-S or Enter pressed. |
@@ -2675,25 +2670,25 @@ void ZSafe::addCategory() | |||
2675 | #endif | 2670 | #endif |
2676 | 2671 | ||
2677 | QString category; | 2672 | QString category; |
2678 | QString icon; | 2673 | QString icon; |
2679 | QString fullIconPath; | 2674 | QString fullIconPath; |
2680 | QPixmap *pix; | 2675 | QPixmap *pix; |
2681 | if (result == Accepted) | 2676 | if (result == Accepted) |
2682 | { | 2677 | { |
2683 | modified = true; | 2678 | modified = true; |
2684 | category = dialog->CategoryField->currentText(); | 2679 | category = dialog->CategoryField->currentText(); |
2685 | icon = dialog->IconField->currentText()+".png"; | 2680 | icon = dialog->IconField->currentText()+".png"; |
2686 | 2681 | ||
2687 | qWarning (category); | 2682 | owarn << category << oendl; |
2688 | 2683 | ||
2689 | QListViewItem *li = new ShadedListItem( 1, ListView ); | 2684 | QListViewItem *li = new ShadedListItem( 1, ListView ); |
2690 | Category *c1 = new Category(); | 2685 | Category *c1 = new Category(); |
2691 | c1->setCategoryName(category); | 2686 | c1->setCategoryName(category); |
2692 | 2687 | ||
2693 | // if (!icon.isEmpty() && !icon.isNull()) | 2688 | // if (!icon.isEmpty() && !icon.isNull()) |
2694 | if (icon != "predefined.png") | 2689 | if (icon != "predefined.png") |
2695 | { | 2690 | { |
2696 | // build the full path | 2691 | // build the full path |
2697 | fullIconPath = iconPath + icon; | 2692 | fullIconPath = iconPath + icon; |
2698 | pix = new QPixmap (fullIconPath); | 2693 | pix = new QPixmap (fullIconPath); |
2699 | // pix->resize(14, 14); | 2694 | // pix->resize(14, 14); |
@@ -3183,25 +3178,25 @@ void ZSafe::editCategory() | |||
3183 | { | 3178 | { |
3184 | // #ifndef WIN32 | 3179 | // #ifndef WIN32 |
3185 | conf->removeEntry (category); | 3180 | conf->removeEntry (category); |
3186 | // #endif | 3181 | // #endif |
3187 | saveConf(); | 3182 | saveConf(); |
3188 | cat->setIcon (*getPredefinedIcon(category)); | 3183 | cat->setIcon (*getPredefinedIcon(category)); |
3189 | } | 3184 | } |
3190 | 3185 | ||
3191 | // change the category name of the selected category | 3186 | // change the category name of the selected category |
3192 | QListViewItem *catItem = cat->getListItem(); | 3187 | QListViewItem *catItem = cat->getListItem(); |
3193 | if (catItem) | 3188 | if (catItem) |
3194 | { | 3189 | { |
3195 | qWarning (category); | 3190 | owarn << category << oendl; |
3196 | catItem->setText( 0, tr( category ) ); | 3191 | catItem->setText( 0, tr( category ) ); |
3197 | cat->setCategoryName (tr(category)); | 3192 | cat->setCategoryName (tr(category)); |
3198 | 3193 | ||
3199 | cat->initListItem(); | 3194 | cat->initListItem(); |
3200 | categories.insert (category, cat); | 3195 | categories.insert (category, cat); |
3201 | } | 3196 | } |
3202 | } | 3197 | } |
3203 | saveCategoryDialogFields(dialog); | 3198 | saveCategoryDialogFields(dialog); |
3204 | } | 3199 | } |
3205 | else | 3200 | else |
3206 | { | 3201 | { |
3207 | // delete dialog; | 3202 | // delete dialog; |
@@ -3584,25 +3579,25 @@ void ZSafe::paintEvent( QPaintEvent * ) | |||
3584 | { | 3579 | { |
3585 | if (raiseFlag) | 3580 | if (raiseFlag) |
3586 | { | 3581 | { |
3587 | raiseFlag = false; | 3582 | raiseFlag = false; |
3588 | raiseTimer.start (1, true); | 3583 | raiseTimer.start (1, true); |
3589 | if (infoForm->isVisible()) | 3584 | if (infoForm->isVisible()) |
3590 | infoForm->raise(); | 3585 | infoForm->raise(); |
3591 | } | 3586 | } |
3592 | } | 3587 | } |
3593 | 3588 | ||
3594 | void ZSafe::resizeEvent ( QResizeEvent * ) | 3589 | void ZSafe::resizeEvent ( QResizeEvent * ) |
3595 | { | 3590 | { |
3596 | // qWarning ("resizeEvent"); | 3591 | // owarn << "resizeEvent" << oendl; |
3597 | #ifndef DESKTOP | 3592 | #ifndef DESKTOP |
3598 | DeskW = appl->desktop()->width(); | 3593 | DeskW = appl->desktop()->width(); |
3599 | DeskH = appl->desktop()->height(); | 3594 | DeskH = appl->desktop()->height(); |
3600 | #else | 3595 | #else |
3601 | DeskW = this->width(); | 3596 | DeskW = this->width(); |
3602 | DeskH = this->height(); | 3597 | DeskH = this->height(); |
3603 | #endif | 3598 | #endif |
3604 | 3599 | ||
3605 | if (New) | 3600 | if (New) |
3606 | New->setGeometry ( QRect( DeskW-84, 2, 20, 20 ) ); | 3601 | New->setGeometry ( QRect( DeskW-84, 2, 20, 20 ) ); |
3607 | if (Edit) | 3602 | if (Edit) |
3608 | Edit->setGeometry ( QRect( DeskW-64, 2, 20, 20 ) ); | 3603 | Edit->setGeometry ( QRect( DeskW-64, 2, 20, 20 ) ); |