2 files changed, 15 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 2922afd..24ae63c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,23 +1,24 @@
         2005-??-??Opie 1.2.2
         
         
         New Features
         ------------
         * Appearance: Added configuration options to set smallIconSize, bigIconSize, useBigPixmaps (hrw)
 
         Fixed Bugs
         ----------
         * #1695 - Date selector use too small fontsize on VGA screen (hrw)
         * #1686 - opie-console lack UI setting for switching scrollbar (hrw)
+        * #1647 - Opie-console doesn't respect scroll-bar on left side (hrw)
         * #1624 - Button settngs changes are applied only after restart (hrw)
         * #1492 - Backup and Restore does not show list of backups to restore on start (hrw)
         * n.a.  - remove hardcoded font size from wellenreiter (hrw)
         * n.a.  - added patch to build QT/E 2.3.10 with gc 4.x.x (hrw)
 
         2005-09-11Opie 1.2.1
         
         
         New Features
         ------------
         * OpieStumbler: Scans WiFi networks using the wireless extension scanning (skyhusker)
         * Opie-Reader: Support for document formats ArriereGo and Reb, add flite output (tim,pohly)
diff --git a/noncore/apps/opie-console/TEWidget.cpp b/noncore/apps/opie-console/TEWidget.cpp
index 1199e4f..117f6dd 100644
--- a/noncore/apps/opie-console/TEWidget.cpp
+++ b/noncore/apps/opie-console/TEWidget.cpp
@@ -311,34 +311,39 @@ TEWidget::TEWidget(QWidget *parent, const char *name) : QFrame(parent,name)
 
   hscrollbar = new QScrollBar( Qt::Horizontal, this );
   hscrollbar->setCursor( arrowCursor );
   connect(hscrollbar, SIGNAL(valueChanged(int)), this, SLOT(hscrollChanged(int)));
 
   m_cornerButton = new QPushButton( this );
   m_cornerButton->setPixmap( QPixmap( (const char**)menu_xpm ) );
   m_cornerButton->setMaximumSize( 14, 14 );
   m_cornerButton->hide();
 
   Config cfg("Konsole");
   cfg.setGroup("ScrollBar");
-  switch( cfg.readNumEntry("Position",2)){
-  case 0:
-      scrollLoc = SCRNONE;
-      break;
-  case 1:
-      scrollLoc = SCRLEFT;
-      break;
-  case 2:
+  
+  scrollLoc = cfg.readNumEntry("Position", -1);
+
+  // bugfix for #1647
+  // if user set 'show scrollbar on left' then let it be on left
+  // but only if it is not set in opie-console itself
+  if(scrollLoc == -1)
+  {
+      Config qpecfg ("qpe");
+      qpecfg.setGroup("Appearance");
+      scrollLoc = qpecfg.readNumEntry("LeftHand", SCRRIGHT);
+      if(scrollLoc == 0)    // user set LeftHand in past and switched it off later
+      {
       scrollLoc = SCRRIGHT;
-      break;
+      }
   };
 
   blinkT   = new QTimer(this);
   connect(blinkT, SIGNAL(timeout()), this, SLOT(blinkEvent()));
   // blinking = FALSE;
   blinking = TRUE;
 
   resizing = FALSE;
   actSel   = 0;
   image    = 0;
   lines    = 1;
   columns  = 1;