japanese support added (see defines JPATCH_HDE)

3 files changed, 171 insertions, 42 deletions

diff --git a/noncore/apps/zsafe/categorylist.cpp b/noncore/apps/zsafe/categorylist.cpp
index 2fa59d2..c5e8d66 100644
--- a/noncore/apps/zsafe/categorylist.cpp
+++ b/noncore/apps/zsafe/categorylist.cpp
@@ -1,35 +1,35 @@
 /* C implementation of RC2 encryption algorithm, as described in RFC2268 */
 /* By Matthew Palmer <mjp16@uow.edu.au> */
 /* $Id$ */
 
 #include "categorylist.h"
 
 CategoryList::CategoryList()
 {
 }
 
 CategoryList::~CategoryList()
 {
 }
 
 void CategoryList::insert (QString key, Category *category)
 {
-   categoryList.insert ((const char *) key, category);
+   categoryList.insert (key, category);
 }
 
 Category *CategoryList::find (QString key)
 {
-   return categoryList.find ((const char *) key);
+   return categoryList.find (key);
 }
 
 void CategoryList::remove (QString key)
 {
-   categoryList.remove ((const char *) key);
+   categoryList.remove (key);
 }
 
 void CategoryList::clear()
 {
    categoryList.clear();
 }
 
 
diff --git a/noncore/apps/zsafe/categorylist.h b/noncore/apps/zsafe/categorylist.h
index 96cf389..fc1c0a2 100644
--- a/noncore/apps/zsafe/categorylist.h
+++ b/noncore/apps/zsafe/categorylist.h
@@ -1,32 +1,34 @@
 /*
 ** $Id$
 */
 #ifndef _CATEGORY_LIST_H_
 #define _CATEGORY_LIST_H_
 
 #include <qstring.h>
-#include <qasciidict.h>
+
+#include <qdict.h>
+
 #include "category.h"
 
 // list of Category
 
 class CategoryList
 {
 public:
 	CategoryList();
 	~CategoryList();
 
         void insert (QString key, Category *category);
         Category *find (QString key);
         void remove (QString key);
         void clear();
 
-        QAsciiDict<Category> categoryList;
+        QDict<Category> categoryList;
 
 private:
 
 };
 #endif // _CATEGORY_LIST_H_
 
 
 
