1 files changed, 99 insertions, 56 deletions

diff --git a/noncore/apps/opie-reader/QTReaderApp.h b/noncore/apps/opie-reader/QTReaderApp.h
index fe3eebf..5ecc42d 100644
--- a/noncore/apps/opie-reader/QTReaderApp.h
+++ b/noncore/apps/opie-reader/QTReaderApp.h
@@ -39,4 +39,10 @@
 #include <qlistbox.h>
+#ifdef USEQPE
+#include <qpe/qpeapplication.h>
+#endif
+#include "orkey.h"
 //#include "Queue.h"
+#include "BGType.h"
 
+class QBoxLayout;
 class QWidgetStack;
@@ -46,5 +52,6 @@ class QToolBar;
 #ifdef USEQPE
-class QToolBar;
-class QMenuBar;
+class QPEToolBar;
+class QPEMenuBar;
 #endif
+class QScrollBar;
 class CBkmkSelector;
@@ -58,30 +65,5 @@ class QImage;
 class Config;
+class CButtonPrefs;
 
-enum ActionTypes
-{
-    cesNone = 0,
-    cesOpenFile,
-    cesAutoScroll,
-    cesActionMark,
-    cesActionAnno,
-    cesFullScreen,
-    cesZoomIn,
-    cesZoomOut,
-    cesBack,
-    cesForward,
-    cesHome,
-    cesPageUp,
-    cesPageDown,
-    cesLineUp,
-    cesLineDown,
-    cesStartDoc,
-    cesEndDoc
-};
-/*
-*m_preferences_action, *m_close_action *m_info_action, *m_touch_action,
-*m_find_action, *m_jump_action, *m_setfont_action *m_goto_action,
-*m_delete_action; *m_autogen_action, *m_clear_action, *m_save_action;
-*m_tidy_action, *m_startBlock_action, *m_endBlock_action;
-*m_setenc_action, *m_setmono_action;
-*/
+#ifdef USEQPE
 enum ToolbarPolicy
@@ -92,2 +74,9 @@ enum ToolbarPolicy
 };
+#else
+enum ToolbarPolicy
+{
+    cesMenuTool = 0,
+    cesMultiple
+};
+#endif
 
@@ -106,3 +95,4 @@ enum regedit_type
     cExtraSpace,
-    cExtraLead
+    cExtraLead,
+    cRepara
 };
@@ -117,3 +107,4 @@ enum bkmk_action
     cRmConfig,
-    cExportLinks
+    cExportLinks,
+    cLdTheme
 };
@@ -142,5 +133,16 @@ class QTReaderApp : public QMainWindow
 
+      QColor getcolour(int c);
+
+      QMap<orKey, int> kmap;
     unsigned long m_savedpos;
     int m_debounce;
+    bool m_kmapchanged;
+    bground m_bgtype;
     timeb m_lastkeytime;
+    QScrollBar* m_scrollbar;
+    QScrollBar* scrollbar;
+    int m_qtscroll, m_localscroll;
+    bool m_hidebars, m_scrollishidden, m_statusishidden;
+    QBoxLayout *m_layout;
+    QLabel* m_prog;
     bool m_annoIsEditing;
@@ -148,4 +150,5 @@ class QTReaderApp : public QMainWindow
     bool m_url_clipboard, m_url_localfile, m_url_globalfile;
+    CButtonPrefs* m_buttonprefs;
     fontselector_action m_fontAction;
-    void doAction(ActionTypes a, QKeyEvent* e);
+    void doAction(QKeyEvent* e);
 
@@ -155,8 +158,21 @@ class QTReaderApp : public QMainWindow
 
-    void handlekey(QKeyEvent* e);
     void hideEvent(QHideEvent*)
     {
+#ifdef USEQPE
+        if (m_grabkeyboard)
+          {
+            ((QPEApplication*)qApp)->ungrabKeyboard();
+          }
+#endif
         suspend();
     }
-
+#ifdef USEQPE
+    void showEvent(QShowEvent*)
+      {
+        if (m_grabkeyboard)
+          {
+            ((QPEApplication*)qApp)->grabKeyboard();
+          }
+      }
+#endif
     void suspend();
@@ -164,3 +180,2 @@ class QTReaderApp : public QMainWindow
 
-    void setScrollState(bool _b);
 
@@ -171,4 +186,10 @@ class QTReaderApp : public QMainWindow
     Bkmk* m_anno;
+    int m_scrollcolor, m_scrollbarcolor, m_background, m_foreground;
 //    void resizeEvent(QResizeEvent* e);
     void closeEvent( QCloseEvent *e );
+#ifdef NEWFULLSCREEN
+    void resizeEvent(QResizeEvent *);
+    void focusInEvent(QFocusEvent*);
+    void enableFullscreen();
+#endif
     void readbkmks();
@@ -176,2 +197,3 @@ class QTReaderApp : public QMainWindow
     void do_jump(const QString&);
+        void do_reparastring(const QString&);
     void do_settarget(const QString&);
@@ -181,5 +203,8 @@ class QTReaderApp : public QMainWindow
     void do_saveconfig(const QString&, bool);
