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
@@ -25,3 +25,3 @@
 #define MAX_ENCODING 6
-#define MAX_ACTIONS 3
+#define MAX_ACTIONS 4
 
@@ -41,3 +41,3 @@ class QPopupMenu;
 class QToolBar;
-class QPEToolBar;
+//class QPEToolBar;
 class CBkmkSelector;
@@ -49,2 +49,3 @@ class CDrawBuffer;
 class QTReader;
+class QPixmap;
 
@@ -54,3 +55,4 @@ enum ActionTypes
     cesAutoScroll,
-    cesActionMark
+    cesActionMark,
+    cesFullScreen
 };
@@ -67,2 +69,3 @@ struct searchrecord
 class infowin;
+class GraphicWin;
 
@@ -78,3 +81,3 @@ class QTReaderApp : public QMainWindow
     ~QTReaderApp();
-
+    void suspend();
     void openFile( const QString & );
@@ -85,5 +88,7 @@ class QTReaderApp : public QMainWindow
     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 );
@@ -99,2 +104,3 @@ class QTReaderApp : public QMainWindow
     bool m_doClipboard;
+    bool m_fullscreen;
 
@@ -103,2 +109,6 @@ class QTReaderApp : public QMainWindow
 private slots:
+    void zoomin();
+    void zoomout();
+    void setfullscreen(bool sfs);
+    void setcontinuous(bool sfs);
     void setTwoTouch(bool _b);
@@ -118,2 +128,3 @@ private slots:
     void OnWordSelected(const QString&, size_t, const QString&);
+    void showgraphic(QPixmap&);
     void addAnno(const QString&, const QString&, size_t);
@@ -143,4 +154,2 @@ private slots:
     void setDocument(const QString&);
-    void TBD();
-    void TBDzoom();
 
@@ -150,2 +159,3 @@ private slots:
     void fileOpen();
+    void fileClose();
 
@@ -168,3 +178,2 @@ private slots:
 
-    void openFile( const DocLnk & );
     void showEditTools();
@@ -172,2 +181,6 @@ private slots:
     void stripcr(bool);
+    void onespace(bool);
+#ifdef REPALM
+//    void repalm(bool);
+#endif
     void peanut(bool _b);
@@ -183,2 +196,3 @@ private slots:
     void pagemode(bool);
+    void navkeys(bool);
     //  void gotobkmk(const QString& bm);
@@ -194,4 +208,14 @@ 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();
@@ -225,3 +249,4 @@ private slots:
     QComboBox* m_fontSelector;
-    QPEToolBar /* *menu,*/ *editBar;
+//    QPEToolBar /* *menu,*/ *editBar;
+    QToolBar /* *menu,*/ *editBar;
     QFloatBar *searchBar, *regBar/*, *m_fontBar*/;
@@ -229,3 +254,2 @@ private slots:
     QLineEdit *searchEdit, *regEdit;
-    DocLnk *doc;
     bool searchVisible;
@@ -245,3 +269,5 @@ private slots:
     CList<Bkmk>* pBkmklist;
+    CList<Bkmk>* pOpenlist;
     infowin*  m_infoWin;
+    GraphicWin* m_graphicwin;
     QProgressBar* pbar;
@@ -262,2 +288,4 @@ const int cOverlap = 7;
 const int cSetTarget = 8;
+const int cOpenFile = 9;
+
 #endif