Opie-fy ZSafe UI: clean up menus, use proper toolbar, use shared pics where possible and use OResource for image loading

1 files changed, 3 insertions, 12 deletions

diff --git a/noncore/apps/zsafe/zsafe.h b/noncore/apps/zsafe/zsafe.h
index 3d812f8..0be579c 100644
--- a/noncore/apps/zsafe/zsafe.h
+++ b/noncore/apps/zsafe/zsafe.h
@@ -17,12 +17,14 @@
 #include <stdio.h>
 
 #include "infoform.h"
 #include "categorylist.h"
 #include "shadedlistitem.h"
 
+#include <qmainwindow.h>
+
 #include <qvariant.h>
 #include <qdialog.h>
 #include <qwidgetstack.h>
 #include <qtimer.h>
 
 class QVBoxLayout; 
@@ -43,35 +45,30 @@ class Config;
 class CategoryDialog;
 class QPixmap;
 
 // number of fields for one entry
 #define FIELD_SIZE 7
 
-class ZSafe : public QWidget
+class ZSafe : public QMainWindow
 { 
     Q_OBJECT
 
 protected:
     void paintEvent( QPaintEvent * e );
-    void resizeEvent ( QResizeEvent * );
 
     bool raiseFlag;
     QTimer raiseTimer;
 
 public:
     ZSafe( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~ZSafe();
     static QString appName() { return QString::fromLatin1( QUICKAPP_NAME ); }
 
      static const QColor *evenRowColor; 
      static const QColor *oddRowColor;  
 
-    QToolButton* Edit;
-    QToolButton* Delete;
-    QToolButton* Find;
-    QToolButton* New;
     ZListView* ListView;
 
     QString cfgFile;
     QString iconPath;
 
     InfoForm *infoForm;
@@ -178,13 +175,12 @@ public slots:
 
     virtual void newDocument();
     virtual void loadDocument();
     virtual void saveDocumentAs();
     virtual void saveDocumentWithoutPwd();
     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);
@@ -193,12 +189,7 @@ private slots:
     void setDocument(const QString& fileref);
     void slotLoadDocu();
     void slotRaiseTimer();
 
 };
 
-
-extern ZSafe *zs;
-extern QApplication *appl;
-extern int DeskW;
-extern int DeskH;
 #endif // ZSAFE_H