summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2005-10-18 14:04:01 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-10-18 14:04:01 +0000
commitfd8300f5611cd8c925204c4392ac9ef8c3562166 (patch)
tree52263c6c5aaf479afd52a04c062a6a7c6fee0584
parent32e7cd7bb8fc3b2d14abdc8b19beb84df45a015b (diff)
opie-console 1.2.1: CVS backported patch for OPIE bug #1647
- Opie-console doesn't respect scroll-bar on left side.
-rw-r--r--packages/opie-console/opie-console-1.2.1/1647-bugfix.patch40
-rw-r--r--packages/opie-console/opie-console_1.2.1.bb5
2 files changed, 43 insertions, 2 deletions
diff --git a/packages/opie-console/opie-console-1.2.1/1647-bugfix.patch b/packages/opie-console/opie-console-1.2.1/1647-bugfix.patch
new file mode 100644
index 0000000000..c4603333cf
--- /dev/null
+++ b/packages/opie-console/opie-console-1.2.1/1647-bugfix.patch
@@ -0,0 +1,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);
diff --git a/packages/opie-console/opie-console_1.2.1.bb b/packages/opie-console/opie-console_1.2.1.bb
index 10399d9d4d..b9ba9e0e43 100644
--- a/packages/opie-console/opie-console_1.2.1.bb
+++ b/packages/opie-console/opie-console_1.2.1.bb
@@ -1,8 +1,9 @@
include ${PN}.inc
-PR = "r1"
+PR = "r2"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
- file://1686-bugfix.patch;patch=1"
+ file://1686-bugfix.patch;patch=1 \
+ file://1647-bugfix.patch;patch=1"