fixed bug #1647 - Opie-console doesn't respect scroll-bar on left side

2 files changed, 15 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 2922afd..24ae63c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,75 +1,76 @@
 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-11	Opie 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)
 	* Opie-Networksettings: Add support for wlan-ng devices and improve WEP handling (Dirk Opfer)
 	* Wellenreiter: Remove Joining networks - use OpieStumbler for that (mickeyl)
 	* Opie-Mobilemsg has gone unsupported - it never really worked and there will be a replacement (mickeyl)
 	* Opie-Tabmanager has gone unsupported - it barely works and there is not much of a use of it anyway (mickeyl)
 	* Checkbook: Added configuration option to use smaller font for checkbook transaction tab (hrw)
 	* ZSafe: Made UI conform to Opie standards (drw)
 	* Today Addressbook plugin: Fixed configuration to show/not show birthdays, use checkboxes for selection (hrw)
 	* Opie-Console: Read initial fixed font configuration from qpe.conf (mickeyl)
 	* Opie-PcmciaApplet: Configure insert/resume actions and bind unsupported cards (mickeyl)
 	* SysInfo: Remove CPU tab and add Devices tab instead (mickeyl)
 	* Opie-smb: Added Opie front end for Samba (ljp)
 	* Opie-Bluetooth: Replace obex send implementation and patch libopieobex and the bluetoothapplet (Michael Haynie)
 	* Opieplayer: rudimentary podcast support (ljp)
 	
 	Fixed Bugs
 	----------
 	* #1377 - Suspend Powermanagement when switched to another VT (mickeyl)
 	        - We actually suspend the complete Opie now in that case.
 	* #1384 - Battery status updated improperly when charging (skyhusker)
 	* #1476 - Wrong order of application entries in the O-menu (skyhusker)
 	* #1514 - Remove usage of cardmon/pcmcia picture in applications. pcmcia is now an inline picture (mickeyl)
 	* #1535	- Missing line break and unnecessary location shown with Today-Calendar plugin (deller)
 	* #1543 - Time Settings: "predict" tab is displayed twice after reopen (hrw)
 	* #1546 - Battery applet popup is not always large enough to show jacket remaining info (skyhusker)
 	* #1557 - Light&Power-Settings don't store warning intervall and warning levels (skyhusker)
 	* #1565 - crash-fix in odevice.cpp while scanning the distribution table (deller)
 	* #1614 - Make Opie-console start in $HOME instead of / (skyhusker)
 	* #1635 - opie-today, datebook-plugin does not show notes (skyhusker)
 	* #1665 - Opie-IRC displays the host prepended to the message when peer is using and ipv6 address (skyhusker)
 	* #1666 - Opie-IRC does not allow to add !channels in config as	autojoin ones (skyhusker)
 	* #1667 - Opie-IRC does not show messages from !channel (skyhusker)
 	* #1679 - Security PIN plugin is QVGA sized (hrw)
 	* #1682 - Properly resize tab control in OTabWidget (drw)
 	* n.a.  - always show volume and wireless applet popups inside visible screen (deller)
 	* n.a.  - scale O-Menu-Applets appropriately (mickeyl)
 	* n.a.  - libopienet: fix bugs in wireless scanning and setting SSID (skyhusker)
 	* n.a.  - Wellenreiter: relax WE version matching test a bit (mickeyl)
 	* n.a.  - scale BluezApplet appropriately and use larger icons (mickeyl)
 	* n.a.  - memoryapplet: fix crash in memoryapplet on kernels without swap support (seneca cunningham)
 	* n.a.  - networksettings: ignore hostap control interfaces wifi* (mickeyl)
 	* n.a.  - Today Addressbook plugin fix configuration to show/not show birthdays, use checkboxes for selection (hrw)
 	* n.a.  - remove hardcoded font size from netsystemtime (hrw)
 	* n.a.  - remove hardcoded font size from checkbook graphs (hrw)
 	* n.a.  - Dagger - fixes for Sword 1.5.8, morph tag x-refs, closing last tab crash (drw)
 	
 
 	Internal
 	--------
 	* Make BluezApplet use OTaskbarApplet (mickeyl)
 	* libopiecore: rewrite OFileNotification to use the Linux 2.6 inotify interface (mickeyl)
 	* libopiecore: add ODirNotification - recursive directory notifications (mickeyl)
 	* libopienet: Skip hostap control interfaces 'wifi' and improve robustness in ONetworkInterface (mickeyl)
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
@@ -259,138 +259,143 @@ void TEWidget::fontChange(const QFont &)
   font_w = fm.maxWidth();
   font_a = fm.ascent();
 //printf("font_h: %d\n",font_h);
 //printf("font_w: %d\n",font_w);
 //printf("font_a: %d\n",font_a);
 //printf("charset: %s\n",QFont::encodingName(font().charSet()).ascii());
 //printf("rawname: %s\n",font().rawName().ascii());
   fontMap =
 #if QT_VERSION < 0x030000
   strcmp(QFont::encodingName(font().charSet()).ascii(),"iso10646")
           ? vt100extended
           :
 #endif
   identicalMap;
   propagateSize();
   update();
 }
 
 void TEWidget::setVTFont(const QFont& f)
 {
   QFrame::setFont(f);
 }
 
 QFont TEWidget::getVTFont() {
   return font();
 }
 
 void TEWidget::setFont(const QFont &)
 {
   // ignore font change request if not coming from konsole itself
 }
 
 /* ------------------------------------------------------------------------- */
 /*                                                                           */
 /*                         Constructor / Destructor                          */
 /*                                                                           */
 /* ----------------------------------------------------------------------- */
 
 
 
 TEWidget::TEWidget(QWidget *parent, const char *name) : QFrame(parent,name)
 {
 #ifndef QT_NO_CLIPBOARD
   cb = QApplication::clipboard();
   QObject::connect( (QObject*)cb, SIGNAL(dataChanged()),
                     this, SLOT(onClearSelection()) );
 #endif
 
 
   scrollbar = new QScrollBar( this );
   scrollbar->setCursor( arrowCursor );
   connect(scrollbar, SIGNAL(valueChanged(int)), this, SLOT(scrollChanged(int)));
 
   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;
   font_w   = 1;
   font_h   = 1;
   font_a   = 1;
   word_selection_mode = FALSE;
   vcolumns = 0;
   hposition = 0;
 
   setMouseMarks(TRUE);
   setVTFont( QFont("fixed") );
   setColorTable(base_color_table); // init color table
 
   qApp->installEventFilter( this ); //FIXME: see below
 //  KCursor::setAutoHideCursor( this, true );
 
   // Init DnD ////////////////////////////////////////////////////////////////
   currentSession = NULL;
 //  setAcceptDrops(true); // attempt
 //  m_drop = new QPopupMenu(this);
 //  m_drop->insertItem( QString("Paste"), 0);
 //  m_drop->insertItem( QString("cd"),    1);
 //  connect(m_drop, SIGNAL(activated(int)), SLOT(drop_menu_activated(int)));
 
   // we need focus so that the auto-hide cursor feature works
   setFocus();
   setFocusPolicy( WheelFocus );
 }
 
 //FIXME: make proper destructor
 // Here's a start (David)
 TEWidget::~TEWidget()
 {
   qApp->removeEventFilter( this );
   if (image) free(image);
 }
 
 /* ------------------------------------------------------------------------- */
 /*                                                                           */
 /*                             Display Operations                            */
 /*                                                                           */
 /* ------------------------------------------------------------------------- */
 
 /*!
     attributed string draw primitive
 */
 
 void TEWidget::drawAttrStr(QPainter &paint, QRect rect,
                            QString& str, ca attr, BOOL pm, BOOL clear)
 {
   if (pm && color_table[attr.b].transparent)
   {
     paint.setBackgroundMode( TransparentMode );
     if (clear) erase(rect);