summaryrefslogtreecommitdiff
authorhrw <hrw>2005-10-18 13:56:12 (UTC)
committer hrw <hrw>2005-10-18 13:56:12 (UTC)
commit0f25331618ea6cac8a59f2c2298a9e1684748b97 (patch) (unidiff)
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
@@ -4,16 +4,17 @@
4 New Features 4 New Features
5 ------------ 5 ------------
6 * Appearance: Added configuration options to set smallIconSize, bigIconSize, useBigPixmaps (hrw) 6 * Appearance: Added configuration options to set smallIconSize, bigIconSize, useBigPixmaps (hrw)
7 7
8 Fixed Bugs 8 Fixed Bugs
9 ---------- 9 ----------
10 * #1695 - Date selector use too small fontsize on VGA screen (hrw) 10 * #1695 - Date selector use too small fontsize on VGA screen (hrw)
11 * #1686 - opie-console lack UI setting for switching scrollbar (hrw) 11 * #1686 - opie-console lack UI setting for switching scrollbar (hrw)
12 * #1647 - Opie-console doesn't respect scroll-bar on left side (hrw)
12 * #1624 - Button settngs changes are applied only after restart (hrw) 13 * #1624 - Button settngs changes are applied only after restart (hrw)
13 * #1492 - Backup and Restore does not show list of backups to restore on start (hrw) 14 * #1492 - Backup and Restore does not show list of backups to restore on start (hrw)
14 * n.a. - remove hardcoded font size from wellenreiter (hrw) 15 * n.a. - remove hardcoded font size from wellenreiter (hrw)
15 * n.a. - added patch to build QT/E 2.3.10 with gc 4.x.x (hrw) 16 * n.a. - added patch to build QT/E 2.3.10 with gc 4.x.x (hrw)
16 17
17 2005-09-11Opie 1.2.1 18 2005-09-11Opie 1.2.1
18 19
19 20
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
@@ -315,26 +315,31 @@ TEWidget::TEWidget(QWidget *parent, const char *name) : QFrame(parent,name)
315 315
316 m_cornerButton = new QPushButton( this ); 316 m_cornerButton = new QPushButton( this );
317 m_cornerButton->setPixmap( QPixmap( (const char**)menu_xpm ) ); 317 m_cornerButton->setPixmap( QPixmap( (const char**)menu_xpm ) );
318 m_cornerButton->setMaximumSize( 14, 14 ); 318 m_cornerButton->setMaximumSize( 14, 14 );
319 m_cornerButton->hide(); 319 m_cornerButton->hide();
320 320
321 Config cfg("Konsole"); 321 Config cfg("Konsole");
322 cfg.setGroup("ScrollBar"); 322 cfg.setGroup("ScrollBar");
323 switch( cfg.readNumEntry("Position",2)){ 323
324 case 0: 324 scrollLoc = cfg.readNumEntry("Position", -1);
325 scrollLoc = SCRNONE; 325
326 break; 326 // bugfix for #1647
327 case 1: 327 // if user set 'show scrollbar on left' then let it be on left
328 scrollLoc = SCRLEFT; 328 // but only if it is not set in opie-console itself
329 break; 329 if(scrollLoc == -1)
330 case 2: 330 {
331 scrollLoc = SCRRIGHT; 331 Config qpecfg ("qpe");
332 break; 332 qpecfg.setGroup("Appearance");
333 scrollLoc = qpecfg.readNumEntry("LeftHand", SCRRIGHT);
334 if(scrollLoc == 0) // user set LeftHand in past and switched it off later
335 {
336 scrollLoc = SCRRIGHT;
337 }
333 }; 338 };
334 339
335 blinkT = new QTimer(this); 340 blinkT = new QTimer(this);
336 connect(blinkT, SIGNAL(timeout()), this, SLOT(blinkEvent())); 341 connect(blinkT, SIGNAL(timeout()), this, SLOT(blinkEvent()));
337 // blinking = FALSE; 342 // blinking = FALSE;
338 blinking = TRUE; 343 blinking = TRUE;
339 344
340 resizing = FALSE; 345 resizing = FALSE;