fixes

5 files changed, 58 insertions, 28 deletions

diff --git a/noncore/apps/zsafe/main.cpp b/noncore/apps/zsafe/main.cpp
index c187520..2707730 100644
--- a/noncore/apps/zsafe/main.cpp
+++ b/noncore/apps/zsafe/main.cpp
@@ -1,118 +1,123 @@
 /*
 ** Author: Carsten Schneider <CarstenSchneider@t-online.de>
 **
 ** $Id$
 **
 ** Homepage: http://home.t-online.de/home/CarstenSchneider/zsafe/index.html
 */
 
 
 #include "zsafe.h"
 
 #ifndef NO_OPIE
 /* OPIE */
 #include <opie2/odebug.h>
 using namespace Opie::Core;
 #endif
 
 /* QT */
 #ifdef DESKTOP
 #include <qapplication.h>
 #else
 #include <qpe/qpeapplication.h>
 #endif
 
 /* STD */
 #include <stdio.h>
 #include <signal.h>
 
 ZSafe *zs;
 #ifdef DESKTOP
 QApplication   *appl;
 #else
 QPEApplication *appl;
 #endif
 
 int DeskW;
 int DeskH;
 
 void suspend (int signum)
 {
    printf ("Suspend signal %d received\n", signum);
 }
 
 void resume (int signum)
 {
    printf ("Resume signal %d received\n", signum);
    zs->resume(signum);
 }
 
 int main( int argc, char ** argv )
 {
-#ifndef WIN32
+#ifndef Q_WS_WIN
     // install signal handler
-    signal (SIGSTOP, suspend);
+//    signal (SIGSTOP, suspend);
 #endif
 
 #ifdef DESKTOP
     QApplication a( argc, argv );
 #else
     QPEApplication a( argc, argv );
 #endif
     appl = &a;
 
 #ifdef DESKTOP
     if (argc >= 3)
     {
-#ifndef WIN32
+#ifndef Q_WS_WIN
        DeskW = atoi(argv[1]);
        DeskH = atoi(argv[2]);
 #else
        int w, h;
        sscanf (argv[1], "%d", &w);
        sscanf (argv[2], "%d", &h);
        DeskW = w;
        DeskH = h;
 #endif
     }
     else
     {
        DeskW = 600;
        DeskH = 400;
     }
 #else
     DeskW = a.desktop()->width();
     DeskH = a.desktop()->height();
 
+#ifndef NO_OPIE
     owarn << "Width: " << DeskW << " Height: " << DeskH << oendl;
-
+#endif
 #ifdef JPATCH_HDE
     // nothings
 #else
     if (DeskW > 240)
     {
        DeskW -= 20;
        DeskH += 25;
+#ifndef NO_OPIE
        owarn << "Changed width: " << DeskW << " Height: " << DeskH << oendl;
+#endif
     }
 #endif
 
 #endif
 
-    ZSafe mw;
-    zs = &mw;
-
-#ifndef WIN32
-    signal (SIGCONT, resume);
+    ZSafe *mw = new ZSafe( 0, 0, QWidget::WDestructiveClose );
+//    ZSafe mw;
+//    zs = &mw;
+    zs = mw;
+                
+#ifndef Q_WS_WIN
+//    signal (SIGCONT, resume);
 #endif
 #ifdef DESKTOP
-    a.setMainWidget(&mw);
-    mw.show();
+    a.setMainWidget(mw);
+    mw->show();
 #else
     // a.showMainWidget( &mw );
-    a.showMainDocumentWidget( &mw );
+    a.showMainDocumentWidget( mw );
 #endif
     int ret = a.exec();
 
     return ret;
 }
