1 files changed, 66 insertions, 10 deletions

diff --git a/noncore/apps/opie-reader/ToolbarPrefs.cpp b/noncore/apps/opie-reader/ToolbarPrefs.cpp
index 0347736..5cf220a 100644
--- a/noncore/apps/opie-reader/ToolbarPrefs.cpp
+++ b/noncore/apps/opie-reader/ToolbarPrefs.cpp
@@ -8,6 +8,16 @@
 ****************************************************************************/
+#include "useqpe.h"
 #include "ToolbarPrefs.h"
 
+#include <qcheckbox.h>
+#include <qlabel.h>
+#include <qpushbutton.h>
+#include <qspinbox.h>
 #include <qlayout.h>
+#include <qvariant.h>
+#include <qtooltip.h>
+#include <qwhatsthis.h>
+#include <qcombobox.h>
 #include <qbuttongroup.h>
+#include <qlineedit.h>
 #ifdef USEQPE
@@ -15,3 +25,2 @@
 #endif
-#include <qpe/qpeapplication.h>
 
@@ -36,4 +45,3 @@ CBarPrefs::CBarPrefs(const QString& appdir, bool fs, QWidget* parent, const char
 
-    if (fs)
-        QPEApplication::showDialog( this );
+    if (fs) showMaximized();
 }
@@ -123,2 +131,10 @@ CBarPrefs2::CBarPrefs2( Config& _config, QWidget* parent,  const char* name, WFl
     connect(fullscreen, SIGNAL(stateChanged(int)), this, SLOT( isChanged(int) ) );
+    rotate = new QCheckBox( tr("Rotate"), bg );
+    rotate->setChecked(config.readBoolEntry( "Rotate", false ));
+    connect(rotate, SIGNAL(stateChanged(int)), this, SLOT( isChanged(int) ) );
+
+    invert = new QCheckBox( tr("Invert"), bg );
+    invert->setChecked(config.readBoolEntry( "Invert Action", false ));
+    connect(invert, SIGNAL(stateChanged(int)), this, SLOT( isChanged(int) ) );
+
     zoom = new QCheckBox( tr("Zoom"), bg );
@@ -179,2 +195,4 @@ void CBarPrefs2::saveall()
     config.writeEntry( "Fullscreen", fullscreen->isChecked());
+    config.writeEntry( "Rotate", rotate->isChecked());
+    config.writeEntry( "Invert Action", invert->isChecked());
     config.writeEntry( "Zoom In/Out", zoom->isChecked());
@@ -317,2 +335,10 @@ CViewBarPrefs::CViewBarPrefs( Config& _config, QWidget* parent,  const char* nam
     connect(fullscreen, SIGNAL(stateChanged(int)), this, SLOT( isChanged(int) ) );
+    rotate = new QCheckBox( tr("Rotate"), bg );
+    rotate->setChecked(config.readBoolEntry( "Rotate", false ));
+    connect(rotate, SIGNAL(stateChanged(int)), this, SLOT( isChanged(int) ) );
+
+    invert = new QCheckBox( tr("Invert"), bg );
+    invert->setChecked(config.readBoolEntry( "Invert Action", false ));
+    connect(invert, SIGNAL(stateChanged(int)), this, SLOT( isChanged(int) ) );
+
     zoomin = new QCheckBox( tr("Zoom In"), bg );
@@ -340,2 +366,4 @@ void CViewBarPrefs::saveall()
     config.writeEntry( "Fullscreen", fullscreen->isChecked());
+    config.writeEntry( "Rotate", rotate->isChecked());
+    config.writeEntry( "Invert Action", invert->isChecked());
     config.writeEntry( "Zoom In", zoomin->isChecked());
@@ -414,3 +442,3 @@ CMiscBarPrefs::CMiscBarPrefs( QWidget* parent,  const char* name, WFlags fl )
 
-    QGridLayout* hl = new QGridLayout(this,1,2);
+    QGridLayout* hl = new QGridLayout(this,2,2);
 
@@ -421,7 +449,2 @@ CMiscBarPrefs::CMiscBarPrefs( QWidget* parent,  const char* name, WFlags fl )
     floating->setText(tr("Floating"));
-
-//    QLabel* TextLabel = new QLabel( gb );
-//    TextLabel->setText( tr( "Select Button" ) );
-
-
     hl->addWidget( gb, 0, 0 );
@@ -441,2 +464,3 @@ CMiscBarPrefs::CMiscBarPrefs( QWidget* parent,  const char* name, WFlags fl )
     tbpolicy->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
+#ifdef USEQPE
     tbpolicy->insertItem(tr("Single bar"));
@@ -444,2 +468,6 @@ CMiscBarPrefs::CMiscBarPrefs( QWidget* parent,  const char* name, WFlags fl )
     tbpolicy->insertItem(tr("Multiple bars"));
+#else
+    tbpolicy->insertItem(tr("Single bar"));
+    tbpolicy->insertItem(tr("Multiple bars"));
+#endif
 
@@ -457,3 +485,2 @@ CMiscBarPrefs::CMiscBarPrefs( QWidget* parent,  const char* name, WFlags fl )
     tbmovable = new QCheckBox( tr("Movable"), gb );
-//  ch->setChecked(config.readBoolEntry( "Movable", false ));
 
@@ -461,2 +488,31 @@ CMiscBarPrefs::CMiscBarPrefs( QWidget* parent,  const char* name, WFlags fl )
 
+    gb = new QGroupBox(1, Qt::Horizontal, "QT Scroll Bar", this);
+
+#ifdef USECOMBO
+    qtscroll = new QComboBox(gb);
+#else
+    qtscroll = new MenuButton(gb);
+#endif
+    qtscroll->insertItem(tr("None"));
+    qtscroll->insertItem(tr("Right"));
+    qtscroll->insertItem(tr("Left"));
+
+    hl->addWidget(gb, 1, 0);
+    gb = new QGroupBox(1, Qt::Horizontal, "Miniscroll", this);
+
+#ifdef USECOMBO
+    localscroll = new QComboBox(gb);
+#else
+    localscroll = new MenuButton(gb);
+#endif
+    localscroll->insertItem(tr("None"));
+    localscroll->insertItem(tr("Bottom"));
+    localscroll->insertItem(tr("Right"));
+    localscroll->insertItem(tr("Left"));
+
+    //scrollonleft = new QCheckBox( tr("... on Left"), gb );
+    //  ch->setChecked(config.readBoolEntry( "Movable", false ));
+
+    hl->addWidget(gb, 1, 1);
+
 }