1 files changed, 7 insertions, 6 deletions

diff --git a/noncore/apps/opie-reader/QTReaderApp.h b/noncore/apps/opie-reader/QTReaderApp.h
index ad47fc9..ab1b7ad 100644
--- a/noncore/apps/opie-reader/QTReaderApp.h
+++ b/noncore/apps/opie-reader/QTReaderApp.h
@@ -166,57 +166,58 @@ class QTReaderApp : public QMainWindow
             suspend();
         }
 #ifdef USEQPE
     void showEvent(QShowEvent*)
       {
         if (m_grabkeyboard)
           {
             ((QPEApplication*)qApp)->grabKeyboard();
           }
       }
 #endif
     void suspend();
-    void openFile( const QString & );
+    void openFile( const QString &, unsigned int loc = 0 );
 
 
  protected:
     void setfontHelper(const QString& lcn, int size = 0);
     QAction* m_bkmkAvail, *m_actFullscreen;
     CAnnoEdit* m_annoWin;
     Bkmk* m_anno;
     int m_scrollcolor, m_scrollbarcolor, m_background, m_foreground;
 //    void resizeEvent(QResizeEvent* e);
     void closeEvent( QCloseEvent *e );
-#ifdef NEWFULLSCREEN
+#if defined(USEQPE) && defined(USENEWFULLSCREEN)
+    bool m_usenewfullscreen;
     void resizeEvent(QResizeEvent *);
     void focusInEvent(QFocusEvent*);
-    void enableFullscreen();
 #endif
         void readbkmks();
         void do_mono(const QString&);
         void do_jump(const QString&);
         void do_reparastring(const QString&);
         void do_settarget(const QString&);
 #ifdef _SCROLLPIPE
         //void do_setpipetarget(const QString&);
 #endif
         void do_saveconfig(const QString&, bool);
         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;
     bool m_doDictionary;
+    bool m_doOutput;
     bool m_doClipboard;
     bool m_fullscreen;
     bool m_loadedconfig;
  public:
         void saveprefs();
 public slots:
       void setBackgroundBitmap();
   void UpdateStatus();
     void setScrollState(bool _b);
     void handlekey(QKeyEvent* e);
       void forceopen(const QString& filename);
     void setDocument(const QString&);
@@ -379,25 +380,25 @@ private slots:
     void SaveScript(const char* sname);
 #endif
 /*
     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, m_statusstring, m_themename;
-    bool listbkmk(CList<Bkmk>*, const QString& _lab = QString::null);
+    bool listbkmk(CList<Bkmk>*, const QString& _lab = QString::null, bool presel=false);
     QString usefilebrowser();
     void do_regedit();
     void colorChanged( const QColor &c );
     void clear();
     void updateCaption();
     void do_autogen(const QString&);
     void do_addbkmk(const QString&);
     bool findNextBookmark(size_t start);
 
  private:
 
     QAction* m_scrollButton;
@@ -412,29 +413,29 @@ private slots:
     bool m_bcloseDisabled, m_disableesckey;
     size_t searchStart;
 #ifdef __ISEARCH
     QStack<searchrecord>* searchStack;
     bool dosearch(size_t start, CDrawBuffer& test, const QString& arg);
 #else
     bool dosearch(size_t start, CDrawBuffer& test, const QRegExp& arg);
 #endif
     QWidgetStack *editorStack;
     QTReader* reader;
     QComboBox* m_fontSelector;
 //    QPEToolBar /* *menu,*/ *fileBar;
-#ifdef USEQPE
+#if defined(USEQPE)
     QToolBar *menubar;
 #endif
     QToolBar *fileBar, *navBar, *viewBar, *markBar;
-#ifdef USEQPE
+#if defined(USEQPE)
     QPEMenuBar *mb;
 #else
     QMenuBar *mb;
 #endif
     QFloatBar *searchBar, *regBar/*, *m_fontBar*/;
     QToolBar /* *searchBar, *regBar,*/ *m_fontBar;
     QLineEdit *searchEdit, *regEdit;
     bool searchVisible;
     bool regVisible;
     bool m_fontVisible, m_twoTouch;
     static unsigned long m_uid;
     long unsigned get_unique_id() { return m_uid++; }