add right click menu, and drag and drop for desktop version. show icons

2 files changed, 122 insertions, 18 deletions

diff --git a/noncore/apps/zsafe/zsafe.cpp b/noncore/apps/zsafe/zsafe.cpp
index 189453e..5cad7cb 100644
--- a/noncore/apps/zsafe/zsafe.cpp
+++ b/noncore/apps/zsafe/zsafe.cpp
@@ -51,12 +51,13 @@ using namespace Opie::Ui;
 
 #include <qmenubar.h>
 #include <qpopupmenu.h>
 
 #ifdef DESKTOP
 #include <qfiledialog.h>
+#include <qdragobject.h>
 #ifndef WIN32
 #include <qsettings.h>
 #else
 #include "qsettings.h"
 #endif
 #include <qapplication.h>
@@ -390,12 +391,13 @@ ZSafe::ZSafe( QWidget* parent,  const char* name, bool modal, WFlags fl )
     : QDialog( parent, name, modal, fl ),
       Edit(0l), Delete(0l), Find(0l), New(0l), ListView(0l)
 {
     IsCut = false;
     IsCopy = false;
     modified = false;
+    showpwd = false;
 
     // set the config file
     cfgFile=QDir::homeDirPath();
     cfgFile += "/.zsafe.cfg";
     // set the icon path
 #ifdef NO_OPIE
@@ -454,13 +456,14 @@ ZSafe::ZSafe( QWidget* parent,  const char* name, bool modal, WFlags fl )
     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 )
+		QPixmap image0( ( const char** ) zsafe_xpm );
+	if ( !name )
     setName( "ZSafe" );
 
 #ifdef DESKTOP
 #ifdef WIN32
     setGeometry(100, 150, DeskW, DeskH-30 );
 #else
@@ -489,32 +492,69 @@ ZSafe::ZSafe( QWidget* parent,  const char* name, bool modal, WFlags fl )
 #endif
    setCaption( tr( "ZSafe" ) );
    QString zsafeAppDirPath = QDir::homeDirPath() + "/Documents/application/zsafe";
    QString filename = conf->readEntry(APP_KEY+"document");
    if (filename.isEmpty() || filename.isNull())
    {
-       if ( !QDir( zsafeAppDirPath ).exists() )
+
+    // 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 pd2(QDir::homeDirPath() + "/Documents");
+	   if (!pd2.exists()) {
+			QDir pd3(QDir::homeDirPath());
+			if (!pd3.mkdir("Documents", FALSE)) {
+		   }
+	   }
+       
+	   if (!pd2.mkdir("application", FALSE))
        {
-           //FIXME: Pending someone to look into why QDir.mkdir does not work as expected
-           QString cmdline = QString().sprintf( "mkdir -p %s", (const char*) zsafeAppDirPath );
-           ::system( cmdline );
+          QMessageBox::critical( 0, tr("ZSafe"),
+#ifdef JPATCH_HDE
+               tr("<P>Can't create directory ..."+d1+"</P><P>ZSafe will now exit.</P>"));
+#else
+               tr("<P>Can't create directory %1</P><P>ZSafe will now exit.</P>").arg(d1));
+#endif
+          exitZs (1);
        }
-       if ( !QDir( zsafeAppDirPath ).exists() )
+    }
+// #ifndef WIN32
+    // QString d2("Documents/application/zsafe");
+// #else
+	QString d2(QDir::homeDirPath() + "/Documents/application/zsafe");
+// #endif
+    QDir pd2(d2);
+    if (!pd2.exists())
+    {
+       if (!pd1.mkdir("zsafe", FALSE))
        {
-               QMessageBox::critical( 0, "ZSafe", tr("Can't create application data directory.\nZSafe will now exit."));
-               exitZs (1);
+          QMessageBox::critical( 0, tr("ZSafe"),
+#ifdef JPATCH_HDE
+               tr("<P>Can't create directory ...//Documents/application/zsafe</P><P>ZSafe will now exit.</P"));
+#else
+               tr("<P>Can't create directory %1</P><P>ZSafe will now exit.</P>").arg(d2));
+#endif
+          exitZs (1);
        }
-    }
-
+   }
+    
     // set the default filename
     filename = zsafeAppDirPath + "/passwords.zsf";
 
     // save the current filename to the config file
     conf->writeEntry(APP_KEY+"document", filename);
     saveConf();
-
+	 }
    //if (filename == "INVALIDPWD")
       //filename = "";
 
     QString ti = filename.right (filename.length() - filename.findRev ('/') - 1);
 #ifdef WIN32
     this->setCaption("Qt ZSafe: " + ti);
