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
@@ -20,13 +20,13 @@
 #ifndef __QTREADERAPP_H
 #define __QTREADERAPP_H
 
 //#define __ISEARCH
 
 #define MAX_ENCODING 6
-#define MAX_ACTIONS 3
+#define MAX_ACTIONS 4
 
 #include <qmainwindow.h>
 #include "CExpander.h"
 #include <qlist.h>
 #include <qpe/filemanager.h>
 #include <qmap.h>
@@ -36,74 +36,84 @@
 //#include "Queue.h"
 
 class QWidgetStack;
 class QToolButton;
 class QPopupMenu;
 class QToolBar;
-class QPEToolBar;
+//class QPEToolBar;
 class CBkmkSelector;
 class QProgressBar;
 class QAction;
 class CAnnoEdit;
 class QFloatBar;
 class CDrawBuffer;
 class QTReader;
+class QPixmap;
 
 enum ActionTypes
 {
     cesOpenFile = 0,
     cesAutoScroll,
-    cesActionMark
+    cesActionMark,
+    cesFullScreen
 };
 
 #ifdef __ISEARCH
 struct searchrecord
 {
   QString s;
   size_t pos;
   searchrecord(const QString& _s, size_t _pos) : s(_s), pos(_pos) {}
 };
 #endif
 
 class infowin;
+class GraphicWin;
 
 class QTReaderApp : public QMainWindow
 {
     Q_OBJECT
 
         unsigned long m_savedpos;
     bool m_annoIsEditing;
 
         public:
     QTReaderApp( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
     ~QTReaderApp();
-
+    void suspend();
     void openFile( const QString & );
 
     void setScrollState(bool _b);
 
  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();
         void do_mono(const QString&);
         void do_jump(const QString&);
         void do_overlap(const QString&);
         void do_settarget(const QString&);
         int EncNameToInt(const QString&);
         ActionTypes ActNameToInt(const QString&);
     bool m_doAnnotation;
     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();
  void OnAnnotation(bool _b)
         {
             m_doAnnotation = _b;
         }
@@ -113,12 +123,13 @@ private slots:
         }
     void OnClipboard(bool _b)
         {
             m_doClipboard = _b;
         }
     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&);
     void addanno();
     void showAnnotation();
         void do_setfont(const QString&);
         void encodingSelected(QAction*);
@@ -138,19 +149,18 @@ private slots:
         void savebkmks();
         //void importFiles();
         void infoClose();
         //    void oldFile();
         void showinfo();
     void setDocument(const QString&);
-    void TBD();
-    void TBDzoom();
 
     void indentplus();
     void indentminus();
 
     void fileOpen();
+    void fileClose();
 
     void editCopy();
     void editFind();
 
     void pageup();
     void pagedn();
@@ -163,40 +173,54 @@ private slots:
 #ifdef __ISEARCH
 //  void search( const QString& );
 #else
     void search();
 #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);
     void embolden(bool);
     void autofmt(bool);
     void textfmt(bool);
     void striphtml(bool);
     void dehyphen(bool);
     void unindent(bool);
     void repara(bool);
     void dblspce(bool);
     void pagemode(bool);
+    void navkeys(bool);
     //  void gotobkmk(const QString& bm);
     void gotobkmk(int);
     void cancelbkmk();
     void do_gotomark();
     void do_delmark();
     void do_autogen();
     void do_regaction();
     void OnRedraw();
     void OnActionPressed();
 
  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 );
     void clear();
     void updateCaption();
     void do_autogen(const QString&);
     void do_addbkmk(const QString&);
@@ -220,17 +244,17 @@ private slots:
 #else
     bool dosearch(size_t start, CDrawBuffer& test, const QRegExp& arg);
 #endif
     QWidgetStack *editorStack;
     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;
     bool m_fontVisible, m_twoTouch;
     bool bFromDocView;
     static unsigned long m_uid;
     long unsigned get_unique_id() { return m_uid++; }
@@ -240,13 +264,15 @@ private slots:
       qDebug("resize:(%u,%u)", r->oldSize().width(), r->oldSize().height());
       qDebug("resize:(%u,%u)", r->size().width(), r->size().height());
       //    bgroup->move( width()-bgroup->width(), 0 );
       }
     */
     CList<Bkmk>* pBkmklist;
+    CList<Bkmk>* pOpenlist;
     infowin*  m_infoWin;
+    GraphicWin* m_graphicwin;
     QProgressBar* pbar;
     bool m_fBkmksChanged;
     int m_nRegAction;
     QString m_autogenstr;
     bool m_dontSave;
 };
@@ -257,7 +283,9 @@ const int cDelBkmk = 2;
 const int cGotoBkmk = 3;
 const int cRmBkmkFile = 4;
 const int cJump = 5;
 const int cMonoSpace = 6;
 const int cOverlap = 7;
 const int cSetTarget = 8;
+const int cOpenFile = 9;
+
 #endif