1 files changed, 19 insertions, 87 deletions

diff --git a/noncore/apps/zsafe/zsafe.cpp b/noncore/apps/zsafe/zsafe.cpp
index d55624b..43565ee 100644
--- a/noncore/apps/zsafe/zsafe.cpp
+++ b/noncore/apps/zsafe/zsafe.cpp
@@ -8,192 +8,196 @@
 **
 ** Homepage: http://home.t-online.de/home/CarstenSchneider/zsafe/index.html
 **
 ** Compile Flags:
 **    Zaurus arm     : -DNO_OPIE
 **    Zaurus Opie arm: none
 **    Linux Desktop  : -DDESKTOP
 **    Windows Desktop: -DDESKTOP -DWIN32
 **
 **    for japanese version additional use: -DJPATCH_HDE
 **
 ****************************************************************************/
 #include "zsafe.h"
 #include "newdialog.h"
 #include "searchdialog.h"
 #include "categorydialog.h"
 #include "passworddialog.h"
 #include "infoform.h"
 #include "zlistview.h"
 #include "shadedlistitem.h"
 
 #ifndef DESKTOP
 #ifndef NO_OPIE
 #include <opie/ofiledialog.h>
 #else
 #include "scqtfileedit.h"
 #endif
 #endif
 
 #include <qclipboard.h>
 
 #include <stdio.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #ifndef WIN32
 #include <unistd.h>
 #endif
 #include <string.h>
 #include <errno.h>
 
 #include <qmenubar.h>
 #include <qpopupmenu.h>
 
 #ifdef DESKTOP
 #include <qfiledialog.h>
 #ifndef WIN32
 #include <qsettings.h>
 #else
 #include "qsettings.h"
 #endif
 #include <qapplication.h>
 #else
 #include <qfile.h>
 #include <qpe/fileselector.h>
 #include <qpe/global.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #endif
 
 #include <qtimer.h>
 #include <qlayout.h>
 #include <qmessagebox.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qheader.h>
 #include <qlistview.h>
 #include <qtoolbutton.h>
 #include <qlayout.h>
 #include <qvariant.h>
 #include <qtooltip.h>
 #include <qwhatsthis.h>
 #include <qimage.h>
 #include <qpixmap.h>
 #include <qlineedit.h>
 #include <qmultilineedit.h>
 #include <qregexp.h>
 #include <qdir.h>
 #include <qtextbrowser.h>
 #include <qlabel.h>
 #include <qcombobox.h>
 
 #include "krc2.h"
 
 #include "wait.h"
 
 extern int DeskW, DeskH;
 #ifdef DESKTOP
 extern QApplication   *appl;
 #else
 extern QPEApplication *appl;
 #endif
 