diff --git a/noncore/apps/zsafe/zsafe.cpp b/noncore/apps/zsafe/zsafe.cpp
index 1c15852..2dd94aa 100644
--- a/noncore/apps/zsafe/zsafe.cpp
+++ b/noncore/apps/zsafe/zsafe.cpp
@@ -249,375 +249,375 @@ static const char* const general_data[] = {
 "#y c #292c29",
 ".c c #293029",
 ".d c #313031",
 "#E c #313429",
 "#r c #313831",
 ".j c #393c31",
 "#j c #394039",
 "#C c #414841",
 ".w c #4a554a",
 ".a c #4a594a",
 ".# c #525052",
 ".l c #52594a",
 "#f c #525952",
 "#v c #525d52",
 ".O c #5a4c4a",
 ".9 c #5a595a",
 ".A c #5a5d52",
 ".B c #624c52",
 ".0 c #625552",
 "#o c #626562",
 ".R c #626962",
 "#. c #626d5a",
 "#p c #626d62",
 ".2 c #627162",
 "#h c #6a6d62",
 "#z c #6a7562",
 "#w c #6a756a",
 ".C c #73656a",
 ".P c #73696a",
 "#a c #737d6a",
 ".U c #738573",
 ".E c #7b817b",
 "#B c #7b857b",
 "#s c #7b897b",
 "#n c #7b917b",
 ".b c #838d83",
 ".7 c #839583",
 ".n c #8b7d7b",
 "#g c #8b8583",
 ".g c #8b858b",
 ".r c #8b898b",
 ".s c #8b8d8b",
 ".i c #8b9183",
 ".8 c #8b918b",
 "#A c #8b9d8b",
 ".S c #8ba183",
 ".Z c #94918b",
 ".N c #949994",
 ".F c #949d94",
 ".x c #94a18b",
 ".v c #94a194",
 ".Y c #94aa94",
 ".h c #9c999c",
 ".Q c #9ca19c",
 "#u c #9ca59c",
 ".H c #9caa9c",
 "#e c #9cb29c",
 "#m c #a4b29c",
 "#t c #a4b2a4",
 ".M c #a4b69c",
 "#l c #a4b6a4",
 ".z c #a4baa4",
 ".f c #aca5ac",
 ".q c #acaaac",
 "#d c #acbeac",
 ".6 c #acc2ac",
 ".o c #b4b2b4",
 ".t c #b4beb4",
 "#k c #b4c2ac",
 ".5 c #b4cab4",
 ".D c #bdb6bd",
 ".G c #bdc6b4",
 "#c c #bdceb4",
 ".X c #bdd2bd",
 ".4 c #bdd6bd",
 ".1 c #c5bec5",
 ".e c #c5c2c5",
 ".u c #c5cac5",
 "#b c #c5d6c5",
 ".J c #c5dec5",
 ".p c #cdcacd",
 ".W c #cddecd",
 ".L c #cde2cd",
 ".K c #d5eacd",
 ".V c #d5ead5",
 ".y c #d5eed5",
 "QtQtQtQtQtQtQtQtQtQtQtQtQtQt",
 "QtQtQt.#.a.b.cQtQtQtQtQtQtQt",
 "QtQt.d.e.f.g.h.i.c.j.dQt.kQt",
 ".a.l.m.n.o.p.q.r.s.t.u.v.wQt",
 ".x.y.z.A.B.C.D.p.q.E.F.G.H.I",
 ".I.J.K.L.M.N.O.P.o.p.Q.R.S.T",
 "Qt.U.V.L.W.X.Y.Z.0.P.1.s.2.3",
 "Qt.3.X.W.4.X.5.6.7.8.9.s#.##",
 "QtQt#a.X#b#c.5.6#d#e#f#g#h#i",
 "QtQtQt#j.7#k.6#d#l#m#n#o#p#q",
 "QtQtQtQt.k#r#s#m#t.H#u#v#w#x",
 "QtQtQtQtQtQt.k#y#z.v#A#B#C#x",
 "QtQtQtQtQtQtQtQt.k#D.w#s#E.k",
 "QtQtQtQtQtQtQtQtQtQtQt#x#FQt"};
 
 // exit ZSafe and clear the clipboard for security reasons
   void ZSafe::exitZs (int ec)
   {
      QClipboard *cb = QApplication::clipboard();
      cb->clear();
 
      exit (ec);
   }
 
 
 // save the configuration into the file
   void ZSafe::saveConf ()
   {
     if (conf)
     {
        delete conf;
 
 #ifdef DESKTOP
 #ifndef Q_WS_WIN
        conf = new QSettings();
        conf->insertSearchPath (QSettings::Unix, QDir::homeDirPath());
 #else
        conf = new QSettings (cfgFile);
        conf->insertSearchPath (QSettings::Unix, cfgFile);
 #endif
 #else
        conf = new Config (cfgFile, Config::File);
-       conf->setGroup ("zsafe");
+       conf->setGroup ("zsafePrefs");
 #endif
     }
   }
 
 
 /*
  *  Constructs a ZSafe which is a child of 'parent', with the
  *  name 'name' and widget flags set to 'f'
  *
  *  The dialog will by default be modeless, unless you set 'modal' to
  *  TRUE to construct a modal dialog.
  */
 ZSafe::ZSafe( QWidget* parent,  const char* name, bool modal, WFlags fl )
     : QDialog( parent, name, modal, fl ),
       Edit(0l), Delete(0l), Find(0l), New(0l), ListView(0l)
 {
     IsCut = false;
     IsCopy = false;
     modified = false;
     showpwd = false;
 
     // set the config file
     cfgFile=QDir::homeDirPath();
     cfgFile += "/.zsafe.cfg";
     // set the icon path
 #ifdef NO_OPIE
     QString qpedir ((const char *)getenv("QPEDIR"));
 #else
     QString qpedir ((const char *)getenv("OPIEDIR"));
 #endif
 
 #ifdef DESKTOP
     iconPath = QDir::homeDirPath() + "/pics/";
 #else
     if (qpedir.isEmpty())
        iconPath = "/home/QtPalmtop/pics/";
     else
        iconPath = qpedir + "/pics/";
 #endif
 
     // create a zsafe configuration object
 #ifdef DESKTOP
 #ifndef Q_WS_WIN
     conf = new QSettings ();
     conf->insertSearchPath (QSettings::Unix, QDir::homeDirPath());
 #else
     conf = new QSettings (cfgFile);
     conf->insertSearchPath (QSettings::Unix, cfgFile);
 #endif
 #else
     conf = new Config (cfgFile, Config::File);
     conf->setGroup ("zsafePrefs");
 #endif
 #ifdef DESKTOP
 // #ifndef Q_WS_WIN
     expandTree = conf->readBoolEntry(APP_KEY+"expandTree", false);
 // #endif
 #else
     expandTree = conf->readNumEntry(APP_KEY+"expandTree", 0);
 #endif
 #ifndef DESKTOP
     conf->setGroup ("zsafe");
 #endif
 
     QPixmap copy_img((const char**) copy_xpm);
     QPixmap cut_img((const char**) cut_xpm);
     QPixmap edit_img((const char**) edit_xpm);
     QPixmap editdelete_img((const char**) editdelete_xpm);
     QPixmap find_img((const char**) find_xpm);
     QPixmap folder_open_img((const char**) folder_open_xpm);
     QPixmap help_icon_img((const char**) help_icon_xpm);
     QPixmap new_img((const char**) new_xpm);
     QPixmap paste_img((const char**) paste_xpm);
     QPixmap quit_icon_img((const char**) quit_icon_xpm);
     QPixmap save_img((const char**) save_xpm);
     QPixmap trash_img((const char**) trash_xpm);
     QPixmap expand_img((const char**) expand_xpm);
     QPixmap export_img((const char**) export_xpm);
     QPixmap import_img((const char**) import_xpm);
 
     QPixmap bank_cards( ( const char** ) bank_cards_data );
     QPixmap passwords( ( const char** ) passwords_data );
     QPixmap software( ( const char** ) software_data );
     QPixmap general( ( const char** ) general_data );
                 QPixmap image0( ( const char** ) zsafe_xpm );
         if ( !name )
     setName( "ZSafe" );
 
 #ifdef DESKTOP
 #ifdef Q_WS_WIN
     setGeometry(100, 150, DeskW, DeskH-30 );
 #else
     resize( DeskW, DeskH-30 );
 #endif
 
 #else
 
 #ifdef JPATCH_HDE
    int DeskS;
    if(DeskW > DeskH)
    {
       DeskS = DeskW;
    }
    else
    {
       DeskS = DeskH;
    }
    resize( DeskW, DeskH );
    setMinimumSize( QSize( DeskS, DeskS ) );
    setMaximumSize( QSize( DeskS, DeskS ) );
 #else
     resize( DeskW, DeskH-30 );
 #endif
 
 #endif
    setCaption( tr( "ZSafe" ) );
    QString zsafeAppDirPath = QDir::homeDirPath() + "/Documents/application/zsafe";
-   QString filename = conf->readEntry(APP_KEY+"document");
+   filename = conf->readEntry(APP_KEY+"document");
    if ( !QFileInfo(filename).exists() || !QDir(zsafeAppDirPath).exists() )
    {
     // check if the directory application exists, if not
     // create it
 // #ifndef Q_WS_WIN
     // QString d1("Documents/application");
 // #else
         QString d1(QDir::homeDirPath() + "/Documents/application");
 // #endif
     QDir pd1(d1);
     if (!pd1.exists())
     {
        QDir pd2(QDir::homeDirPath() + "/Documents");
            if (!pd2.exists()) {
                                 QDir pd3(QDir::homeDirPath());
                         if (!pd3.mkdir("Documents", FALSE)) {
                    }
            }
        
            if (!pd2.mkdir("application", FALSE))
        {
           QMessageBox::critical( 0, tr("ZSafe"),
 #ifdef JPATCH_HDE
                tr("<P>Can't create directory ..."+d1+"</P><P>ZSafe will now exit.</P>"));
 #else
                tr("<P>Can't create directory %1</P><P>ZSafe will now exit.</P>").arg(d1));
 #endif
           exitZs (1);
        }
     }
 // #ifndef Q_WS_WIN
     // QString d2("Documents/application/zsafe");
 // #else
         QString d2(QDir::homeDirPath() + "/Documents/application/zsafe");
 // #endif
     QDir pd2(d2);
     if (!pd2.exists())
     {
        if (!pd1.mkdir("zsafe", FALSE))
        {
           QMessageBox::critical( 0, tr("ZSafe"),
 #ifdef JPATCH_HDE
                tr("<P>Can't create directory ...//Documents/application/zsafe</P><P>ZSafe will now exit.</P"));
 #else
                tr("<P>Can't create directory %1</P><P>ZSafe will now exit.</P>").arg(d2));
 #endif
           exitZs (1);
        }
    }
     
     filename = zsafeAppDirPath + "/passwords.zsf";
 
     // save the current filename to the config file
     conf->writeEntry(APP_KEY+"document", filename);
     saveConf();
          }
    //if (filename == "INVALIDPWD")
       //filename = "";
 
     QString ti = filename.right (filename.length() - filename.findRev ('/') - 1);
 #ifdef Q_WS_WIN
     this->setCaption("Qt ZSafe: " + ti);
 #else
     this->setCaption("ZSafe: " + ti);
 #endif
 
     selectedItem = NULL;
     lastSearchedCategory = NULL;
     lastSearchedItem = NULL;
     lastSearchedName = "";
     lastSearchedUsername = "";
     lastSearchedComment = "";
 
     infoForm = new InfoForm(this, "show_info", TRUE);
     categoryDialog = NULL;
     infoForm->setIcon( image0);
 
     // add a menu bar
     QMenuBar *menu = new QMenuBar( this );
 
     // add file menu
     // QPopupMenu *file = new QPopupMenu( this );
     file = new QPopupMenu( this );
 
 // #ifdef DESKTOP
     file->insertItem( new_img, tr("&New document"),  this, SLOT(newDocument()) );
     file->insertItem( folder_open_img, tr("&Open document"),  this, SLOT(loadDocument()) );
     file->insertItem( save_img, tr("&Save document as .."),  this, SLOT(saveDocumentAs()) );
     file->insertSeparator();
 // #endif
 
     file->insertItem( save_img, tr("&Save document"),  this, SLOT(saveDocumentWithoutPwd()) );
     file->insertItem( save_img, tr("S&ave document with new Password"),  this,
                       SLOT(saveDocumentWithPwd()) );
     file->insertSeparator();
     file->insertItem( export_img, tr("&Export text file"),  this, SLOT(writeAllEntries()) );
     file->insertItem( import_img, tr("&Import text file"),  this, SLOT(readAllEntries()) );
     file->insertItem( trash_img, tr("&Remove text file"),  this, SLOT(removeAsciiFile()) );
     file->insertSeparator();
     file->insertItem( expand_img, tr("&Open entries expanded"), this,
                       SLOT(setExpandFlag()), 0, 'o');
     file->setItemChecked('o', expandTree);
     file->insertSeparator();
     file->insertItem( quit_icon_img, tr("E&xit"),  this, SLOT(quitMe()) );
     menu->insertItem( tr("&File"), file );
 
     QPopupMenu *cat = new QPopupMenu( this );
     cat->insertItem( new_img, tr("&New"),  this, SLOT(addCategory()) );
     cat->insertItem( edit_img, tr("&Edit"),  this, SLOT(editCategory()) );
     cat->insertItem( trash_img, tr("&Delete"),  this, SLOT(delCategory()) );
     menu->insertItem( tr("&Category"), cat );
 
     QPopupMenu *it = new QPopupMenu( this );
     it->insertItem( cut_img, tr("&Cut"),  this, SLOT(cutItem()) );
     it->insertItem( copy_img, tr("C&opy"),  this, SLOT(copyItem()) );
     it->insertItem( paste_img, tr("&Paste"),  this, SLOT(pasteItem()) );
     it->insertSeparator();
     it->insertItem( new_img, tr("&New"),  this, SLOT(newPwd()) );
     it->insertItem( edit_img, tr("&Edit"),  this, SLOT(editPwd()) );
     it->insertItem( trash_img, tr("&Delete"),  this, SLOT(deletePwd()) );
     it->insertItem( find_img, tr("&Search"),  this, SLOT(findPwd()) );
     menu->insertItem( tr("&Entry"), it );
 
     QPopupMenu *help = new QPopupMenu( this );
     help->insertItem( help_icon_img, tr("&About"),  this, SLOT(about()) );
     menu->insertItem( tr("&Help"), help );
 
     // toolbar icons
