1 files changed, 10 insertions, 4 deletions

diff --git a/noncore/apps/opie-reader/ToolbarPrefs.h b/noncore/apps/opie-reader/ToolbarPrefs.h
index 9571c28..a2686e5 100644
--- a/noncore/apps/opie-reader/ToolbarPrefs.h
+++ b/noncore/apps/opie-reader/ToolbarPrefs.h
@@ -95,49 +95,49 @@ class CNavBarPrefs : public QWidget
 /*
 class CBarPrefs2 : public QWidget
 { 
     Q_OBJECT
         Config& config;
     QCheckBox *fullscreen, *zoom, *setfont, *mark, *annotate, *go_to, *Delete, *autogen, *clear, *save, *tidy, *block, *indannotate, *encoding, *ideogram;
 
     bool m_isChanged;
 
     private slots:
         void isChanged(int _v) { m_isChanged = true; }
 
  public:
     CBarPrefs2( Config&, QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~CBarPrefs2();
     void saveall();
     bool isChanged() { return m_isChanged; }
 
 };
 */
 class CViewBarPrefs : public QWidget
 { 
     Q_OBJECT
         Config& config;
-    QCheckBox *fullscreen, *zoomin, *zoomout, *setfont, *encoding, *ideogram;
+    QCheckBox *fullscreen, *rotate, *zoomin, *zoomout, *setfont, *encoding, *ideogram, *invert;
 
     bool m_isChanged;
 
     private slots:
         void isChanged(int _v) { m_isChanged = true; }
 
  public:
     CViewBarPrefs( Config&, QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~CViewBarPrefs();
     void saveall();
     bool isChanged() { return m_isChanged; }
 
 };
 
 class CMarkBarPrefs : public QWidget
 { 
     Q_OBJECT
         Config& config;
     QCheckBox *mark, *annotate, *go_to, *Delete, *autogen, *clear, *save, *tidy, *startblock, *copyblock;
 
     bool m_isChanged;
 
     private slots:
         void isChanged(int _v) { m_isChanged = true; }
@@ -150,58 +150,58 @@ class CMarkBarPrefs : public QWidget
 
 };
 
 class CIndBarPrefs : public QWidget
 { 
     Q_OBJECT
         Config& config;
     QCheckBox *indannotate;
 
     bool m_isChanged;
 
     private slots:
         void isChanged(int _v) { m_isChanged = true; }
 
  public:
     CIndBarPrefs( Config&, QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~CIndBarPrefs();
     void saveall();
     bool isChanged() { return m_isChanged; }
 
 };
 
 class CMiscBarPrefs : public QWidget
 { 
-    Q_OBJECT
+
 public:
 
     CMiscBarPrefs( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~CMiscBarPrefs();
 
 #ifdef USECOMBO
-    QComboBox *tbpolicy, *tbposition;
+    QComboBox *tbpolicy, *tbposition, *qtscroll, *localscroll;
 #else
-    MenuButton *tbpolicy, *tbposition;
+    MenuButton *tbpolicy, *tbposition, *qtscroll, *localscroll;
 #endif
     QCheckBox *tbmovable, *floating;
 };
 
 class CBarPrefs : public QDialog
 {
     Q_OBJECT
         ;
     CMiscBarPrefs* misc;
     CFileBarPrefs* filebar;
     CNavBarPrefs* navbar;
     CViewBarPrefs* viewbar;
     CMarkBarPrefs* markbar;
     CIndBarPrefs* indbar;
     Config config;
 
     void keyPressEvent(QKeyEvent* e)
         {
             switch (e->key())
             {
                 case Key_Escape:
                     e->accept();
                     reject();
                     break;
@@ -224,40 +224,46 @@ class CBarPrefs : public QDialog
                 if (filebar->isChanged()) filebar->saveall();
                 if (viewbar->isChanged()) viewbar->saveall();
                 if (markbar->isChanged()) markbar->saveall();
                 if (indbar->isChanged()) indbar->saveall();
             }
         }
     bool isChanged()
         {
             return
                 (
                     filebar->isChanged()
                     ||
                     navbar->isChanged()
                     ||
                     viewbar->isChanged()
                     ||
                     markbar->isChanged()
                     ||
                     indbar->isChanged()
                 );
         }
     bool floating() { return misc->floating->isChecked(); }
     void floating(bool v) { misc->floating->setChecked(v); }
     int tbpolicy() { return misc->tbpolicy->currentItem(); }
+    int qtscroll() { return misc->qtscroll->currentItem(); }
+    int localscroll() { return misc->localscroll->currentItem(); }
 #ifdef USECOMBO
     void tbpolicy(int v) { misc->tbpolicy->setCurrentItem(v); }
+    void qtscroll(int v) { misc->qtscroll->setCurrentItem(v); }
+    void localscroll(int v) { misc->localscroll->setCurrentItem(v); }
 #else
     void tbpolicy(int v) { misc->tbpolicy->select(v); }
+    void qtscroll(int v) { misc->qtscroll->select(v); }
+    void localscroll(int v) { misc->localscroll->select(v); }
 #endif
     bool tbmovable() { return misc->tbmovable->isChecked(); }
     void tbmovable(bool v) { misc->tbmovable->setChecked(v); }
     int tbposition() { return misc->tbposition->currentItem(); }
 #ifdef USECOMBO
     void tbposition(int v) { misc->tbposition->setCurrentItem(v); }
 #else
     void tbposition(int v) { misc->tbposition->select(v); }
 #endif
 
 };
 #endif // CPREFS_H