summaryrefslogtreecommitdiff
path: root/packages/opie-console/opie-console-1.2.1/1647-bugfix.patch
blob: c4603333cfefd67cd24460b10982c4185d50aae3 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
Index: opie-console/TEWidget.cpp
===================================================================
RCS file: /cvs/opie/noncore/apps/opie-console/TEWidget.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -u -r1.13 -r1.14
--- opie-console/TEWidget.cpp	21 Jan 2005 19:56:17 -0000	1.13
+++ opie-console/TEWidget.cpp	18 Oct 2005 13:56:12 -0000	1.14
@@ -320,16 +320,21 @@
 
   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);