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
@@ -146,97 +146,98 @@ class QTReaderApp : public QMainWindow
     QLabel* m_prog;
     bool m_annoIsEditing;
     bool m_propogatefontchange, m_bFloatingDialog;
     bool m_url_clipboard, m_url_localfile, m_url_globalfile;
     CButtonPrefs* m_buttonprefs;
     fontselector_action m_fontAction;
     void doAction(QKeyEvent* e);
 
         public:
     QTReaderApp( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
     ~QTReaderApp();
 
     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();
-    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&);
 private slots:
 #ifdef _SCRIPT
 //    void RunScript();
 #endif
   void actionscroll(int v);
     void SaveConfig();
  void LoadTheme();
  void LoadConfig();
  void TidyConfig();
  void ExportLinks();
     void zoomin();
     void zoomout();
     void chooseencoding();
     void setfullscreen(bool sfs);
     void setrotated(bool sfs);
     void setinverted(bool sfs);
     void setgrab(bool sfs);
 //    void setcontinuous(bool sfs);
     void setTwoTouch(bool _b);
  void restoreFocus();
@@ -359,102 +360,102 @@ private slots:
     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);
     ToolbarPolicy m_tbpol, m_tbpolsave;
     ToolBarDock m_tbposition;
     bool m_tbmove, m_tbmovesave;
     QToolBar* filebar();
     QToolBar* viewbar();
     QToolBar* navbar();
     QToolBar* markbar();
     void hidetoolbars();
     void addfilebar(Config* _config, const QString& key, QAction* a);
     void addviewbar(Config* _config, const QString& key, QAction* a);
     void addnavbar(Config* _config, const QString& key, QAction* a);
     void addmarkbar(Config* _config, const QString& key, QAction* a);
     bool checkbar(Config* _config, const QString& key);
 #ifdef _SCRIPT
     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;
 
     QAction* m_buttonAction[MAX_ACTIONS];
 
     CBkmkSelector* bkmkselector;
 
     //    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;
     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++; }
     /*
       void resizeEvent( QResizeEvent * r)
       {
 //      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;
     regedit_type m_nRegAction;
     bkmk_action m_nBkmkAction;
     QString m_autogenstr;
     bool m_dontSave;
 };