5 files changed, 55 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 07be30b..b817062 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,339 +1,340 @@
         2005-??-??Opie 1.2.2
         
         
         New Features
         ------------
 
 
         Fixed Bugs
         ----------
         * #1695 - Date selector use too small fontsize on VGA screen (hrw)
+        * #1686 - opie-console lack UI setting for switching scrollbar (hrw)
         * n.a.  - remove hardcoded font size from wellenreiter (hrw)
         * n.a.  - added patch to build QT/E 2.3.10 with gc 4.x.x (hrw)
 
         2005-09-11Opie 1.2.1
         
         
         New Features
         ------------
         * OpieStumbler: Scans WiFi networks using the wireless extension scanning (skyhusker)
         * Opie-Reader: Support for document formats ArriereGo and Reb, add flite output (tim,pohly)
         * Opie-Networksettings: Add support for wlan-ng devices and improve WEP handling (Dirk Opfer)
         * Wellenreiter: Remove Joining networks - use OpieStumbler for that (mickeyl)
         * Opie-Mobilemsg has gone unsupported - it never really worked and there will be a replacement (mickeyl)
         * Opie-Tabmanager has gone unsupported - it barely works and there is not much of a use of it anyway (mickeyl)
         * Checkbook: Added configuration option to use smaller font for checkbook transaction tab (hrw)
         * ZSafe: Made UI conform to Opie standards (drw)
         * Today Addressbook plugin: Fixed configuration to show/not show birthdays, use checkboxes for selection (hrw)
         * Opie-Console: Read initial fixed font configuration from qpe.conf (mickeyl)
         * Opie-PcmciaApplet: Configure insert/resume actions and bind unsupported cards (mickeyl)
         * SysInfo: Remove CPU tab and add Devices tab instead (mickeyl)
         * Opie-smb: Added Opie front end for Samba (ljp)
         * Opie-Bluetooth: Replace obex send implementation and patch libopieobex and the bluetoothapplet (Michael Haynie)
         * Opieplayer: rudimentary podcast support (ljp)
         
         Fixed Bugs
         ----------
         * #1377 - Suspend Powermanagement when switched to another VT (mickeyl)
                 - We actually suspend the complete Opie now in that case.
         * #1384 - Battery status updated improperly when charging (skyhusker)
         * #1476 - Wrong order of application entries in the O-menu (skyhusker)
         * #1514 - Remove usage of cardmon/pcmcia picture in applications. pcmcia is now an inline picture (mickeyl)
                 * #1535- Missing line break and unnecessary location shown with Today-Calendar plugin (deller)
         * #1543 - Time Settings: "predict" tab is displayed twice after reopen (hrw)
         * #1546 - Battery applet popup is not always large enough to show jacket remaining info (skyhusker)
         * #1557 - Light&Power-Settings don't store warning intervall and warning levels (skyhusker)
         * #1565 - crash-fix in odevice.cpp while scanning the distribution table (deller)
         * #1614 - Make Opie-console start in $HOME instead of / (skyhusker)
         * #1635 - opie-today, datebook-plugin does not show notes (skyhusker)
         * #1665 - Opie-IRC displays the host prepended to the message when peer is using and ipv6 address (skyhusker)
                 * #1666 - Opie-IRC does not allow to add !channels in config asautojoin ones (skyhusker)
         * #1667 - Opie-IRC does not show messages from !channel (skyhusker)
         * #1679 - Security PIN plugin is QVGA sized (hrw)
         * #1682 - Properly resize tab control in OTabWidget (drw)
         * n.a.  - always show volume and wireless applet popups inside visible screen (deller)
         * n.a.  - scale O-Menu-Applets appropriately (mickeyl)
         * n.a.  - libopienet: fix bugs in wireless scanning and setting SSID (skyhusker)
         * n.a.  - Wellenreiter: relax WE version matching test a bit (mickeyl)
         * n.a.  - scale BluezApplet appropriately and use larger icons (mickeyl)
         * n.a.  - memoryapplet: fix crash in memoryapplet on kernels without swap support (seneca cunningham)
         * n.a.  - networksettings: ignore hostap control interfaces wifi* (mickeyl)
         * n.a.  - Today Addressbook plugin fix configuration to show/not show birthdays, use checkboxes for selection (hrw)
         * n.a.  - remove hardcoded font size from netsystemtime (hrw)
         * n.a.  - remove hardcoded font size from checkbook graphs (hrw)
         * n.a.  - Dagger - fixes for Sword 1.5.8, morph tag x-refs, closing last tab crash (drw)
         
 
         Internal
         --------
         * Make BluezApplet use OTaskbarApplet (mickeyl)
         * libopiecore: rewrite OFileNotification to use the Linux 2.6 inotify interface (mickeyl)
         * libopiecore: add ODirNotification - recursive directory notifications (mickeyl)
         * libopienet: Skip hostap control interfaces 'wifi' and improve robustness in ONetworkInterface (mickeyl)
         * libopieui: Remove OVersatileView and OVersatileViewItem (mickeyl)
         * libopienet: Miscellaneous API cleanups (mickeyl)
         * libopiecore: Add linux pcmcia system abstraction classes (mickeyl)
         * libopiecore: ODevice now knows the default gfx driver to use (mteira,mickeyl)
         * libopiecore: Add support for the Sharp SL-C3100 "Borzoi" (mickeyl)
         * libopiecore: Add support for the new Linux Inputsystem Switches type [necessary for auto rotation in 2.6.13] (mickeyl)
         * Remove assumptions about default gfx driver ("Transformed") all over the place (mteira,mickeyl)
         * Fix / Optimize number of scanned directories (ljp)
         * Use five point mouse calibration to make calibrated mouse drivers work on newer Zaurii (rp,mickeyl)
 
         2005-03-25Opie 1.2.0
 
         Fixed Bugs
         ----------
         * #1613 - AdvancedFM - scale toolbar icons appropriately (drw)
         * #1620 - OFileSelector - show the button on press and not on press on hold (alwin)
         * #1473 - Opie-Eye - Same as #1620 but we lack a common FileSystem Button class (zecke)
         * n.a.  - PackageManager - fix bug where messages show up multiple times in install dialog (drw)
                 * n.a.- make qpeglobal.h include qglobal.h (zecke)
 
         2005-03-20Opie 1.2.0-rc1
 
 
         New Features
         ------------
         * Launcher: Support a static background pixmap (mickeyl)
         * LauncherSettings: Choose whether to have a static background pixmap (mickeyl)
         * PackageManager supports the 'lists_dir' ipkg configuration option (drw)
         * Added hi-res inline images for large resolution devices (drw)
         * Improved launcher icons for consistency (ar)
         * Datebook: Added plugin system to datebook so holidays and birthdays from contacts may displayed in datebook (alwin)
 
         Fixed Bugs
         ----------
         * #1236 - VCards contained empty home and work address entries causing Palms to crash (eilers)
         * #1412 - Launcher Settings - fixed default settings for background in Edit tab dialog (drw)
         * #1472 - Opie textedit now check for unsaved changes on ESC key (ljp)
         * #1474 - Implement GUI for Scrollbars on the Left in Appearance (zecke)
         * #1482 - Fix double '/' in paths (zecke)
         * #1536 - Autosave of custom locations in opie backup (ar)
         * #1539 - Fixed displaying too long path in the delete dialog in opie-eye (zecke)
         * #1540 - Implemented deletion of DocLnks in opie-eye (zecke)
         * #1542 - Fixed Todo crash when priority < 1 or > 5 (drw)
         * #1550 - Browse for alarm sound start in QPEDIR/sounds/ (zecke)
         * #1554 - Fixed Opie-Console name in .desktop file (mickeyl)
         * #1556 - Start to look for sound files in /opt/QtPalmtop/sounds (zecke)
         * #1558 - Fixed opie-login breaking opie startup (mickeyl)
         * #1560 - Fixed Opie-Console picking up the wrong shell (bluelightning)
         * #1570 - Confirmation needed befor Restore a backup and overwrite local data (ar)
         * #1591 - Addressbook sortorder changed by clicking on column 0 (eilers)
         * #1599 - Security - change recommendation for opie-multiauth to opie-securityplugin (gints)
         * #1604 - Checkbook crashed on startup (drw)
         * #1608 - Addressbook crashed after search, which may caused by not initialzed member variable (eilers)
         * #1608 - QueryByExampe-Datediff on SQL database did not worked properly (eilers)
         * n.a.  - Netsystemtime - fixed UI to prevent error dialog from displaying when it shouldn't, get rid of some compiler warnings (drw)
         * n.a.  - PackageManager - fixed where last package in status file was not shown as installed when it should be (drw)
         * n.a.  - PackageManager - fixed bug where lists_dir was not being honored at startup (drw)
         * n.a.  - PackageManager - provided default value for lists_dir when none is entered in configuration dialog (drw)
         * n.a.  - OTabWidget - fixed scroll buttons, fix display position of tabs (drw)
         * n.a.  - AddressBook - fixed sorting by 'File As' name (drw)
         * n.a.  - AddressBook - fixed category handling for 'All' and 'Unfiled' (eilers)
         * n.a.  - AddressBook - fixed letter picker record selection and sort records afterwards (drw)
 
         Internal
         --------
         * Worked around bug in Qt/Embedded 2.3.10: qt_version() returns 231 (mickeyl)
         * Killed the need for weak symbols in QtE (zecke)
         * Added optional building libqpe without inline images (mickeyl)
         * OColorButton - fixed so does not emit a colorSelected signal inside of resizeEvent (drw)
 
         2005-02-03Opie 1.1.9
 
         New Features
         ------------
         * Number of icon columns in Launcher is customizable through Launcher.conf (hrw,zecke,mickeyl)
         * Number of icon columns in Launcher is customizable through LauncherSettings (mickeyl)
         * Usability enhancements in OpieIRC (skyhusker)
 
         Fixed Bugs
         ----------
         * #1501 - Fixed bug in todo sql backend (eilers)
         * #1505 - Added more Swap sizes in memoryapplet (mickeyl)
         * #1525 - Hopefully fixed double alarms and not removing alarms set with the Clock application (zecke)
         * #1533 - Security Owner Dialog (shown in case of unsuccessfull authentiacation) wasn't able to display information in non latin1 encoding (zecke)
         * n.a. - Removed hard coded font sizes in a couple of inputmethods (mickeyl)
         * n.a. - Removed MediumDlg appearing prior to FirstUsage wizard (i.e. calibration) (mickeyl)
         * n.a. - Fixed numerous buglets in OpieIRC (skyhusker)
 
         Internal
         --------
         * Added the Qtopia 1.7 SDK macros for quick-apps to easa compilation of 3rd party apps against our headers (mickeyl)
         * You can now use the Opie build system in combination with a OpenEmbedded staging area which makes a nice cross development environment (mickeyl)
         * Made Opie compilable with Qt/Embedded 2.3.10 (ar)
         * Changed Launcher to get default orientation from ODevice w/ QWS_DISPLAY overriding (mickeyl)
         * Build tree cleanups (mickeyl)
 
         2004-11-26Opie 1.1.8
 
         New Features
         ------------
         * PackageManager supports installation of local ipkg files (drw)
         * PackageManager supports linking of applications to root (drw)
         * PackageManager supports src/gz feeds (drw,wimpie)
         * Added a syslog information tab to sysinfo (mickeyl)
         * Added new, more consistent, PIM icons + a GIMP teplate (ar)
 
         Fixed Bugs
         ----------
         * #1017 - Tetrix doesn't display correctly for high resolution screens (drw)
         * #1269 - VCards were imported into personal area if it was activated (eilers)
         * #1464 - Packagemanager dont set active filter after install a package (drw)
         * #1479 - Improved VCard-Parser to import VCards created by Evolution 2 and Apple Addressbook (eilers)
         * #1493 - Fixed one column layout bug of the launcher (hrw)
         * n.a. - PackageManager - (Minor UI tweak) in filter dialog, when option is enabled, set focus to widget that corresponds to that option (drw)
         * n.a. - PackageManager - (Minor UI tweak) fix double entry in source feed configuration when adding a new feed (drw)
         * n.a. - Battery Applet - fix sizing of battery info popup (drw,mickeyl)
 
         Internal
         --------
         * Moved libopie1 to unsupported (mickeyl)
         * Implemented generic queryByExample() with incremental searching. A lot of internal changes of the Pim2-library (eilers)
         * Added fast and full featured and incremental sorted() for SQL addressbook backend (eilers)
 
         2004-11-14Opie 1.1.7
 
         New Features
         ------------
         * libOpieDB now uses SQLite V3 instead V2. Remember to upgrade your database files! (eilers)
         * Backup now uses the busy indicator when backing up and restore (ar)
         * OpiePlayer2 gained adding of Directories to the playlist (zecke)
         * OpiePlayer2 better error handling (zecke)
         * OpiePlayer2 progress indication while streaming (zecke)
         * OpiePlayer2 ported to use libxine 1.0.0-rc6a (brad,zecke)
         * Ported brightnessapplet from Qtopia 1.7 (mickeyl)
         * Opie-Eye got a Digital Camera File Backend (alwin,zecke)
         * Support for Tuxpad1 of Tradesquare.NL (mickeyl,zecke)
         * Opie-Console use Custom Font and Size in a Profile (harlekin)
         * Opie-Console transparently log the Output and Input to a file (harlekin)
         * Added new O-menu icon to lock the PDA immediately: opie-lockapplet (clem)
         * Opie-Security now hides the plugin-based authentication tabs if no auth. plugin package is installed (clem)
         * Opie-Security gained a 'test authentication' button (clem)
         * Opie-Eye  got a more unique layout (menubar), a slideshow, user can setup some defaults
         * Opie-Mail improve the handling of POP mail boxes (alwin)
         * Both Opie-Eye and Opie-Mail were greatly improved due the hard work of Rajko Albrecht(alwin)
         * Opie IRC - backports of the 'NeIRC fork' (zecke)
 
         Fixed Bugs
         ----------
         * #501  - Pickboard is able to show 'Umlaute' (TT,zecke)
         * #608  - Make Opie usable for left handed users (zecke)
         * #957  - Import of VCards/VTodos/VEvents with BASE64 encoding (ljp,zecke)
         * #1245 - Opie-Go 'paused' (zecke)
         * #1358 - DocTab didn't show any MimeTypes (was fixed earlier) (zecke)
         * #1380 - QDateBookAccess::remove() doesn't remove entries (eilers, zecke)
         * #1395 - Build VNC Backend with gcc3.4
         * #1440 - The icon of opie-mobilemsg is missing (CoreDump)
         * #1426 - Add missing opie-bartender Icon (CoreDump)
         * #1445 - Opie-Sheet Has No Icon (CoreDump)
         * #1448 - Brightness Applet added (mickeyl)
         * #1450 - ZSame didn't clear the bonus item after winning a game (zecke)
         * #1482 - Fix OFileSelector to be able to sort by size (zecke)
         * n.a.  - Opie-mail: fixed some crasher, some layout-problems
         * n.a.  - Converted applications to not hardcode /opt/QtPalmtop but to use QPEApplication::qpeDir (zecke)
         * n.a.  - Converted usage of qpeDir() not to include a '/' as first charachter of the string (zecke)
         * n.a.  - Build system: Enable distcc and ccache when crosscompiling too, and use them everywhere we can (clem)
         * n.a.  - Build system: Fix deps in several config.in (and fix scripts/deps.pl too) to stop breaking builds, especially with make -j highNumber (clem)
         * n.a.  - Removed hardcoded icon size in a couple of applets (mickeyl)
 
         Internal
         --------
         * Opie-Qashmoney has been moved to unsupported (mickeyl)
         * Opie-Ubrowser has been moved to unsupported (mickeyl)
 
         2004-09-17Opie 1.1.6
 
         New Features
         ------------
         * Fifteen gained configurable number of items (zecke)
         * Fifteen can have custom background images (zecke)
         * Added daemonizing capabilities to QWS Server [via Qt/Embedded] (mickeyl)
         * Integrated the new security framework into libopie2 (zecke,clem)
         * Converted the launcher to use the new security framework (zecke)
         * Backup can now handle custom locations for backup and restore (ar)
         * Implemented right-on-hold feedback (wimpie,zecke)
         * Lots of new features in opie-reader (tim,pohly)
         * Build system cleanups (schurig)
 
         Fixed Bugs
         --------
         * #1005 - Fixed backup to CompactFlash (ar)
         * #1167 - Fixed Opie write crashing on more text than one page (ar)
         * #1225 - Fixed repeated light flashing on Zaurus with keyz (mickeyl)
         * #1359 - Fixed bookmarks in Gutenbrowser (ljp)
         * #1361 - Fixed auto upercase in Opie-Addressbook (eilers)
         * #1370 - Pimconverter now reacts on cancel key (eilers)
         * #1376 - Bring back the capslock/numlock display (zecke)
         * #1383 - Language settings now warns about losing open apps (Markus Litz)
         * #1393 - Fixed line wrap issues in opie-console for the default profile (mickeyl)
         * #1394 - Fixed oversized headline in opie-login (coredump)
         * #1396 - Opie-console captures the escape key and vim is working (zecke)
         * #1401 - Scrollbar is now only visible if necessary in DocTab (mickeyl)
 
         2004-07-06Opie 1.1.4
 
         New Features
         ------------
         * Added four themes courtesy Robert Griebl (http://www.softforge.de/zstyle)
         * Added Conversion tool for pim-data (eilers)
         * Introduced new OPimAccessFactory and OBackendFactory which simplyfies database access (eilers)
         * Modified the PIM API for providing generic use of OPimRecords (eilers)
         * Clicking on the application symbol now iterates over the application's top level widgets if already raised (zecke)
 
         Fixed Bugs
         --------
         * #1068 - Country Drop Down Box Off Screen
         * #1291 - Opie tinykate does not open .desktop files (ar)
         * #1291 - Opie sheet not saving correctly (ar)
         * #1294 - Opie does not know about British Summer Time
         * #1314 - Drawpad initialization (mickeyl)
         * #1317 - Packagemanager crashes on hold-down or install (chicken)
         * #1321 - Batteryapplet graphic glitch (harlekin)
         * #1324 - ZSafe not starting up (mickeyl)
         * #1328 - Personal Home Address fields is trimmed to 1char (eilers)
         * #1327 - Opie-mail ipk does not depend on libopiedb2 (chicken)
         * #1345 - Networksettingsplugin wlan plugin dependency on libpcap0 (mickeyl)
         * #1348 - Datebook dependency on libopiedb2 (chicken)
         * #1328 - Switched SQLDatabase and VCards char encoding from latin1 to unicode (eilers)
 
         2004-04-25Opie 1.1.3
 
         * Introduced first implementation of SQL-Support using SQLite (eilers)
         * Added a new Gutenberg Project reader app - opie-gutenbrowser (ljp)
         * Added a real system graffiti character set (brad)
         * Added Generic Keyconfig Widget (zecke)
         * Improved Screenshotapplet and Drawpad integration. You can now open a screenshot in drawpad and take notes (zecke)
         * Added new Bible reader app - opie-dagger (drw)
         * Added a new Image Viewer. Work is ongoing (zecke,alwin)
         * Added namespace usage in libopie2 and everywhere (zecke,alwin)
         * Enabled the possibility to pass command line arguments to applications (mickeyl)
         * Added an about applet showing some credits and information about Opie (mickeyl)
         * Added benchmarking functionality to sysinfo (mickeyl)
         * Added applet and configuration application for switching hardware keyboard layouts (alwin)
         * Ported applications from libopie1 to libopie2* (drw,ar,alwin)
         * Imported fullscreen and font improvements from the Qkonsole fork to embeddedkonsole (waspe)
         * Clean-up of package information in control files (drw)
         * Repaired mediummount which was broken since integrating the quicklauncher (alwin)
         * Improved big-screen support (zecke,ar)
         * Improved multikeyboard support, added keyboard layout switching applet (mouse)
         * Added a new mail client based on libetpan (harlekin,alwin,jgf)
         * Added new package manager - opie-packagemanager (drw)
         * Improved light-n-power for C7x0 (mickeyl)
         * Added automatic rotation support for C7x0 (treke)
         * Split libopie1 up into a set of smaller - functionally grouped - libraries (mickeyl)
         * Added scanning the wireless network neighbourhood to networksettings (mickeyl)
 
         2003-11-29Opie 1.0.3
 
         * Released as Version 1.0.3
         * Improved i18n (various contributors)
         * Reduced application startup time by integrating the TT quicklauncher (zecke,harlekin)
         * Made the Documents Tab optional (mickeyl)
         * Integrated basic support for HP iPAQ 54xx and the Jornada 5xx (chicken)
 
         2003-08-04Opie 1.0.0
 
         * Released as Version 1.0.0
         * Including a PPP module for easy dial up (tille,harlekin,zecke)
diff --git a/noncore/apps/opie-console/emulation_handler.cpp b/noncore/apps/opie-console/emulation_handler.cpp
index 2087f57..d5a435e 100644
--- a/noncore/apps/opie-console/emulation_handler.cpp
+++ b/noncore/apps/opie-console/emulation_handler.cpp
@@ -1,252 +1,255 @@
 #include "TEmuVt102.h"
 #include "profile.h"
 #include "emulation_handler.h"
 #include "script.h"
 #include "logger.h"
 
 /* OPIE */
 #include <qpe/config.h>
 
 /* QT */
 #include <qfile.h>
 #include <qtextstream.h>
 
 EmulationHandler::EmulationHandler( const Profile& prof, QWidget* parent,const char* name )
     : QObject(0, name )
 {
     m_teWid = new TEWidget( parent, "TerminalMain");
         // use setWrapAt(0) for classic behaviour (wrap at screen width, no scrollbar)
         // use setWrapAt(80) for normal console with scrollbar
         setWrap(prof.readNumEntry("Wrap", 80) ? 0 : 80);
     m_teWid->setMinimumSize(150, 70 );
     m_script = 0;
     m_log = 0;
     parent->resize( m_teWid->calcSize(80, 24 ) );
     m_teEmu = new TEmuVt102(m_teWid );
 
     connect(m_teEmu,SIGNAL(ImageSizeChanged(int,int) ),
             this, SIGNAL(changeSize(int,int) ) );
     connect(m_teEmu, SIGNAL(sndBlock(const char*,int) ),
             this, SLOT(recvEmulation(const char*,int) ) );
     m_teEmu->setConnect( true );
     m_teEmu->setHistory( TRUE );
     load( prof );
 
 
 
 }
 TEmulation* EmulationHandler::emulation() {
     return m_teEmu;
 }
 EmulationHandler::~EmulationHandler() {
     if (isRecording())
         clearScript();
     delete m_teEmu;
     delete m_teWid;
     delete m_log;
 }
 
 void EmulationHandler::load( const Profile& prof) {
 
     // try to read the fontconfig from the profile
     QString aFont = prof.readEntry( "Font" );
     int aFontSize = prof.readNumEntry( "FontSize" );
     // use defaults from qpe.conf if no profile yet
     if ( ( aFontSize == -1 ) || ( aFont == QString::null ) )
     {
         Config c( "qpe" );
         c.setGroup( "Appearance" );
         aFont = c.readEntry( "FixedFontFamily", "Fixed" );
         aFontSize = c.readNumEntry( "FixedFontSize", 7 );
     }
     QFont font( aFont, aFontSize );
     font.setFixedPitch( TRUE );
     m_teWid->setVTFont( font );
 
     int num = prof.readNumEntry("Color", 0);
     setColor( foreColor(num), backColor(num) );
     m_teWid->setBackgroundColor(backColor(num) );
 
     int term = prof.readNumEntry("Terminal",  0) ;
     switch(term) {
     default:
     case Profile::VT102:
     case Profile::VT100:
         m_teEmu->setKeytrans("vt100.keytab");
         break;
     case Profile::Linux:
         m_teEmu->setKeytrans("linux.keytab");
         break;
     case Profile::XTerm:
         m_teEmu->setKeytrans("default.Keytab");
         break;
     }
 }
 void EmulationHandler::recv( const QByteArray& ar) {
     m_teEmu->onRcvBlock(ar.data(), ar.count() );
              if ( isLogging() ) {
                 m_log->append( ar );
         }
 }
 
 void EmulationHandler::recvEmulation(const char* src, int len ) {
     QByteArray ar(len);
 
     memcpy(ar.data(), src, sizeof(char) * len );
     if (isRecording())
         m_script->append(ar);
     emit send(ar);
 }
 
 
 QWidget* EmulationHandler::widget() {
     return m_teWid;
 }
 /*
  * allocate a new table of colors
  */
 void EmulationHandler::setColor( const QColor& fore, const QColor& back ) {
     ColorEntry table[TABLE_COLORS];
     const ColorEntry *defaultCt = m_teWid->getdefaultColorTable();
 
     for (int i = 0; i < TABLE_COLORS; i++ ) {
         if ( i == 0 || i == 10 ) {
             table[i].color = fore;
         }else if ( i == 1 || i == 11 ) {
             table[i].color = back;
             table[i].transparent = 0;
         }else {
             table[i].color = defaultCt[i].color;
         }
     }
     m_teWid->setColorTable(table );
     m_teWid->update();
 }
 QFont EmulationHandler::font( int id ) {
     QString name;
     int size = 0;
     switch(id ) {
     default: // fall through
     case 0:
         name = QString::fromLatin1("Micro");
         size = 4;
         break;
     case 1:
         name = QString::fromLatin1("Fixed");
         size = 7;
         break;
     case 2:
         name = QString::fromLatin1("Fixed");
         size = 12;
         break;
     }
     QFont font(name, size, QFont::Normal );
     font.setFixedPitch(TRUE );
     return font;
 }
 QColor EmulationHandler::foreColor(int col) {
     QColor co;
     /* we need to switch it */
     switch( col ) {
     default:
     case Profile::White:
         /* color is black */
         co = Qt::white;
         break;
     case Profile::Black:
         co = Qt::black;
         break;
     case Profile::Green:
         co = Qt::green;
         break;
     case Profile::Orange:
         co.setRgb( 231, 184, 98 );
         break;
     }
 
     return co;
 }
 QColor EmulationHandler::backColor(int col ) {
   QColor co;
     /* we need to switch it */
     switch( col ) {
     default:
     case Profile::White:
         /* color is white */
         co = Qt::black;
         break;
     case Profile::Black:
         co = Qt::white;
         break;
     case Profile::Green:
         co = Qt::black;
         break;
     case Profile::Orange:
         co = Qt::black;
         break;
     }
 
     return co;
 }
 
 QPushButton*  EmulationHandler::cornerButton() {
     return m_teWid->cornerButton();
 }
 
 
 Script *EmulationHandler::script() {
     return m_script;
 }
 
 bool EmulationHandler::isRecording() {
     return (m_script != 0);
 }
 
 bool EmulationHandler::isLogging() {
         return (m_log != 0);
 }
 
 void EmulationHandler::startRecording() {
     if (!isRecording())
         m_script = new Script();
 }
 
 void EmulationHandler::startLogging(const QString fileName) {
         m_logFileName = fileName;
         if (!isLogging())
                 m_log = new Logger(m_logFileName);
 }
 
 QString EmulationHandler::logFileName() {
         return m_logFileName;
 }
 
 void EmulationHandler::clearScript() {
     if (isRecording()) {
         delete m_script;
         m_script = 0;
     }
 }
 
 void EmulationHandler::clearLog() {
         if (isLogging()) {
                 delete m_log;
                 m_log = 0;
         }
 }
 
 void EmulationHandler::runScript(const Script *script) {
     emit send(script->script());
 }
 
 void EmulationHandler::copy() {
     m_teWid->emitSelection();
 }
 void EmulationHandler::paste() {
     m_teWid->pasteClipboard();
 }
 
 void EmulationHandler::setWrap(int columns) {
   m_teWid->setWrapAt(columns);
 }
 
+void EmulationHandler::setScrollbarLocation(int index) {
+  m_teWid->setScrollbarLocation(index);
+}
diff --git a/noncore/apps/opie-console/emulation_handler.h b/noncore/apps/opie-console/emulation_handler.h
index 1092c82..dabdb15 100644
--- a/noncore/apps/opie-console/emulation_handler.h
+++ b/noncore/apps/opie-console/emulation_handler.h
@@ -1,111 +1,112 @@
 #ifndef OPIE_EMULATION_HANDLER_H
 #define OPIE_EMULATION_HANDLER_H
 
 #include <qobject.h>
 #include <qcolor.h>
 #include <qcstring.h>
 
 /*
  * Badly ibotty lacks the time to finish
  * his widget in time..
  * Never the less we've to have an EmulationWidget
  * This is why I'm taking the inferior not cleaned
  * up TE* KDE STUFF
  */
 
 /**
  * This is the layer above the IOLayer*
  * This nice QObject here will get stuff from
  * got a slot and a signal
  * the signal for data
  * the slot for receiving
  * it'll set up the widget internally
  * and manage the communication between
  * the pre QByteArray world!
  */
 class Profile;
 class QWidget;
 class QPushButton;
 class TEWidget;
 class QFile;
 class TEmulation;
 class QFont;
 class QTextStream;
 class Script;
 class Logger;
 
 class EmulationHandler : public QObject {
     Q_OBJECT
 public:
     /**
      * simple c'tor the parent of the TEWdiget
      * and a name
      * and a Profile
      */
     EmulationHandler( const Profile&, QWidget* parent, const char* name = 0l );
 
     /**
      * delete all components
      */
     ~EmulationHandler();
 
     void load( const Profile& );
     QWidget* widget();
     TEmulation *emulation();
     void setColor( const QColor& fore, const QColor& back );
     QPushButton* cornerButton();
 
     /* Scripts */
     /* Create a new script and record all typed characters */
     void startRecording();
 
         void startLogging(const QString);
 
     /* Return whether we are currently recording a script */
     bool isRecording();
 
         /* Return whether we are currently recording a log */
         bool isLogging();
         
         QString logFileName();
 
     /* Return the current script (or NULL) */
     Script *script();
 
     /* Stop recording and remove the current script from memory */
     void clearScript();
     
     /* Stop logging and remove the current log from memory */
     void clearLog();
 
     /* Run a script by forwarding its keys to the EmulationLayer */
     void runScript(const Script *);
 
         /* Propagate change to widget */
         void setWrap(int columns);
+        void setScrollbarLocation(int index);
 signals:
     void send( const QByteArray& );
     void changeSize(int rows, int cols );
 
 
 public slots:
     void recv( const QByteArray& );
     void paste();
     void copy();
 
 private slots:
     void recvEmulation( const char*,  int len );
 private:
     QFont font( int );
     QColor foreColor(int );
     QColor backColor(int );
 
 private:
     TEWidget* m_teWid;
     TEmulation* m_teEmu;
     Script * m_script;
     Logger *m_log;
     QString m_logFileName;
 };
 
 #endif
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index 45a662c..18c0434 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -1,793 +1,834 @@
 #include "TEmulation.h"
 #include "profileeditordialog.h"
 #include "configdialog.h"
 #include "default.h"
 #include "profilemanager.h"
 #include "mainwindow.h"
 #include "tabwidget.h"
 #include "transferdialog.h"
 #include "function_keyboard.h"
 #include "emulation_handler.h"
 #include "script.h"
 #include "fixit.h"
 
 /* OPIE */
 #include <opie2/ofiledialog.h>
 #include <opie2/oresource.h>
 #include <qpe/filemanager.h>
 using namespace Opie::Ui;
 
 /* QT */
 #include <qaction.h>
 #include <qmenubar.h>
 #include <qtoolbar.h>
 #include <qmessagebox.h>
 #include <qwhatsthis.h>
 #include <qfileinfo.h>
 
 /* STD */
 #include <assert.h>
 
 #include <opie2/oconfig.h>
 
 MainWindow::MainWindow(QWidget *parent, const char *name, WFlags) : QMainWindow(parent, name, WStyle_ContextHelp)  {
 
 #ifdef FSCKED_DISTRI
    FixIt fix;
    fix.fixIt();
 #endif
 
     setCaption(QObject::tr("Opie Console") );
     KeyTrans::loadAll();
     for (int i = 0; i < KeyTrans::count(); i++ ) {
         KeyTrans* s = KeyTrans::find(i );
         assert( s );
     }
     m_factory = new MetaFactory();
     Default def(m_factory);
     m_sessions.setAutoDelete( TRUE );
     m_curSession = 0;
     m_manager = new ProfileManager( m_factory );
     m_manager->load();
     m_scriptsData.setAutoDelete(TRUE);
 
     initUI();
     populateProfiles();
     populateScripts();
 }
 
 void MainWindow::initUI() {
 
     setToolBarsMovable( FALSE  );
 
     /* tool bar for the menu */
     m_tool = new QToolBar( this );
     m_tool->setHorizontalStretchable( TRUE );
 
     m_bar = new QMenuBar( m_tool );
     m_console = new QPopupMenu( this );
     m_scripts = new QPopupMenu( this );
     m_sessionsPop= new QPopupMenu( this );
     m_scriptsPop = new QPopupMenu( this );
+    m_scrollbar = new QPopupMenu( this );
 
     /* add a toolbar for icons */
     m_icons = new QToolBar(this);
 
     /*
      * the settings action
      */
     m_setProfiles = new QAction(tr("Configure Profiles"),
                                 Opie::Core::OResource::loadPixmap( "SettingsIcon", Opie::Core::OResource::SmallIcon ),
                                 QString::null, 0, this, 0);
     m_setProfiles->addTo( m_console );
     connect( m_setProfiles, SIGNAL(activated() ),
              this, SLOT(slotConfigure() ) );
 
     m_console->insertSeparator();
     /*
      * new Action for new sessions
      */
     QAction* newCon = new QAction(tr("New Profile"),
                                   Opie::Core::OResource::loadPixmap( "new", Opie::Core::OResource::SmallIcon ),
                                   QString::null, 0, this, 0);
     newCon->addTo( m_console );
     connect( newCon, SIGNAL(activated() ),
             this, SLOT(slotNew() ) );
 
     m_console->insertSeparator();
 
     QAction *saveCon = new QAction( tr("Save Profile" ),
                                     Opie::Core::OResource::loadPixmap( "save", Opie::Core::OResource::SmallIcon ), QString::null,
                                     0, this, 0 );
     saveCon->addTo( m_console );
     connect( saveCon, SIGNAL(activated() ),
             this, SLOT(slotSaveSession() ) );
     m_console->insertSeparator();
 
     /*
      * connect action
      */
     m_connect = new QAction( tr("Connect"), Opie::Core::OResource::loadPixmap("console/connected",
                              Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 );
     m_connect->addTo( m_console );
     connect(m_connect, SIGNAL(activated() ),
             this, SLOT(slotConnect() ) );
 
     /*
      * disconnect action
      */
     m_disconnect = new QAction( tr("Disconnect"), Opie::Core::OResource::loadPixmap("console/notconnected",
                                 Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 );
     m_disconnect->addTo( m_console );
     connect(m_disconnect, SIGNAL(activated() ),
             this, SLOT(slotDisconnect() ) );
 
     m_console->insertSeparator();
 
 #ifndef EAST
     m_quickLaunch = new QAction( tr("QuickLaunch"),
                                  Opie::Core::OResource::loadPixmap("console/konsole_mini", Opie::Core::OResource::SmallIcon ),
                                  QString::null,  0,  this, 0 );
     m_quickLaunch->addTo( m_icons );
     connect( m_quickLaunch,  SIGNAL( activated() ),
              this,  SLOT( slotQuickLaunch() ) );
 #endif
 
     QWhatsThis::add( m_icons, tr( "The shell button launches the \"default\" profile. If there is none default values are taken" ) );
 
     m_transfer = new QAction( tr("Transfer file..."), Opie::Core::OResource::loadPixmap("pass", Opie::Core::OResource::SmallIcon ),
                               QString::null, 0, this, 0  );
     m_transfer->addTo( m_console );
     connect(m_transfer, SIGNAL(activated() ),
             this, SLOT(slotTransfer() ) );
 
 
 
     /*
      * immediate change of line wrap policy
      */
     m_isWrapped = true;
     m_wrap = new QAction( tr("Line wrap"), Opie::Core::OResource::loadPixmap( "linewrap", Opie::Core::OResource::SmallIcon ),
                           QString::null, 0, this, 0, true );
     m_wrap->addTo( m_console );
     m_wrap->setOn( true );
     connect( m_wrap, SIGNAL( activated() ), SLOT( slotWrap() ) );
 
     /*
      * fullscreen
      */
     m_isFullscreen = false;
 
     m_fullscreen = new QAction( tr("Full screen"), Opie::Core::OResource::loadPixmap( "fullscreen",
                                 Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 );
     m_fullscreen->addTo( m_console );
     connect( m_fullscreen, SIGNAL( activated() ),
              this,  SLOT( slotFullscreen() ) );
 
+        /*
+         * scrollbar
+         */
+    sm_none = m_scrollbar->insertItem(tr( "None" ));
+    sm_left = m_scrollbar->insertItem(tr( "Left" ));
+    sm_right = m_scrollbar->insertItem(tr( "Right" ));
+
+    m_console->insertItem(tr("Scrollbar"), m_scrollbar, -1, 0);
+    connect( m_scrollbar, SIGNAL(activated(int)),
+                         this, SLOT(slotScrollbarSelected(int)));
+
     m_console->insertSeparator();
 
         m_recordLog = new QAction();
         m_recordLog->setText( tr("Start log") );
         m_recordLog->addTo( m_console );
         connect(m_recordLog, SIGNAL(activated() ), 
                         this, SLOT( slotSaveLog() ) );
          m_recordingLog = false;
 
     QAction *a = new QAction();
     a->setText( tr("Save history") );
     a->addTo( m_console );
     connect(a, SIGNAL(activated() ),
             this, SLOT(slotSaveHistory() ) );
     /*
      * terminate action
      */
     m_terminate = new QAction();
     m_terminate->setText( tr("Terminate") );
     m_terminate->addTo( m_console );
     connect(m_terminate, SIGNAL(activated() ),
             this, SLOT(slotTerminate() ) );
 
     m_closewindow = new QAction();
     m_closewindow->setText( tr("Close Window") );
     m_closewindow->addTo( m_console );
     connect( m_closewindow, SIGNAL(activated() ),
             this, SLOT(slotClose() ) );
 
 
     /*
      * script actions
      */
     m_runScript_id = m_scripts->insertItem(tr("Run Script"), m_scriptsPop, -1, 0);
     connect(m_scriptsPop, SIGNAL(activated(int)), this, SLOT(slotRunScript(int)));
 
     m_recordScript = new QAction(tr("Record Script"), QString::null, 0, this, 0);
     m_recordScript->addTo(m_scripts);
     connect(m_recordScript, SIGNAL(activated()), this, SLOT(slotRecordScript()));
 
     m_saveScript = new QAction(tr("Save Script"), QString::null, 0, this, 0);
     m_saveScript->addTo(m_scripts);
     connect(m_saveScript, SIGNAL(activated()), this, SLOT(slotSaveScript()));
    
          
         
         
     /*
      * action that open/closes the keyboard
      */
     m_openKeys = new QAction (tr("Open Keyboard..."),
                               Opie::Core::OResource::loadPixmap( "console/keys/keyboard_icon", Opie::Core::OResource::SmallIcon ),
                              QString::null, 0, this, 0);
     m_openKeys->setToggleAction(true);
     connect (m_openKeys, SIGNAL(toggled(bool)), this, SLOT(slotOpenKeb(bool)));
 
     /* insert the submenu */
     m_console->insertItem(tr("New from Profile"), m_sessionsPop,
                           -1, 0);
 
     /* insert the connection menu */
     m_bar->insertItem( tr("Connection"), m_console );
 
     /* the scripts menu */
 #ifdef EAST
     Opie::Core::OConfig cfg("opie-console");
         cfg.setGroup("10east");
            if( !cfg.readEntry("scripthide",0) ) {
             m_bar->insertItem( tr("Scripts"), m_scripts );
     }
 #endif
 
     /* and the keyboard */
     m_keyBar = new QToolBar(this);
     addToolBar( m_keyBar,  "Keyboard", QMainWindow::Top, TRUE );
     m_keyBar->setHorizontalStretchable( TRUE );
     m_keyBar->hide();
 
     m_kb = new FunctionKeyboard(m_keyBar);
     connect(m_kb, SIGNAL(keyPressed(FKey,ushort,ushort,bool)),
             this, SLOT(slotKeyReceived(FKey,ushort,ushort,bool)));
 
 
     a = new QAction(tr("Copy"),
                     Opie::Core::OResource::loadPixmap("copy", Opie::Core::OResource::SmallIcon ), QString::null,
                     0, this, 0 );
     //a->addTo( m_icons );
     connect( a, SIGNAL(activated() ),
              this, SLOT(slotCopy() ) );
 
     QAction *paste = new QAction(tr("Paste"),
                                  Opie::Core::OResource::loadPixmap("paste", Opie::Core::OResource::SmallIcon ), QString::null,
                     0, this, 0 );
     connect( paste, SIGNAL(activated() ),
              this, SLOT(slotPaste() ) );
 
 
     newCon->addTo( m_icons );
     //m_setProfiles->addTo( m_icons );
     paste->addTo( m_icons );
     m_openKeys->addTo(m_icons);
     m_fullscreen->addTo( m_icons );
 
     m_connect->setEnabled( false );
     m_disconnect->setEnabled( false );
     m_terminate->setEnabled( false );
     m_transfer->setEnabled( false );
     m_scripts->setItemEnabled(m_runScript_id, false);
     m_recordScript->setEnabled( false );
     m_saveScript->setEnabled( false );
     m_fullscreen->setEnabled( false );
     m_closewindow->setEnabled( false );
     m_wrap->setEnabled( false );
 
     /*
      * connect to the menu activation
      */
     connect( m_sessionsPop, SIGNAL(activated(int) ),
              this, SLOT(slotProfile(int) ) );
 
     m_consoleWindow = new TabWidget( this, "blah");
     connect(m_consoleWindow, SIGNAL(activated(Session*) ),
             this, SLOT(slotSessionChanged(Session*) ) );
     setCentralWidget( m_consoleWindow );
 
     slotQuickLaunch();
 }
 
 ProfileManager* MainWindow::manager() {
     return m_manager;
 }
 TabWidget* MainWindow::tabWidget() {
     return m_consoleWindow;
 }
 void MainWindow::populateProfiles() {
     m_sessionsPop->clear();
     Profile::ValueList list = manager()->all();
     for (Profile::ValueList::Iterator it = list.begin(); it != list.end(); ++it ) {
         m_sessionsPop->insertItem( (*it).name() );
     }
 
 }
 
 void MainWindow::populateScripts() {
     m_scriptsPop->clear();
     m_scriptsData.clear();
     DocLnkSet files(QPEApplication::documentDir(), "text/plain");
     QListIterator<DocLnk> dit(files.children());
     for (; dit.current(); ++dit) {
         if (*dit && (*dit)->name().length()>0) {
             QFileInfo info((*dit)->file());
             if (info.extension(false) == "script") {
                 m_scriptsData.append(new DocLnk(**dit));
                 m_scriptsPop->insertItem((*dit)->name());
             }
         }
     }
 
 }
 
 MainWindow::~MainWindow() {
     delete m_factory;
     manager()->save();
 #ifdef FSCKED_DISTRI
     FixIt fix;
     fix.breakIt();
 #endif
 }
 
 MetaFactory* MainWindow::factory() {
     return m_factory;
 }
 
 Session* MainWindow::currentSession() {
     return m_curSession;
 }
 
 QList<Session> MainWindow::sessions() {
     return m_sessions;
 }
 
 void MainWindow::slotNew() {
     ProfileEditorDialog dlg(factory() );
     dlg.setCaption( tr("New Connection") );
     int ret = QPEApplication::execDialog( &dlg );
 
     if ( ret == QDialog::Accepted ) {
         create( dlg.profile() );
     }
 }
 
 void MainWindow::slotRecordScript() {
     if (currentSession()) {
         currentSession()->emulationHandler()->startRecording();
         m_saveScript->setEnabled(true);
         m_recordScript->setEnabled(false);
     }
 }
 
 void MainWindow::slotSaveScript() {
     if (currentSession() && currentSession()->emulationHandler()->isRecording()) {
         QMap<QString, QStringList> map;
         QStringList text;
         text << "text/plain";
         map.insert(tr("Script"), text );
         QString filename = OFileDialog::getSaveFileName(2, QPEApplication::documentDir(), QString::null, map);
         if (!filename.isEmpty()) {
             QFileInfo info(filename);
             if (info.extension(FALSE) != "script")
                 filename += ".script";
             DocLnk nf;
             nf.setType("text/plain");
             nf.setFile(filename);
             nf.setName(info.fileName());
             FileManager fm;
             fm.saveFile(nf, currentSession()->emulationHandler()->script()->script());
             currentSession()->emulationHandler()->clearScript();
             m_saveScript->setEnabled(false);
             m_recordScript->setEnabled(true);
             populateScripts();
         }
     }
 }
 
 void MainWindow::slotRunScript(int id) {
     if (currentSession()) {
         int index = m_scriptsPop->indexOf(id);
         DocLnk *lnk = m_scriptsData.at(index);
         QString filePath = lnk->file();
         Script script(filePath);
         currentSession()->emulationHandler()->runScript(&script);
     }
 }
 
 void MainWindow::slotConnect() {
     if ( currentSession() ) {
         bool ret = currentSession()->layer()->open();
         if(!ret) QMessageBox::warning(currentSession()->widgetStack(),
                                       QObject::tr("Failed"),
                                       QObject::tr("Connecting failed for this session."));
         else {
             m_connect->setEnabled( false );
             m_disconnect->setEnabled( true );
 
             // if it does not support file transfer, disable the menu entry
             if ( ( m_curSession->layer() )->supports()[1] == 0 ) {
                 m_transfer->setEnabled( false );
             } else {
                 m_transfer->setEnabled( true );
             }
 
             m_recordScript->setEnabled( true );
             m_scripts->setItemEnabled(m_runScript_id, true);
         }
     }
 }
 
 void MainWindow::slotDisconnect() {
     if ( currentSession() ) {
         currentSession()->layer()->close();
         m_connect->setEnabled( true );
         m_disconnect->setEnabled( false );
         m_transfer->setEnabled( false );
         m_recordScript->setEnabled( false);
         m_saveScript->setEnabled( false );
         m_scripts->setItemEnabled(m_runScript_id, false);
     }
 }
 
 void MainWindow::slotTerminate() {
     if ( currentSession() )
         currentSession()->layer()->close();
 
     slotClose();
     /* FIXME move to the next session */
 }
 
 
 
 void MainWindow::slotQuickLaunch()  {
 
     Profile prof = manager()->profile(  "default" );
     if ( prof.name() == "default"  )  {
         create( prof );
     } else {
     #ifndef EAST
         Profile newProf =  Profile( "default",  "console", "default" ,  0, 3,  0 );
         newProf.setAutoConnect( true );
         create( newProf );
         slotSaveSession();
     #endif
     }
 }
 
 void MainWindow::slotConfigure() {
     ConfigDialog conf( manager()->all(), factory() );
 
     int ret = QPEApplication::execDialog( &conf );
 
     if ( QDialog::Accepted == ret ) {
         manager()->setProfiles( conf.list() );
         manager()->save();
         populateProfiles();
     }
 }
 /*
  * we will remove
  * this window from the tabwidget
  * remove it from the list
  * delete it
  * and set the currentSession()
  */
 void MainWindow::slotClose() {
     if (!currentSession() )
         return;
 
     Session* ses = currentSession();
     /* set to NULL to be safe, if its needed slotSessionChanged resets it automatically */
     m_curSession = NULL;
     tabWidget()->remove( /*currentSession()*/ses );
     /*it's autodelete */
     m_sessions.remove( ses );
 
     if (!currentSession() ) {
         m_connect->setEnabled( false );
         m_disconnect->setEnabled( false );
         m_terminate->setEnabled( false );
         m_transfer->setEnabled( false );
         m_recordScript->setEnabled( false );
         m_saveScript->setEnabled( false );
         m_scripts->setItemEnabled(m_runScript_id, false);
         m_fullscreen->setEnabled( false );
         m_wrap->setEnabled( false );
         m_closewindow->setEnabled( false );
     }
 
     m_kb->loadDefaults();
 }
 
 /*
  * We will get the name
  * Then the profile
  * and then we will make a profile
  */
 void MainWindow::slotProfile( int id) {
     Profile prof = manager()->profile( m_sessionsPop->text( id)  );
     create( prof );
 }
 
 
 
 void MainWindow::create( const Profile& prof ) {
     char *homeDir = getenv("HOME");
 
     if ( homeDir )
         ::chdir( homeDir );
     
     if(m_curSession)
         if(m_curSession->transferDialog()) m_curSession->transferDialog()->hide();
 
     Session *ses = manager()->fromProfile( prof, tabWidget() );
 
     if((!ses) || (!ses->layer()) || (!ses->widgetStack()))
     {
         QMessageBox::warning(this,
             QObject::tr("Session failed"),
             QObject::tr("<qt>Cannot open session: Not all components were found.</qt>"));
         //if(ses) delete ses;
         return;
     }
 
     m_sessions.append( ses );
     tabWidget()->add( ses );
     tabWidget()->repaint();
     m_curSession = ses;
 
     // dicide if its a local term ( then no connction and no tranfer), maybe make a wrapper method out of it
     m_connect->setEnabled( true );
     m_disconnect->setEnabled( false );
     m_terminate->setEnabled( true );
     m_fullscreen->setEnabled( true );
     m_wrap->setEnabled( true );
     m_closewindow->setEnabled( true );
     m_transfer->setEnabled( false );
     m_recordScript->setEnabled( false );
     m_saveScript->setEnabled( false );
     m_scripts->setItemEnabled(m_runScript_id, false);
 
     // is io_layer wants direct connection, then autoconnect
     //if ( ( m_curSession->layer() )->supports()[0] == 1 ) {
     if (prof.autoConnect()) {
         slotConnect();
     }
 
     QWidget *w = currentSession()->widget();
     if(w) w->setFocus();
 
     if(currentSession()->profile().readNumEntry("Wrap", 80)){
         m_isWrapped = true;
     } else {
         m_isWrapped = false;
     }
 
     m_kb->load(currentSession()->profile());
 }
 
 void MainWindow::slotTransfer()
 {
     if ( currentSession() ) {
     Session *mysession = currentSession();
     TransferDialog dlg(/*mysession->widgetStack()*/this, this);
     mysession->setTransferDialog(&dlg);
     //dlg.reparent(mysession->widgetStack(), QPoint(0, 0));
     //dlg.showMaximized();
     currentSession()->widgetStack()->addWidget(&dlg, -1);
     dlg.show();
     //dlg.exec();
     while(dlg.isRunning()) qApp->processEvents();
     mysession->setTransferDialog(0l);
     }
 }
 
 
 void MainWindow::slotOpenKeb(bool state) {
 
     if (state) m_keyBar->show();
     else m_keyBar->hide();
 
 }
 
 
 void MainWindow::slotOpenButtons( bool state ) {
 
     if ( state ) {
         m_buttonBar->show();
     } else {
         m_buttonBar->hide();
     }
 }
 
 
 
 void MainWindow::slotSessionChanged( Session* ses ) {
     if(m_curSession)
         if(m_curSession->transferDialog()) m_curSession->transferDialog()->hide();
     if(ses)
         if(ses->transferDialog()) ses->transferDialog()->show();
 
     if ( ses ) {
         m_curSession = ses;
         if ( m_curSession->layer()->isConnected() ) {
             m_connect->setEnabled( false );
             m_disconnect->setEnabled( true );
             m_recordScript->setEnabled(!m_curSession->emulationHandler()->isRecording());
             m_saveScript->setEnabled(m_curSession->emulationHandler()->isRecording());
             m_scripts->setItemEnabled(m_runScript_id, true);
         } else {
             m_connect->setEnabled( true );
             m_disconnect->setEnabled( false );
             m_recordScript->setEnabled( false );
             m_saveScript->setEnabled( false );
             m_scripts->setItemEnabled(m_runScript_id, false);
         }
 
                 if ( ( currentSession()->emulationHandler()->isLogging() ) ) {
                          m_recordLog->setText( tr("Stop log") );
                 } else {
                          m_recordLog->setText( tr("Start log") );
                 }
 
         if ( ( m_curSession->layer() )->supports()[1] == 0 ) {
             m_transfer->setEnabled( false );
         } else {
             m_transfer->setEnabled( true );
         }
 
         QWidget *w = m_curSession->widget();
         if(w) w->setFocus();
 
         if(currentSession()->profile().readNumEntry("Wrap", 80)){
             m_isWrapped = true;
         } else {
             m_isWrapped = false;
         }
 
         m_kb->load(currentSession()->profile());
     }
 }
 
 void MainWindow::slotWrap()
 {
     if(m_curSession)
     {
         EmulationHandler *e = m_curSession->emulationHandler();
         if(e)
         {
             e->setWrap( m_isWrapped ? 80:0 );
             m_isWrapped = !m_isWrapped;
         }
     }
 }
 
 void MainWindow::slotFullscreen() {
 
 
 
     if ( m_isFullscreen ) {
         ( m_curSession->widgetStack() )->reparent(  savedParentFullscreen, 0, QPoint(0,0), true );
         ( m_curSession->widgetStack() )->resize( savedParentFullscreen->width(), savedParentFullscreen->height() );
         ( m_curSession->emulationHandler() )->cornerButton()->hide();
         disconnect( ( m_curSession->emulationHandler() )->cornerButton(), SIGNAL( pressed() ), this, SLOT( slotFullscreen() ) );
 
     } else {
         savedParentFullscreen = ( m_curSession->widgetStack() )->parentWidget();
         ( m_curSession->widgetStack() )->setFrameStyle( QFrame::NoFrame );
         ( m_curSession->widgetStack() )->reparent( 0, WStyle_Tool | WStyle_Customize | WStyle_StaysOnTop
                                                    , QPoint(0,0), false );
         ( m_curSession->widgetStack() )->resize( qApp->desktop()->width(), qApp->desktop()->height() );
         ( m_curSession->widgetStack() )->setFocus();
         ( m_curSession->widgetStack() )->show();
 
         ( ( m_curSession->emulationHandler() )->cornerButton() )->show();
 
         connect( ( m_curSession->emulationHandler() )->cornerButton(), SIGNAL( pressed() ), this, SLOT( slotFullscreen() ) );
     }
 
     m_isFullscreen = !m_isFullscreen;
 }
 
+void MainWindow::slotScrollbarSelected(int index)
+{
+        int loc;
+
+    Config cfg( "Konsole" );
+    cfg.setGroup("ScrollBar");
+    if(index == sm_none)
+    {
+                loc = 0;
+    }
+    else if(index == sm_left)
+    {
+                loc = 1;
+    }
+    else if(index == sm_right)
+    {
+                loc = 2;
+    }
+        
+        cfg.writeEntry("Position", loc);
+
+    if (currentSession()) {
+        currentSession()->emulationHandler()->setScrollbarLocation(loc);
+    }
+
+    m_scrollbar->setItemChecked(sm_none, index == sm_none);
+    m_scrollbar->setItemChecked(sm_left, index == sm_left);
+    m_scrollbar->setItemChecked(sm_right, index == sm_right);
+}
 
 void MainWindow::slotKeyReceived(FKey k, ushort, ushort, bool pressed) {
 
     if ( m_curSession ) {
 
         QEvent::Type state;
 
         if (pressed) state = QEvent::KeyPress;
         else state = QEvent::KeyRelease;
 
         QKeyEvent ke(state, k.qcode, k.unicode, 0, QString(QChar(k.unicode)));
 
         // is this the best way to do this? cant figure out any other way to work
         QApplication::sendEvent((QObject *)m_curSession->widget(), &ke);
         ke.ignore();
     }
 }
 void MainWindow::slotCopy() {
     if (!currentSession() ) return;
     currentSession()->emulationHandler()->copy();
 }
 void MainWindow::slotPaste() {
     if (!currentSession() ) return;
     currentSession()->emulationHandler()->paste();
 }
 
 /*
  * Save the session
  */
 
 void MainWindow::slotSaveSession() {
     if (!currentSession() ) {
       QMessageBox::information(this, tr("Save Connection"),
                                           tr("<qt>There is no Connection.</qt>"), 1 );
       return;
     }
     manager()->add( currentSession()->profile() );
     manager()->save();
     populateProfiles();
 }
 
 
 
 void MainWindow::slotSaveLog() {
 
     if( currentSession()->emulationHandler()->isLogging() ) {
       DocLnk nf;
       QString m_logName = currentSession()->emulationHandler()->logFileName();
       QFileInfo info(m_logName);
       nf.setType("text/plain");
       nf.setFile(m_logName);
       nf.setName(info.fileName());
       nf.writeLink();
       m_recordLog->setText( tr("Start log") );
       m_recordingLog = false;
           currentSession()->emulationHandler()->clearLog(); 
     } else {
     QMap<QString, QStringList> map;
     QStringList text;
     text << "text/plain";
     map.insert(tr("Log"), text );
     Opie::Core::OConfig cfg("opie-console");
     cfg.setGroup("defaults");
     QString startDir = cfg.readEntry("defaultlogdir", QPEApplication::documentDir() );
     QString m_logName = OFileDialog::getSaveFileName(2, startDir, QString::null, map, 0, startDir);
     if (m_logName.isEmpty() ) return;
 
     m_recordLog->setText( tr("Stop log") ); 
     m_recordingLog = true;
     currentSession()->emulationHandler()->startLogging(m_logName); 
     }
 }
 
 void MainWindow::slotSaveHistory() {
     QMap<QString, QStringList> map;
     QStringList text;
     text << "text/plain";
     map.insert(tr("History"), text );
     QString filename = OFileDialog::getSaveFileName(2, QPEApplication::documentDir(), QString::null, map);
     if (filename.isEmpty() ) return;
 
     QFileInfo info(filename);
 
     DocLnk nf;
     nf.setType("text/plain");
     nf.setFile(filename);
     nf.setName(info.fileName());
 
 
     QFile file(filename);
     file.open(IO_WriteOnly );
     QTextStream str(&file );
     if ( currentSession() )
         currentSession()->emulationHandler()->emulation()->streamHistory(&str);
 
     file.close();
     nf.writeLink();
 }
diff --git a/noncore/apps/opie-console/mainwindow.h b/noncore/apps/opie-console/mainwindow.h
index f3c8b81..abdf6ee 100644
--- a/noncore/apps/opie-console/mainwindow.h
+++ b/noncore/apps/opie-console/mainwindow.h
@@ -1,143 +1,152 @@
 #ifndef OPIE_MAIN_WINDOW_H
 #define OPIE_MAIN_WINDOW_H
 
 #include <qmainwindow.h>
 #include <qlist.h>
 #include <qfile.h>
 
 #include "session.h"
 
 /**
  * this is the MainWindow of the new opie console
  * it's also the dispatcher between the different
  * actions supported by the gui
  */
 class QToolBar;
 class QToolButton;
 class QMenuBar;
 class QAction;
 class MetaFactory;
 class TabWidget;
 class ProfileManager;
 class Profile;
 class FunctionKeyboard;
 class FKey;
 class DocLnk;
 
+
 class MainWindow : public QMainWindow {
     Q_OBJECT
 public:
     MainWindow( QWidget *parent = 0, const char *name = 0, WFlags fl = 0 );
     ~MainWindow();
     static QString appName() {return QString::fromLatin1("opie-console"); }
 
     /**
      * our factory to generate IOLayer and so on
      *
      */
     MetaFactory* factory();
 
     /**
      * A session contains a QWidget*,
      * an IOLayer* and some infos for us
      */
     Session* currentSession();
 
     /**
      * the session list
      */
     QList<Session> sessions();
 
     /**
      *
      */
     ProfileManager* manager();
     TabWidget* tabWidget();
 
 private slots:
     void slotNew();
     void slotConnect();
     void slotDisconnect();
     void slotTerminate();
     void slotConfigure();
     void slotClose();
     void slotProfile(int);
     void slotTransfer();
     void slotOpenKeb(bool);
     void slotOpenButtons(bool);
     void slotRecordScript();
     void slotSaveScript();
     void slotRunScript(int);
     void slotFullscreen();
     void slotQuickLaunch();
     void slotWrap();
     void slotSessionChanged( Session* );
     void slotKeyReceived(FKey, ushort, ushort, bool);
     void slotSaveHistory();
     void slotSaveLog();
+    void slotScrollbarSelected(int);
 
     /* what could these both slot do? */
     void slotCopy();
     void slotPaste();
 
     /* save the currentSession() to Profiles */
     void slotSaveSession();
 
 private:
     void initUI();
     void populateProfiles();
     void populateScripts();
     void create( const Profile& );
     /**
      * the current session
      */
     Session* m_curSession;
 
     /**
      * the session list
      */
     QList<Session> m_sessions;
     QList<DocLnk>  m_scriptsData;
 
     /**
      * the metafactory
      */
     MetaFactory* m_factory;
     ProfileManager* m_manager;
 
+        /*
+         * scrollbar
+         */
+
+    int sm_none, sm_left, sm_right;
+        
     TabWidget* m_consoleWindow;
     QToolBar* m_tool;
     QToolBar* m_icons;
     QToolBar* m_keyBar;
     QToolBar* m_buttonBar;
     QMenuBar* m_bar;
     QPopupMenu* m_console;
     QPopupMenu* m_sessionsPop;
     QPopupMenu* m_scriptsPop;
     QPopupMenu* m_scripts;
+    QPopupMenu* m_scrollbar;
     QAction* m_connect;
     QAction* m_disconnect;
     QAction* m_quickLaunch;
     QAction* m_terminate;
     QAction* m_transfer;
     QAction* m_setProfiles;
     QAction* m_openKeys;
     QAction* m_openButtons;
     QAction* m_recordScript;
     QAction* m_saveScript;
     QAction* m_fullscreen;
     QAction* m_wrap;
     QAction* m_closewindow;
         QAction* m_recordLog;
 
     FunctionKeyboard *m_kb;
     int m_runScript_id;
     bool m_isFullscreen;
     bool m_isWrapped;
     bool m_recordingLog;
 
     QWidget* savedParentFullscreen;
 };
 
 
 #endif