+#ifdef JPATCH_HDE
+#define tr(arg) arg
+#endif
+
 
 #ifdef DESKTOP
 #ifndef WIN32
 const QString APP_KEY="/.zsafe/";
 #else
 const QString APP_KEY="";
 #endif
 #else
 const QString APP_KEY="";
 #endif
 
 // include xmp images
 #include "pics/zsafe/copy.xpm"
 #include "pics/zsafe/cut.xpm"
 #include "pics/zsafe/edit.xpm"
 #include "pics/zsafe/editdelete.xpm"
 #include "pics/zsafe/find.xpm"
 #include "pics/zsafe/folder_open.xpm"
 #include "pics/zsafe/help_icon.xpm"
 #include "pics/zsafe/new.xpm"
 #include "pics/zsafe/paste.xpm"
 #include "pics/zsafe/quit_icon.xpm"
 #include "pics/zsafe/save.xpm"
 #include "pics/zsafe/trash.xpm"
 #include "pics/zsafe/expand.xpm"
 #include "pics/zsafe/export.xpm"
 #include "pics/zsafe/import.xpm"
 #include "pics/zsafe/zsafe.xpm"
 
 static const char* const bank_cards_data[] = { 
 "14 14 16 1",
 ". c None",
 "# c #000000",
 "b c #0000de",
 "a c #0000e6",
 "j c #41de83",
 "k c #4acecd",
 "h c #4aced5",
 "g c #5a40cd",
 "d c #5a44d5",
 "l c #9440d5",
 "m c #b4ce4a",
 "n c #cd4883",
 "e c #d5ae10",
 "f c #de3ce6",
 "i c #e640e6",
 "c c #ffffff",
 "..............",
 ".###########..",
 ".#ababababa#..",
 ".#babbbabbb#..",
 ".#ccccccccc#..",
 ".#cdcefcghc#..",
 ".#ccccccccc#..",
 ".#cicjkclic#..",
 ".#ccccccccc#..",
 ".#cmchlcnec#..",
 ".#ccccccccc#..",
 ".###########..",
 "..............",
 ".............."};
 
 
 static const char* const passwords_data[] = { 
 "16 16 20 1",
 ". c None",
 "# c #000000",
 "r c #000083",
 "p c #0000c5",
 "q c #0000ff",
 "n c #008100",
 "l c #00c200",
 "m c #00ff00",
 "j c #838100",
 "a c #c55900",
 "h c #c5c200",
 "o c #c5c2ff",
 "k c #c5ffc5",
 "f c #ff0000",
 "d c #ff8100",
 "b c #ffaa5a",
 "e c #ffc2c5",
 "c c #ffdeac",
 "i c #ffff00",
 "g c #ffffc5",
 "............###.",
 "...........#abb#",
 "..........#cbab#",
 ".........#cbdd#.",
 "######..#cbdd#..",
 "#eeff#..#add#...",
 "#eeff#######....",
 "#ccdbdd#........",
 "#dddbdd###......",
 "#gghihhjj#......",
 "#hhhihhjj###....",
@@ -404,209 +408,217 @@ ZSafe::ZSafe( QWidget* parent,  const char* name, bool modal, WFlags fl )
 #endif
 
     // create a zsafe configuration object
 #ifdef DESKTOP
 #ifndef WIN32
     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 WIN32
     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 );
     if ( !name )
         setName( "ZSafe" );
 
 #ifdef DESKTOP
 #ifdef WIN32
     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" ) );
 
     filename = conf->readEntry(APP_KEY+"document");
    if (filename.isEmpty() || filename.isNull())
    {
 
     // check if the directory application exists, if not
     // create it
 // #ifndef WIN32
     // QString d1("Documents/application");
 // #else
         QString d1(QDir::homeDirPath() + "/Documents/application");
 // #endif
     QDir pd1(d1);
     if (!pd1.exists())
     {
        QDir pd1("Documents");
        if (!pd1.mkdir("application", FALSE))
        {
           QMessageBox::critical( 0, tr("ZSafe"),
+#ifdef JPATCH_HDE
+               tr("Can't create directory\n.../Documents/application\n\nZSafe will now exit."));
+#else
                tr("Can't create directory\n%1\n\nZSafe will now exit.").arg(d1));
+#endif
           exitZs (1);
        }
     }
 // #ifndef WIN32
     // QString d2("Documents/application/zsafe");
 // #else
         QString d2(QDir::homeDirPath() + "/Documents/application/zsafe");
 // #endif
     QDir pd2(d2);
     if (!pd2.exists())
     {
        QDir pd2("Documents/application");
        if (!pd2.mkdir("zsafe", FALSE))
        {
           QMessageBox::critical( 0, tr("ZSafe"),
+#ifdef JPATCH_HDE
+               tr("Can't create directory\n...//Documents/application/zsafe\n\nZSafe will now exit."));
+#else
                tr("Can't create directory\n%1\n\nZSafe will now exit.").arg(d2));
+#endif
           exitZs (1);
        }
     }
     
 
     // set the default filename
     filename=d2 + "/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 WIN32
     this->setCaption("Qt ZSafe: " + ti);
 #else
     this->setCaption("ZSafe: " + ti);
 #endif
 
     selectedItem = NULL;
     lastSearchedCategory = NULL;
     lastSearchedItem = NULL;
     lastSearchedName = "";
     lastSearchedUsername = "";
     lastSearchedComment = "";
 
     infoForm = new InfoForm();
     categoryDialog = NULL;
 
     // 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
 
     New = new QToolButton( menu, "New" );
     New->setGeometry( QRect( DeskW-84, 2, 20, 20 ) ); 
     New->setMouseTracking( TRUE );
     New->setText( tr( "" ) );
     New->setPixmap( new_img );
     QToolTip::add(  New, tr( "New entry" ) );
 
     Edit = new QToolButton( menu, "Edit" );
     Edit->setGeometry( QRect( DeskW-64, 2, 20, 20 ) ); 
     Edit->setText( tr( "" ) );
     Edit->setPixmap( edit_img );
