summaryrefslogtreecommitdiff
path: root/noncore
authorllornkcor <llornkcor>2004-07-14 07:17:17 (UTC)
committer llornkcor <llornkcor>2004-07-14 07:17:17 (UTC)
commitc70dbfde7f9605be295cdc7f789c7e3e8d823d39 (patch) (side-by-side diff)
tree75c5fa13be08c30515685f1a6ef6b237809bbc71 /noncore
parenta309681894af2632f9db2fcc252a058f218a82b2 (diff)
downloadopie-c70dbfde7f9605be295cdc7f789c7e3e8d823d39.zip
opie-c70dbfde7f9605be295cdc7f789c7e3e8d823d39.tar.gz
opie-c70dbfde7f9605be295cdc7f789c7e3e8d823d39.tar.bz2
allow new user to create new doc on first startup
Diffstat (limited to 'noncore') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/zsafe/zsafe.cpp137
-rw-r--r--noncore/apps/zsafe/zsafe.h1
2 files changed, 54 insertions, 84 deletions
diff --git a/noncore/apps/zsafe/zsafe.cpp b/noncore/apps/zsafe/zsafe.cpp
index f3d57f8..41c572a 100644
--- a/noncore/apps/zsafe/zsafe.cpp
+++ b/noncore/apps/zsafe/zsafe.cpp
@@ -368,3 +368,3 @@ static const char* const general_data[] = {
#ifndef Q_WS_WIN
- conf = new QSettings ();
+ conf = new QSettings();
conf->insertSearchPath (QSettings::Unix, QDir::homeDirPath());
@@ -495,5 +495,4 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl )
QString filename = conf->readEntry(APP_KEY+"document");
- if (filename.isEmpty() || filename.isNull())
+ if ( !QFileInfo(filename).exists() || !QDir(zsafeAppDirPath).exists() )
{
-
// check if the directory application exists, if not
@@ -508,6 +507,5 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl )
{
-
QDir pd2(QDir::homeDirPath() + "/Documents");
if (!pd2.exists()) {
- QDir pd3(QDir::homeDirPath());
+ QDir pd3(QDir::homeDirPath());
if (!pd3.mkdir("Documents", FALSE)) {
@@ -547,3 +545,2 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl )
- // set the default filename
filename = zsafeAppDirPath + "/passwords.zsf";
@@ -1341,28 +1338,3 @@ void ZSafe::writeAllEntries()
// open the file dialog
-#ifndef DESKTOP
-#ifndef NO_OPIE
- QMap<QString, QStringList> mimeTypes;
- mimeTypes.insert(tr("All"), QStringList() );
- mimeTypes.insert(tr("Text"), "text/*" );
- QString fn = OFileDialog::getSaveFileName( OFileSelector::EXTENDED_ALL,
- QDir::homeDirPath() + "/Documents/application/zsafe",
- QString::null,
- mimeTypes,
- this,
- tr ("Export text file"));
-#else
- QString fn = ScQtFileEdit::getSaveAsFileName(this,
- tr ("Export text file"),
- QDir::homeDirPath() + "/Documents/application/zsafe",
- "*.txt");
-#endif
-#else
- QString fn = QFileDialog::getSaveFileName(
- QDir::homeDirPath() + "/Documents/application/zsafe",
- "ZSafe (*.txt)",
- this,
- "ZSafe File Dialog"
- "Choose a text file" );
-#endif
-
+ QString fn = zsaveDialog();
// open the new document
@@ -1923,2 +1895,4 @@ bool ZSafe::openDocument(const char* _filename, const char* )
{
+ QString name= _filename;
+ qWarning("openDocument "+name);
int retval;
@@ -1972,3 +1946,17 @@ bool ZSafe::openDocument(const char* _filename, const char* )
filename = "";
+ switch( QMessageBox::warning( this, tr("ZSafe"),
+ tr("<P>You must create a new document first. Ok to create?</P>"),
+ tr("&Yes"), tr("&No."),
+ 0
+ ) )
+ {
+ case 1: // No
return false;
+ break;
+ case 0: // Yes
+ newDocument();
+ return false;
+ break;
+ }
+
}
@@ -3449,27 +3437,3 @@ void ZSafe::newDocument()
// open the file dialog
-#ifndef DESKTOP
-#ifndef NO_OPIE
- QMap<QString, QStringList> mimeTypes;
- mimeTypes.insert(tr("All"), QStringList() );
- mimeTypes.insert(tr("ZSafe"), "zsafe/*" );
- QString newFile = OFileDialog::getSaveFileName( OFileSelector::EXTENDED_ALL,
- QDir::homeDirPath() + "/Documents/application/zsafe",
- QString::null,
- mimeTypes,
- this,
- tr ("Create new ZSafe document"));
-#else
- QString newFile = ScQtFileEdit::getSaveAsFileName(this,
- tr ("Create new ZSafe document"),
- QDir::homeDirPath() + "/Documents/application/zsafe",
- "*.zsf");
-#endif
-#else
- QString newFile = QFileDialog::getSaveFileName(
- QDir::homeDirPath() + "/Documents/application/zsafe",
- "ZSafe (*.zsf)",
- this,
- "ZSafe File Dialog"
- "Choose a ZSafe file" );
-#endif
+ QString newFile = zsaveDialog();
@@ -3615,29 +3579,3 @@ void ZSafe::saveDocumentAs()
-#ifndef DESKTOP
-#ifndef NO_OPIE
- QMap<QString, QStringList> mimeTypes;
- mimeTypes.insert(tr("All"), QStringList() );
- mimeTypes.insert(tr("ZSafe"), "zsafe/*" );
- QString newFile = OFileDialog::getSaveFileName( OFileSelector::EXTENDED_ALL,
- QDir::homeDirPath() + "/Documents/application/zsafe",
- QString::null,
- mimeTypes,
- this,
- tr ("Save ZSafe document as.."));
-#else
- QString newFile = ScQtFileEdit::getSaveAsFileName(this,
- tr ("Save ZSafe document as.."),
- QDir::homeDirPath() + "/Documents/application/zsafe",
- "*.zsf");
-#endif
-#else
- // open the file dialog
- QString newFile = QFileDialog::getSaveFileName(
- QDir::homeDirPath() + "/Documents/application/zsafe",
- "ZSafe (*.zsf)",
- this,
- "ZSafe File Dialog"
- "Choose a ZSafe file" );
-#endif
-
+QString newFile = zsaveDialog();
// open the new document
@@ -3855,2 +3793,4 @@ void ZSafe::setDocument(const QString& fileref)
openDocument(filename);
+#else
+Q_UNUSED(fileref);
#endif
@@ -3906 +3846,30 @@ void ZSafe::copyClip( const QString &text) {
+QString ZSafe::zsaveDialog() {
+
+ QString fn;
+#ifndef DESKTOP
+#ifndef NO_OPIE
+ QMap<QString, QStringList> mimeTypes;
+ mimeTypes.insert(tr("All"), QStringList() );
+ mimeTypes.insert(tr("Text"), "text/*" );
+ fn = OFileDialog::getSaveFileName( OFileSelector::EXTENDED_ALL,
+ QDir::homeDirPath() + "/Documents/application/zsafe",
+ QString::null,
+ mimeTypes,
+ this,
+ tr ("Export text file"));
+#else
+ fn = ScQtFileEdit::getSaveAsFileName(this,
+ tr ("Export text file"),
+ QDir::homeDirPath() + "/Documents/application/zsafe",
+ "*.txt");
+#endif
+#else
+ fn = QFileDialog::getSaveFileName(
+ QDir::homeDirPath() + "/Documents/application/zsafe",
+ "ZSafe (*.txt)",
+ this,
+ "ZSafe");
+#endif
+ return fn;
+}
diff --git a/noncore/apps/zsafe/zsafe.h b/noncore/apps/zsafe/zsafe.h
index ca041ff..7419797 100644
--- a/noncore/apps/zsafe/zsafe.h
+++ b/noncore/apps/zsafe/zsafe.h
@@ -155,2 +155,3 @@ public:
+ QString zsaveDialog();