1 files changed, 39 insertions, 11 deletions

diff --git a/noncore/apps/opie-reader/QTReaderApp.h b/noncore/apps/opie-reader/QTReaderApp.h
index 22c57e4..cb33e4a 100644
--- a/noncore/apps/opie-reader/QTReaderApp.h
+++ b/noncore/apps/opie-reader/QTReaderApp.h
@@ -24,5 +24,5 @@
 
 #define MAX_ENCODING 6
-#define MAX_ACTIONS 3
+#define MAX_ACTIONS 4
 
 #include <qmainwindow.h>
@@ -40,5 +40,5 @@ class QToolButton;
 class QPopupMenu;
 class QToolBar;
-class QPEToolBar;
+//class QPEToolBar;
 class CBkmkSelector;
 class QProgressBar;
@@ -48,4 +48,5 @@ class QFloatBar;
 class CDrawBuffer;
 class QTReader;
+class QPixmap;
 
 enum ActionTypes
@@ -53,5 +54,6 @@ enum ActionTypes
     cesOpenFile = 0,
     cesAutoScroll,
-    cesActionMark
+    cesActionMark,
+    cesFullScreen
 };
 
@@ -66,4 +68,5 @@ struct searchrecord
 
 class infowin;
+class GraphicWin;
 
 class QTReaderApp : public QMainWindow
@@ -77,5 +80,5 @@ class QTReaderApp : public QMainWindow
     QTReaderApp( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
     ~QTReaderApp();
-
+    void suspend();
     void openFile( const QString & );
 
@@ -84,7 +87,9 @@ class QTReaderApp : public QMainWindow
  protected:
     void setfontHelper(const QString& lcn, int size = 0);
-    QAction* m_bkmkAvail;
+    QAction* m_bkmkAvail, *m_actFullscreen;
     CAnnoEdit* m_annoWin;
     Bkmk* m_anno;
+//    void resizeEvent(QResizeEvent* e);
+    void keyPressEvent(QKeyEvent* e);
     void closeEvent( QCloseEvent *e );
         void readbkmks();
@@ -98,8 +103,13 @@ class QTReaderApp : public QMainWindow
     bool m_doDictionary;
     bool m_doClipboard;
+    bool m_fullscreen;
 
  public:
         void saveprefs();
 private slots:
+    void zoomin();
+    void zoomout();
+    void setfullscreen(bool sfs);
+    void setcontinuous(bool sfs);
     void setTwoTouch(bool _b);
  void restoreFocus();
@@ -117,4 +127,5 @@ private slots:
         }
     void OnWordSelected(const QString&, size_t, const QString&);
+    void showgraphic(QPixmap&);
     void addAnno(const QString&, const QString&, size_t);
     void addAnno(const QString&, const QString&);
@@ -142,6 +153,4 @@ private slots:
         void showinfo();
     void setDocument(const QString&);
-    void TBD();
-    void TBDzoom();
 
     void indentplus();
@@ -149,4 +158,5 @@ private slots:
 
     void fileOpen();
+    void fileClose();
 
     void editCopy();
@@ -167,8 +177,11 @@ private slots:
 #endif
 
-    void openFile( const DocLnk & );
     void showEditTools();
 
     void stripcr(bool);
+    void onespace(bool);
+#ifdef REPALM
+//    void repalm(bool);
+#endif
     void peanut(bool _b);
     void remap(bool);
@@ -182,4 +195,5 @@ private slots:
     void dblspce(bool);
     void pagemode(bool);
+    void navkeys(bool);
     //  void gotobkmk(const QString& bm);
     void gotobkmk(int);
@@ -193,6 +207,16 @@ private slots:
 
  private:
+/*
+    void setstate(unsigned char* _sd, unsigned short _sdlen);
+    void getstate(unsigned char*& data, unsigned short& len);
+*/
+    void fileOpen2();
+    void readfilelist();
+    void savefilelist();
+    void updatefileinfo();
+    bool openfrombkmk(Bkmk*);
   QString m_targetapp, m_targetmsg;
-    void listbkmk();
+    void listbkmk(CList<Bkmk>*, const QString& _lab = QString::null);
+    QString usefilebrowser();
     void do_regedit();
     void colorChanged( const QColor &c );
@@ -224,9 +248,9 @@ private slots:
     QTReader* reader;
     QComboBox* m_fontSelector;
-    QPEToolBar /* *menu,*/ *editBar;
+//    QPEToolBar /* *menu,*/ *editBar;
+    QToolBar /* *menu,*/ *editBar;
     QFloatBar *searchBar, *regBar/*, *m_fontBar*/;
     QToolBar /* *searchBar, *regBar,*/ *m_fontBar;
     QLineEdit *searchEdit, *regEdit;
-    DocLnk *doc;
     bool searchVisible;
     bool regVisible;
@@ -244,5 +268,7 @@ private slots:
     */
     CList<Bkmk>* pBkmklist;
+    CList<Bkmk>* pOpenlist;
     infowin*  m_infoWin;
+    GraphicWin* m_graphicwin;
     QProgressBar* pbar;
     bool m_fBkmksChanged;
@@ -261,3 +287,5 @@ const int cMonoSpace = 6;
 const int cOverlap = 7;
 const int cSetTarget = 8;
+const int cOpenFile = 9;
+
 #endif