@@ -528,12 +568,13 @@ ZSafe::ZSafe( QWidget* parent,  const char* name, bool modal, WFlags fl )
     lastSearchedName = "";
     lastSearchedUsername = "";
     lastSearchedComment = "";
 
     infoForm = new InfoForm();
     categoryDialog = NULL;
+    infoForm->setIcon( image0);
 
     // add a menu bar
     QMenuBar *menu = new QMenuBar( this );
 
     // add file menu
     // QPopupMenu *file = new QPopupMenu( this );
@@ -663,12 +704,19 @@ ZSafe::ZSafe( QWidget* parent,  const char* name, bool modal, WFlags fl )
              this, SLOT( listViewSelected(QListViewItem*) ) );
     connect( ListView, SIGNAL( doubleClicked(QListViewItem*) ),
              this, SLOT( showInfo(QListViewItem*) ) );
     connect( ListView, SIGNAL( returnPressed(QListViewItem*) ),
              this, SLOT( showInfo(QListViewItem*) ) );
 
+#ifndef DESKTOP	  
+  	QPEApplication::setStylusOperation( ListView->viewport(),QPEApplication::RightOnHold);
+#endif
+    connect( ListView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
+           this,SLOT( ListPressed(int, QListViewItem *, const QPoint&, int)) );
+
+	   this->setIcon( image0);
 }
 
 const QColor *ZSafe::evenRowColor = &Qt::white;
 // const QColor *ZSafe::oddRowColor = &Qt::lightGray;
 const QColor *ZSafe::oddRowColor = new QColor(216,240,255);
 
