1 files changed, 65 insertions, 8 deletions

diff --git a/noncore/apps/opie-reader/QTReaderApp.h b/noncore/apps/opie-reader/QTReaderApp.h
index 48575e9..22c57e4 100644
--- a/noncore/apps/opie-reader/QTReaderApp.h
+++ b/noncore/apps/opie-reader/QTReaderApp.h
@@ -25,5 +25,6 @@
 #define MAX_ENCODING 6
+#define MAX_ACTIONS 3
 
 #include <qmainwindow.h>
-#include "QTReader.h"
+#include "CExpander.h"
 #include <qlist.h>
@@ -34,3 +35,3 @@
 #include <qlistbox.h>
-#include "Queue.h"
+//#include "Queue.h"
 
@@ -40,2 +41,3 @@ class QPopupMenu;
 class QToolBar;
+class QPEToolBar;
 class CBkmkSelector;
@@ -43,2 +45,13 @@ class QProgressBar;
 class QAction;
+class CAnnoEdit;
+class QFloatBar;
+class CDrawBuffer;
+class QTReader;
+
+enum ActionTypes
+{
+    cesOpenFile = 0,
+    cesAutoScroll,
+    cesActionMark
+};
 
@@ -60,2 +73,3 @@ class QTReaderApp : public QMainWindow
         unsigned long m_savedpos;
+    bool m_annoIsEditing;
 
@@ -70,2 +84,6 @@ class QTReaderApp : public QMainWindow
  protected:
+    void setfontHelper(const QString& lcn, int size = 0);
+    QAction* m_bkmkAvail;
+    CAnnoEdit* m_annoWin;
+    Bkmk* m_anno;
     void closeEvent( QCloseEvent *e );
@@ -77,7 +95,32 @@ class QTReaderApp : public QMainWindow
         int EncNameToInt(const QString&);
-        void saveprefs();
+        ActionTypes ActNameToInt(const QString&);
+    bool m_doAnnotation;
+    bool m_doDictionary;
+    bool m_doClipboard;
 
+ public:
+        void saveprefs();
 private slots:
+    void setTwoTouch(bool _b);
+ void restoreFocus();
+ void OnAnnotation(bool _b)
+        {
+            m_doAnnotation = _b;
+        }
+    void OnDictionary(bool _b)
+        {
+            m_doDictionary = _b;
+        }
+    void OnClipboard(bool _b)
+        {
+            m_doClipboard = _b;
+        }
+    void OnWordSelected(const QString&, size_t, const QString&);
+    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*);
+        void buttonActionSelected(QAction*);
         void msgHandler(const QCString&, const QByteArray&);
@@ -129,2 +172,7 @@ private slots:
     void stripcr(bool);
+    void peanut(bool _b);
+    void remap(bool);
+    void embolden(bool);
+    void autofmt(bool);
+    void textfmt(bool);
     void striphtml(bool);
@@ -133,3 +181,2 @@ private slots:
     void repara(bool);
-    void setbold(bool);
     void dblspce(bool);
@@ -143,4 +190,7 @@ private slots:
     void do_regaction();
+    void OnRedraw();
+    void OnActionPressed();
 
  private:
+  QString m_targetapp, m_targetmsg;
     void listbkmk();
@@ -152,2 +202,3 @@ private slots:
     void do_addbkmk(const QString&);
+    bool findNextBookmark(size_t start);
 
@@ -159,4 +210,7 @@ private slots:
 
+    QAction* m_buttonAction[MAX_ACTIONS];
+
     CBkmkSelector* bkmkselector;
 
+    ActionTypes m_spaceTarget;
     size_t searchStart;
@@ -164,5 +218,5 @@ private slots:
     QStack<searchrecord>* searchStack;
-    bool dosearch(size_t start, CBuffer& test, const QString& arg);
+    bool dosearch(size_t start, CDrawBuffer& test, const QString& arg);
 #else
-    bool dosearch(size_t start, CBuffer& test, const QRegExp& arg);
+    bool dosearch(size_t start, CDrawBuffer& test, const QRegExp& arg);
 #endif
@@ -171,3 +225,5 @@ private slots:
     QComboBox* m_fontSelector;
-    QToolBar *menu, *editBar, *searchBar, *regBar, *m_fontBar;
+    QPEToolBar /* *menu,*/ *editBar;
+    QFloatBar *searchBar, *regBar/*, *m_fontBar*/;
+    QToolBar /* *searchBar, *regBar,*/ *m_fontBar;
     QLineEdit *searchEdit, *regEdit;
@@ -176,3 +232,3 @@ private slots:
     bool regVisible;
-    bool m_fontVisible;
+    bool m_fontVisible, m_twoTouch;
     bool bFromDocView;
@@ -194,2 +250,3 @@ private slots:
     QString m_autogenstr;
+    bool m_dontSave;
 };