@@ -682,315 +694,283 @@ ZSafe::ZSafe( QWidget* parent,  const char* name, bool modal, WFlags fl )
              this, SLOT( showInfo( QListViewItem* ) ) );
 
 }
 
 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 (!isCategory(selectedItem))
     {
        // open the 'New Entry' dialog
        NewDialog *dialog = new NewDialog(this, tr("Edit Entry"), TRUE);
 #ifdef WIN32
        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 DESKTOP
 #ifndef WIN32
        dialog->show();
 #endif
 #else
        dialog->showMaximized();
 #endif
        DialogCode result = (DialogCode) dialog->exec();
 
 #ifdef DESKTOP
        result = Accepted;
 #endif
        if (result == Accepted)
        {
-#ifdef JPATCH_HDE
-          // edit the selected item
-          QString name = dialog->NameField->text();
-          selectedItem->setText (0, name);
-          QString user = dialog->UsernameField->text();
-          selectedItem->setText (1, user);
-          QString pwd = dialog->PasswordField->text();
-          selectedItem->setText (2, pwd);
-          QString comment = dialog->CommentField->text();
-          comment.replace (QRegExp("\n"), "<br>");
-          selectedItem->setText (3, comment);
-          QString f5 = dialog->Field5->text();
-          selectedItem->setText (4, f5);
-          QString f6 = dialog->Field6->text();
-          selectedItem->setText (5, f6);
-#else
           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));
-#endif
        }
 
        delete dialog;
     }
     else 
     {
        editCategory();
     }
 }
 
 void ZSafe::newPwd()
 {
     if (!selectedItem)
        return;
 
     if (!isCategory(selectedItem))
          selectedItem = selectedItem->parent();
 
     if (isCategory(selectedItem))
     {
        QString cat = selectedItem->text(0);
 
        // open the 'New Entry' dialog
        NewDialog *dialog = new NewDialog(this, tr("New Entry"), TRUE);
 #ifdef WIN32
        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 DESKTOP
 #ifndef WIN32
        dialog->show();
 #endif
 #else
        dialog->showMaximized();
 #endif
        DialogCode result = (DialogCode) dialog->exec();
 #ifdef DESKTOP
        result = 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);
 
-#ifdef JPATCH_HDE
-          i->setText (0, name);
-          QString user = dialog->UsernameField->text();
-          i->setText (1, user);
-          QString pwd = dialog->PasswordField->text();
-          i->setText (2, pwd);
-          QString comment = dialog->CommentField->text();
-          comment.replace (QRegExp("\n"), "<br>");
-          i->setText (3, comment);
-          QString f5 = dialog->Field5->text();
-          i->setText (4, f5);
-          QString f6 = dialog->Field6->text();
-          i->setText (5, f6);
-#else
           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));