-    bool readconfig(const QString&, bool);
-    bool PopulateConfig(const char*);
+        bool readconfig(const QString&, const QString&, bool);
+        bool PopulateConfig(const char*, bool usedirs = false);
     ActionTypes ActNameToInt(const QString&);
+#ifdef USEQPE
+        bool m_grabkeyboard;
+#endif
     bool m_doAnnotation;
@@ -192,2 +217,7 @@ class QTReaderApp : public QMainWindow
 public slots:
+      void setBackgroundBitmap();
+  void UpdateStatus();
+    void setScrollState(bool _b);
+    void handlekey(QKeyEvent* e);
+      void forceopen(const QString& filename);
     void setDocument(const QString&);
@@ -197,3 +227,5 @@ private slots:
 #endif
+  void actionscroll(int v);
     void SaveConfig();
+ void LoadTheme();
  void LoadConfig();
@@ -205,2 +237,5 @@ private slots:
     void setfullscreen(bool sfs);
+    void setrotated(bool sfs);
+    void setinverted(bool sfs);
+    void setgrab(bool sfs);
 //    void setcontinuous(bool sfs);
@@ -220,6 +255,6 @@ private slots:
     }
-    void OnWordSelected(const QString&, size_t, const QString&);
-    void OnURLSelected(const QString& href);
+    void OnWordSelected(const QString&, size_t, size_t, const QString&);
+    void OnURLSelected(const QString& href, const size_t tgt);
     void showgraphic(QImage&);
-    void addAnno(const QString&, const QString&, size_t);
+    void addAnno(const QString&, const QString&, size_t, size_t);
     void addAnno(const QString&, const QString&);
@@ -229,6 +264,7 @@ private slots:
     void do_setfont(const QString&);
-    void buttonActionSelected(QAction*);
-//  void msgHandler(const QCString&, const QByteArray&);
+                //void buttonActionSelected(QAction*);
+        void msgHandler(const QCString&, const QByteArray&);
     void monospace(bool);
     void jump();
+        void reparastring();
     void settarget();
@@ -249,2 +285,3 @@ private slots:
     void showtoolbarprefs();
+        void showbuttonprefs();
     void infoClose();
@@ -284,5 +321,3 @@ private slots:
 //    void onespace(bool);
-#ifdef REPALM
 //    void repalm(bool);
-#endif
 //    void peanut(bool _b);
@@ -310,2 +345,4 @@ private slots:
  private:
+    void setscrollcolour();
+    void setscrollbarcolour();
     void writeUrl(const QString& file, const QString& href);
@@ -321,4 +358,8 @@ private slots:
     QAction *m_setenc_action, *m_setmono_action, *m_saveconfig_action;
-    QAction *m_loadconfig_action, *m_toolbarprefs_action, *m_tidyconfig_action;
-    QAction *m_exportlinks_action;
+    QAction *m_loadconfig_action, *m_loadtheme_action, *m_toolbarprefs_action, *m_tidyconfig_action;
+    QAction *m_exportlinks_action, *m_rotate_action, *m_buttonprefs_action, *m_inverse_action;
+    QAction *m_repara_action;
+#ifdef USEQPE
+    QAction *m_grab_action;
+#endif
     void addtoolbars(Config* config);
@@ -349,3 +390,3 @@ private slots:
     bool openfrombkmk(Bkmk*);
-  QString m_targetapp, m_targetmsg;
+  QString m_targetapp, m_targetmsg, m_statusstring, m_themename;
     bool listbkmk(CList<Bkmk>*, const QString& _lab = QString::null);
@@ -368,5 +409,5 @@ private slots:
 
-    ActionTypes m_spaceTarget, m_escapeTarget, m_returnTarget, m_leftTarget, m_rightTarget,
-    m_upTarget, m_downTarget;
-    bool m_leftScroll, m_rightScroll, m_upScroll, m_downScroll;
+    //    ActionTypes m_spaceTarget, m_escapeTarget, m_returnTarget, m_leftTarget, m_rightTarget,
+    //m_upTarget, m_downTarget;
+    //bool m_leftScroll, m_rightScroll, m_upScroll, m_downScroll;
     bool m_bcloseDisabled, m_disableesckey;
@@ -382,6 +423,9 @@ private slots:
     QComboBox* m_fontSelector;
-//    QToolBar /* *menu,*/ *fileBar;
-    QToolBar *menubar, *fileBar, *navBar, *viewBar, *markBar;
+//    QPEToolBar /* *menu,*/ *fileBar;
 #ifdef USEQPE
-    QMenuBar *mb;
+    QToolBar *menubar;
+#endif
+    QToolBar *fileBar, *navBar, *viewBar, *markBar;
+#ifdef USEQPE
+    QPEMenuBar *mb;
 #else
@@ -395,3 +439,2 @@ private slots:
     bool m_fontVisible, m_twoTouch;
-    bool bFromDocView;
     static unsigned long m_uid;
@@ -401,4 +444,4 @@ private slots:
       {
-//      odebug << "resize:(" << r->oldSize().width() << "," << r->oldSize().height() << ")" << oendl;
-//      odebug << "resize:(" << r->size().width() << "," << r->size().height() << ")" << oendl;
+//      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 );