@@ -637,369 +637,369 @@ ZSafe::ZSafe( QWidget* parent,  const char* name, bool modal, WFlags fl )
 
     Delete = new QToolButton( menu, "Delete" );
     Delete->setGeometry( QRect( DeskW-44, 2, 20, 20 ) );
     Delete->setText( "" );
     Delete->setPixmap( trash_img );
     QToolTip::add(  Delete, tr( "Delete category or entry" ) );
 
     Find = new QToolButton( menu, "Find" );
     Find->setGeometry( QRect( DeskW-24, 2, 20, 20 ) );
     Find->setText( "" );
     Find->setPixmap( find_img );
     QToolTip::add(  Find, tr( "Find entry" ) );
 
 /*
     QBoxLayout * h = new QHBoxLayout( this );
     h->addWidget (menu);
     h->addWidget (New);
     h->addWidget (Edit);
     h->addWidget (Delete);
     h->addWidget (Find);
 */
 
     ListView = new ZListView( this, "ListView" );
     ListView->addColumn( tr( "Name" ) );
     ListView->addColumn( tr( "Field 2" ) );
     ListView->addColumn( tr( "Field 3" ) );
     ListView->addColumn( tr( "Comment" ) );
     ListView->addColumn( tr( "Field 4" ) );
     ListView->addColumn( tr( "Field 5" ) );
     ListView->setAllColumnsShowFocus(TRUE);
 
 #ifdef DESKTOP
     ListView->setResizePolicy(QScrollView::AutoOneFit);
     // ListView->setGeometry( QRect( 0, 22, this->width(), this->height() - 30 ) );
 #else
     ListView->setResizePolicy(QScrollView::AutoOneFit);
     // ListView->setGeometry( QRect( 0, 22,
                            // this->width(), this->height() - 30 ) );
     // ListView->setMaximumSize( QSize( 440, 290 ) );
 #endif
     ListView->setVScrollBarMode( QListView::Auto );
 
     QBoxLayout * l = new QVBoxLayout( this );
     l->addWidget (menu);
     l->addWidget (ListView);
 
 #ifndef DESKTOP
     // start a timer (100 ms) to load the default document
     docuTimer.start( 100, true );
     connect( &docuTimer, SIGNAL(timeout()), SLOT( slotLoadDocu() ) );
     raiseFlag = true;
     connect( &raiseTimer, SIGNAL(timeout()), SLOT( slotRaiseTimer() ) );
 #else
     // open the default document
     openDocument(filename);
 #endif
 
     // signals and slots connections for QTollButton
     connect( New, SIGNAL( clicked() ), this, SLOT( newPwd() ) );
     connect( Edit, SIGNAL( clicked() ), this, SLOT( editPwd() ) );
     connect( Delete, SIGNAL( clicked() ), this, SLOT( deletePwd() ) );
     connect( Find, SIGNAL( clicked() ), this, SLOT( findPwd() ) );
     // signals and slots connections for QListView
     connect( ListView, SIGNAL( selectionChanged(QListViewItem*) ),
              this, SLOT( listViewSelected(QListViewItem*) ) );
     connect( ListView, SIGNAL( doubleClicked(QListViewItem*) ),
              this, SLOT( showInfo(QListViewItem*) ) );
     connect( ListView, SIGNAL( returnPressed(QListViewItem*) ),
              this, SLOT( showInfo(QListViewItem*) ) );
 
         #ifndef DESKTOP  
           QPEApplication::setStylusOperation( ListView->viewport(),QPEApplication::RightOnHold);
 #endif
     connect( ListView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
            this,SLOT( ListPressed(int, QListViewItem *, const QPoint&, int)) );
 
            this->setIcon( image0);
 }
 
 const QColor *ZSafe::evenRowColor = &Qt::white;
 // const QColor *ZSafe::oddRowColor = &Qt::lightGray;
 const QColor *ZSafe::oddRowColor = new QColor(216,240,255);
 
 /*
  *  Destroys the object and frees any allocated resources
  */
 ZSafe::~ZSafe()
 {
     // no need to delete child widgets, Qt does it all for us
     quitMe();
 }
 
 // load the default document
 void ZSafe::slotLoadDocu()
 {
    openDocument (filename);
 }
 
 void ZSafe::deletePwd()
 {
 
     if (!selectedItem)
        return;
     if (!isCategory(selectedItem))
     {
        switch( QMessageBox::information( this, tr("ZSafe"),
                                       tr("Do you want to delete?"),
                                       tr("&Delete"), tr("D&on't Delete"),
                                       0      // Enter == button 0
                                       ) ) { // Escape == button 2
        case 0: // Delete clicked, Alt-S or Enter pressed.
           // Delete
           modified = true;
           selectedItem->parent()->takeItem(selectedItem);
           selectedItem = NULL;
           break;
        case 1: // Don't delete
           break;
        }
     }
     else
     {
        delCategory();
     }
 }
 
 void ZSafe::editPwd()
 {
-    if (!selectedItem)
-       return;
+     if (!selectedItem)
+        return;
     if (!isCategory(selectedItem))
     {
        // open the 'New Entry' dialog
        NewDialog *dialog = new NewDialog(this, "edit_entry", TRUE);
 #ifdef Q_WS_WIN
        dialog->setCaption ("Qt " + tr("Edit Entry"));
        dialog->setGeometry(200, 250, 220, 310 );
 #endif
 
        // set the labels
        dialog->Name->setText(getFieldLabel (selectedItem,     "1", tr("Name")));
        dialog->Username->setText(getFieldLabel (selectedItem, "2", tr("Username")));
        dialog->Password->setText(getFieldLabel (selectedItem, "3", tr("Password")));
        dialog->Comment->setText(getFieldLabel (selectedItem,  "4", tr("Comment")));
        dialog->Field5Label->setText(getFieldLabel (selectedItem,"5", tr("Field 4")));
        dialog->Field6Label->setText(getFieldLabel (selectedItem,"6", tr("Field 5")));
 
        // set the fields
        dialog->NameField->setText(selectedItem->text (0));
        dialog->UsernameField->setText(selectedItem->text (1));
        dialog->PasswordField->setText(selectedItem->text (2));
        QString comment = selectedItem->text (3);
        comment.replace (QRegExp("<br>"), "\n");
        dialog->Field5->setText(selectedItem->text (4));
        dialog->Field6->setText(selectedItem->text (5));
        dialog->CommentField->insertLine(comment);
        dialog->CommentField->setCursorPosition(0,0);
 
 #ifdef Q_WS_QWS
        DialogCode result = (DialogCode) QPEApplication::execDialog( dialog );
 #endif
                          
 #ifdef DESKTOP
 #ifndef Q_QW_QWIN
        dialog->show();
 #endif
 #else
        dialog->showMaximized();
 #endif
 #ifdef DESKTOP
        int result = dialog->exec();
-//       result = QDialog::Accepted;
+       result = QDialog::Accepted;
 #endif
        if (result == Accepted)
        {
           modified = true;
           // edit the selected item
           QString name = dialog->NameField->text();
           selectedItem->setText (0, tr (name));
           QString user = dialog->UsernameField->text();
           selectedItem->setText (1, tr (user));
           QString pwd = dialog->PasswordField->text();
           selectedItem->setText (2, tr (pwd));
           QString comment = dialog->CommentField->text();
           comment.replace (QRegExp("\n"), "<br>");
           selectedItem->setText (3, tr (comment));
           QString f5 = dialog->Field5->text();
           selectedItem->setText (4, tr (f5));
           QString f6 = dialog->Field6->text();
           selectedItem->setText (5, tr (f6));
        }
 
        delete dialog;
     }
     else
     {
        editCategory();
     }
 }
 
 void ZSafe::newPwd()
 {
-    if (!selectedItem)
-       return;
-
+     if (!selectedItem)
+        return;
+                qWarning("new item");
     if (!isCategory(selectedItem))
          selectedItem = selectedItem->parent();
 
     if (isCategory(selectedItem))
     {
        QString cat = selectedItem->text(0);
-
+                         qWarning(cat);
        // open the 'New Entry' dialog
        NewDialog *dialog = new NewDialog(this, "new_entry", TRUE);
 #ifdef Q_WS_WIN
        dialog->setCaption ("Qt " + tr("New Entry"));
        dialog->setGeometry(200, 250, 220, 310 );
 #endif
        // set the labels
        dialog->Name->setText(getFieldLabel (selectedItem,     "1", tr("Name")));
        dialog->Username->setText(getFieldLabel (selectedItem, "2", tr("Username")));
        dialog->Password->setText(getFieldLabel (selectedItem, "3", tr("Password")));
        dialog->Comment->setText(getFieldLabel (selectedItem,  "4", tr("Comment")));
        dialog->Field5Label->setText(getFieldLabel (selectedItem,"5", tr("Field 4")));
        dialog->Field6Label->setText(getFieldLabel (selectedItem,"6", tr("Field 5")));
 retype:
 
 #ifdef Q_WS_QWS
        DialogCode result = (DialogCode) QPEApplication::execDialog( dialog );
 #endif
                          
 #ifdef DESKTOP
 #ifndef Q_QW_QWIN
        dialog->show();
 #endif
 #else
        dialog->showMaximized();
 #endif
 #ifdef DESKTOP
        int result = dialog->exec();
-//       result = QDialog::Accepted;
+       result = QDialog::Accepted;
 #endif
 
        if (result == Accepted)
        {
 
           QString name = dialog->NameField->text();
           if (cat == name)
           {
              QMessageBox::critical( 0, tr("ZSafe"),
                 tr("Entry name must be different\nfrom the category name.") );
              goto retype; // it's not a good programming style :-)
           }
 
           modified = true;
           // add the new item
           QListViewItem *i = new ShadedListItem (0, selectedItem);
           i->setOpen (TRUE);
 
           i->setText (0, tr (name));
           QString user = dialog->UsernameField->text();
           i->setText (1, tr (user));
           QString pwd = dialog->PasswordField->text();
           i->setText (2, tr (pwd));
           QString comment = dialog->CommentField->text();
           comment.replace (QRegExp("\n"), "<br>");
           i->setText (3, tr (comment));
           QString f5 = dialog->Field5->text();
           i->setText (4, tr (f5));
           QString f6 = dialog->Field6->text();
           i->setText (5, tr (f6));
        }
 
        delete dialog;
     }
 }
 
 void ZSafe::findPwd()
 {
 
     // open the 'Search' dialog
     SearchDialog *dialog = new SearchDialog(this, tr("Search"), TRUE);
 #ifdef Q_WS_WIN
     dialog->setCaption ("Qt " + tr("Search"));
 #endif
 
 #ifdef DESKTOP
 #endif
     if (lastSearchedName)
        dialog->NameField->setText(lastSearchedName);
     else
        dialog->NameField->setText("");
     if (lastSearchedUsername)
        dialog->UsernameField->setText(lastSearchedUsername);
     else
        dialog->UsernameField->setText("");
     if (lastSearchedComment)
        dialog->CommentField->setText(lastSearchedComment);
     else
        dialog->CommentField->setText("");
     DialogCode result = (DialogCode) dialog->exec();
 #ifdef DESKTOP
        result = Accepted;
 #endif
 
     QString name;
     QString username;
     QString comment;
     if (result == Accepted)
     {
        name = dialog->NameField->text();
        username = dialog->UsernameField->text();
        comment = dialog->CommentField->text();
 #ifndef NO_OPIE
                          owarn << name << oendl;
 #else
                qWarning (name);                  
 #endif
     }
     else
     {
        delete dialog;
        return;
     }
 
     if (!name.isEmpty() && name != lastSearchedName ||
         lastSearchedName.isEmpty() && !name.isEmpty())
     {
        // set search at the beginning if a new name is given
        lastSearchedCategory = NULL;
        lastSearchedItem = NULL;
     }
     lastSearchedName = name;
     if (!username.isEmpty() && username != lastSearchedUsername ||
         lastSearchedUsername.isEmpty() && !username.isEmpty())
     {
        // set search at the beginning if a new name is given
        lastSearchedCategory = NULL;
        lastSearchedItem = NULL;
     }
     lastSearchedUsername = username;
     if (!comment.isEmpty() && comment != lastSearchedComment ||
         lastSearchedComment.isEmpty() && !comment.isEmpty())
     {
        // set search at the beginning if a new name is given
        lastSearchedCategory = NULL;
        lastSearchedItem = NULL;
     }
     lastSearchedComment = comment;
 
     ListView->clearSelection();
 
     bool found=FALSE;
     // step through all categories
     QListViewItem *i;
     if (lastSearchedCategory)
        i = lastSearchedCategory;
      else
        i = ListView->firstChild();
     for (;
          i != NULL;
          i = i->nextSibling())
     {
 #ifndef NO_OPIE
        owarn << i->text(0) << oendl;
 #endif
        i->setSelected(FALSE);
 
        // step through all subitems
diff --git a/noncore/apps/zsafe/zsafe.pro b/noncore/apps/zsafe/zsafe.pro
index 3cae706..236d11e 100644
--- a/noncore/apps/zsafe/zsafe.pro
+++ b/noncore/apps/zsafe/zsafe.pro
@@ -1,17 +1,31 @@
 TEMPLATE     = app
 CONFIG       = qt warn_on 
 DESTDIR      = $(OPIEDIR)/bin
 HEADERS      = zsafe.h krc2.h category.h categorylist.h zlistview.h \
                scqtfiledlg.h
 SOURCES      = main.cpp zsafe.cpp krc2.cpp category.cpp \
                categorylist.cpp zlistview.cpp shadedlistitem.cpp\
                scqtfileedit.cpp scqtfileedit.moc.cpp \
                scqtfiledlg.cpp
 INTERFACES   = newdialog.ui searchdialog.ui passworddialog.ui categorydialog.ui infoform.ui wait.ui
 INCLUDEPATH  += $(OPIEDIR)/include
 DEPENDPATH   += $(OPIEDIR)/include
 LIBS         += -lqpe -lopiecore2 -lopieui2
 TARGET       = zsafe
 
 include ( $(OPIEDIR)/include.pro )
 
+QWS {
+message( "Configuring for multi-threaded Qt..." )
+
+}
+
+win32 {
+    TEMPLATE = app
+    DEFINES += DESKTOP QT_DLL QT_THREAD_SUPPORT
+    SOURCES += extra/qsettings.cpp
+    HEADERS += extra/qsettings.h
+            INCLUDEPATH+= extra
+    DEPENDPATH += extra
+    RC_FILE = zsafe.rc
+}
diff --git a/noncore/apps/zsafe/zsafe_win32.pro b/noncore/apps/zsafe/zsafe_win32.pro
index 5bc2c9e..3289fa0 100644
--- a/noncore/apps/zsafe/zsafe_win32.pro
+++ b/noncore/apps/zsafe/zsafe_win32.pro
@@ -1,18 +1,18 @@
         TEMPLATE= app

         #CONFIG         = qt warn_on thread debug

         CONFIG  = qt warn_on thread release

-        DEFINES         = DESKTOP WIN32 

+        DEFINES         = DESKTOP 

 DEFINES += QT_DLL QT_THREAD_SUPPORT

 HEADERS         = zsafe.h krc2.h category.h categorylist.h zlistview.h qsettings.h shadedlistitem.h

 SOURCES         = main.cpp zsafe.cpp krc2.cpp category.cpp \

                   categorylist.cpp zlistview.cpp qsettings.cpp shadedlistitem.cpp

         #INCLUDEPATH+= $(QTDIR)/include

         #INCLUDEPATH+= .

         #DEPENDPATH+= $(QTDIR)/include

 #LIBS            += -lqt

         INTERFACES= newdialog.ui searchdialog.ui passworddialog.ui categorydialog.ui

 INTERFACES      += infoform.ui wait.ui

         TARGET  = zsafe

 #DESTDIR        = ../bin

 TRANSLATIONS    = i18n/de/zsafe.ts

 RC_FILE = zsafe.rc

diff --git a/noncore/apps/zsafe/zsafe_x86.pro b/noncore/apps/zsafe/zsafe_x86.pro
index 95eb63f..6bffd23 100644
--- a/noncore/apps/zsafe/zsafe_x86.pro
+++ b/noncore/apps/zsafe/zsafe_x86.pro
@@ -1,16 +1,27 @@
         TEMPLATE= app
-        #CONFIG         = qt warn_on debug
-        CONFIG  = qt warn_on release thread
-        DEFINES         = DESKTOP QT_THREAD_SUPPORT
+        # CONFIG        = qt warn_on debug
+        CONFIG  = qt warn_on release 
+        DEFINES         = DESKTOP NO_OPIE
 HEADERS         = zsafe.h krc2.h category.h categorylist.h zlistview.h shadedlistitem.h
 SOURCES         = main.cpp zsafe.cpp krc2.cpp category.cpp categorylist.cpp zlistview.cpp shadedlistitem.cpp
         INCLUDEPATH+= $(QTDIR)/include
         INCLUDEPATH+= .
         DEPENDPATH+= $(QTDIR)/include
-#LIBS            +=-L$(QPEDIR)/lib -lqt
-LIBS           +=-Wl,-rpath,/usr/lib/qt3/lib -L/usr/lib/qt3/lib -L/usr/X11R6/lib -lqt-mt -lXext -lX11 -lm
         INTERFACES= newdialog.ui searchdialog.ui passworddialog.ui categorydialog.ui
 INTERFACES      += infoform.ui wait.ui
         TARGET  = zsafe
 #DESTDIR        = ../bin
 TRANSLATIONS    = i18n/de/zsafe.ts
+MOC_DIR=.x11
+OBJECTS_DIR=.x11
+
+isEmpty(OPIEDIR) {
+ message( "Configuring for multi-threaded Qt..." )
+}
+
+win32 {
+HEADERS+=extra/qsettings.h
+SOURCES+=extra/qsettings.cpp
+        INCLUDEPATH+= extra
+        DEPENDPATH+= extra
+}