fix #1401 and upgrade ChangeLog

2 files changed, 3 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index b5d27c3..7228691 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,85 +1,88 @@
 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-06	The 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)
 	* #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-25	The Opie Team <opie@handhelds.org>
 
 	* Released as Version 1.1.3 (devel)
 	* 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-29	The Opie Team <opie@handhelds.org>
 
 	* 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-04	The Opie Team <opie@handhelds.org>
 
 	* Released as Version 1.0.0
 	* Including a PPP module for easy dial up (tille,harlekin,zecke)
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
@@ -565,194 +565,192 @@ void LauncherIconView::hideOrShowItems(bool resort)
 	sort();
     viewport()->setUpdatesEnabled( TRUE );
 }
 
 bool LauncherIconView::removeLink(const QString& linkfile)
 {
     LauncherItem* item = (LauncherItem*)firstItem();
     AppLnk* l;
     bool did = FALSE;
     DocLnk dl(linkfile);
     while (item) {
 	l = item->appLnk();
 	LauncherItem *nextItem = (LauncherItem *)item->nextItem();
 	if (  l->linkFileKnown() && l->linkFile() == linkfile
 		|| l->fileKnown() && (
 		    l->file() == linkfile
 		    || dl.isValid() && dl.file() == l->file() ) ) {
 	    delete item;
 	    did = TRUE;
 	}
 	item = nextItem;
     }
     QListIterator<AppLnk> it(hidden);
     while ((l=it.current())) {
 	++it;
 	if ( l->linkFileKnown() && l->linkFile() == linkfile
 		|| l->file() == linkfile
 		|| dl.isValid() && dl.file() == l->file() ) {
 	    hidden.removeRef(l);
 	   did = TRUE;
 	}
     }
     return did;
 }
 
 //===========================================================================
 
 LauncherView::LauncherView( QWidget* parent, const char* name, WFlags fl )
     : QVBox( parent, name, fl )
 {
     catmb = 0;
     icons = new LauncherIconView( this );
     setFocusProxy(icons);
     QPEApplication::setStylusOperation( icons->viewport(), QPEApplication::RightOnHold );
 
     icons->setItemsMovable( FALSE );
     icons->setAutoArrange( TRUE );
     icons->setSorting( TRUE );
     icons->setFrameStyle( QFrame::NoFrame );
     icons->setMargin( 0 );
     icons->setSelectionMode( QIconView::NoSelection );
     icons->setBackgroundMode( PaletteBase );
     icons->setResizeMode( QIconView::Fixed );
     vmode = (ViewMode)-1;
     setViewMode( Icon );
 
     connect( icons, SIGNAL(mouseButtonClicked(int,QIconViewItem*,const QPoint&)),
 		   SLOT(itemClicked(int,QIconViewItem*)) );
     connect( icons, SIGNAL(selectionChanged()),
 		   SLOT(selectionChanged()) );
     connect( icons, SIGNAL(returnPressed(QIconViewItem*)),
 		   SLOT(returnPressed(QIconViewItem*)) );
     connect( icons, SIGNAL(mouseButtonPressed(int,QIconViewItem*,const QPoint&)),
 		   SLOT(itemPressed(int,QIconViewItem*)) );
 
     tools = 0;
     setBackgroundType( Ruled, QString::null );
 }
 
 LauncherView::~LauncherView()
 {
     if ( bgCache && bgCache->contains( bgName ) )
 	(*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;
 	if ( t.left(12) == "application/" ) {
 	    MimeType mt(t);
 	    const AppLnk* app = mt.application();
 	    if ( app )
 		t = app->name();
 	    else
 		t = t.mid(12);
 	} else {
 	    t[0] = t[0].upper();
 	}
 	types += t;
     }
     types << tr("All types");
     prev = typemb->currentText();
     typemb->clear();
     typemb->insertStringList(types);
     for (int i=0; i<typemb->count(); i++) {
 	if ( typemb->text(i) == prev ) {
 	    typemb->setCurrentItem(i);
 	    break;
 	}
     }
     if ( prev.isNull() )
 	typemb->setCurrentItem(typemb->count()-1);
 
     int pcat = catmb ? catmb->currentCategory() : -2;
     if ( !catmb )
 	catmb = new CategorySelect(tools);
     Categories cats( 0 );
     cats.load( categoryFileName() );
     QArray<int> vl( 0 );
     catmb->setCategories( vl, "Document View", // No tr
 	tr("Document View") );
     catmb->setRemoveCategoryEdit( TRUE );
     catmb->setAllCategories( TRUE );
     catmb->setCurrentCategory(pcat);
 
     // if type has changed we need to redisplay
     if ( typemb->currentText() != prev )
 	showType( typemb->currentItem() );
 
     connect(typemb, SIGNAL(activated(int)), this, SLOT(showType(int)));
     connect(catmb, SIGNAL(signalSelected(int)), this, SLOT(showCategory(int)));
 }
 
 void LauncherView::sortBy(int s)
 {
     icons->setSortMethod((LauncherIconView::SortMethod)s);
 }
 
 void LauncherView::showType(int t)
 {
     if ( t >= (int)typelist.count() ) {
 	icons->setTypeFilter("",TRUE);
     } else {
 	QString ty = typelist[t];
 	if ( !ty.contains('/') )
 	    ty += "/*";
 	icons->setTypeFilter(ty,TRUE);
     }
 }
 
 void LauncherView::showCategory( int c )
 {
     icons->setCategoryFilter( c, TRUE );
 }
 
 void LauncherView::setViewMode( ViewMode m )
 {
     if ( vmode != m ) {
 	bool bigIcons = m == Icon;
 	icons->viewport()->setUpdatesEnabled( FALSE );