@@ -1513,13 +1561,13 @@ void ZSafe::readAllEntries()
          bool isIconAv = false;
          if (!icon.isEmpty() && !icon.isNull())
          {
             // build the full path
             fullIconPath = iconPath + icon;
             pix = new QPixmap (fullIconPath);
-            if (pix)
+            if (!pix->isNull())
             {
                QImage img = pix->convertToImage();
                pix->convertFromImage(img.smoothScale(14,14));
                c1->setIconName (icon);
                c1->setIcon (*pix);
                isIconAv = true;
@@ -1728,13 +1776,13 @@ void ZSafe::readAllEntries()
          bool isIconAv = false;
          if (!icon.isEmpty() && !icon.isNull())
          {
             // build the full path
             fullIconPath = iconPath + icon;
             pix = new QPixmap (fullIconPath);
-            if (pix)
+            if (!pix->isNull())
             {
                QImage img = pix->convertToImage();
                pix->convertFromImage(img.smoothScale(14,14));
                c1->setIconName (icon);
                c1->setIcon (*pix);
                isIconAv = true;
@@ -1757,12 +1805,14 @@ void ZSafe::readAllEntries()
 
 void ZSafe::resume(int)
 {
    owarn << "Resume" << oendl;
    // hide the main window
 
+   if ( !showpwd )
+   {
    infoForm->hide();
    // open zsafe again
    m_password = "";
    selectedItem = NULL;
 
    // clear the password list
@@ -1783,12 +1833,13 @@ void ZSafe::resume(int)
           if (_si) delete _si;
       }
    }
 
    // ask for password and read again
    openDocument(filename);
+	 }
 }
 
 //---------------------------------------------
 
 
 bool ZSafe::openDocument(const char* _filename, const char* )
@@ -1951,13 +2002,13 @@ bool ZSafe::openDocument(const char* _filename, const char* )
                    bool isIconAv = false;
                    if (!icon.isEmpty() && !icon.isNull())
                    {
                       // build the full path
                       fullIconPath = iconPath + icon;
                       pix = new QPixmap (fullIconPath);
-                      if (pix)
+                      if (!pix->isNull())
                       {
                          QImage img = pix->convertToImage();
                          pix->convertFromImage(img.smoothScale(14,14));
                          c1->setIconName (icon);
                          c1->setIcon (*pix);
                          isIconAv = true;
@@ -2299,12 +2350,15 @@ void ZSafe::getDocPassword(QString title)
     owarn << "getDocPassword" << oendl;
     // open the 'Password' dialog
     PasswordForm *dialog = new PasswordForm(this, title, TRUE);
     newPwdDialog = dialog;
     newPwdDialogResult = false;
 
+		QPixmap image0( ( const char** ) zsafe_xpm );
+		dialog->setIcon( image0);
+
     connect( dialog->PasswordField, SIGNAL( returnPressed() ),
              this, SLOT( setPasswordDialogDone() ) );
 
     // CS: !!!
     // int pos = filename.findRev ('/');
     QString ti = filename.right (filename.length() - filename.findRev ('/') - 1);
@@ -2689,13 +2743,13 @@ void ZSafe::addCategory()
            if (icon != "predefined.png")
            {
                // build the full path
                fullIconPath = iconPath + icon;
                pix = new QPixmap (fullIconPath);
                // pix->resize(14, 14);
-               if (pix)
+               if (!pix->isNull())
                {
                   // save the full pixmap name into the config file
 // #ifndef WIN32
                   conf->writeEntry(APP_KEY+category, icon);
 // #endif
                   saveConf();
@@ -3158,13 +3212,13 @@ void ZSafe::editCategory()
               // if (!icon.isEmpty() && !icon.isNull())
               if (icon != "predefined.png")
               {
                   // build the full path
                   fullIconPath = iconPath + icon;
                   pix = new QPixmap (fullIconPath);
-                  if (pix)
+                  if (!pix->isNull())
                   {
                      // save the full pixmap name into the config file
 // #ifndef WIN32
                      conf->writeEntry(APP_KEY+category, icon);
 // #endif
                      saveConf();
@@ -3689,7 +3743,53 @@ void ZSafe::setDocument(const QString& fileref)
 
      openDocument(filename);
 #endif
 }
 
 
+void ZSafe::ListPressed(int mouse, QListViewItem *item, const QPoint&, int column) {
+	if(item ==0) return;
+   switch (mouse) {
+   case 1:
+   {
+#ifdef DESKTOP
+	   QDragObject *d = new QTextDrag( item->text(column) , this );
+	   d->dragCopy();
+#endif
+   }
+   break;
+   case 2:
+	   {
+			QClipboard *cb = QApplication::clipboard();
+
+			QIconSet copy_img((const char**) copy_xpm);
+			QIconSet edit_img((const char**) edit_xpm);
+			QPixmap folder_open_img((const char**) folder_open_xpm);
+			QPixmap editdelete_img((const char**) editdelete_xpm);
+
+			QPopupMenu *m = new QPopupMenu(this);
+			int copyItem = 	m->insertItem( copy_img, tr( "Copy to Clipboard" ));
+			int editItem = m->insertItem(edit_img, tr( "Edit" ));
+			int showItem = m->insertItem(folder_open_img, tr( "Show Info" ));
+			int cancelItem = m->insertItem( editdelete_img, tr( "Cancel" ));
+			m->setFocus();
+			int me=m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y() ) ) ;
+			 if(me == copyItem) {
+				copyClip( item->text(column) ) ;
+			} else if (me == cancelItem) {
+			     cb->clear();
+			} else if (me == editItem) {
+				editPwd();
+			} else if (me == showItem) {
+				showInfo(item);
+			}
+	   }
+      break;
+   };
+}
+
+void  ZSafe::copyClip( const QString &text) {
+	QClipboard *cb = QApplication::clipboard();
+	cb->setText( text);
+}
+
 
diff --git a/noncore/apps/zsafe/zsafe.h b/noncore/apps/zsafe/zsafe.h
index eef5cdc..ca041ff 100644
--- a/noncore/apps/zsafe/zsafe.h
+++ b/noncore/apps/zsafe/zsafe.h
@@ -58,14 +58,14 @@ protected:
     QTimer raiseTimer;
 
 public:
     ZSafe( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = WDestructiveClose );
     ~ZSafe();
 
-    static const QColor *evenRowColor;
-    static const QColor *oddRowColor;
+     static const QColor *evenRowColor; 
+     static const QColor *oddRowColor;  
 
     QToolButton* Edit;
     QToolButton* Delete;
     QToolButton* Find;
     QToolButton* New;
     ZListView* ListView;
@@ -78,12 +78,13 @@ public:
 
     QListViewItem *selectedItem; // current selected item
     QListViewItem *copiedItem; // copied item
     bool IsCopy;
     bool IsCut;
     bool modified; // true if database is modified
+    bool showpwd;  // show PWD Dialog
 
     QListViewItem *lastSearchedCategory; 
     QListViewItem *lastSearchedItem; 
     QString        lastSearchedName;
     QString        lastSearchedUsername;
     QString        lastSearchedComment;
@@ -180,12 +181,15 @@ public slots:
     virtual void saveDocumentWithPwd();
     virtual void about();
     virtual void setExpandFlag();
 
     virtual void categoryFieldActivated( const QString& str);
 
+		virtual void ListPressed(int, QListViewItem *, const QPoint&, int);
+	  virtual void copyClip( const QString &text);
+
 private slots:
     void setDocument(const QString& fileref);
     void slotLoadDocu();
     void slotRaiseTimer();
 
 };