summaryrefslogtreecommitdiff
authorhrw <hrw>2005-10-18 13:56:12 (UTC)
committer hrw <hrw>2005-10-18 13:56:12 (UTC)
commit0f25331618ea6cac8a59f2c2298a9e1684748b97 (patch) (side-by-side diff)
treeeb734f970761359b4fd61166936b87550e2e1b2d
parent9f41cd10ef92daa889f86cb43793dc75de18e786 (diff)
downloadopie-0f25331618ea6cac8a59f2c2298a9e1684748b97.zip
opie-0f25331618ea6cac8a59f2c2298a9e1684748b97.tar.gz
opie-0f25331618ea6cac8a59f2c2298a9e1684748b97.tar.bz2
fixed bug #1647 - Opie-console doesn't respect scroll-bar on left side
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ChangeLog1
-rw-r--r--noncore/apps/opie-console/TEWidget.cpp25
2 files changed, 16 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 2922afd..24ae63c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,2 +11,3 @@
* #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)
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
@@ -322,12 +322,17 @@ TEWidget::TEWidget(QWidget *parent, const char *name) : QFrame(parent,name)
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;
+ }
};