diff --git a/noncore/apps/zsafe/zsafe.cpp b/noncore/apps/zsafe/zsafe.cpp
index 9341425..d55624b 100644
--- a/noncore/apps/zsafe/zsafe.cpp
+++ b/noncore/apps/zsafe/zsafe.cpp
@@ -1,112 +1,114 @@
 /****************************************************************************
 **
 ** Created: Sat Apr 6 17:57:45 2002
 **
 ** Author: Carsten Schneider <CarstenSchneider@t-online.de>
 **
 ** $Id$
 **
 ** 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 DESKTOP
 #ifndef WIN32
 const QString APP_KEY="/.zsafe/";
 #else
 const QString APP_KEY="";
 #endif
 #else
 const QString APP_KEY="";
 #endif
 
@@ -361,199 +363,212 @@ static const char* const general_data[] = {
 #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 ("zsafe");
 #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 )
 {
     IsCut = false;
     IsCopy = false;
     modified = false;
 
     // set the config file
     cfgFile=QDir::homeDirPath();
     cfgFile += "/.zsafe.cfg";
     // set the icon path
     QString qpedir ((const char *)getenv("QPEDIR"));
 #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 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
-    // setMinimumSize( QSize( DeskW, DeskH-30 ) );
-    // setMaximumSize( QSize( DeskW, DeskH-30 ) );
+
 #else
-    resize( DeskW, DeskH-30 ); 
-    // setMinimumSize( QSize( DeskW, DeskH-30 ) );
-    // setMaximumSize( QSize( 440, 290 ) );
-    // setMaximumSize( QSize( DeskW+400, DeskH+200 ) );
+
+#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"),
                tr("Can't create directory\n%1\n\nZSafe will now exit.").arg(d1));
           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"),
                tr("Can't create directory\n%1\n\nZSafe will now exit.").arg(d2));
           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);
@@ -667,283 +682,315 @@ 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
@@ -1111,193 +1158,193 @@ void ZSafe::showInfo( QListViewItem *_item)
       }
 
       entry = selectedItem->text(2);
       if (!entry.isEmpty() && entry.compare(" "))
       {
          text += "<u><b>";
          text += getFieldLabel (selectedItem, "3", tr("Password"));
          text += ":<br> </b></u><blockquote>";
          text += entry;
          text += "</blockquote>";
          // text += "<br>";
       }
 
       entry = selectedItem->text(4);
       if (!entry.isEmpty() && entry.compare(" "))
       {
          text += "<u><b>";
          text += getFieldLabel (selectedItem, "5", tr("Field 4"));
          text += ":<br> </b></u><blockquote>";
          text += entry;
          text += "</blockquote>";
          // text += "<br>";
       }
 
       entry = selectedItem->text(5);
       if (!entry.isEmpty() && entry.compare(" "))
       {
          text += "<u><b>";
          text += getFieldLabel (selectedItem, "6", tr("Field 5"));
          text += ":<br> </b></u><blockquote>";
          text += entry;
          text += "</blockquote>";
          // text += "<br>";
       }
 
       entry = selectedItem->text(3);
       if (!entry.isEmpty() && entry.compare(" "))
       {
          text += "<u><b>";
          text += getFieldLabel (selectedItem, "4", tr("Comment"));
          text += ":<br> </b></u>";
          QString comment = selectedItem->text(3);
          comment.replace (QRegExp("\n"), "<br>");
          text += comment;
          // text += "<br>";
       }
 
       text += "</body></html>";
 
       infoForm->InfoText->setText(text);
       infoForm->hide();
 #ifdef DESKTOP
       infoForm->show();
 #else
       infoForm->showMaximized();
 #endif
 
    }
 }
 
 void ZSafe::listViewSelected( QListViewItem *_item)
 {
    if (!_item)
       return;
    if (selectedItem != NULL)
       selectedItem->setSelected(FALSE);
    
    selectedItem = _item;
 
 #ifndef DESKTOP
    // set the column text dependent on the selected item
    ListView->setColumnText(0, getFieldLabel (selectedItem, "1", tr("Name")));
    ListView->setColumnText(1, getFieldLabel (selectedItem, "2", tr("Field 2")));
    ListView->setColumnText(2, getFieldLabel (selectedItem, "3", tr("Field 3")));
    ListView->setColumnText(3, getFieldLabel (selectedItem, "4", tr("Comment")));
    ListView->setColumnText(4, getFieldLabel (selectedItem, "5", tr("Field 4")));
    ListView->setColumnText(5, getFieldLabel (selectedItem, "6", tr("Field 5")));
 #endif
 #ifdef WIN32
    // set the column text dependent on the selected item
    ListView->setColumnText(0, getFieldLabel (selectedItem, "1", tr("Name")));
    ListView->setColumnText(1, getFieldLabel (selectedItem, "2", tr("Field 2")));
    ListView->setColumnText(2, getFieldLabel (selectedItem, "3", tr("Field 3")));
    ListView->setColumnText(3, getFieldLabel (selectedItem, "4", tr("Comment")));
    ListView->setColumnText(4, getFieldLabel (selectedItem, "5", tr("Field 4")));
    ListView->setColumnText(5, getFieldLabel (selectedItem, "6", tr("Field 5")));
 #endif
 
 }
 
 bool ZSafe::isCategory(QListViewItem *_item)
 {
    if (_item == NULL)
       return FALSE;
 
    QString categoryName = _item->text (0);
-   if (categories.find ((const char *)categoryName))
+   if (categories.find (categoryName))
       return TRUE;
    else
       return FALSE;
 }
 
 void ZSafe::removeAsciiFile()
 {
     // QString fn = filename + ".txt";
   // 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::getOpenFileName( OFileSelector::EXTENDED_ALL,
                        QDir::homeDirPath() + "/Documents/application/zsafe",
                        QString::null,
                        mimeTypes,
                        this,
                        tr ("Remove text file"));
 #else
   QString fn = ScQtFileEdit::getOpenFileName(this, 
                        tr ("Remove text file"),
                        QDir::homeDirPath() + "/Documents/application/zsafe",
                        "*.txt");
 #endif
 #else
   QString fn = QFileDialog::getOpenFileName(
 	            QDir::homeDirPath() + "/Documents/application/zsafe",
                     "ZSafe (*.txt)",
                     this,
                     "ZSafe File Dialog"
                     "Choose a text file" );
 #endif
 
   if (fn && fn.length() > 0 )
   {
     QFile f( fn );
     if ( !f.remove() ) 
     {
         qWarning( QString("Could not remove file %1").arg(fn),
                       2000 );
         QMessageBox::critical( 0, tr("ZSafe"),
                   tr("Could not remove text file.") );
         return;
     }
   }
 }
 
 void ZSafe::writeAllEntries()
 {
    if (filename.isEmpty())
    {
        QMessageBox::critical( 0, tr("ZSafe"),
          tr("No document defined.\nYou have to create a new document"));
        return;
    }
 
    // 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
 
    // open the new document
    if (fn && fn.length() > 0 )
    {
     QFile f( fn );
     if ( !f.open( IO_WriteOnly ) ) {
         qWarning( QString("Could not write to file %1").arg(fn),
                       2000 );
         QMessageBox::critical( 0, "ZSafe",
                   QString("Could not export to text file.") );
         return;
     }
@@ -1340,273 +1387,295 @@ void ZSafe::writeAllEntries()
           oneEntry += si->text(5);
           oneEntry += "\"";
           // qWarning (oneEntry);
           t << oneEntry << endl;
 
           // qWarning (si->text(0));
        }
     }
     f.close();
    }
 }
 
 void ZSafe::readAllEntries()
 {
    if (filename.isEmpty())
    {
        QMessageBox::critical( 0, tr("ZSafe"),
          tr("No document defined.\nYou have to create a new document"));
        return;
    }
 
   // 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::getOpenFileName( OFileSelector::EXTENDED_ALL,
                        QDir::homeDirPath() + "/Documents/application/zsafe",
                        QString::null,
                        mimeTypes,
                        this,
                        tr ("Import text file"));
 #else
   QString fn = ScQtFileEdit::getOpenFileName(this, 
                        tr ("Import text file"),
                        QDir::homeDirPath() + "/Documents/application/zsafe",
                        "*.txt");
 #endif
 #else
   QString fn = QFileDialog::getOpenFileName(
 	            QDir::homeDirPath() + "/Documents/application/zsafe",
                     "ZSafe (*.txt)",
                     this,
                     "ZSafe File Dialog"
                     "Choose a text file" );
 #endif
 
   if (fn && fn.length() > 0 )
   {
    QFile f( fn );
    if ( !f.open( IO_ReadOnly ) )
    {
       qWarning( QString("Could not read file %1").arg(fn),
                       2000 );
       QMessageBox::critical( 0, "ZSafe",
                   QString("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];
 #ifndef WIN32
 	  char buffer[s.length()+1];
 #else
 	  char buffer[4048];
 #endif
-      strcpy (buffer, s);
+
+
+      /* 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(&i[1]);
+      QString category(QString::fromUtf8(&i[1]));
       category.truncate(category.length() -1);
 
       int idx=0;
       while ((i = strtok (NULL, "|")) != NULL)
       {
          switch (idx)
          {
             case 0:
-               name = &i[1];
+               name = QString::fromUtf8(&i[1]);
                name.truncate(name.length() -1);
                // name
                break;
             case 1:
                // user
-               user = &i[1];
+               user = QString::fromUtf8(&i[1]);
                user.truncate(user.length() -1);
                break;
             case 2:
                // password
-               password = &i[1];
+               password = QString::fromUtf8(&i[1]);
                password.truncate(password.length() -1);
                break;
             case 3:
                // comment
-               comment = &i[1];
+               comment = QString::fromUtf8(&i[1]);
                comment.truncate(comment.length() -1);
                break;
             case 4:
                // field5
-               field5 = &i[1];
+               field5 = QString::fromUtf8(&i[1]);
                field5.truncate(field5.length() -1);
                break;
             case 5:
                // field6
-               field6 = &i[1];
+               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));
        }
@@ -1620,427 +1689,459 @@ 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())
 	      getDocPassword(tr("Enter Password"));
 	   if (m_password.isEmpty() && validationFlag == 0)
            {
               qWarning ("Wrong password");
               QMessageBox::critical( 0, tr("ZSafe"),
                   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(entry[0]);
-                QString name(entry[1]);
-                QString user(entry[2]);
-                QString password(entry[3]);
-                QString comment(entry[4]);
-                QString field5(entry[5]);
-                QString field6(entry[6]);
+                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
@@ -2166,207 +2267,206 @@ bool ZSafe::saveDocument(const char* _filename,
    
 	   getDocPassword(tr("Reenter Password"));
 	   if (m_password.isEmpty())
            {
               QMessageBox::critical( 0, tr("ZSafe"), 
                       tr("Password is empty.\nPlease enter again."));
               continue;
            }
            if (firstPasswd != m_password)
            {
               
               QMessageBox::critical( 0, tr("ZSafe"), 
                       tr("Passwords must be identical.\nPlease enter again."));
               continue;
            }
            pwdOk = TRUE; 
            modified = false;
         }
      } 
      else if (modified)
      {
       QString fns(_filename);
       fns = fns.right (fns.length() - fns.findRev ('/') - 1);
       switch( QMessageBox::information( this, tr("ZSafe"),
           tr("Do you want to save ") + fns + tr("\nbefore continuing?"),
           tr("&Save"), 
           tr("&Don't Save"), 
           0      // Enter == button 0
           ) ) 
       { // Escape == button 2
       case 0: // Save clicked, Alt-S or Enter pressed.
         modified = false;
         break;
       case 1: // Don't Save clicked or Alt-D pressed
         modified = false;
         return true;
       }
      }
      modified = false;
 	
      if (m_password.isEmpty())
         return false;
 
      int retval = saveInit(_filename, m_password);
 	// int retval = saveInit(_filename, "test");
 	if (retval != PWERR_GOOD) {
 		return false;
      }
 	
 	char* entry[FIELD_SIZE];
 
         // save the validation entry
         {
            int i=0;
 	   entry[i] = (char*)malloc(strlen("ZSAFECATEGORY")+1);
 	   strcpy(entry[i++], "ZSAFECATEGORY");
 	   entry[i] = (char*)malloc(strlen("name")+1);
 	   strcpy(entry[i++], "name");
 	   entry[i] = (char*)malloc(strlen("username")+1);
 	   strcpy(entry[i++], "username");
 	   entry[i] = (char*)malloc(strlen("password")+1);
 	   strcpy(entry[i++], "password");
 	   entry[i] = (char*)malloc(strlen("comment")+1);
 	   strcpy(entry[i++], "comment");
 
 	   entry[i] = (char*)malloc(strlen("field5")+1);
 	   strcpy(entry[i++], "field5");
 	   entry[i] = (char*)malloc(strlen("field6")+1);
 	   strcpy(entry[i++], "field6");
 
 	   retval = saveEntry(entry);
            for (int z=0; z<i; z++) free(entry[z]);
            if (retval == PWERR_DATA) {
               qWarning("1: Error writing file, contents not saved");
               saveFinalize();
               return false;
            }
 // #ifndef WIN32
            conf->writeEntry(APP_KEY+"valzsafe", 1);
 // #endif
            saveConf();
         }
 
         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())
            {
               int j=0;
-	      entry[j] = (char*)malloc(strlen(i->text(0))+1);
-	      strcpy(entry[j++], i->text(0));
-	      entry[j] = (char*)malloc(strlen(si->text(0))+1);
-	      strcpy(entry[j++], si->text(0));
-	      entry[j] = (char*)malloc(strlen(si->text(1))+1);
-	      strcpy(entry[j++], si->text(1));
-	      entry[j] = (char*)malloc(strlen(si->text(2))+1);
-	      strcpy(entry[j++], si->text(2));
-	      entry[j] = (char*)malloc(strlen(si->text(3))+1);
-	      strcpy(entry[j++], si->text(3));
-
-	      entry[j] = (char*)malloc(strlen(si->text(4))+1);
-	      strcpy(entry[j++], si->text(4));
-	      entry[j] = (char*)malloc(strlen(si->text(5))+1);
-	      strcpy(entry[j++], si->text(5));
+         entry[j] = (char*)malloc(strlen(i->text(0).utf8())+1);
+         strcpy(entry[j++], i->text(0).utf8());
+         entry[j] = (char*)malloc(strlen(si->text(0).utf8())+1);
+         strcpy(entry[j++], si->text(0).utf8());
+         entry[j] = (char*)malloc(strlen(si->text(1).utf8())+1);
+         strcpy(entry[j++], si->text(1).utf8());
+         entry[j] = (char*)malloc(strlen(si->text(2).utf8())+1);
+         strcpy(entry[j++], si->text(2).utf8());
+         entry[j] = (char*)malloc(strlen(si->text(3).utf8())+1);
+         strcpy(entry[j++], si->text(3).utf8());
+         entry[j] = (char*)malloc(strlen(si->text(4).utf8())+1);
+         strcpy(entry[j++], si->text(4).utf8());
+         entry[j] = (char*)malloc(strlen(si->text(5).utf8())+1);
+         strcpy(entry[j++], si->text(5).utf8());
 
 	      retval = saveEntry(entry);
               for (int z=0; z<j; z++)
               {
                   free(entry[z]);
               }
               if (retval == PWERR_DATA) {
                         qWarning("1: Error writing file, contents not saved");
                         saveFinalize();
                         return false;
               }
 
            }
         }
 
 	if (saveFinalize() == PWERR_DATA) {
                 qWarning("2: Error writing file, contents not saved");
 		return false;
 	} else {
 #ifndef DESKTOP
                 Global::statusMessage (tr("Password file saved."));
 #endif
                 modified = false;
 		return true;
 	}
 }
 
 PasswordForm *newPwdDialog;
 bool newPwdDialogResult = false;
 void ZSafe::setPasswordDialogDone()
 {
    newPwdDialogResult = true;
    newPwdDialog->close();
 }
 
 void ZSafe::getDocPassword(QString title)
 {
 qWarning ("getDocPassword");
     // open the 'Password' dialog
     PasswordForm *dialog = new PasswordForm(this, title, TRUE);
     newPwdDialog = dialog;
     newPwdDialogResult = false;
 
     connect( dialog->PasswordField, SIGNAL( returnPressed() ),
              this, SLOT( setPasswordDialogDone() ) );
 
     // CS: !!!
     // int pos = filename.findRev ('/');
     QString ti = filename.right (filename.length() - filename.findRev ('/') - 1);
 #ifdef WIN32
     dialog->setCaption("Qt " + ti);
 #else
     dialog->setCaption(ti);
 #endif
     // dialog->setCaption(title);
 
     dialog->PasswordField->setFocus();
     DialogCode result = (DialogCode) dialog->exec();
 #ifdef DESKTOP
        result = Accepted;
 #endif
 
     QString password;
     if (result == Accepted || newPwdDialogResult)
     {
        m_password = dialog->PasswordField->text();
     }
     else
     {
        exitZs (1);
     }
 }
 
 int ZSafe::saveInit(const char *_filename, const char *password)
 {
 	char key[128];
 	unsigned int j = 0;
 	unsigned int keylength;
 	// int val;
 	int count2;
 	Krc2* krc2 = new Krc2();
 
 	/* first we should check the permissions of the filename */
 /*
 	if (QFile::exists(_filename)) {
 		val = checkFile(_filename);
 		if (val != PWERR_GOOD)
 			return val;
 	} else 
         {
 		val = creat (_filename, (S_IRUSR | S_IWUSR));
 		if (val == -1)
 			return PWERR_OPEN;
 		else
 			close(val);
 	}
@@ -3110,194 +3210,199 @@ 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/*" );
@@ -3436,205 +3541,227 @@ void ZSafe::loadDocument()
               QListViewItem *_si = si;
               si = si->nextSibling();
               i->takeItem(_si); // remove from view list
               if (_si) delete _si;
           }
        }
        if (c) delete c; // delete the previous category
        categories.clear();
        m_password = "";
        selectedItem = NULL;
        filename = newFile;
 
        // save the current filename to the config file
        conf->writeEntry(APP_KEY+"document", filename);
        saveConf();
        QString ti = filename.right (filename.length() - filename.findRev ('/') - 1);
 #ifdef WIN32
        this->setCaption("Qt ZSafe: " + ti);
 #else
        this->setCaption("ZSafe: " + ti);
 #endif
 
        openDocument(filename);
     }
 }
 
 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
 
     // open the new document
     if (newFile && newFile.length() > 0 )
     {
        // save the previous opened document
        if (!filename.isEmpty())
           saveDocument(filename, FALSE);
 
        selectedItem = NULL;
        filename = newFile;
 
        // save the current filename to the config file
        conf->writeEntry(APP_KEY+"document", filename);
        saveConf();
        QString ti = filename.right (filename.length() - filename.findRev ('/') - 1);
 #ifdef WIN32
        this->setCaption("Qt ZSafe: " + ti);
 #else
        this->setCaption("ZSafe: " + ti);
 #endif
 
        QMessageBox::information( this, tr("ZSafe"), 
        tr("Now you have to enter\na password twice for your\nnewly created document."),       tr("&OK"), 0);
 
        saveDocumentWithPwd();
     }
 }
 
 void ZSafe::saveDocumentWithoutPwd()
 {
    saveDocument(filename, FALSE);
 }
 
 void ZSafe::saveDocumentWithPwd()
 {
    saveDocument(filename, TRUE);
 }
 
 void ZSafe::about()
 {
    QString info;
+#ifdef JPATCH_HDE
+   info  = "<html><body><div align=""center"">";
+   info += "<b>";
+   info += tr("Zaurus Password Manager<br>");
+   info += tr("ZSafe version 2.1.2-jv01b<br>");
+   info += "</b>";
+   info += tr("by Carsten Schneider<br>");
+   info += "zcarsten@gmx.net<br>";
+   info += "http://z-soft.z-portal.info/zsafe";
+   info += "<br>";
+   info += tr("Translations by Robert Ernst<br>");
+   info += "robert.ernst@linux-solutions.at<br>";
+
+   info += "<br><br>";
+   info += QString::fromUtf8("æ~W¥æ~\\¬èª~^/VGA Zaurus対å¿~\\ã~C~Qã~C~Cã~C~Aä½~\\æ ~H~P<br>");
+   info += "HADECO R&D<br>";
+   info += "r&d@hadeco.co.jp<br>";
+   info += "http://www.hadeco.co.jp/r&d/<br>";
+   info += "<br></div>";
+   info += "</body></html>";
+#else
    info  = "<html><body><div align=""center"">";
    info += "<b>";
    info += tr("Zaurus Password Manager<br>");
    info += tr("ZSafe version 2.1.2<br>");
    info += "</b>";
    info += tr("by Carsten Schneider<br>");
    info += "zcarsten@gmx.net<br>";
    info += "http://z-soft.z-portal.info/zsafe";
    info += "<br>";
    info += tr("Translations by Robert Ernst<br>");
    info += "robert.ernst@linux-solutions.at<br>";
    info += "<br></div>";
    info += "</body></html>";
+#endif
 
    // QMessageBox::information( this, tr("ZSafe"), info, tr("&OK"), 0);
 
    QMessageBox mb( this, tr("ZSafe"));
    mb.setText (info);
    mb.setButtonText (QMessageBox::Ok, tr ("&OK"));
    QPixmap zsafe_img((const char**) zsafe_xpm);
    mb.setIconPixmap (zsafe_img);
    mb.exec();
 }
 
 void ZSafe::setExpandFlag()
 {
    expandTree = !expandTree;
    file->setItemChecked('o', expandTree);
 #ifndef DESKTOP
    conf->setGroup ("zsafePrefs");
 #endif
 // #ifndef WIN32
    conf->writeEntry (APP_KEY+"expandTree", expandTree);
 // #endif
    saveConf();
 
 }
 
 void ZSafe::paintEvent( QPaintEvent * )
 {
    if (raiseFlag)
    {
       raiseFlag = false;
       raiseTimer.start (1, true);
       if (infoForm->isVisible())
          infoForm->raise();
    }
 }
 
 void ZSafe::resizeEvent ( QResizeEvent * ) 
 {
    // qWarning ("resizeEvent");
 #ifndef DESKTOP
    DeskW = appl->desktop()->width();
    DeskH = appl->desktop()->height();
 #else
    DeskW = this->width();
    DeskH = this->height();
 #endif
    qWarning( QString("Width : %1").arg(DeskW), 2000 );
    qWarning( QString("Height: %1").arg(DeskH), 2000 );
 
    New->setGeometry   ( QRect( DeskW-84, 2, 20, 20 ) ); 
    Edit->setGeometry  ( QRect( DeskW-64, 2, 20, 20 ) ); 
    Delete->setGeometry( QRect( DeskW-44, 2, 20, 20 ) ); 
    Find->setGeometry  ( QRect( DeskW-24, 2, 20, 20 ) ); 
 }
 
 void ZSafe::slotRaiseTimer()
 {
    if (infoForm->isVisible())
       infoForm->raise();
    raiseFlag = true;
 }
 
 QPixmap * ZSafe::getPredefinedIcon(QString category)
 {
    QPixmap *pm;
    if (category == "Bank cards")
       pm = new QPixmap((const char**)bank_cards_data);
    else if (category == "Passwords")
       pm = new QPixmap((const char**)passwords_data);
    else if (category == "Software")
       pm = new QPixmap((const char**)software_data);
    else if (category == "General")
       pm = new QPixmap((const char**)general_data);
    else
       pm = new QPixmap((const char**)general_data);
    return pm;
 }
 
 void ZSafe::setDocument(const QString& fileref)
 {
 #ifndef DESKTOP
      // stop the timer to prevent loading of the default document
      docuTimer.stop();
 
      DocLnk link(fileref);
      if ( link.isValid() )
      {
          // if (filename != link.file())
             // saveDocument(filename, FALSE);
          filename = link.file();
      }
      else
      {
          // if (filename != fileref)
             // saveDocument(filename, FALSE);
          filename = fileref;