-#endif
        }
 
        delete dialog;
     }
 }
 
 void ZSafe::findPwd()
 {
 
     // open the 'Search' dialog
     SearchDialog *dialog = new SearchDialog(this, tr("Search"), TRUE);
 #ifdef WIN32
     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();
        qWarning (name);
     }
     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())
     {
        qWarning (i->text(0));
        i->setSelected(FALSE);
 
        // step through all subitems
        QListViewItem *si;
        if (lastSearchedItem)
           si = lastSearchedItem;
        else
@@ -1452,230 +1432,213 @@ void ZSafe::readAllEntries()
    // step through all categories
    for (i = ListView->firstChild();
         i != NULL;
         i = i->nextSibling())
    {
       // step through all subitems
       QListViewItem *si;
       for (si = i->firstChild();
            si != NULL; )
            // si = si->nextSibling())
       {
           QListViewItem *_si = si;
           si = si->nextSibling();
           i->takeItem(_si); // remove from view list
           if (_si) delete _si;
       }
    }
 
    qWarning ("ReadAllEntries(): ");
 
    QTextStream t(&f);
    while ( !t.eof() ) 
    {
       QString s = t.readLine();
       s.replace (QRegExp("\";\""), "\"|\"");
       // char buffer[1024];
 #ifndef WIN32
           char buffer[s.length()+1];
 #else
           char buffer[4048];
 #endif
 
 
       /* modify QString -> QCString::utf8 */
       
       strcpy (buffer, s.utf8());
 
       QString name;
       QString user;
       QString password;
       QString comment;
       QString field5="";
       QString field6="";
 
       // separete the entries
       char *i = strtok (buffer, "|");
       QString category(QString::fromUtf8(&i[1]));
       category.truncate(category.length() -1);
 
       int idx=0;
       while ((i = strtok (NULL, "|")) != NULL)
       {
          switch (idx)
          {
             case 0:
                name = QString::fromUtf8(&i[1]);
                name.truncate(name.length() -1);
                // name
                break;
             case 1:
                // user
                user = QString::fromUtf8(&i[1]);
                user.truncate(user.length() -1);
                break;
             case 2:
                // password
                password = QString::fromUtf8(&i[1]);
                password.truncate(password.length() -1);
                break;
             case 3:
                // comment
                comment = QString::fromUtf8(&i[1]);
                comment.truncate(comment.length() -1);
                break;
             case 4:
                // field5
                field5 = QString::fromUtf8(&i[1]);
                field5.truncate(field5.length() -1);
                break;
             case 5:
                // field6
                field6 = QString::fromUtf8(&i[1]);
                field6.truncate(field6.length() -1);
                break;
          }
          idx++; 
       }
 
       Category *cat= categories.find (category);
       if (cat)
       {
          // use the existend item
          QListViewItem *catItem = cat->getListItem();
          if (catItem)
          {
             QListViewItem * item = new ShadedListItem( 0, catItem );
-#ifdef JPATCH_HDE
-            item->setText( 0, name );
-            item->setText( 1, user );
-            item->setText( 2, password );
-            item->setText( 3, comment );
-            item->setText( 4, field5 );
-            item->setText( 5, field6 );
-#else
             item->setText( 0, tr( name ) );
             item->setText( 1, tr( user ) );
             item->setText( 2, tr( password ) );
             item->setText( 3, tr( comment ) );
             item->setText( 4, tr( field5 ) );
             item->setText( 5, tr( field6 ) );
             catItem->setOpen( TRUE );
-#endif
          }
       }
       else
       {
          QListViewItem *catI = new ShadedListItem( 1, ListView );
          // create and insert a new item
          QListViewItem * item = new ShadedListItem( 0, catI );
-#ifdef JPATCH_HDE
-         item->setText( 0, name );
-         item->setText( 1, user );
-         item->setText( 2, password );
-         item->setText( 3, comment );
-         item->setText( 4, field5 );
-         item->setText( 5, field6 );
-#else
          item->setText( 0, tr( name ) );
          item->setText( 1, tr( user ) );
          item->setText( 2, tr( password ) );
          item->setText( 3, tr( comment ) );
          item->setText( 4, tr( field5 ) );
          item->setText( 5, tr( field6 ) );
-#endif
+
          catI->setOpen( TRUE );
 
          Category *c1 = new Category();
          c1->setCategoryName(category);
 
          QString icon;
          QString fullIconPath;
          QPixmap *pix;
 // #ifndef WIN32
          icon = conf->readEntry(APP_KEY+category);
 // #endif
          bool isIconAv = false;
          if (!icon.isEmpty() && !icon.isNull())
          {
             // build the full path
             fullIconPath = iconPath + icon;
             pix = new QPixmap (fullIconPath);
             if (pix)
             {
                QImage img = pix->convertToImage();
                pix->convertFromImage(img.smoothScale(14,14));
                c1->setIconName (icon);
                c1->setIcon (*pix);
                isIconAv = true;
             }
          }
          if (!isIconAv)
          {
             c1->setIcon (*getPredefinedIcon(category));
          }
          c1->setListItem (catI);
          c1->initListItem();
          categories.insert (c1->getCategoryName(), c1);
       }
 
    }
    f.close();
 
   }
   else
   {
   }
 
 }
 
 #ifdef UNUSED
 void ZSafe::writeAllEntries()
 {
     // open the file for writing
     QString fn = filename + ".txt";
     QFile f( fn );
     if ( !f.open( IO_WriteOnly ) ) {
         qWarning( QString("Could not write to file %1").arg(fn),
                       2000 );
         QMessageBox::critical( 0, tr("ZSafe"),
                   tr("Could not export to text file.") );
         return;
     }
     QTextStream t( &f );
 
     QListViewItem *i;
     // step through all categories
     for (i = ListView->firstChild(); 
          i != NULL;
          i = i->nextSibling())
     {
        // step through all subitems
        QListViewItem *si;
        for (si = i->firstChild(); 
             si != NULL;
             si = si->nextSibling())
        {
           QString oneEntry;
           oneEntry += "\"";
           oneEntry += i->text(0);
           oneEntry += "\";";
           oneEntry += "\"";
           oneEntry += si->text(0);
           oneEntry += "\";";
           oneEntry += "\"";
           oneEntry += si->text(1);
           oneEntry += "\";";
           oneEntry += "\"";
           oneEntry += si->text(2);
           oneEntry += "\";";
           oneEntry += "\"";
           // oneEntry += si->text(3);
           QString comment = si->text(3);
           comment.replace (QRegExp("\n"), "<br>");
           oneEntry += comment;
           oneEntry += "\"";
           // qWarning (oneEntry);
           t << oneEntry << endl;
 
           // qWarning (si->text(0));
        }
@@ -1689,222 +1652,210 @@ void ZSafe::readAllEntries()
    QFile f( fn );
    if ( !f.open( IO_ReadOnly ) )
    {
       qWarning( QString("Could not read file %1").arg(fn),
                       2000 );
       QMessageBox::critical( 0, tr("ZSafe"),
                   tr("Could not import text file.") );
       return;
    }
 
    modified = true;
 
    // clear the password list
    selectedItem = NULL;
    QListViewItem *i;
    // step through all categories
    for (i = ListView->firstChild();
         i != NULL;
         i = i->nextSibling())
    {
       // step through all subitems
       QListViewItem *si;
       for (si = i->firstChild();
            si != NULL; )
            // si = si->nextSibling())
       {
           QListViewItem *_si = si;
           si = si->nextSibling();
           i->takeItem(_si); // remove from view list
           if (_si) delete _si;
       }
    }
 
    qWarning ("ReadAllEntries(): ");
 
    QTextStream t(&f);
    while ( !t.eof() ) 
    {
       QString s = t.readLine();
       s.replace (QRegExp("\";\""), "\"|\"");
       // char buffer[1024];
           int len=s.length()+1;
 #ifdef WIN32
           char buffer[512];
 #else
       char buffer[len];
 #endif
       strcpy (buffer, s);
 
       QString name;
       QString user;
       QString password;
       QString comment;
 
       // separete the entries
       char *i = strtok (buffer, "|");
       QString category(&i[1]);
       category.truncate(category.length() -1);
 
       int idx=0;
       while (i = strtok (NULL, "|"))
       {
          switch (idx)
          {
             case 0:
                name = &i[1];
                name.truncate(name.length() -1);
                // name
                break;
             case 1:
                // user
                user = &i[1];
                user.truncate(user.length() -1);
                break;
             case 2:
                // password
                password = &i[1];
                password.truncate(password.length() -1);
                break;
             case 3:
                // comment
                comment = &i[1];
                comment.truncate(comment.length() -1);
                break;
          }
          idx++; 
       }
 
       Category *cat= categories.find (category);
       if (cat)
       {
          // use the existend item
          QListViewItem *catItem = cat->getListItem();
          if (catItem)
          {
             QListViewItem * item = new ShadedListItem( 0, catItem );
-#ifdef JPATCH_HDE
-            item->setText( 0, name );
-            item->setText( 1, user );
-            item->setText( 2, password );
-            item->setText( 3, comment );
-#else
             item->setText( 0, tr( name ) );
             item->setText( 1, tr( user ) );
             item->setText( 2, tr( password ) );
             item->setText( 3, tr( comment ) );
-#endif
+
             catItem->setOpen( TRUE );
          }
       }
       else
       {
          QListViewItem *catI = new ShadedListItem( 1, ListView );
          // create and insert a new item
          QListViewItem * item = new ShadedListItem( 0, catI );
-#ifdef JPATCH_HDE
-         item->setText( 0, name );
-         item->setText( 1, user );
-         item->setText( 2, password );
-         item->setText( 3, comment );
-#else
          item->setText( 0, tr( name ) );
          item->setText( 1, tr( user ) );
          item->setText( 2, tr( password ) );
          item->setText( 3, tr( comment ) );
-#endif
+
          catI->setOpen( TRUE );
 
          Category *c1 = new Category();
          c1->setCategoryName(category);
 
          QString icon;
          QString fullIconPath;
          QPixmap *pix;
 // #ifndef WIN32
          icon = conf->readEntry(APP_KEY+category);
 // #endif
          bool isIconAv = false;
          if (!icon.isEmpty() && !icon.isNull())
          {
             // build the full path
             fullIconPath = iconPath + icon;
             pix = new QPixmap (fullIconPath);
             if (pix)
             {
                QImage img = pix->convertToImage();
                pix->convertFromImage(img.smoothScale(14,14));
                c1->setIconName (icon);
                c1->setIcon (*pix);
                isIconAv = true;
             }
          }
          if (!isIconAv)
          {
             c1->setIcon (*getPredefinedIcon(category));
          }
          c1->setListItem (catI);
          c1->initListItem();
          categories.insert (c1->getCategoryName(), c1);
       }
 
    }
    f.close();
 
 }
 #endif // UNUSED
 
 void ZSafe::resume(int)
 {
    qWarning ("Resume");
    // hide the main window
 
    infoForm->hide();
    // open zsafe again
    m_password = "";
    selectedItem = NULL;
 
    // clear the password list
    QListViewItem *i;
    // step through all categories
    for (i = ListView->firstChild();
         i != NULL;
         i = i->nextSibling())
    {
       // step through all subitems
       QListViewItem *si;
       for (si = i->firstChild();
            si != NULL; )
       {
           QListViewItem *_si = si;
           si = si->nextSibling();
           i->takeItem(_si); // remove from view list
           if (_si) delete _si;
       }
    }
 
    // ask for password and read again
    openDocument(filename);
 }
 
 //---------------------------------------------
 
 
 bool ZSafe::openDocument(const char* _filename, const char* )
 {
      int retval;
      char* entry[FIELD_SIZE];
 // #ifndef WIN32
      int validationFlag = conf->readNumEntry(APP_KEY+"valzsafe", 1);
 // #else
          // int validationFlag = 1;
 // #endif
 
      int pwdOk = 0;
      int numberOfTries = 3;
      for (int i=0; i < numberOfTries; i++)
      {
         QFile f(_filename);
         if (f.exists())
         {
            // ask with a dialog for the password
            if (m_password.isEmpty())
@@ -1916,232 +1867,217 @@ bool ZSafe::openDocument(const char* _filename, const char* )
                   tr("Wrong password.\n\nZSafe will now exit.") );
               exitZs (1);
            }
 
            retval = loadInit(_filename, m_password);
            if (retval != PWERR_GOOD) 
            {
                 qWarning ("Error loading Document");
                 return false;
            }
         }
         else
         {
 #ifdef WIN32
            this->setCaption("Qt ZSafe");
 #else
            this->setCaption("ZSafe");
 #endif
            filename = "";
            return false;
         }
 
 
         // load the validation entry
         if (validationFlag == 0)
         {
             pwdOk = 1;
             break;
         }
 
         retval = loadEntry(entry);
         if (retval == 1 &&
             !strcmp (entry[0], "ZSAFECATEGORY") &&
             !strcmp (entry[1], "name") &&
             !strcmp (entry[2], "username") &&
             !strcmp (entry[3], "password") &&
             !strcmp (entry[4], "comment") )
         {
             for (int count = 0; count < FIELD_SIZE; count++) free(entry[count]);
             pwdOk = 1;
             break;
         }
         else
            // for (int count = 0; count < FIELD_SIZE; count++) free(entry[count]);
         fclose (fd);
         m_password = "";
 
         if (i < numberOfTries - 1)
         {
            switch( QMessageBox::warning( this, tr("ZSafe"),
                     tr("Wrong password.\nEnter again?"),
                     tr("&Yes"), tr("&No."), 
                     0      
                     ) ) 
            { 
            case 1: // No
                  exitZs (1);
                  break;
            case 0:  // Yes
                  continue;
            }
         }
      }
      if (pwdOk == 0)
      {
         // unset the document entry
         conf->writeEntry(APP_KEY+"document", "INVALIDPWD");
         if (conf)
            delete conf;
 
         exitZs (1);
      }
 
 
         retval = loadEntry(entry);
         
         int numberOfEntries=0;
         while (retval == 1) {
 
                 QString category( QString::fromUtf8(entry[0]) );
                 QString name( QString::fromUtf8(entry[1]) );
                 QString user( QString::fromUtf8(entry[2]) );
                 QString password( QString::fromUtf8(entry[3]) );
                 QString comment( QString::fromUtf8(entry[4]) );
                 QString field5( QString::fromUtf8(entry[5]) );
                 QString field6( QString::fromUtf8(entry[6]) );
                 // add the subitems to the categories
 
                 Category *cat= categories.find (category);
                 if (cat)
                 {
                    // use the existend item
                    QListViewItem *catItem = cat->getListItem();
                    if (catItem)
                    {
                       QListViewItem * item = new ShadedListItem( 0, catItem );
-#ifdef JPATCH_HDE
-                      item->setText( 0, name );
-                      item->setText( 1, user );
-                      item->setText( 2, password );
-                      item->setText( 3, comment );
-                      item->setText( 4, field5 );
-                      item->setText( 5, field6 );
-#else
                       item->setText( 0, tr( name ) );
                       item->setText( 1, tr( user ) );
                       item->setText( 2, tr( password ) );
                       item->setText( 3, tr( comment ) );
                       item->setText( 4, tr( field5 ) );
                       item->setText( 5, tr( field6 ) );
-#endif
+
                       if (expandTree)
                          catItem->setOpen( TRUE );
                       numberOfEntries++;
                    }
                 }
                 else
                 {
                    QListViewItem *catI = new ShadedListItem( 1, ListView );
                    // create and insert a new item
                    QListViewItem * item = new ShadedListItem( 0, catI );
-#ifdef JPATCH_HDE
-                   item->setText( 0, name );
-                   item->setText( 1, user );
-                   item->setText( 2, password );
-                   item->setText( 3, comment );
-                   item->setText( 4, field5 );
-                   item->setText( 5, field6 );
-#else
+
                    item->setText( 0, tr( name ) );
                    item->setText( 1, tr( user ) );
                    item->setText( 2, tr( password ) );
                    item->setText( 3, tr( comment ) );
                    item->setText( 4, tr( field5 ) );
                    item->setText( 5, tr( field6 ) );
-#endif
+
                    if (expandTree)
                       catI->setOpen( TRUE );
 
                    Category *c1 = new Category();
                    c1->setCategoryName(category);
 
                    QString icon;
                    QString fullIconPath;
                    QPixmap *pix;
 // #ifndef WIN32
                    icon = conf->readEntry(APP_KEY+category);
 // #endif
                    bool isIconAv = false;
                    if (!icon.isEmpty() && !icon.isNull())
                    {
                       // build the full path
                       fullIconPath = iconPath + icon;
                       pix = new QPixmap (fullIconPath);
                       if (pix)
                       {
                          QImage img = pix->convertToImage();
                          pix->convertFromImage(img.smoothScale(14,14));
                          c1->setIconName (icon);
                          c1->setIcon (*pix);
                          isIconAv = true;
                       }
                    }
                    if (!isIconAv)
                    {
                       c1->setIcon (*getPredefinedIcon(category));
                    }
 
                    c1->setListItem (catI);
                    c1->initListItem();
                    categories.insert (c1->getCategoryName(), c1);
                    numberOfEntries++;
                 }
 
                 for (int count = 0; count < FIELD_SIZE; count++) {
                         free(entry[count]);
                 }
                 retval = loadEntry(entry);
                 if (retval == 2) {
                         // m_parent->slotStatusHelpMsg("Last entry loaded");
                 }
         } // end while
 
         if (numberOfEntries == 0)
         {
     
            switch( QMessageBox::warning( this, tr("ZSafe"),
                  tr("Empty document or\nwrong password.\nContinue?"),
                  tr("&No"), tr("&Yes."), 
                  0      
                  ) ) { 
            case 0: // No
               retval = loadFinalize();
               exitZs (1);
               break;
            case 1:  // Yes
               break;
            }
         }
 
         retval = loadFinalize();
 
         return true;
 }
 
 int ZSafe::loadInit(const char* _filename, const char *password)
 {
         unsigned int j = 0;
         unsigned int keylength=0;
         int count=0, count2=0, count3=0;
         unsigned char charbuf[8];
         unsigned short ciphertext[4];
         char key[128];
         Krc2* krc2 = new Krc2();
 
         fd = fopen (_filename, "rb");
 
         QFileInfo f (_filename);
         load_buffer_length = f.size();
         load_buffer_length = ((load_buffer_length / 1024)+1) * 1024 * 2;
 
         if (fd == NULL)
                 return PWERR_OPEN;
 
         buffer = (char *)malloc(load_buffer_length);
         for (j = 0; password[j] != '\0'; j++) {
                 key[j] = password[j];
         }
         keylength = j;
         krc2->rc2_expandkey (key, keylength, 128);
 
 #ifndef WIN32
@@ -3210,199 +3146,195 @@ void ZSafe::editCategory()
                 d.setFilter( QDir::Files);
 
                 const QFileInfoList *list = d.entryInfoList();
                 int i=0;
                 QFileInfoListIterator it( *list );      // create list iterator
                 QFileInfo *fi;                          // pointer for traversing
                 if (icon.isEmpty() || icon.isNull())
                 {
                    dialog->IconField->setCurrentItem(0);
                 }
                 else
                 {
 
                   while ( (fi=it.current()) ) 
                   { // for each file...
                         QString fileName = fi->fileName();
                         if(fileName.right(4) == ".png")
                         {
                                 fileName = fileName.mid(0,fileName.length()-4);
 
 
                                 if(fileName+".png"==icon) 
                                 {
                                    dialog->IconField->setCurrentItem(i+1);
                                    break;
                                 }
                                 ++i;
                         }
                         ++it;
                   }
                 }
            }
 
         // dialog->show();
 #ifndef DESKTOP
         // dialog->move (20, 100);
 #endif
         DialogCode result = (DialogCode) dialog->exec();
 #ifdef DESKTOP
        result = Accepted;
 #endif
 
         QString fullIconPath;
         QPixmap *pix;
         if (result == Accepted)
         {
            modified = true;
            if (category != dialog->CategoryField->currentText())
            {
               categories.remove (category);
 // #ifndef WIN32
               conf->removeEntry(category);
 // #endif
               saveConf();
            }
 
            category = dialog->CategoryField->currentText();
            icon = dialog->IconField->currentText()+".png";
 
            if (cat)
            {
               qWarning("Category found");
 
               // if (!icon.isEmpty() && !icon.isNull())
               if (icon != "predefined.png")
               {
                   // build the full path
                   fullIconPath = iconPath + icon;
                   pix = new QPixmap (fullIconPath);
                   if (pix)
                   {
                      // save the full pixmap name into the config file
 // #ifndef WIN32
                      conf->writeEntry(APP_KEY+category, icon);
 // #endif
                      saveConf();
                      QImage img = pix->convertToImage();
                      pix->convertFromImage(img.smoothScale(14,14));
                      cat->setIconName (icon);
                      cat->setIcon (*pix);
                   }
               }
               else
               {
 // #ifndef WIN32
                  conf->removeEntry (category);
 // #endif
                  saveConf();
                  cat->setIcon (*getPredefinedIcon(category));
               }
 
               // change the category name of the selected category
               QListViewItem *catItem = cat->getListItem();
               if (catItem)
               {
                  qWarning (category);
-#ifdef JPATCH_HDE
-                 catItem->setText( 0, category );
-                 cat->setCategoryName (category);
-#else
                  catItem->setText( 0, tr( category ) );
                  cat->setCategoryName (tr(category));
-#endif
+
                  cat->initListItem();
                  categories.insert (category, cat);
               }
            }
            saveCategoryDialogFields(dialog);
         }
         else
         {
            // delete dialog;
            dialog->hide();
            return;
         }
 
     }
 }
 
 void ZSafe::cutItem()
 {
     if (!selectedItem)
        return;
     if (!isCategory(selectedItem))
     {
        IsCut = true;
        copiedItem = selectedItem;
     }
 }
 
 void ZSafe::copyItem()
 {
     if (!selectedItem)
        return;
     if (!isCategory(selectedItem))
     {
        IsCopy = true;
        copiedItem = selectedItem;
     }
 }
 
 // paste item into category
 void ZSafe::pasteItem()
 {
     if (!selectedItem)
        return;
     if (isCategory(selectedItem))
     {
        modified = true;
        if (IsCut)
        {
           if (copiedItem)
           {
              // add the new item
              QListViewItem *i = new ShadedListItem (0, selectedItem);
              // i->setOpen (TRUE);
              i->setText (0, copiedItem->text(0));
              i->setText (1, copiedItem->text(1));
              i->setText (2, copiedItem->text(2));
              i->setText (3, copiedItem->text(3));
              i->setText (4, copiedItem->text(4));
              i->setText (5, copiedItem->text(5));
              selectedItem->setOpen( TRUE );
 
              // remove the cutted item
              copiedItem->parent()->takeItem(copiedItem);
              selectedItem = NULL;
           }
        }
        else if (IsCopy)
        {
           if (copiedItem)
           {
               // add the new item
               QListViewItem *i = new ShadedListItem (0, selectedItem);
               // i->setOpen (TRUE);
               i->setText (0, copiedItem->text(0));
               i->setText (1, copiedItem->text(1));
               i->setText (2, copiedItem->text(2));
               i->setText (3, copiedItem->text(3));
               i->setText (4, copiedItem->text(4));
               i->setText (5, copiedItem->text(5));
               selectedItem->setOpen( TRUE );
           }
        }
     }
     IsCut = false;
     IsCopy = false;
 }
 
 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/*" );