2 files changed, 3 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index b5d27c3..7228691 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,40 +1,43 @@
         2004-??-??The Opie Team <opie@handhelds.org>
 
         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)
 
         Fixed Bugs
         --------
         * #1225 - Fixed repeated light flashing on Zaurus with keyz (mickeyl)
         * #1361 - Fixed auto upercase in Opie-Addressbook (eilers) 
         * #1370 - Pimconverter now reacts on cancel key (eilers)
+        * #1401 - Scrollbar is now only visible if necessary in DocTab (mickeyl)
 
         2004-07-06The Opie Team <opie@handhelds.org>
 
         * Tagged as Version 1.1.4 (devel)
 
         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)
diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp
index e86f389..0d0f2cb 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -637,50 +637,48 @@ LauncherView::~LauncherView()
         (*bgCache)[bgName]->ref--;
 }
 
 void LauncherView::hideIcons()
 {
     icons->hide();
 }
 
 void LauncherView::setToolsEnabled(bool y)
 {
     if ( !y != !tools ) {
         if ( y ) {
             tools = new QHBox(this);
 
             // Type filter
             typemb = new QComboBox(tools);
             QSizePolicy p = typemb->sizePolicy();
             p.setHorData(QSizePolicy::Expanding);
             typemb->setSizePolicy(p);
 
             // Category filter
             updateTools();
             tools->show();
 
-            // Always show vscrollbar
-            icons->setVScrollBarMode( QScrollView::AlwaysOn );
         } else {
             delete tools;
             tools = 0;
         }
     }
 }
 
 void LauncherView::updateTools()
 {
     disconnect( typemb, SIGNAL(activated(int)),
                 this, SLOT(showType(int)) );
     if ( catmb ) disconnect( catmb, SIGNAL(signalSelected(int)),
                 this, SLOT(showCategory(int)) );
 
     // ### I want to remove this
     icons->updateCategoriesAndMimeTypes();
 
     QString prev;
 
     // Type filter
     QStringList types;
     typelist = icons->mimeTypes();
     for (QStringList::ConstIterator it = typelist.begin(); it!=typelist.end(); ++it) {
         QString t = *it;