summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/zsafe/config.in2
-rw-r--r--noncore/apps/zsafe/zsafe.cpp85
-rw-r--r--noncore/apps/zsafe/zsafe.pro2
3 files changed, 85 insertions, 4 deletions
diff --git a/noncore/apps/zsafe/config.in b/noncore/apps/zsafe/config.in
index 53956ad..4b1e968 100644
--- a/noncore/apps/zsafe/config.in
+++ b/noncore/apps/zsafe/config.in
@@ -1,5 +1,5 @@
1config ZSAFE 1config ZSAFE
2 boolean "zsafe (Zaurus Password Manager)" 2 boolean "zsafe (Zaurus Password Manager)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
5 5
diff --git a/noncore/apps/zsafe/zsafe.cpp b/noncore/apps/zsafe/zsafe.cpp
index bd03031..abf6511 100644
--- a/noncore/apps/zsafe/zsafe.cpp
+++ b/noncore/apps/zsafe/zsafe.cpp
@@ -9,7 +9,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 : none 12** Zaurus arm : -DNO_OPIE
13** Zaurus Opie arm: none
13** Linux Desktop : -DDESKTOP 14** Linux Desktop : -DDESKTOP
14** Windows Desktop: -DDESKTOP -DWIN32 15** Windows Desktop: -DDESKTOP -DWIN32
15** 16**
@@ -24,8 +25,12 @@
24#include "shadedlistitem.h" 25#include "shadedlistitem.h"
25 26
26#ifndef DESKTOP 27#ifndef DESKTOP
28#ifndef NO_OPIE
29#include <opie/ofiledialog.h>
30#else
27#include "scqtfileedit.h" 31#include "scqtfileedit.h"
28#endif 32#endif
33#endif
29 34
30#include <qclipboard.h> 35#include <qclipboard.h>
31 36
@@ -1195,6 +1200,9 @@ void ZSafe::listViewSelected( QListViewItem *_item)
1195 1200
1196bool ZSafe::isCategory(QListViewItem *_item) 1201bool ZSafe::isCategory(QListViewItem *_item)
1197{ 1202{
1203 if (_item == NULL)
1204 return FALSE;
1205
1198 QString categoryName = _item->text (0); 1206 QString categoryName = _item->text (0);
1199 if (categories.find ((const char *)categoryName)) 1207 if (categories.find ((const char *)categoryName))
1200 return TRUE; 1208 return TRUE;
@@ -1207,10 +1215,22 @@ void ZSafe::removeAsciiFile()
1207 // QString fn = filename + ".txt"; 1215 // QString fn = filename + ".txt";
1208 // open the file dialog 1216 // open the file dialog
1209#ifndef DESKTOP 1217#ifndef DESKTOP
1218#ifndef NO_OPIE
1219 QMap<QString, QStringList> mimeTypes;
1220 mimeTypes.insert(tr("All"), QStringList() );
1221 mimeTypes.insert(tr("Text"), "text/*" );
1222 QString fn = OFileDialog::getOpenFileName( OFileSelector::EXTENDED_ALL,
1223 QDir::homeDirPath() + "/Documents/application/zsafe",
1224 QString::null,
1225 mimeTypes,
1226 this,
1227 tr ("Remove text file"));
1228#else
1210 QString fn = ScQtFileEdit::getOpenFileName(this, 1229 QString fn = ScQtFileEdit::getOpenFileName(this,
1211 tr ("Remove text file"), 1230 tr ("Remove text file"),
1212 QDir::homeDirPath() + "/Documents/application/zsafe", 1231 QDir::homeDirPath() + "/Documents/application/zsafe",
1213 "*.txt"); 1232 "*.txt");
1233#endif
1214#else 1234#else
1215 QString fn = QFileDialog::getOpenFileName( 1235 QString fn = QFileDialog::getOpenFileName(
1216 QDir::homeDirPath() + "/Documents/application/zsafe", 1236 QDir::homeDirPath() + "/Documents/application/zsafe",
@@ -1245,10 +1265,22 @@ void ZSafe::writeAllEntries()
1245 1265
1246 // open the file dialog 1266 // open the file dialog
1247#ifndef DESKTOP 1267#ifndef DESKTOP
1268#ifndef NO_OPIE
1269 QMap<QString, QStringList> mimeTypes;
1270 mimeTypes.insert(tr("All"), QStringList() );
1271 mimeTypes.insert(tr("Text"), "text/*" );
1272 QString fn = OFileDialog::getSaveFileName( OFileSelector::EXTENDED_ALL,
1273 QDir::homeDirPath() + "/Documents/application/zsafe",
1274 QString::null,
1275 mimeTypes,
1276 this,
1277 tr ("Export text file"));
1278#else
1248 QString fn = ScQtFileEdit::getSaveAsFileName(this, 1279 QString fn = ScQtFileEdit::getSaveAsFileName(this,
1249 tr ("Export text file"), 1280 tr ("Export text file"),
1250 QDir::homeDirPath() + "/Documents/application/zsafe", 1281 QDir::homeDirPath() + "/Documents/application/zsafe",
1251 "*.txt"); 1282 "*.txt");
1283#endif
1252#else 1284#else
1253 QString fn = QFileDialog::getSaveFileName( 1285 QString fn = QFileDialog::getSaveFileName(
1254 QDir::homeDirPath() + "/Documents/application/zsafe", 1286 QDir::homeDirPath() + "/Documents/application/zsafe",
@@ -1328,10 +1360,22 @@ void ZSafe::readAllEntries()
1328 1360
1329 // open the file dialog 1361 // open the file dialog
1330#ifndef DESKTOP 1362#ifndef DESKTOP
1363#ifndef NO_OPIE
1364 QMap<QString, QStringList> mimeTypes;
1365 mimeTypes.insert(tr("All"), QStringList() );
1366 mimeTypes.insert(tr("Text"), "text/*" );
1367 QString fn = OFileDialog::getOpenFileName( OFileSelector::EXTENDED_ALL,
1368 QDir::homeDirPath() + "/Documents/application/zsafe",
1369 QString::null,
1370 mimeTypes,
1371 this,
1372 tr ("Import text file"));
1373#else
1331 QString fn = ScQtFileEdit::getOpenFileName(this, 1374 QString fn = ScQtFileEdit::getOpenFileName(this,
1332 tr ("Import text file"), 1375 tr ("Import text file"),
1333 QDir::homeDirPath() + "/Documents/application/zsafe", 1376 QDir::homeDirPath() + "/Documents/application/zsafe",
1334 "*.txt"); 1377 "*.txt");
1378#endif
1335#else 1379#else
1336 QString fn = QFileDialog::getOpenFileName( 1380 QString fn = QFileDialog::getOpenFileName(
1337 QDir::homeDirPath() + "/Documents/application/zsafe", 1381 QDir::homeDirPath() + "/Documents/application/zsafe",
@@ -3141,10 +3185,22 @@ void ZSafe::newDocument()
3141 3185
3142 // open the file dialog 3186 // open the file dialog
3143#ifndef DESKTOP 3187#ifndef DESKTOP
3188#ifndef NO_OPIE
3189 QMap<QString, QStringList> mimeTypes;
3190 mimeTypes.insert(tr("All"), QStringList() );
3191 mimeTypes.insert(tr("ZSafe"), "zsafe/*" );
3192 QString newFile = OFileDialog::getSaveFileName( OFileSelector::EXTENDED_ALL,
3193 QDir::homeDirPath() + "/Documents/application/zsafe",
3194 QString::null,
3195 mimeTypes,
3196 this,
3197 tr ("Create new ZSafe document"));
3198#else
3144 QString newFile = ScQtFileEdit::getSaveAsFileName(this, 3199 QString newFile = ScQtFileEdit::getSaveAsFileName(this,
3145 tr ("Create new ZSafe document"), 3200 tr ("Create new ZSafe document"),
3146 QDir::homeDirPath() + "/Documents/application/zsafe", 3201 QDir::homeDirPath() + "/Documents/application/zsafe",
3147 "*.zsf"); 3202 "*.zsf");
3203#endif
3148#else 3204#else
3149 QString newFile = QFileDialog::getSaveFileName( 3205 QString newFile = QFileDialog::getSaveFileName(
3150 QDir::homeDirPath() + "/Documents/application/zsafe", 3206 QDir::homeDirPath() + "/Documents/application/zsafe",
@@ -3189,7 +3245,7 @@ void ZSafe::newDocument()
3189 categories.clear(); 3245 categories.clear();
3190 3246
3191 // m_password = ""; 3247 // m_password = "";
3192 // selectedItem = NULL; 3248 selectedItem = NULL;
3193 3249
3194 filename = newFile; 3250 filename = newFile;
3195 3251
@@ -3217,10 +3273,22 @@ void ZSafe::loadDocument()
3217 3273
3218 // open the file dialog 3274 // open the file dialog
3219#ifndef DESKTOP 3275#ifndef DESKTOP
3276#ifndef NO_OPIE
3277 QMap<QString, QStringList> mimeTypes;
3278 mimeTypes.insert(tr("All"), QStringList() );
3279 mimeTypes.insert(tr("ZSafe"), "zsafe/*" );
3280 QString newFile = OFileDialog::getOpenFileName( OFileSelector::EXTENDED_ALL,
3281 QDir::homeDirPath() + "/Documents/application/zsafe",
3282 QString::null,
3283 mimeTypes,
3284 this,
3285 tr ("Open ZSafe document"));
3286#else
3220 QString newFile = ScQtFileEdit::getOpenFileName(this, 3287 QString newFile = ScQtFileEdit::getOpenFileName(this,
3221 tr ("Open ZSafe document"), 3288 tr ("Open ZSafe document"),
3222 QDir::homeDirPath() + "/Documents/application/zsafe", 3289 QDir::homeDirPath() + "/Documents/application/zsafe",
3223 "*.zsf"); 3290 "*.zsf");
3291#endif
3224#else 3292#else
3225 QString newFile = QFileDialog::getOpenFileName( 3293 QString newFile = QFileDialog::getOpenFileName(
3226 QDir::homeDirPath() + "/Documents/application/zsafe", 3294 QDir::homeDirPath() + "/Documents/application/zsafe",
@@ -3283,10 +3351,22 @@ void ZSafe::saveDocumentAs()
3283{ 3351{
3284 3352
3285#ifndef DESKTOP 3353#ifndef DESKTOP
3354#ifndef NO_OPIE
3355 QMap<QString, QStringList> mimeTypes;
3356 mimeTypes.insert(tr("All"), QStringList() );
3357 mimeTypes.insert(tr("ZSafe"), "zsafe/*" );
3358 QString newFile = OFileDialog::getSaveFileName( OFileSelector::EXTENDED_ALL,
3359 QDir::homeDirPath() + "/Documents/application/zsafe",
3360 QString::null,
3361 mimeTypes,
3362 this,
3363 tr ("Save ZSafe document as.."));
3364#else
3286 QString newFile = ScQtFileEdit::getSaveAsFileName(this, 3365 QString newFile = ScQtFileEdit::getSaveAsFileName(this,
3287 tr ("Save ZSafe document as.."), 3366 tr ("Save ZSafe document as.."),
3288 QDir::homeDirPath() + "/Documents/application/zsafe", 3367 QDir::homeDirPath() + "/Documents/application/zsafe",
3289 "*.zsf"); 3368 "*.zsf");
3369#endif
3290#else 3370#else
3291 // open the file dialog 3371 // open the file dialog
3292 QString newFile = QFileDialog::getSaveFileName( 3372 QString newFile = QFileDialog::getSaveFileName(
@@ -3304,6 +3384,7 @@ void ZSafe::saveDocumentAs()
3304 if (!filename.isEmpty()) 3384 if (!filename.isEmpty())
3305 saveDocument(filename, FALSE); 3385 saveDocument(filename, FALSE);
3306 3386
3387 selectedItem = NULL;
3307 filename = newFile; 3388 filename = newFile;
3308 3389
3309 // save the current filename to the config file 3390 // save the current filename to the config file
diff --git a/noncore/apps/zsafe/zsafe.pro b/noncore/apps/zsafe/zsafe.pro
index ae4c793..5cb74dd 100644
--- a/noncore/apps/zsafe/zsafe.pro
+++ b/noncore/apps/zsafe/zsafe.pro
@@ -14,7 +14,7 @@ INCLUDEPATH += $(OPIEDIR)/include
14 INCLUDEPATH+= . 14 INCLUDEPATH+= .
15 INCLUDEPATH+= $(OPIEDIR)/noncore/apps/zsafe 15 INCLUDEPATH+= $(OPIEDIR)/noncore/apps/zsafe
16 DEPENDPATH+= $(OPIEDIR)/include 16 DEPENDPATH+= $(OPIEDIR)/include
17LIBS += -Wl,-rpath,$(OPIEDIR)/lib -L$(OPIEDIR)/lib -lqpe 17LIBS += -Wl,-rpath,$(OPIEDIR)/lib -L$(OPIEDIR)/lib -lqpe -lopie
18 TARGET = zsafe 18 TARGET = zsafe
19TRANSLATIONS = $(OPIEDIR)/noncore/apps/zsafe/i18n/de/zsafe.ts 19TRANSLATIONS = $(OPIEDIR)/noncore/apps/zsafe/i18n/de/zsafe.ts
20 20