summaryrefslogtreecommitdiff
path: root/noncore
Side-by-side diff
Diffstat (limited to 'noncore') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/TEWidget.cpp25
1 files changed, 15 insertions, 10 deletions
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
@@ -317,22 +317,27 @@ TEWidget::TEWidget(QWidget *parent, const char *name) : QFrame(parent,name)
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 = SCRRIGHT;
- break;
+
+ 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;
+ }
};
blinkT = new QTimer(this);
connect(blinkT, SIGNAL(timeout()), this, SLOT(blinkEvent()));
// blinking = FALSE;
blinking = TRUE;