File 4_3_BRANCH.diff of Package kdegraphics4

Overview Repositories Revisions Requests Users Attributes Meta

File 4_3_BRANCH.diff of Package kdegraphics4 (Revision ee5c16e36be9ad14c4addadb46fc9a32)

Currently displaying revision ee5c16e36be9ad14c4addadb46fc9a32 , Show latest

package: kdegraphics-4.2.85.tar.bz2
kdemod: kdegraphics
--- BRANCH_STATUS
+++ BRANCH_STATUS
@@ -0,0 +1,2 @@
+current HEAD: 968463
+svn di between //tags/KDE/4.2.85/kdegraphics and //trunk/KDE/kdegraphics
--- ksaneplugin/ksane_scan_service.desktop	
+++ ksaneplugin/ksane_scan_service.desktop	
@@ -59,8 +59,8 @@
 Name[uz@cyrillic]=KDE скан қилиш хизмати
 Name[vi]=Dịch vụ quét của KDE
 Name[wa]=Siervice di scanaedje di KDE
-Name[x-test]=xxKDE Scan Servicexx
 Name[xh]=Inkonzo yemita yovavanyo ye KDE
+Name[x-test]=xxKDE Scan Servicexx
 Name[zh_CN]=KDE 扫描服务
 Name[zh_HK]=KDE 掃描服務
 Name[zh_TW]=KDE 掃描服務
--- strigi-analyzer/tiff/kfile_tiff.desktop	
+++ strigi-analyzer/tiff/kfile_tiff.desktop	
@@ -58,8 +58,8 @@
 Name[uz@cyrillic]=TIFF-файлининг мета-маълумоти
 Name[vi]=Thông tin về tập tin TIFF
 Name[wa]=Informåcion sol imådje TIFF
-Name[x-test]=xxTIFF File Meta Infoxx
 Name[xh]=Ulwazi lwe TIFF Ifayile Esembindini
+Name[x-test]=xxTIFF File Meta Infoxx
 Name[zh_CN]=TIFF 文件元信息
 Name[zh_HK]=TIFF 檔案 Meta 資訊
 Name[zh_TW]=TIFF 檔案 Meta 資訊
--- libs/libkdcraw/libkdcraw/kdcraw.cpp	
+++ libs/libkdcraw/libkdcraw/kdcraw.cpp	
@@ -753,7 +753,7 @@
 
 QString KDcraw::librawVersion()
 {
-    return QString(LIBRAW_VERSION_STR);
+    return QString(LIBRAW_VERSION_STR).remove("-Release");
 }
 
 bool KDcraw::librawUseGomp()
--- libs/libksane/libksane/ksane_widget_private.cpp	
+++ libs/libksane/libksane/ksane_widget_private.cpp	
@@ -737,7 +737,7 @@
     if (status != SANE_STATUS_GOOD) {
         switch (status)
         {
-            #ifndef SANE_CAP_ALWAYS_SETTABLE
+            #if !defined(SANE_CAP_ALWAYS_SETTABLE) && defined(SANE_STATUS_WARMING_UP) 
             // should better be done by detecting SANE's version in configure and providing a HAS_SANE_1_1
             // FIXME remove these ifdefs and require sane 1.1.x as soon as possible
             case SANE_STATUS_WARMING_UP:
@@ -759,7 +759,7 @@
             case SANE_STATUS_COVER_OPEN:
             case SANE_STATUS_DEVICE_BUSY:
             case SANE_STATUS_ACCESS_DENIED:
-            #ifndef SANE_CAP_ALWAYS_SETTABLE
+            #if !defined(SANE_CAP_ALWAYS_SETTABLE) && defined(SANE_STATUS_HW_LOCKED) 
             case SANE_STATUS_HW_LOCKED:
             #endif
                 KMessageBox::sorry(0, i18n(sane_strstatus(status)));
--- gwenview/app/thumbnailviewpanel.cpp	
+++ gwenview/app/thumbnailviewpanel.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -24,6 +24,7 @@
 // Qt
 #include <QMenu>
 #include <QSlider>
+#include <QToolTip>
 #include <QVBoxLayout>
 
 // KDE
@@ -94,6 +95,8 @@
 		// Thumbnail slider
 		QObject::connect(mThumbnailSlider, SIGNAL(valueChanged(int)),
 			mThumbnailView, SLOT(setThumbnailSize(int)) );
+		QObject::connect(mThumbnailSlider, SIGNAL(actionTriggered(int)),
+			that, SLOT(updateSliderToolTip(int)) );
 	}
 
 	void setupActions(KActionCollection* actionCollection) {
@@ -206,6 +209,7 @@
 	d->mUrlNavigator->setShowFullPath(GwenviewConfig::urlNavigatorShowFullPath());
 
 	d->mThumbnailSlider->setValue(GwenviewConfig::thumbnailSize());
+	updateSliderToolTip(QAbstractSlider::SliderNoAction);
 	// If GwenviewConfig::thumbnailSize() returns the current value of
 	// mThumbnailSlider, it won't emit valueChanged() and the thumbnail view
 	// won't be updated. That's why we do it ourself.
@@ -307,4 +311,19 @@
 }
 
 
+void ThumbnailViewPanel::updateSliderToolTip(int actionTriggered) {
+	// FIXME: i18n?
+	const int size = d->mThumbnailSlider->sliderPosition();
+	const QString text = QString("%1 x %2").arg(size).arg(size);
+	d->mThumbnailSlider->setToolTip(text);
+
+	if (actionTriggered != QAbstractSlider::SliderNoAction) {
+		// If we are updating because of a direct action on the slider, show
+		// the tooltip immediatly.
+		const QPoint pos = d->mThumbnailSlider->mapToGlobal(QPoint(0, d->mThumbnailSlider->height() / 2));
+		QToolTip::showText(pos, text, d->mThumbnailSlider);
+	}
+}
+
+
 } // namespace
--- gwenview/app/filtercontroller.h	
+++ gwenview/app/filtercontroller.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/app/startpage.h	
+++ gwenview/app/startpage.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/app/fullscreencontent.h	
+++ gwenview/app/fullscreencontent.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/app/semanticinfocontextmanageritem.h	
+++ gwenview/app/semanticinfocontextmanageritem.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/app/kipiuploadwidget.cpp	
+++ gwenview/app/kipiuploadwidget.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/app/kipiinterface.cpp	
+++ gwenview/app/kipiinterface.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2000-2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2000-2008 Aurélien Gâteau <agateau@kde.org>
 Copyright 2008      Angelo Naselli  <anaselli@linux.it>
 
 This program is free software; you can redistribute it and/or
--- gwenview/app/sidebar.h	
+++ gwenview/app/sidebar.h	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -74,6 +74,9 @@
 
 	void addPage(SideBarPage*);
 
+	QString currentPage() const;
+	void setCurrentPage(const QString& name);
+
 	virtual QSize sizeHint() const;
 
 private:
--- gwenview/app/fileopscontextmanageritem.cpp	
+++ gwenview/app/fileopscontextmanageritem.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -39,6 +39,7 @@
 #include <kservice.h>
 
 // Local
+#include <lib/eventwatcher.h>
 #include "contextmanager.h"
 #include "fileoperations.h"
 #include "sidebar.h"
@@ -113,7 +114,7 @@
 	d->mContextManagerItem = this;
 	d->mGroup = new SideBarGroup(i18n("File Operations"));
 	setWidget(d->mGroup);
-	new AboutToShowHelper(d->mGroup, this, SLOT(updateSideBarContent()));
+	EventWatcher::install(d->mGroup, QEvent::Show, this, SLOT(updateSideBarContent()));
 
 	connect(contextManager(), SIGNAL(selectionChanged()),
 		SLOT(updateActions()) );
--- gwenview/app/preloader.h	
+++ gwenview/app/preloader.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/app/gwenview.desktop	
+++ gwenview/app/gwenview.desktop	
@@ -62,8 +62,8 @@
 GenericName[uz@cyrillic]=Расм кўрувчи
 GenericName[vi]=Bộ xem ảnh
 GenericName[wa]=Håyneu d' imådjes
-GenericName[x-test]=xxImage Viewerxx
 GenericName[xh]=Umboniseli Womfanekiso
+GenericName[x-test]=xxImage Viewerxx
 GenericName[zh_CN]=图像查看器
 GenericName[zh_HK]=圖像檢視器
 GenericName[zh_TW]=影像檢視程式
--- gwenview/app/thumbnailviewhelper.h	
+++ gwenview/app/thumbnailviewhelper.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/app/fileoperations.cpp	
+++ gwenview/app/fileoperations.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/app/contextmanager.h	
+++ gwenview/app/contextmanager.h	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/app/savebar.h	
+++ gwenview/app/savebar.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/app/filtercontroller.cpp	
+++ gwenview/app/filtercontroller.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/app/imagemetainfodialog.h	
+++ gwenview/app/imagemetainfodialog.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/app/fullscreencontent.cpp	
+++ gwenview/app/fullscreencontent.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/app/thumbnailviewpanel.h	
+++ gwenview/app/thumbnailviewpanel.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -67,6 +67,7 @@
 	void slotDirModelReset();
 	void updateSortOrder();
 	void updateThumbnailDetails();
+	void updateSliderToolTip(int sliderAction);
 
 private:
 	ThumbnailViewPanelPrivate* const d;
--- gwenview/app/sidebar.cpp	
+++ gwenview/app/sidebar.cpp	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -22,6 +22,7 @@
 // Qt
 #include <QAction>
 #include <QApplication>
+#include <QLabel>
 #include <QPainter>
 #include <QStyle>
 #include <QStyleOptionTabV3>
@@ -38,7 +39,6 @@
 #include <kwordwrap.h>
 
 // Local
-#include "lib/expandbutton.h"
 
 namespace Gwenview {
 
@@ -83,7 +83,7 @@
 //- SideBarGroup ---------------------------------------------------------------
 struct SideBarGroupPrivate {
 	QFrame* mContainer;
-	ExpandButton* mTitleButton;
+	QLabel* mTitleLabel;
 };
 
 
@@ -91,20 +91,19 @@
 : QFrame()
 , d(new SideBarGroupPrivate) {
 	d->mContainer = 0;
-	d->mTitleButton = new ExpandButton(this);
-	d->mTitleButton->setChecked(true);
-	d->mTitleButton->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-	d->mTitleButton->setFixedHeight(d->mTitleButton->sizeHint().height() * 3 / 2);
-	QFont font(d->mTitleButton->font());
+	d->mTitleLabel = new QLabel(this);
+	d->mTitleLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+	d->mTitleLabel->setFixedHeight(d->mTitleLabel->sizeHint().height() * 3 / 2);
+	QFont font(d->mTitleLabel->font());
 	font.setBold(true);
-	d->mTitleButton->setFont(font);
-	d->mTitleButton->setText(title);
+	d->mTitleLabel->setFont(font);
+	d->mTitleLabel->setText(title);
 
 	QVBoxLayout* layout = new QVBoxLayout(this);
 	layout->setMargin(0);
 	layout->setSpacing(0);
 
-	layout->addWidget(d->mTitleButton);
+	layout->addWidget(d->mTitleLabel);
 
 	clear();
 }
@@ -144,9 +143,6 @@
 	containerLayout->setSpacing(0);
 
 	layout()->addWidget(d->mContainer);
-
-	connect(d->mTitleButton, SIGNAL(toggled(bool)),
-		d->mContainer, SLOT(setVisible(bool)) );
 }
 
 
@@ -398,4 +394,18 @@
 }
 
 
+QString SideBar::currentPage() const {
+	return currentWidget()->objectName();
+}
+
+
+void SideBar::setCurrentPage(const QString& name) {
+	for (int index = 0; index < count(); ++index) {
+		if (widget(index)->objectName() == name) {
+			setCurrentIndex(index);
+		}
+	}
+}
+
+
 } // namespace
--- gwenview/app/infocontextmanageritem.cpp	
+++ gwenview/app/infocontextmanageritem.cpp	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -36,6 +36,7 @@
 #include "imagemetainfodialog.h"
 #include "sidebar.h"
 #include <lib/archiveutils.h>
+#include <lib/eventwatcher.h>
 #include <lib/gwenviewconfig.h>
 #include <lib/preferredimagemetainfomodel.h>
 #include <lib/document/document.h>
@@ -139,7 +140,7 @@
 		mGroup->addWidget(mOneFileWidget);
 		mGroup->addWidget(mMultipleFilesLabel);
 
-		new AboutToShowHelper(mGroup, q, SLOT(updateSideBarContent()));
+		EventWatcher::install(mGroup, QEvent::Show, q, SLOT(updateSideBarContent()));
 
 		QObject::connect(moreLabel, SIGNAL(linkActivated(const QString&)),
 			q, SLOT(showMetaInfoDialog()) );
--- gwenview/app/mainwindow.cpp	
+++ gwenview/app/mainwindow.cpp	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -83,6 +83,7 @@
 #include <lib/archiveutils.h>
 #include <lib/document/documentfactory.h>
 #include <lib/documentview/documentview.h>
+#include <lib/eventwatcher.h>
 #include <lib/fullscreenbar.h>
 #include <lib/gwenviewconfig.h>
 #include <lib/mimetypeutils.h>
@@ -108,6 +109,11 @@
 
 static const int PRELOAD_DELAY = 1000;
 
+static const char* BROWSE_MODE_SIDE_BAR_GROUP = "SideBar-BrowseMode";
+static const char* VIEW_MODE_SIDE_BAR_GROUP = "SideBar-ViewMode";
+static const char* SIDE_BAR_IS_VISIBLE_KEY = "IsVisible";
+static const char* SIDE_BAR_CURRENT_PAGE_KEY = "CurrentPage";
+
 enum PageId {
 	StartPageId,
 	BrowsePageId,
@@ -182,6 +188,8 @@
 		layout->setSpacing(0);
 
 		mSideBar = new SideBar(mCentralSplitter);
+		EventWatcher::install(mSideBar, QList<QEvent::Type>() << QEvent::Show << QEvent::Hide,
+			mWindow, SLOT(updateToggleSideBarAction()));
 
 		mViewStackedWidget = new QStackedWidget(mCentralSplitter);
 
@@ -412,10 +420,12 @@
 		// Fill sidebar
 		SideBarPage* page;
 		page = new SideBarPage(i18n("Folders"), "folder");
+		page->setObjectName("folders");
 		page->addWidget(folderViewItem->widget());
 		mSideBar->addPage(page);
 
 		page = new SideBarPage(i18n("Information"), "dialog-information");
+		page->setObjectName("information");
 		page->addWidget(infoItem->widget());
 		#ifndef GWENVIEW_SEMANTICINFO_BACKEND_NONE
 		page->addWidget(semanticInfoItem->widget());
@@ -424,6 +434,7 @@
 		mSideBar->addPage(page);
 
 		page = new SideBarPage(i18n("Operations"), "system-run");
+		page->setObjectName("operations");
 		page->addWidget(imageOpsItem->widget());
 		page->addWidget(fileOpsItem->widget());
 		page->addStretch();
@@ -638,6 +649,28 @@
 		mSaveBar->setCurrentUrl(url);
 		mSlideShow->setCurrentUrl(url);
 	}
+
+	KConfigGroup sideBarConfigGroup() const {
+		return KConfigGroup(KGlobal::config(),
+			mCurrentPageId == ViewPageId
+			? BROWSE_MODE_SIDE_BAR_GROUP
+			: VIEW_MODE_SIDE_BAR_GROUP);
+	}
+
+	void loadSideBarConfig() {
+		KConfigGroup group = sideBarConfigGroup();
+		mSideBar->setVisible(group.readEntry(SIDE_BAR_IS_VISIBLE_KEY, true));
+
+		QString defaultPage = mCurrentPageId == ViewPageId
+			? "information" : "folders";
+		mSideBar->setCurrentPage(group.readEntry(SIDE_BAR_CURRENT_PAGE_KEY, defaultPage));
+	}
+
+	void saveSideBarConfig() const {
+		KConfigGroup group = sideBarConfigGroup();
+		group.writeEntry(SIDE_BAR_IS_VISIBLE_KEY, mSideBar->isVisible());
+		group.writeEntry(SIDE_BAR_CURRENT_PAGE_KEY, mSideBar->currentPage());
+	}
 };
 
 
@@ -742,7 +775,6 @@
 		openDocumentUrl(url);
 	}
 	d->updateContextDependentComponents();
-	d->mToggleSideBarAction->setChecked(GwenviewConfig::sideBarIsVisible());
 }
 
 
@@ -757,6 +789,8 @@
 void MainWindow::setActiveViewModeAction(QAction* action) {
 	if (d->mCurrentPageId == StartPageId) {
 		d->mSideBarCollapser->show();
+	} else {
+		d->saveSideBarConfig();
 	}
 	if (action == d->mViewAction) {
 		d->mCurrentPageId = ViewPageId;
@@ -783,6 +817,7 @@
 		d->setDirModelShowDirs(true);
 		setCaption(QString());
 	}
+	d->loadSideBarConfig();
 
 	emit viewModeChanged();
 }
@@ -915,6 +950,12 @@
 }
 
 
+void MainWindow::updateToggleSideBarAction() {
+	SignalBlocker blocker(d->mToggleSideBarAction);
+	d->mToggleSideBarAction->setChecked(d->mSideBar->isVisible());
+}
+
+
 void MainWindow::slotPartCompleted() {
 	d->updateActions();
 	KUrl url = d->mDocumentPanel->url();
@@ -1054,6 +1095,7 @@
 		// fullscreen, we are sure latest MainWindow changes are remembered.
 		saveMainWindowSettings(autoSaveConfigGroup());
 		resetAutoSaveSettings();
+		d->saveSideBarConfig();
 
 		// Go full screen
 		d->mStateBeforeFullScreen.mActiveViewModeAction = d->mViewModeActionGroup->checkedAction();
@@ -1182,6 +1224,9 @@
 
 bool MainWindow::queryClose() {
 	saveConfig();
+	if (!d->mFullScreenAction->isChecked()) {
+		d->saveSideBarConfig();
+	}
 	QList<KUrl> list = DocumentFactory::instance()->modifiedDocumentList();
 	if (list.size() == 0) {
 		return true;
@@ -1283,7 +1328,6 @@
 void MainWindow::saveConfig() {
 	d->mDocumentPanel->saveConfig();
 	d->mThumbnailViewPanel->saveConfig();
-	GwenviewConfig::setSideBarIsVisible(d->mSideBar->isVisible());
 }
 
 
--- gwenview/app/kipiimagecollectionselector.cpp	
+++ gwenview/app/kipiimagecollectionselector.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/app/preloader.cpp	
+++ gwenview/app/preloader.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/app/contextmanager.cpp	
+++ gwenview/app/contextmanager.cpp	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/app/savebar.cpp	
+++ gwenview/app/savebar.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/app/fileopscontextmanageritem.h	
+++ gwenview/app/fileopscontextmanageritem.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/app/imagemetainfodialog.cpp	
+++ gwenview/app/imagemetainfodialog.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/app/imageopscontextmanageritem.h	
+++ gwenview/app/imageopscontextmanageritem.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/app/configdialog.h	
+++ gwenview/app/configdialog.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/app/folderviewcontextmanageritem.h	
+++ gwenview/app/folderviewcontextmanageritem.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2009 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2009 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/app/documentpanel.cpp	
+++ gwenview/app/documentpanel.cpp	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/app/thumbnailbarview.h	
+++ gwenview/app/thumbnailbarview.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 Copyright 2008 Ilya Konkov <eruart@gmail.com>
 
 This program is free software; you can redistribute it and/or
--- gwenview/app/infocontextmanageritem.h	
+++ gwenview/app/infocontextmanageritem.h	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/app/mainwindow.h	
+++ gwenview/app/mainwindow.h	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -82,6 +82,7 @@
 	void goToUrl(const KUrl&);
 	void goUp();
 	void toggleSideBar(bool visible);
+	void updateToggleSideBarAction();
 	void slotModifiedDocumentListChanged();
 
 	/**
--- gwenview/app/kipiimagecollectionselector.h	
+++ gwenview/app/kipiimagecollectionselector.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/app/abstractcontextmanageritem.cpp	
+++ gwenview/app/abstractcontextmanageritem.cpp	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/app/imageopscontextmanageritem.cpp	
+++ gwenview/app/imageopscontextmanageritem.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -40,6 +40,7 @@
 #include "sidebar.h"
 #include <lib/crop/croptool.h>
 #include <lib/document/documentfactory.h>
+#include <lib/eventwatcher.h>
 #include <lib/redeyereduction/redeyereductiontool.h>
 #include <lib/gwenviewconfig.h>
 #include <lib/imageview.h>
@@ -130,7 +131,7 @@
 	d->mMainWindow = mainWindow;
 	d->mGroup = new SideBarGroup(i18n("Image Operations"));
 	setWidget(d->mGroup);
-	new AboutToShowHelper(d->mGroup, this, SLOT(updateSideBarContent()));
+	EventWatcher::install(d->mGroup, QEvent::Show, this, SLOT(updateSideBarContent()));
 	d->setupActions();
 	updateActions();
 	connect(contextManager(), SIGNAL(selectionChanged()),
--- gwenview/app/main.cpp	
+++ gwenview/app/main.cpp	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007-2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007-2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/app/configdialog.cpp	
+++ gwenview/app/configdialog.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/app/folderviewcontextmanageritem.cpp	
+++ gwenview/app/folderviewcontextmanageritem.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2009 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2009 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -31,6 +31,7 @@
 #include <klocale.h>
 
 // Local
+#include <lib/eventwatcher.h>
 #include "contextmanager.h"
 #include "sidebar.h"
 #include "fileoperations.h"
@@ -59,6 +60,7 @@
 
 protected:
 	void dragEnterEvent(QDragEnterEvent* event) {
+		QAbstractItemView::dragEnterEvent(event);
 		if (event->mimeData()->hasUrls()) {
 			event->acceptProposedAction();
 		}
@@ -66,6 +68,7 @@
 
 
 	void dragMoveEvent(QDragMoveEvent* event) {
+		QAbstractItemView::dragMoveEvent(event);
 		if (indexAt(event->pos()).isValid()) {
 			event->acceptProposedAction();
 		} else {
@@ -113,6 +116,8 @@
 		mView->setEditTriggers(QAbstractItemView::NoEditTriggers);
 		mView->setAcceptDrops(true);
 		mView->setDropIndicatorShown(true);
+		mView->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
+		mView->setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel);
 
 		mView->setHeaderHidden(true);
 		mView->setFrameStyle(QFrame::NoFrame);
@@ -136,7 +141,7 @@
 		q->setWidget(mView);
 		QObject::connect(mView, SIGNAL(activated(const QModelIndex&)),
 			q, SLOT(slotActivated(const QModelIndex&)));
-		new AboutToShowHelper(mView, q, SLOT(expandToSelectedUrl()));
+		EventWatcher::install(mView, QEvent::Show, q, SLOT(expandToSelectedUrl()));
 	}
 
 	QModelIndex findClosestIndex(const QModelIndex& parent, const KUrl& wantedUrl) {
@@ -178,16 +183,21 @@
 
 
 	QModelIndex findRootIndex(const KUrl& wantedUrl) {
+		QModelIndex matchIndex;
+		int matchUrlLength = 0;
 		for (int row = 0; row < mModel->rowCount(); ++row) {
 			QModelIndex index = mModel->index(row, 0);
 			KUrl url = mModel->urlForIndex(index);
-			if (url.isParentOf(wantedUrl)) {
-				// FIXME: Use closest match
-				return index;
+			int urlLength = url.url().length();
+			if (url.isParentOf(wantedUrl) && urlLength > matchUrlLength) {
+				matchIndex = index;
+				matchUrlLength = urlLength;
 			}
 		}
-		kWarning() << "Found no root index for" << wantedUrl;
-		return QModelIndex();
+		if (!matchIndex.isValid()) {
+			kWarning() << "Found no root index for" << wantedUrl;
+		}
+		return matchIndex;
 	}
 };
 
@@ -199,7 +209,6 @@
 	d->mModel = 0;
 
 	d->setupView();
-	new AboutToShowHelper(d->mView, this, SLOT(expandToSelectedUrl()));
 
 	connect(contextManager(), SIGNAL(currentDirUrlChanged()),
 		SLOT(slotCurrentDirUrlChanged()) );
@@ -228,6 +237,10 @@
 
 
 void FolderViewContextManagerItem::expandToSelectedUrl() {
+	if (!d->mUrlToSelect.isValid()) {
+		return;
+	}
+
 	if (!d->mModel) {
 		d->setupModel();
 	}
@@ -253,9 +266,13 @@
 }
 
 
-void FolderViewContextManagerItem::slotRowsInserted(const QModelIndex& index, int /*start*/, int /*end*/) {
-	if (d->mModel->urlForIndex(index).isParentOf(d->mUrlToSelect)) {
-		d->mExpandingIndex = index;
+void FolderViewContextManagerItem::slotRowsInserted(const QModelIndex& parentIndex, int /*start*/, int /*end*/) {
+	// Can't trigger the case where parentIndex is invalid, but it most
+	// probably happen when root items are created. In this case we trigger
+	// expandToSelectedUrl without checking the url.
+	// See bug #191771
+	if (!parentIndex.isValid() || d->mModel->urlForIndex(parentIndex).isParentOf(d->mUrlToSelect)) {
+		d->mExpandingIndex = parentIndex;
 		// Hack because otherwise indexes are not in correct order!
 		QMetaObject::invokeMethod(this, "expandToSelectedUrl", Qt::QueuedConnection);
 	}
--- gwenview/app/startpage.cpp	
+++ gwenview/app/startpage.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/app/gvcore.h	
+++ gwenview/app/gvcore.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/app/semanticinfocontextmanageritem.cpp	
+++ gwenview/app/semanticinfocontextmanageritem.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -44,6 +44,7 @@
 #include "sidebar.h"
 #include "ui_semanticinfosidebaritem.h"
 #include "ui_semanticinfodialog.h"
+#include <lib/eventwatcher.h>
 #include <lib/hudwidget.h>
 #include <lib/widgetfloater.h>
 #include <lib/semanticinfo/abstractsemanticinfobackend.h>
@@ -131,7 +132,7 @@
 	void setupGroup() {
 		mGroup = new SideBarGroup(i18n("Semantic Information"));
 		that->setWidget(mGroup);
-		new AboutToShowHelper(mGroup, that, SLOT(update()));
+		EventWatcher::install(mGroup, QEvent::Show, that, SLOT(update()));
 
 		QWidget* container = new QWidget;
 		setupUi(container);
--- gwenview/app/thumbnailbarview.cpp	
+++ gwenview/app/thumbnailbarview.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 Copyright 2008 Ilya Konkov <eruart@gmail.com>
 
 This program is free software; you can redistribute it and/or
--- gwenview/app/documentpanel.h	
+++ gwenview/app/documentpanel.h	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/app/kipiuploadwidget.h	
+++ gwenview/app/kipiuploadwidget.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/app/thumbnailviewhelper.cpp	
+++ gwenview/app/thumbnailviewhelper.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/app/kipiinterface.h	
+++ gwenview/app/kipiinterface.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2000-2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2000-2008 Aurélien Gâteau <agateau@kde.org>
 Copyright 2008      Angelo Naselli  <anaselli@linux.it>
 
 This program is free software; you can redistribute it and/or
--- gwenview/app/gvcore.cpp	
+++ gwenview/app/gvcore.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/app/abstractcontextmanageritem.h	
+++ gwenview/app/abstractcontextmanageritem.h	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -22,36 +22,11 @@
 #define ABSTRACTCONTEXTMANAGERITEM_H
 
 // Qt
-#include <QEvent>
-#include <QObject>
 #include <QWidget>
 
 
 namespace Gwenview {
 
-class AboutToShowHelper : public QObject {
-	Q_OBJECT
-public:
-	AboutToShowHelper(QWidget* watched, QObject* receiver, const char* slot)
-	: QObject(receiver) {
-		Q_ASSERT(watched);
-		watched->installEventFilter(this);
-		connect(this, SIGNAL(aboutToShow()), receiver, slot);
-	}
-
-Q_SIGNALS:
-	void aboutToShow();
-
-protected:
-	virtual bool eventFilter(QObject*, QEvent* event) {
-		if (event->type() == QEvent::Show) {
-			aboutToShow();
-		}
-		return false;
-	}
-};
-
-
 class ContextManager;
 
 struct AbstractContextManagerItemPrivate;
--- gwenview/app/fileoperations.h	
+++ gwenview/app/fileoperations.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/tests/imagescalertest.h	
+++ gwenview/tests/imagescalertest.h	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/tests/documenttest.h	
+++ gwenview/tests/documenttest.h	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/tests/thumbnailloadjobtest.h	
+++ gwenview/tests/thumbnailloadjobtest.h	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/tests/timeutilstest.h	
+++ gwenview/tests/timeutilstest.h	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/tests/jpegcontenttest.h	
+++ gwenview/tests/jpegcontenttest.h	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/tests/semanticinfobackendtest.cpp	
+++ gwenview/tests/semanticinfobackendtest.cpp	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/tests/paintutilstest.h	
+++ gwenview/tests/paintutilstest.h	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/tests/slidecontainertest.cpp	
+++ gwenview/tests/slidecontainertest.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/tests/testutils.h	
+++ gwenview/tests/testutils.h	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/tests/imagescalertest.cpp	
+++ gwenview/tests/imagescalertest.cpp	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/tests/documenttest.cpp	
+++ gwenview/tests/documenttest.cpp	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/tests/thumbnailloadjobtest.cpp	
+++ gwenview/tests/thumbnailloadjobtest.cpp	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/tests/timeutilstest.cpp	
+++ gwenview/tests/timeutilstest.cpp	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/tests/jpegcontenttest.cpp	
+++ gwenview/tests/jpegcontenttest.cpp	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/tests/semanticinfobackendtest.h	
+++ gwenview/tests/semanticinfobackendtest.h	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/tests/paintutilstest.cpp	
+++ gwenview/tests/paintutilstest.cpp	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/expandbutton.h	
+++ gwenview/lib/expandbutton.h	
@@ -1,52 +0,0 @@
-/*
-Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-*/
-#ifndef EXPANDBUTTON_H
-#define EXPANDBUTTON_H
-
-#include <lib/gwenviewlib_export.h>
-
-#include <QToolButton>
-
-
-namespace Gwenview {
-
-
-/**
- * A button which looks flat and shows an expand indicator ([-] or [+]).
- *
- * To implement expandable frames, add a button like this above your frame,
- * connect the toggled(bool) signal of the button to the setVisible(bool) slot
- * of the frame.
- * By default the button is not on, so be sure to hide the frame.
- */
-class GWENVIEWLIB_EXPORT ExpandButton : public QToolButton {
-public:
-	ExpandButton(QWidget* parent);
-	virtual QSize sizeHint() const;
-
-protected:
-	virtual void paintEvent(QPaintEvent* event);
-};
-
-
-} // namespace
-
-
-#endif /* EXPANDBUTTON_H */
--- gwenview/lib/expandbutton.cpp	
+++ gwenview/lib/expandbutton.cpp	
@@ -1,73 +0,0 @@
-/*
-Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-*/
-#include "expandbutton.h"
-
-// Qt
-#include <QStyle>
-#include <QStyleOption>
-#include <QStylePainter>
-
-namespace Gwenview {
-
-static const int INDICATOR_SIZE = 9; // ### hardcoded in qcommonstyle.cpp
-
-ExpandButton::ExpandButton(QWidget* parent)
-: QToolButton(parent) {
-	setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-	setAutoRaise(true);
-	setCheckable(true);
-}
-
-QSize ExpandButton::sizeHint() const {
-	QSize size = QToolButton::sizeHint();
-	size.setWidth(size.width() + 2*INDICATOR_SIZE);
-	size.setHeight(fontMetrics().height());
-	return size;
-}
-
-void ExpandButton::paintEvent(QPaintEvent*) {
-	QStylePainter painter(this);
-
-	QStyleOption option;
-	option.initFrom(this);
-
-	// Paint branch indicator
-	// Code comes from Designer, sheet_delegate.cpp
-	QStyleOption branchOption;
-	QRect r = option.rect;
-	branchOption.rect = QRect(r.left() + INDICATOR_SIZE/2, r.top() + (r.height() - INDICATOR_SIZE)/2, INDICATOR_SIZE, INDICATOR_SIZE);
-	branchOption.palette = option.palette;
-	branchOption.state = QStyle::State_Children;
-
-	if (isChecked()) {
-		branchOption.state |= QStyle::State_Open;
-	}
-
-	style()->drawPrimitive(QStyle::PE_IndicatorBranch, &branchOption, &painter, this);
-
-	// Paint text
-	QRect textRect = rect();
-	textRect.setLeft(INDICATOR_SIZE * 2);
-
-	painter.drawItemText(textRect, Qt::TextShowMnemonic | Qt::AlignVCenter, option.palette, isEnabled(), text());
-}
-
-
-} // namespace
--- gwenview/lib/memoryutils.h	
+++ gwenview/lib/memoryutils.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/semanticinfo/semanticinfodirmodel.cpp	
+++ gwenview/lib/semanticinfo/semanticinfodirmodel.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/semanticinfo/tagmodel.h	
+++ gwenview/lib/semanticinfo/tagmodel.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/semanticinfo/semanticinfodirmodel.h	
+++ gwenview/lib/semanticinfo/semanticinfodirmodel.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/semanticinfo/abstractsemanticinfobackend.cpp	
+++ gwenview/lib/semanticinfo/abstractsemanticinfobackend.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/semanticinfo/fakesemanticinfobackend.cpp	
+++ gwenview/lib/semanticinfo/fakesemanticinfobackend.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/semanticinfo/tagwidget.cpp	
+++ gwenview/lib/semanticinfo/tagwidget.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/semanticinfo/sorteddirmodel.cpp	
+++ gwenview/lib/semanticinfo/sorteddirmodel.cpp	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/semanticinfo/abstractsemanticinfobackend.h	
+++ gwenview/lib/semanticinfo/abstractsemanticinfobackend.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/semanticinfo/fakesemanticinfobackend.h	
+++ gwenview/lib/semanticinfo/fakesemanticinfobackend.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/semanticinfo/tagwidget.h	
+++ gwenview/lib/semanticinfo/tagwidget.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/semanticinfo/tagitemdelegate.cpp	
+++ gwenview/lib/semanticinfo/tagitemdelegate.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/semanticinfo/sorteddirmodel.h	
+++ gwenview/lib/semanticinfo/sorteddirmodel.h	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/semanticinfo/nepomuksemanticinfobackend.cpp	
+++ gwenview/lib/semanticinfo/nepomuksemanticinfobackend.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/semanticinfo/tagitemdelegate.h	
+++ gwenview/lib/semanticinfo/tagitemdelegate.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/semanticinfo/nepomuksemanticinfobackend.h	
+++ gwenview/lib/semanticinfo/nepomuksemanticinfobackend.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/semanticinfo/tagmodel.cpp	
+++ gwenview/lib/semanticinfo/tagmodel.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/orientation.h	
+++ gwenview/lib/orientation.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/paintutils.h	
+++ gwenview/lib/paintutils.h	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/slideshow.cpp	
+++ gwenview/lib/slideshow.cpp	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/archiveutils.cpp	
+++ gwenview/lib/archiveutils.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for KDE
-Copyright 2000-2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2000-2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/eventwatcher.h	
+++ gwenview/lib/eventwatcher.h	
@@ -0,0 +1,59 @@
+/*
+Gwenview: an image viewer
+Copyright 2009 Aurélien Gâteau <agateau@kde.org>
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+*/
+#ifndef EVENTWATCHER_H
+#define EVENTWATCHER_H
+
+// Qt
+#include <QEvent>
+#include <QList>
+#include <QObject>
+
+// Local
+#include "gwenviewlib_export.h"
+
+
+namespace Gwenview {
+
+/**
+ * This class emits a signal when some events are triggered on a watched
+ * object.
+ */
+class GWENVIEWLIB_EXPORT EventWatcher : public QObject {
+	Q_OBJECT
+public:
+	EventWatcher(QObject* watched, const QList<QEvent::Type>& eventTypes);
+
+	static EventWatcher* install(QObject* watched, const QList<QEvent::Type>& eventTypes, QObject* receiver, const char* slot);
+
+	static EventWatcher* install(QObject* watched, QEvent::Type eventType, QObject* receiver, const char* slot);
+
+Q_SIGNALS:
+	void eventTriggered(QEvent*);
+
+protected:
+	virtual bool eventFilter(QObject*, QEvent* event);
+
+private:
+	QList<QEvent::Type> mEventTypes;
+};
+
+}
+
+#endif /* EVENTWATCHER_H */
--- gwenview/lib/abstractimageviewtool.h	
+++ gwenview/lib/abstractimageviewtool.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/transformimageoperation.h	
+++ gwenview/lib/transformimageoperation.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/iodevicejpegsourcemanager.cpp	
+++ gwenview/lib/iodevicejpegsourcemanager.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/mimetypeutils.cpp	
+++ gwenview/lib/mimetypeutils.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for KDE
-Copyright 2006 Aurelien Gateau <aurelien.gateau@free.fr>
+Copyright 2006 Aurelien Gateau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/imagesequence.cpp	
+++ gwenview/lib/imagesequence.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/imagescaler.cpp	
+++ gwenview/lib/imagescaler.cpp	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/datewidget.cpp	
+++ gwenview/lib/datewidget.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/urlutils.cpp	
+++ gwenview/lib/urlutils.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/signalblocker.h	
+++ gwenview/lib/signalblocker.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/imagemetainfomodel.cpp	
+++ gwenview/lib/imagemetainfomodel.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -45,7 +45,8 @@
 	NoGroup = -1,
 	GeneralGroup,
 	ExifGroup,
-	IptcGroup
+	IptcGroup,
+	XmpGroup
 };
 
 
@@ -276,10 +277,11 @@
 ImageMetaInfoModel::ImageMetaInfoModel()
 : d(new ImageMetaInfoModelPrivate) {
 	d->mModel = this;
-	d->mMetaInfoGroupVector.resize(3);
+	d->mMetaInfoGroupVector.resize(4);
 	d->mMetaInfoGroupVector[GeneralGroup] = new MetaInfoGroup(i18nc("@title:group General info about the image", "General"));
-	d->mMetaInfoGroupVector[ExifGroup] = new MetaInfoGroup(i18nc("@title:group", "Exif"));
-	d->mMetaInfoGroupVector[IptcGroup] = new MetaInfoGroup(i18nc("@title:group", "Iptc"));
+	d->mMetaInfoGroupVector[ExifGroup] = new MetaInfoGroup("EXIF");
+	d->mMetaInfoGroupVector[IptcGroup] = new MetaInfoGroup("IPTC");
+	d->mMetaInfoGroupVector[XmpGroup]  = new MetaInfoGroup("XMP");
 	d->initGeneralGroup();
 }
 
@@ -324,26 +326,32 @@
 void ImageMetaInfoModel::setExiv2Image(const Exiv2::Image* image) {
 	MetaInfoGroup* exifGroup = d->mMetaInfoGroupVector[ExifGroup];
 	MetaInfoGroup* iptcGroup = d->mMetaInfoGroupVector[IptcGroup];
+	MetaInfoGroup* xmpGroup  = d->mMetaInfoGroupVector[XmpGroup];
 	QModelIndex exifIndex = index(ExifGroup, 0);
 	QModelIndex iptcIndex = index(IptcGroup, 0);
+	QModelIndex xmpIndex  = index(XmpGroup, 0);
 	d->clearGroup(exifGroup, exifIndex);
 	d->clearGroup(iptcGroup, iptcIndex);
+	d->clearGroup(xmpGroup,  xmpIndex);
 
 	if (!image) {
 		return;
 	}
 
-	if (image->supportsMetadata(Exiv2::mdExif)) {
+	if (image->checkMode(Exiv2::mdExif) & Exiv2::amRead) {
 		const Exiv2::ExifData& exifData = image->exifData();
-
 		d->fillExivGroup<Exiv2::ExifData, Exiv2::ExifData::const_iterator>(exifIndex, exifGroup, exifData);
 	}
 
-	if (image->supportsMetadata(Exiv2::mdIptc)) {
+	if (image->checkMode(Exiv2::mdIptc) & Exiv2::amRead) {
 		const Exiv2::IptcData& iptcData = image->iptcData();
-
 		d->fillExivGroup<Exiv2::IptcData, Exiv2::IptcData::const_iterator>(iptcIndex, iptcGroup, iptcData);
 	}
+
+	if (image->checkMode(Exiv2::mdXmp) & Exiv2::amRead) {
+		const Exiv2::XmpData& xmpData = image->xmpData();
+		d->fillExivGroup<Exiv2::XmpData, Exiv2::XmpData::const_iterator>(xmpIndex, xmpGroup, xmpData);
+	}
 }
 
 
@@ -355,6 +363,8 @@
 		group = d->mMetaInfoGroupVector[ExifGroup];
 	} else if (key.startsWith(QLatin1String("Iptc"))) {
 		group = d->mMetaInfoGroupVector[IptcGroup];
+	} else if (key.startsWith(QLatin1String("Xmp"))) {
+		group = d->mMetaInfoGroupVector[XmpGroup];
 	} else {
 		kWarning() << "Unknown metainfo key" << key;
 		return;
--- gwenview/lib/zoomwidget.cpp	
+++ gwenview/lib/zoomwidget.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/memoryutils.cpp	
+++ gwenview/lib/memoryutils.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 Copyright (C) 2004-2005 by Enrico Ros <eros.kde@email.it>
 Copyright (C) 2004-2007 by Albert Astals Cid <aacid@kde.org>
 
--- gwenview/lib/preferredimagemetainfomodel.h	
+++ gwenview/lib/preferredimagemetainfomodel.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/fullscreentheme.h	
+++ gwenview/lib/fullscreentheme.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/resizeimageoperation.h	
+++ gwenview/lib/resizeimageoperation.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/abstractimageoperation.h	
+++ gwenview/lib/abstractimageoperation.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/imageformats/imageformats.cpp	
+++ gwenview/lib/imageformats/imageformats.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/imageformats/imageformats.h	
+++ gwenview/lib/imageformats/imageformats.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/imageformats/jpeghandler.cpp	
+++ gwenview/lib/imageformats/jpeghandler.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/imageformats/jpegplugin.cpp	
+++ gwenview/lib/imageformats/jpegplugin.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/imageformats/jpeghandler.h	
+++ gwenview/lib/imageformats/jpeghandler.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/imageformats/jpegplugin.h	
+++ gwenview/lib/imageformats/jpegplugin.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/thumbnailview/thumbnailview.cpp	
+++ gwenview/lib/thumbnailview/thumbnailview.cpp	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -430,6 +430,7 @@
 
 
 void ThumbnailView::dragEnterEvent(QDragEnterEvent* event) {
+	QAbstractItemView::dragEnterEvent(event);
 	if (event->mimeData()->hasUrls()) {
 		event->acceptProposedAction();
 	}
@@ -438,6 +439,7 @@
 
 void ThumbnailView::dragMoveEvent(QDragMoveEvent* event) {
 	// Necessary, otherwise we don't reach dropEvent()
+	QAbstractItemView::dragMoveEvent(event);
 	event->acceptProposedAction();
 }
 
--- gwenview/lib/thumbnailview/previewitemdelegate.h	
+++ gwenview/lib/thumbnailview/previewitemdelegate.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/thumbnailview/abstractthumbnailviewhelper.cpp	
+++ gwenview/lib/thumbnailview/abstractthumbnailviewhelper.cpp	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/thumbnailview/thumbnailview.h	
+++ gwenview/lib/thumbnailview/thumbnailview.h	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/thumbnailview/abstractthumbnailviewhelper.h	
+++ gwenview/lib/thumbnailview/abstractthumbnailviewhelper.h	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/thumbnailview/previewitemdelegate.cpp	
+++ gwenview/lib/thumbnailview/previewitemdelegate.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -660,12 +660,7 @@
 		borderColor = bgColor.dark(SELECTION_BORDER_DARKNESS);
 	} else {
 		bgColor = viewport->palette().color(viewport->backgroundRole());
-
-		if (bgColor.value() < 128) {
-			borderColor = bgColor.dark(200);
-		} else {
-			borderColor = bgColor.light(200);
-		}
+		borderColor = bgColor.light(200);
 	}
 	fgColor = viewport->palette().color(viewport->foregroundRole());
 
--- gwenview/lib/jpegerrormanager.h	
+++ gwenview/lib/jpegerrormanager.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/eventwatcher.cpp	
+++ gwenview/lib/eventwatcher.cpp	
@@ -0,0 +1,54 @@
+/*
+Gwenview: an image viewer
+Copyright 2009 Aurélien Gâteau <agateau@kde.org>
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+*/
+#include "eventwatcher.moc"
+
+namespace Gwenview {
+
+EventWatcher::EventWatcher(QObject* watched, const QList<QEvent::Type>& eventTypes)
+: QObject(watched)
+, mEventTypes(eventTypes) {
+	Q_ASSERT(watched);
+	watched->installEventFilter(this);
+}
+
+
+EventWatcher* EventWatcher::install(QObject* watched, const QList<QEvent::Type>& eventTypes, QObject* receiver, const char* slot) {
+	EventWatcher* watcher = new EventWatcher(watched, eventTypes);
+	connect(watcher, SIGNAL(eventTriggered(QEvent*)), receiver, slot);
+	return watcher;
+}
+
+
+EventWatcher* EventWatcher::install(QObject* watched, QEvent::Type eventType, QObject* receiver, const char* slot) {
+	EventWatcher* watcher = new EventWatcher(watched, QList<QEvent::Type>() << eventType);
+	connect(watcher, SIGNAL(eventTriggered(QEvent*)), receiver, slot);
+	return watcher;
+}
+
+
+bool EventWatcher::eventFilter(QObject*, QEvent* event) {
+	if (mEventTypes.contains(event->type())) {
+		eventTriggered(event);
+	}
+	return false;
+}
+
+
+} // namespace
--- gwenview/lib/abstractimageviewtool.cpp	
+++ gwenview/lib/abstractimageviewtool.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/transformimageoperation.cpp	
+++ gwenview/lib/transformimageoperation.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/widgetfloater.cpp	
+++ gwenview/lib/widgetfloater.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/statusbartoolbutton.cpp	
+++ gwenview/lib/statusbartoolbutton.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/ramp.h	
+++ gwenview/lib/ramp.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/thumbnailgroup.h	
+++ gwenview/lib/thumbnailgroup.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/archiveutils.h	
+++ gwenview/lib/archiveutils.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for KDE
-Copyright 2000-2004 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2000-2004 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/imageutils.h	
+++ gwenview/lib/imageutils.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/slidecontainer.h	
+++ gwenview/lib/slidecontainer.h	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/mimetypeutils.h	
+++ gwenview/lib/mimetypeutils.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for KDE
-Copyright 2006 Aurelien Gateau <aurelien.gateau@free.fr>
+Copyright 2006 Aurelien Gateau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/imagescaler.h	
+++ gwenview/lib/imagescaler.h	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/imageview.h	
+++ gwenview/lib/imageview.h	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/crop/croptool.cpp	
+++ gwenview/lib/crop/croptool.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/crop/croptool.h	
+++ gwenview/lib/crop/croptool.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/crop/cropimageoperation.cpp	
+++ gwenview/lib/crop/cropimageoperation.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/crop/cropwidget.cpp	
+++ gwenview/lib/crop/cropwidget.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/crop/cropimageoperation.h	
+++ gwenview/lib/crop/cropimageoperation.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/crop/cropwidget.h	
+++ gwenview/lib/crop/cropwidget.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/imagesequencecontroller.h	
+++ gwenview/lib/imagesequencecontroller.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/timeutils.h	
+++ gwenview/lib/timeutils.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/preferredimagemetainfomodel.cpp	
+++ gwenview/lib/preferredimagemetainfomodel.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/fullscreentheme.cpp	
+++ gwenview/lib/fullscreentheme.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/resizeimageoperation.cpp	
+++ gwenview/lib/resizeimageoperation.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/abstractimageoperation.cpp	
+++ gwenview/lib/abstractimageoperation.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/documentview/abstractdocumentviewadapter.cpp	
+++ gwenview/lib/documentview/abstractdocumentviewadapter.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/documentview/documentview.h	
+++ gwenview/lib/documentview/documentview.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/documentview/imageviewadapter.cpp	
+++ gwenview/lib/documentview/imageviewadapter.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/documentview/messageviewadapter.cpp	
+++ gwenview/lib/documentview/messageviewadapter.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/documentview/svgviewadapter.h	
+++ gwenview/lib/documentview/svgviewadapter.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/documentview/videoviewadapter.cpp	
+++ gwenview/lib/documentview/videoviewadapter.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2009 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2009 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/documentview/abstractdocumentviewadapter.h	
+++ gwenview/lib/documentview/abstractdocumentviewadapter.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/documentview/imageviewadapter.h	
+++ gwenview/lib/documentview/imageviewadapter.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/documentview/messageviewadapter.h	
+++ gwenview/lib/documentview/messageviewadapter.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/documentview/videoviewadapter.h	
+++ gwenview/lib/documentview/videoviewadapter.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2009 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2009 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/documentview/documentview.cpp	
+++ gwenview/lib/documentview/documentview.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/documentview/svgviewadapter.cpp	
+++ gwenview/lib/documentview/svgviewadapter.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/imagemetainfomodel.h	
+++ gwenview/lib/imagemetainfomodel.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/exiv2imageloader.h	
+++ gwenview/lib/exiv2imageloader.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/fullscreenbar.h	
+++ gwenview/lib/fullscreenbar.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/scrolltool.cpp	
+++ gwenview/lib/scrolltool.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/zoomwidget.h	
+++ gwenview/lib/zoomwidget.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/invisiblebuttongroup.h	
+++ gwenview/lib/invisiblebuttongroup.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/imageutils.cpp	
+++ gwenview/lib/imageutils.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/slidecontainer.cpp	
+++ gwenview/lib/slidecontainer.cpp	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/widgetfloater.h	
+++ gwenview/lib/widgetfloater.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/statusbartoolbutton.h	
+++ gwenview/lib/statusbartoolbutton.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/redeyereduction/redeyereductionimageoperation.cpp	
+++ gwenview/lib/redeyereduction/redeyereductionimageoperation.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/redeyereduction/redeyereductionimageoperation.h	
+++ gwenview/lib/redeyereduction/redeyereductionimageoperation.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/redeyereduction/redeyereductiontool.cpp	
+++ gwenview/lib/redeyereduction/redeyereductiontool.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/redeyereduction/redeyereductiontool.h	
+++ gwenview/lib/redeyereduction/redeyereductiontool.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/imageview.cpp	
+++ gwenview/lib/imageview.cpp	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/thumbnailloadjob.cpp	
+++ gwenview/lib/thumbnailloadjob.cpp	
@@ -1,6 +1,6 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*	Gwenview - A simple image viewer for KDE
-	Copyright 2000-2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+	Copyright 2000-2007 Aurélien Gâteau <agateau@kde.org>
 	This class is based on the ImagePreviewJob class from Konqueror.
 */
 /*	This file is part of the KDE project
--- gwenview/lib/imagesequencecontroller.cpp	
+++ gwenview/lib/imagesequencecontroller.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/timeutils.cpp	
+++ gwenview/lib/timeutils.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/jpegcontent.cpp	
+++ gwenview/lib/jpegcontent.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/hudwidget.cpp	
+++ gwenview/lib/hudwidget.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/exiv2imageloader.cpp	
+++ gwenview/lib/exiv2imageloader.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/fullscreenbar.cpp	
+++ gwenview/lib/fullscreenbar.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/paintutils.cpp	
+++ gwenview/lib/paintutils.cpp	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/CMakeLists.txt	
+++ gwenview/lib/CMakeLists.txt	
@@ -34,13 +34,13 @@
 	documentview/videoviewadapter.cpp
 	abstractimageoperation.cpp
 	abstractimageviewtool.cpp
+	eventwatcher.cpp
 	splittercollapser.cpp
 	historymodel.cpp
 	imagesequence.cpp
 	imagesequencecontroller.cpp
 	archiveutils.cpp
 	datewidget.cpp
-	expandbutton.cpp
 	exiv2imageloader.cpp
 	flowlayout.cpp
 	fullscreenbar.cpp
--- gwenview/lib/invisiblebuttongroup.cpp	
+++ gwenview/lib/invisiblebuttongroup.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/document/loadingdocumentimpl.cpp	
+++ gwenview/lib/document/loadingdocumentimpl.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/document/svgdocumentloadedimpl.h	
+++ gwenview/lib/document/svgdocumentloadedimpl.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/document/videodocumentloadedimpl.cpp	
+++ gwenview/lib/document/videodocumentloadedimpl.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2009 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2009 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/document/loadingdocumentimpl.h	
+++ gwenview/lib/document/loadingdocumentimpl.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/document/videodocumentloadedimpl.h	
+++ gwenview/lib/document/videodocumentloadedimpl.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2009 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2009 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/document/documentfactory.cpp	
+++ gwenview/lib/document/documentfactory.cpp	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/document/documentloadedimpl.cpp	
+++ gwenview/lib/document/documentloadedimpl.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/document/documentfactory.h	
+++ gwenview/lib/document/documentfactory.h	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/document/animateddocumentloadedimpl.cpp	
+++ gwenview/lib/document/animateddocumentloadedimpl.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/document/documentloadedimpl.h	
+++ gwenview/lib/document/documentloadedimpl.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/document/document.cpp	
+++ gwenview/lib/document/document.cpp	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/document/abstractdocumenteditor.h	
+++ gwenview/lib/document/abstractdocumenteditor.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/document/jpegdocumentloadedimpl.cpp	
+++ gwenview/lib/document/jpegdocumentloadedimpl.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/document/emptydocumentimpl.cpp	
+++ gwenview/lib/document/emptydocumentimpl.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/document/animateddocumentloadedimpl.h	
+++ gwenview/lib/document/animateddocumentloadedimpl.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/document/document.h	
+++ gwenview/lib/document/document.h	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/document/jpegdocumentloadedimpl.h	
+++ gwenview/lib/document/jpegdocumentloadedimpl.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/document/emptydocumentimpl.h	
+++ gwenview/lib/document/emptydocumentimpl.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/document/abstractdocumentimpl.cpp	
+++ gwenview/lib/document/abstractdocumentimpl.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/document/abstractdocumentimpl.h	
+++ gwenview/lib/document/abstractdocumentimpl.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/document/svgdocumentloadedimpl.cpp	
+++ gwenview/lib/document/svgdocumentloadedimpl.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/mimetypeutils_p.h	
+++ gwenview/lib/mimetypeutils_p.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/scrolltool.h	
+++ gwenview/lib/scrolltool.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/slideshow.h	
+++ gwenview/lib/slideshow.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/gwenviewconfig.kcfg	
+++ gwenview/lib/gwenviewconfig.kcfg	
@@ -36,9 +36,6 @@
 			load. This is useful to exclude raw files which are recognized as
 			TIFF or JPEG.</whatsthis>
 		</entry>
-		<entry name="SideBarIsVisible" type="Bool">
-			<default>true</default>
-		</entry>
 		<entry name="ThumbnailBarIsVisible" type="Bool">
 			<default>false</default>
 		</entry>
--- gwenview/lib/print/printhelper.h	
+++ gwenview/lib/print/printhelper.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/print/printoptionspage.cpp	
+++ gwenview/lib/print/printoptionspage.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/print/printoptionspage.h	
+++ gwenview/lib/print/printoptionspage.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/print/printhelper.cpp	
+++ gwenview/lib/print/printhelper.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/iodevicejpegsourcemanager.h	
+++ gwenview/lib/iodevicejpegsourcemanager.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/imagesequence.h	
+++ gwenview/lib/imagesequence.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/thumbnailloadjob.h	
+++ gwenview/lib/thumbnailloadjob.h	
@@ -1,6 +1,6 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*	Gwenview - A simple image viewer for KDE
-	Copyright 2000-2004 Aurélien Gâteau <aurelien.gateau@free.fr>
+	Copyright 2000-2004 Aurélien Gâteau <agateau@kde.org>
 	This class is based on the ImagePreviewJob class from Konqueror.
 */
 /*	This file is part of the KDE project
--- gwenview/lib/jpegcontent.h	
+++ gwenview/lib/jpegcontent.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/datewidget.h	
+++ gwenview/lib/datewidget.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/urlutils.h	
+++ gwenview/lib/urlutils.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/hudwidget.h	
+++ gwenview/lib/hudwidget.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/lib/sorting.h	
+++ gwenview/lib/sorting.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/part/gvbrowserextension.h	
+++ gwenview/part/gvbrowserextension.h	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/part/gvpart.cpp	
+++ gwenview/part/gvpart.cpp	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007-2008 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007-2008 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/part/gvpart.h	
+++ gwenview/part/gvpart.h	
@@ -1,6 +1,6 @@
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/part/gvbrowserextension.cpp	
+++ gwenview/part/gvbrowserextension.cpp	
@@ -1,7 +1,7 @@
 // vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview: an image viewer
-Copyright 2007 Aurélien Gâteau <aurelien.gateau@free.fr>
+Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
--- gwenview/fullscreenthemes/blackglass/style.css	
+++ gwenview/fullscreenthemes/blackglass/style.css	
@@ -1,11 +1,11 @@
 /* Default text color for most widgets, but not tooltips (hence the '.' before
  * QLabel */
-.QLabel, #configDialog QPushButton, QToolButton, QCheckBox {
+.QLabel, #configDialog QPushButton, QToolButton, QCheckBox, QComboBox, QSpinBox, QListView {
 	color: #ccc;
 }
 
 /* Default borders, normal and hover */
-QCheckBox::indicator, #configDialog QPushButton, QSlider::groove, QSlider::handle {
+QCheckBox::indicator, #configDialog QPushButton, QSlider::groove, QSlider::handle, QListView {
 	border: 1px solid #666;
 }
 
@@ -13,6 +13,12 @@
 	border: 1px solid #ccc;
 }
 
+/* Selections */
+QComboBox, QLineEdit, QSpinBox, QTextEdit, QListView {
+	selection-color: #333;
+	selection-background-color: #ccc;
+}
+
 /* QToolButton */
 QToolButton {
 	padding: 2px;
@@ -27,6 +33,11 @@
 	border: 1px solid #444;
 }
 
+/* Text editable widgets */
+QComboBox:editable, QSpinBox, QLineEdit, QTextEdit, QListView {
+	background-color: #333;
+}
+
 /* Containers */
 Gwenview--HudWidget {
 	background-color:
@@ -79,25 +90,9 @@
 	image:url($themeDir/checked.png);
 }
 
-/* Config dialog list */
-#configDialog QListView {
-	background-color: #333;
-	border: 1px solid #666;
-}
-
-#configDialog QListView:focus {
-	border: 1px solid #ccc;
-}
-
-#configDialog QListView::item {
-	color: #aaa;
-}
-
-#configDialog QListView::item:selected {
-	background-color:
-		qlineargradient(x1:0, y1:0, x2:0, y2:1,
-		stop:0 #888, stop:1 #444);
-	color: #ccc;
+/* QListView */
+QListView {
+	padding: 2px;
 }
 
 /* QPushButton */
--- gwenview/NEWS	
+++ gwenview/NEWS	
@@ -1,4 +1,8 @@
 # 2.3.0
+## New features
+- Gwenview can now play videos (bug #174522).
+- The sidebar has been reworked and now features a folder view.
+
 ## Improvements
 - New crop interface: less intrusive and with the ability to crop to screen
   ratio.
@@ -7,9 +11,12 @@
 - History can now be disabled.
 - Added file operations and "open with" menu to image view context menu. Patch
   by Marian Kyral (bug #187819).
+- Show XMP image information.
 
 ## Fixes
 - Restart slideshow timer when user changes current image (bug #186411).
+- Scroll when dragging files to the top or bottom of the thumbnail view (bug
+  #189510).
 
 # 2.2.4
 ## Improvements
--- kgamma/kcmkgamma/kgamma.desktop	
+++ kgamma/kcmkgamma/kgamma.desktop	
@@ -85,8 +85,8 @@
 Name[th]=แกมมา
 Name[uk]=Гама
 Name[uz@cyrillic]=Гамма
-Name[x-test]=xxGammaxx
 Name[xh]=Unobumba wesithathu konoobumba besiGrike
+Name[x-test]=xxGammaxx
 Name[zh_HK]=伽馬（Gamma）
 
 X-DocPath=kgamma/index.html
--- kgamma/xf86gammacfg/xf86gammacfg.cpp	
+++ kgamma/xf86gammacfg/xf86gammacfg.cpp	
@@ -46,16 +46,9 @@
     int Screen = 0;
     int ScreenCount = (argc-1) / 3;
     
-    // First, search for XF86Config or xorg.conf
     vector <string> searchPaths;
-    searchPaths.push_back("/etc/X11/XF86Config-4");
-    searchPaths.push_back("/etc/X11/XF86Config");
-    searchPaths.push_back("/etc/XF86Config");
-    searchPaths.push_back("/usr/X11R6/etc/X11/XF86Config-4");
-    searchPaths.push_back("/usr/X11R6/etc/X11/XF86Config");
-    searchPaths.push_back("/usr/X11R6/lib/X11/XF86Config-4");
-    searchPaths.push_back("/usr/X11R6/lib/X11/XF86Config");
 
+    // Xorg.conf file (the default config file now)
     searchPaths.push_back("/etc/X11/xorg.conf-4");
     searchPaths.push_back("/etc/X11/xorg.conf");
     searchPaths.push_back("/etc/xorg.conf");
@@ -63,6 +56,15 @@
     searchPaths.push_back("/usr/X11R6/etc/X11/xorg.conf");
     searchPaths.push_back("/usr/X11R6/lib/X11/xorg.conf-4");
     searchPaths.push_back("/usr/X11R6/lib/X11/xorg.conf");
+    
+    // Deprecated XF86Config file (Xfree86 times)
+    searchPaths.push_back("/etc/X11/XF86Config-4");
+    searchPaths.push_back("/etc/X11/XF86Config");
+    searchPaths.push_back("/etc/XF86Config");
+    searchPaths.push_back("/usr/X11R6/etc/X11/XF86Config-4");
+    searchPaths.push_back("/usr/X11R6/etc/X11/XF86Config");
+    searchPaths.push_back("/usr/X11R6/lib/X11/XF86Config-4");
+    searchPaths.push_back("/usr/X11R6/lib/X11/XF86Config");
 
     std::vector<string>::iterator it = searchPaths.begin();
     for (; it != searchPaths.end(); ++it ) {
--- okular/conf/okular.kcfg	
+++ okular/conf/okular.kcfg	
@@ -262,4 +262,12 @@
     <default code="true">userString</default>
   </entry>
  </group>
+ <group name="Search" >
+  <entry key="SearchCaseSensitive" type="Bool">
+   <default>false</default>
+  </entry>
+  <entry key="SearchFromCurrentPage" type="Bool">
+   <default>false</default>
+  </entry>
+ </group>
 </kcfg>
--- okular/part.cpp	
+++ okular/part.cpp	
@@ -1255,8 +1255,10 @@
 
 void Part::slotHideFindBar()
 {
-    m_findBar->hide();
-    m_pageView->setFocus();
+    if ( m_findBar->maybeHide() )
+    {
+        m_pageView->setFocus();
+    }
 }
 
 //BEGIN go to page dialog
--- okular/core/action.h	
+++ okular/core/action.h	
@@ -98,6 +98,16 @@
         GotoAction( const QString& fileName, const DocumentViewport & viewport );
 
         /**
+         * Creates a new goto action.
+         *
+         * @p fileName The name of an external file that shall be loaded.
+         * @p namedDestination The target named destination for the target document.
+         *
+         * @since 0.9 (KDE 4.3)
+         */
+        GotoAction( const QString& fileName, const QString& namedDestination );
+
+        /**
          * Destroys the goto action.
          */
         virtual ~GotoAction();
@@ -127,6 +137,13 @@
          */
         DocumentViewport destViewport() const;
 
+        /**
+         * Returns the document named destination the goto action points to.
+         *
+         * @since 0.9 (KDE 4.3)
+         */
+        QString destinationName() const;
+
     private:
         Q_DECLARE_PRIVATE( GotoAction )
         Q_DISABLE_COPY( GotoAction )
--- okular/core/document_p.h	
+++ okular/core/document_p.h	
@@ -112,6 +112,7 @@
         SaveInterface* generatorSave( GeneratorInfo& info );
         bool openDocumentInternal( const KService::Ptr& offer, bool isstdin, const QString& docFile, const QByteArray& filedata );
         bool savePageDocumentInfo( KTemporaryFile *infoFile, int what ) const;
+        DocumentViewport nextDocumentViewport() const;
 
         // private slots
         void saveDocumentInfo() const;
@@ -168,6 +169,7 @@
         QLinkedList< DocumentViewport > m_viewportHistory;
         QLinkedList< DocumentViewport >::iterator m_viewportIterator;
         DocumentViewport m_nextDocumentViewport; // see Link::Goto for an explanation
+        QString m_nextDocumentDestination;
 
         // observers / requests / allocator stuff
         QMap< int, DocumentObserver * > m_observers;
--- okular/core/action.cpp	
+++ okular/core/action.cpp	
@@ -56,8 +56,14 @@
         {
         }
 
+        GotoActionPrivate( const QString &fileName, const QString &namedDestination )
+            : ActionPrivate(), m_extFileName( fileName ), m_dest( namedDestination )
+        {
+        }
+
         QString m_extFileName;
         DocumentViewport m_vp;
+        QString m_dest;
 };
 
 GotoAction::GotoAction( const QString& fileName, const DocumentViewport & viewport )
@@ -65,6 +71,11 @@
 {
 }
 
+GotoAction::GotoAction( const QString& fileName, const QString& namedDestination )
+    : Action( *new GotoActionPrivate( fileName, namedDestination ) )
+{
+}
+
 GotoAction::~GotoAction()
 {
 }
@@ -99,6 +110,12 @@
     return d->m_vp;
 }
 
+QString GotoAction::destinationName() const
+{
+    Q_D( const GotoAction );
+    return d->m_dest;
+}
+
 // ExecuteAction
 
 class Okular::ExecuteActionPrivate : public Okular::ActionPrivate
--- okular/core/document.cpp	
+++ okular/core/document.cpp	
@@ -719,6 +719,20 @@
     return false;
 }
 
+DocumentViewport DocumentPrivate::nextDocumentViewport() const
+{
+    DocumentViewport ret = m_nextDocumentViewport;
+    if ( !m_nextDocumentDestination.isEmpty() && m_generator )
+    {
+        DocumentViewport vp( m_generator->metaData( "NamedViewport", m_nextDocumentDestination ).toString() );
+        if ( vp.isValid() )
+        {
+            ret = vp;
+        }
+    }
+    return ret;
+}
+
 void DocumentPrivate::saveDocumentInfo() const
 {
     if ( m_xmlFileName.isEmpty() )
@@ -1655,10 +1669,12 @@
     }
     d->m_memCheckTimer->start( 2000 );
 
-    if (d->m_nextDocumentViewport.isValid())
+    const DocumentViewport nextViewport = d->nextDocumentViewport();
+    if ( nextViewport.isValid() )
     {
-        setViewport(d->m_nextDocumentViewport);
+        setViewport( nextViewport );
         d->m_nextDocumentViewport = DocumentViewport();
+        d->m_nextDocumentDestination = QString();
     }
 
     AudioPlayer::instance()->d->m_currentDocument = isstdin ? KUrl() : d->m_url;
@@ -2472,6 +2488,11 @@
     d->m_nextDocumentViewport = viewport;
 }
 
+void Document::setNextDocumentDestination( const QString &namedDestination )
+{
+    d->m_nextDocumentDestination = namedDestination;
+}
+
 void Document::searchText( int searchID, const QString & text, bool fromStart, Qt::CaseSensitivity caseSensitivity,
                                SearchType type, bool moveViewport, const QColor & color, bool noDialogs )
 {
@@ -2749,6 +2770,7 @@
         case Action::Goto: {
             const GotoAction * go = static_cast< const GotoAction * >( action );
             d->m_nextDocumentViewport = go->destViewport();
+            d->m_nextDocumentDestination = go->destinationName();
 
             // Explanation of why d->m_nextDocumentViewport is needed:
             // all openRelativeFile does is launch a signal telling we
@@ -2766,12 +2788,14 @@
             }
             else
             {
+                const DocumentViewport nextViewport = d->nextDocumentViewport();
                 // skip local links that point to nowhere (broken ones)
-                if (!d->m_nextDocumentViewport.isValid())
+                if ( !nextViewport.isValid() )
                     return;
 
-                setViewport( d->m_nextDocumentViewport, -1, true );
+                setViewport( nextViewport, -1, true );
                 d->m_nextDocumentViewport = DocumentViewport();
+                d->m_nextDocumentDestination = QString();
             }
 
             } break;
--- okular/core/document.h	
+++ okular/core/document.h	
@@ -317,6 +317,13 @@
         void setNextDocumentViewport( const DocumentViewport &viewport );
 
         /**
+         * Sets the next @p namedDestination in the viewport history.
+         *
+         * @since 0.9 (KDE 4.3)
+         */
+        void setNextDocumentDestination( const QString &namedDestination );
+
+        /**
          * Sets the zoom for the current document.
          *
          * @param excludeId The observer ids which shouldn't be effected by this change.
--- okular/generators/poppler/generator_pdf.cpp	
+++ okular/generators/poppler/generator_pdf.cpp	
@@ -170,9 +170,25 @@
 		break;
 	
 		case Poppler::Link::Goto:
+		{
 			popplerLinkGoto = static_cast<const Poppler::LinkGoto *>(popplerLink);
+#ifdef HAVE_POPPLER_0_11
+			const Poppler::LinkDestination dest = popplerLinkGoto->destination();
+			const QString destName = dest.destinationName();
+			if (destName.isEmpty())
+			{
+				fillViewportFromLinkDestination( viewport, dest );
+				link = new Okular::GotoAction(popplerLinkGoto->fileName(), viewport);
+			}
+			else
+			{
+				link = new Okular::GotoAction(popplerLinkGoto->fileName(), destName);
+			}
+#else
 			fillViewportFromLinkDestination( viewport, popplerLinkGoto->destination() );
 			link = new Okular::GotoAction(popplerLinkGoto->fileName(), viewport);
+#endif
+		}
 		break;
 		
 		case Poppler::Link::Execute:
@@ -430,6 +446,7 @@
     qDeleteAll(docEmbeddedFiles);
     docEmbeddedFiles.clear();
     nextFontPage = 0;
+    rectsGenerated.clear();
 
     return true;
 }
@@ -801,7 +818,9 @@
 
 Okular::TextPage* PDFGenerator::textPage( Okular::Page *page )
 {
-    kDebug(PDFDebug) << "calling" ;
+#ifdef PDFGENERATOR_DEBUG
+    kDebug(PDFDebug) << "page" << page->number();
+#endif
     // build a TextList...
     Poppler::Page *pp = pdfdoc->page( page->number() );
     userMutex()->lock();
@@ -1055,7 +1074,9 @@
 {    
     Okular::TextPage* ktp=new Okular::TextPage;
     Poppler::TextBox *next; 
-    kWarning(PDFDebug) << "getting text page in generator pdf - rotation:" << rot;
+#ifdef PDFGENERATOR_DEBUG
+    kDebug(PDFDebug) << "getting text page in generator pdf - rotation:" << rot;
+#endif
     int charCount=0;
     int j;
     QString s;
--- okular/generators/poppler/config-okular-poppler.h.cmake	
+++ okular/generators/poppler/config-okular-poppler.h.cmake	
@@ -1,2 +1,5 @@
 /* Defined if we have the 0.9 version of the Poppler library */
 #cmakedefine HAVE_POPPLER_0_9 1
+
+/* Defined if we have the 0.11 version of the Poppler library */
+#cmakedefine HAVE_POPPLER_0_11 1
--- okular/generators/poppler/generator_pdf.h	
+++ okular/generators/poppler/generator_pdf.h	
@@ -15,6 +15,7 @@
 
 #include <poppler-qt4.h>
 
+#include <qbitarray.h>
 #include <qpointer.h>
 #include <qthread.h>
 
@@ -144,7 +145,7 @@
         mutable QList<Okular::EmbeddedFile*> docEmbeddedFiles;
         int nextFontPage;
 
-        QVector<bool> rectsGenerated;
+        QBitArray rectsGenerated;
 
         QPointer<PDFOptionsPage> pdfOptionsPage;
 };
--- okular/generators/poppler/CMakeLists.txt	
+++ okular/generators/poppler/CMakeLists.txt	
@@ -10,6 +10,15 @@
   return 0;
 }
 " HAVE_POPPLER_0_9)
+check_cxx_source_compiles("
+#include <poppler-qt4.h>
+int main()
+{
+  Poppler::LinkDestination * dest = 0;
+  const QString foo = dest->destinationName();
+  return 0;
+}
+" HAVE_POPPLER_0_11)
 
 configure_file(
    ${CMAKE_CURRENT_SOURCE_DIR}/config-okular-poppler.h.cmake
--- okular/generators/dvi/generator_dvi.h	
+++ okular/generators/dvi/generator_dvi.h	
@@ -12,6 +12,8 @@
 
 #include <okular/core/generator.h>
 
+#include <qbitarray.h>
+
 class dviRenderer;
 class dviPageInfo;
 class Anchor;
@@ -28,9 +30,6 @@
         DviGenerator( QObject *parent, const QVariantList &args );
         bool loadDocument( const QString & fileName, QVector< Okular::Page * > & pagesVector );
 
-        bool canGeneratePixmap() const;
-        void generatePixmap( Okular::PixmapRequest * request );
-
         // document information
         const Okular::DocumentInfo *generateDocumentInfo();
 
@@ -41,6 +40,7 @@
 
     protected:
         bool doCloseDocument();
+        QImage image( Okular::PixmapRequest * request );
         Okular::TextPage* textPage( Okular::Page *page );
 
    private:
@@ -49,8 +49,8 @@
         Okular::DocumentInfo *m_docInfo;
         Okular::DocumentSynopsis *m_docSynopsis;
 
-        bool ready;
         dviRenderer *m_dviRenderer;
+        QBitArray m_linkGenerated;
 
         void loadPages( QVector< Okular::Page * > & pagesVector );
         Okular::TextPage *extractTextFromPage( dviPageInfo *pageInfo );
--- okular/generators/dvi/generator_dvi.cpp	
+++ okular/generators/dvi/generator_dvi.cpp	
@@ -27,6 +27,7 @@
 #include <qurl.h>
 #include <qvector.h>
 #include <qstack.h>
+#include <qmutex.h>
 
 #include <kaboutdata.h>
 #include <kdebug.h>
@@ -52,8 +53,9 @@
 OKULAR_EXPORT_PLUGIN( DviGenerator, createAboutData() )
 
 DviGenerator::DviGenerator( QObject *parent, const QVariantList &args ) : Okular::Generator( parent, args ),
-  m_docInfo( 0 ), m_docSynopsis( 0 ), ready( false ), m_dviRenderer( 0 )
+  m_docInfo( 0 ), m_docSynopsis( 0 ), m_dviRenderer( 0 )
 {
+    setFeature( Threaded );
     setFeature( TextExtraction );
     setFeature( PrintPostscript );
     if ( Okular::FilePrinter::ps2pdfAvailable() )
@@ -65,9 +67,15 @@
     //kDebug(DviDebug) << "file:" << fileName;
     KUrl base( fileName );
 
+    (void)userMutex();
+
     m_dviRenderer = new dviRenderer();
     if ( ! m_dviRenderer->setFile( fileName, base ) )
+    {
+        delete m_dviRenderer;
+        m_dviRenderer = 0;
         return false;
+    }
 
     m_dviRenderer->setParentWidget( document()->widget() );
 
@@ -76,7 +84,6 @@
     m_resolution = Okular::Utils::dpiY();
     loadPages( pagesVector );
 
-    ready = true;
     return true;
 }
 
@@ -89,16 +96,11 @@
     delete m_dviRenderer;
     m_dviRenderer = 0;
 
-    ready = false;
+    m_linkGenerated.clear();
 
     return true;
 }
 
-bool DviGenerator::canGeneratePixmap () const
-{
-    return ready;
-}
-
 void DviGenerator::fillViewportFromAnchor( Okular::DocumentViewport &vp,
                                            const Anchor &anch, int pW, int pH ) 
 {
@@ -163,11 +165,12 @@
     return dviLinks; 
 }
 
-void DviGenerator::generatePixmap( Okular::PixmapRequest *request )
+QImage DviGenerator::image( Okular::PixmapRequest *request )
 {
 
     dviPageInfo *pageInfo = new dviPageInfo();
     pageSize ps;
+    QImage ret;
 
     pageInfo->width = request->width();
     pageInfo->height = request->height();
@@ -176,6 +179,8 @@
 
 //  pageInfo->resolution = m_resolution;
 
+    QMutexLocker lock( userMutex() );
+
     SimplePageSize s = m_dviRenderer->sizeOfPage( pageInfo->pageNumber );
 
 /*   if ( s.width() != pageInfo->width) */
@@ -204,20 +209,21 @@
         {
             kDebug(DviDebug) << "Image OK";
 
-            if ( !request->page()->isBoundingBoxKnown() )
-                updatePageBoundingBox( request->page()->number(), Okular::Utils::imageBoundingBox( &(pageInfo->img) ) );
+            ret = pageInfo->img;
 
-            request->page()->setPixmap( request->id(), new QPixmap( QPixmap::fromImage( pageInfo->img ) ) );
-
-            request->page()->setObjectRects( generateDviLinks( pageInfo ) );
+            if ( !m_linkGenerated[ request->pageNumber() ] )
+            {
+                request->page()->setObjectRects( generateDviLinks( pageInfo ) );
+                m_linkGenerated[ request->pageNumber() ] = true;
+            }
         }
     }
 
-    ready = true;
+    lock.unlock();
 
     delete pageInfo;
 
-    signalPixmapRequestDone( request );
+    return ret;
 }
 
 Okular::TextPage* DviGenerator::textPage( Okular::Page *page )
@@ -232,6 +238,9 @@
     pageInfo->pageNumber = page->number() + 1;
 
     pageInfo->resolution = m_resolution;
+
+    QMutexLocker lock( userMutex() );
+
     SimplePageSize s = m_dviRenderer->sizeOfPage( pageInfo->pageNumber );
     pageInfo->resolution = (double)(pageInfo->width)/ps.width().getLength_in_inch();
 
@@ -240,6 +249,7 @@
     if ( m_dviRenderer )
     {
         m_dviRenderer->getText( pageInfo );
+        lock.unlock();
 
         ktp = extractTextFromPage( pageInfo );
     }
@@ -286,6 +296,8 @@
 
     m_docInfo->set( Okular::DocumentInfo::MimeType, "application/x-dvi" );
 
+    QMutexLocker lock( userMutex() );
+
     if ( m_dviRenderer && m_dviRenderer->dviFile )
     {
         dvifile *dvif = m_dviRenderer->dviFile;
@@ -306,8 +318,12 @@
 
     m_docSynopsis = new Okular::DocumentSynopsis();
 
+    userMutex()->lock();
+
     QVector<PreBookmark> prebookmarks = m_dviRenderer->getPrebookmarks();
 
+    userMutex()->unlock();
+
     if ( prebookmarks.isEmpty() ) 
         return m_docSynopsis;
 
@@ -349,6 +365,8 @@
     int numofpages = m_dviRenderer->dviFile->total_pages;
     pagesVector.resize( numofpages );
 
+    m_linkGenerated.fill( false, numofpages );
+
     //kDebug(DviDebug) << "resolution:" << m_resolution << ", dviFile->preferred?";
 
     /* get the suggested size */
--- okular/generators/tiff/libokularGenerator_tiff.desktop	
+++ okular/generators/tiff/libokularGenerator_tiff.desktop	
@@ -3,6 +3,7 @@
 Name=Okular TIFF Library
 Name[ar]=مكتبة TIFF لأوكلار
 Name[ca]=Biblioteca TIFF de l'Okular
+Name[cs]=Knihovna TIFF pro Okular
 Name[da]=TIFF-bibliotek til Okular
 Name[de]=TIFF-Bibliothek für Okular
 Name[el]=Βιβλιοθήκη TIFF του Okular
--- okular/generators/mobipocket/libokularGenerator_mobi.desktop	
+++ okular/generators/mobipocket/libokularGenerator_mobi.desktop	
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Type=Service
 Name=Mobipocket document
+Name[da]=Mobipocket-dokument
 Name[de]=Mobipocket-Dokument
 Name[el]=Έγγραφο Mobipocket
 Name[es]=Documento Mobipocket
@@ -20,6 +21,7 @@
 Name[zh_CN]=Mobipocket 文档
 Name[zh_TW]=Mobipocket 文件
 Comment=Mobipocket backend for Okular
+Comment[da]=Mobipocket-motor til Okular
 Comment[de]=Ein Anzeigemodul für Mobipocket-Dateien in Okular
 Comment[el]=Σύστημα υποστήριξης Mobipocket για το Okular
 Comment[es]=Motor Mobipocket para Okular
--- okular/generators/spectre/Messages.sh	
+++ okular/generators/spectre/Messages.sh	
@@ -1,3 +1,4 @@
 #!/bin/sh
 $EXTRACTRC $(find conf/ -name "*.ui" -o -name "*.kcfg") >> rc_okular_ghostview.cpp || exit 11
 $XGETTEXT $(find . -name "*.cpp" -o -name "*.h") -o $podir/okular_ghostview.pot
+rm -f rc_okular_ghostview.cpp
--- okular/generators/comicbook/libokularGenerator_comicbook.desktop	
+++ okular/generators/comicbook/libokularGenerator_comicbook.desktop	
@@ -2,6 +2,7 @@
 Type=Service
 Name=Comic Book
 Name[ar]=كوميك بوك
+Name[cs]=Kniha komixů
 Name[de]=Comicbook
 Name[el]=Βιβλίο κόμικ
 Name[eo]=ComicBook
--- okular/generators/chm/generator_chm.h	
+++ okular/generators/chm/generator_chm.h	
@@ -16,6 +16,8 @@
 
 #include "lib/libchmfile.h"
 
+#include <qbitarray.h>
+
 class KHTMLPart;
 
 namespace Okular {
@@ -63,7 +65,7 @@
         Okular::PixmapRequest* m_request;
         int m_pixmapRequestZoom;
         Okular::DocumentInfo* m_docInfo;
-        QVector<bool> m_textpageAddedList;
+        QBitArray m_textpageAddedList;
 };
 
 #endif
--- okular/generators/chm/generator_chm.cpp	
+++ okular/generators/chm/generator_chm.cpp	
@@ -280,12 +280,12 @@
 
 void CHMGenerator::recursiveExploreNodes(DOM::Node node,Okular::TextPage *tp)
 {
-    if (node.nodeType() == DOM::Node::TEXT_NODE)
+    if (node.nodeType() == DOM::Node::TEXT_NODE && !node.getRect().isNull())
     {
         QString nodeText=node.nodeValue().string();
         QRect r=node.getRect();
-        int vWidth=m_syncGen->view()->contentsWidth();
-        int vHeight=m_syncGen->view()->contentsHeight();
+        int vWidth=m_syncGen->view()->width();
+        int vHeight=m_syncGen->view()->height();
         Okular::NormalizedRect *nodeNormRect;
 #define NOEXP
 #ifndef NOEXP
@@ -347,8 +347,8 @@
         if ( genObjectRects )
         {
             QLinkedList< Okular::ObjectRect * > objRects;
-            int xScale=qRound(page->width());
-            int yScale=qRound(page->height());
+            int xScale=m_syncGen->view()->width();
+            int yScale=m_syncGen->view()->height();
             // getting links
             DOM::HTMLCollection coll=domDoc.links();
             DOM::Node n;
--- okular/generators/xps/libokularGenerator_xps.desktop	
+++ okular/generators/xps/libokularGenerator_xps.desktop	
@@ -3,6 +3,7 @@
 Name=Okular XPS Plugin
 Name[ar]=ملحق XPS لأوكلار
 Name[ca]=Connector XPS per a l'Okular
+Name[cs]=Modul XPS pro Okular
 Name[da]=XPS-plugin til Okular
 Name[de]=XPS-Modul für Okular
 Name[el]=Πρόσθετο XPS του Okular
--- okular/ui/findbar.cpp	
+++ okular/ui/findbar.cpp	
@@ -21,9 +21,11 @@
 // local includes
 #include "searchlineedit.h"
 #include "core/document.h"
+#include "settings.h"
 
 FindBar::FindBar( Okular::Document * document, QWidget * parent )
   : QWidget( parent )
+  , m_active( false )
 {
     QHBoxLayout * lay = new QHBoxLayout( this );
     lay->setMargin( 2 );
@@ -74,7 +76,13 @@
     connect( m_caseSensitiveAct, SIGNAL( toggled( bool ) ), this, SLOT( caseSensitivityChanged() ) );
     connect( m_fromCurrentPageAct, SIGNAL( toggled( bool ) ), this, SLOT( fromCurrentPageChanged() ) );
 
+    m_caseSensitiveAct->setChecked( Okular::Settings::searchCaseSensitive() );
+    m_fromCurrentPageAct->setChecked( Okular::Settings::searchFromCurrentPage() );
+
     hide();
+
+    // "activate" it only at th very end
+    m_active = true;
 }
 
 FindBar::~FindBar()
@@ -98,6 +106,20 @@
     m_search->lineEdit()->setFocus();
 }
 
+bool FindBar::maybeHide()
+{
+    if ( m_search->lineEdit()->isSearchRunning() )
+    {
+        m_search->lineEdit()->stopSearch();
+        return false;
+    }
+    else
+    {
+        hide();
+        return true;
+    }
+}
+
 void FindBar::findNext()
 {
     m_search->lineEdit()->setSearchType( Okular::Document::NextMatch );
@@ -113,12 +135,20 @@
 void FindBar::caseSensitivityChanged()
 {
     m_search->lineEdit()->setSearchCaseSensitivity( m_caseSensitiveAct->isChecked() ? Qt::CaseSensitive : Qt::CaseInsensitive );
+    if ( !m_active )
+        return;
+    Okular::Settings::setSearchCaseSensitive( m_caseSensitiveAct->isChecked() );
+    Okular::Settings::self()->writeConfig();
     m_search->lineEdit()->restartSearch();
 }
 
 void FindBar::fromCurrentPageChanged()
 {
     m_search->lineEdit()->setSearchFromStart( !m_fromCurrentPageAct->isChecked() );
+    if ( !m_active )
+        return;
+    Okular::Settings::setSearchFromCurrentPage( m_fromCurrentPageAct->isChecked() );
+    Okular::Settings::self()->writeConfig();
 }
 
 #include "findbar.moc"
--- okular/ui/searchlineedit.h	
+++ okular/ui/searchlineedit.h	
@@ -37,12 +37,15 @@
         void setSearchMoveViewport( bool move );
         void setSearchFromStart( bool fromStart );
 
+        bool isSearchRunning() const;
+
     signals:
         void searchStarted();
         void searchStopped();
 
     public slots:
         void restartSearch();
+        void stopSearch();
         void findNext();
         void findPrev();
 
@@ -57,6 +60,7 @@
         bool m_moveViewport;
         bool m_changed;
         bool m_fromStart;
+        bool m_searchRunning;
 
     private slots:
         void slotTextChanged( const QString & text );
--- okular/ui/searchlineedit.cpp	
+++ okular/ui/searchlineedit.cpp	
@@ -24,7 +24,8 @@
     : KLineEdit( parent ), m_document( document ), m_minLength( 0 ),
       m_caseSensitivity( Qt::CaseInsensitive ),
       m_searchType( Okular::Document::AllDocument ), m_id( -1 ),
-      m_moveViewport( false ), m_changed( false ), m_fromStart( true )
+      m_moveViewport( false ), m_changed( false ), m_fromStart( true ),
+      m_searchRunning( false )
 {
     setObjectName( "SearchLineEdit" );
     setClearButtonShown( true );
@@ -87,6 +88,11 @@
     m_fromStart = fromStart;
 }
 
+bool SearchLineEdit::isSearchRunning() const
+{
+    return m_searchRunning;
+}
+
 void SearchLineEdit::restartSearch()
 {
     m_inputDelayTimer->stop();
@@ -94,6 +100,18 @@
     m_changed = true;
 }
 
+void SearchLineEdit::stopSearch()
+{
+    if ( m_id == -1 || !m_searchRunning )
+        return;
+
+    m_inputDelayTimer->stop();
+    // ### this should just cancel the search with id m_id, not all of them
+    m_document->cancelSearch();
+    // flagging as "changed" so the search will be reset at the next one
+    m_changed = true;
+}
+
 void SearchLineEdit::findNext()
 {
     if ( m_id == -1 || m_searchType != Okular::Document::NextMatch )
@@ -102,6 +120,7 @@
     if ( !m_changed )
     {
         emit searchStarted();
+        m_searchRunning = true;
         m_document->continueSearch( m_id, m_searchType );
     }
     else
@@ -116,6 +135,7 @@
     if ( !m_changed )
     {
         emit searchStarted();
+        m_searchRunning = true;
         m_document->continueSearch( m_id, m_searchType );
     }
     else
@@ -157,6 +177,7 @@
     if ( thistext.length() >= qMax( m_minLength, 1 ) )
     {
         emit searchStarted();
+        m_searchRunning = true;
         m_document->searchText( m_id, thistext, m_fromStart, m_caseSensitivity,
                                 m_searchType, m_moveViewport, m_color );
     }
@@ -188,6 +209,7 @@
         setPalette( pal );
     }
 
+    m_searchRunning = false;
     emit searchStopped();
 }
 
--- okular/ui/findbar.h	
+++ okular/ui/findbar.h	
@@ -32,6 +32,7 @@
         Qt::CaseSensitivity caseSensitivity() const;
 
         void focusAndSetCursor();
+        bool maybeHide();
 
     public slots:
         void findNext();
@@ -45,6 +46,7 @@
         SearchLineWidget * m_search;
         QAction * m_caseSensitiveAct;
         QAction * m_fromCurrentPageAct;
+        bool m_active;
 };
 
 
--- thumbnailers/mobi/mobithumbnail.desktop	
+++ thumbnailers/mobi/mobithumbnail.desktop	
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Type=Service
 Name=Mobipocket thumbnailer
+Name[da]=Mobipocket-miniaturer
 Name[de]=M
 Name[el]=Δημιουργία εικόνων επισκόπησης Mobipocket
 Name[es]=Generador de miniaturas Mobipocket
--- thumbnailers/raw/rawthumbnail.desktop	
+++ thumbnailers/raw/rawthumbnail.desktop	
@@ -1,11 +1,16 @@
 [Desktop Entry]
 Type=Service
 Name=RAW Photo Camera files
+Name[da]=RAW kamera-filer
+Name[de]=RAW-Fotokamera-Dateien
 Name[es]=Archivos RAW de cámara fotográfica
+Name[et]=Kaamera toorfailid
 Name[pt]=Ficheiros de máquinas fotográficas RAW
 Name[pt_BR]=Arquivos RAW de câmeras fotográficas
 Name[sv]=Obehandlade kamerafotofiler
+Name[tr]=HAM Fotoğraf Makinesi dosyaları
 Name[uk]=Цифрові негативи фотоапаратів
+Name[zh_CN]=RAW 照片相机文件
 Name[zh_TW]=原始相機檔
 X-KDE-ServiceTypes=ThumbCreator
 MimeType=image/x-canon-cr2;image/x-canon-crw;image/x-nikon-nef;image/x-adobe-dng;image/x-kodak-dcr;image/x-kodak-k25;image/x-kodak-kdc;image/x-olympus-orf;image/x-sony-arw;image/x-sony-sr2;image/x-sony-srf;image/x-fuji-raf;image/x-minolta-mrw;image/x-panasonic-raw;image/x-pentax-pef;image/x-sigma-x3f;image/x-kde-raw;
--- kamera/kcontrol/kamera.desktop	
+++ kamera/kcontrol/kamera.desktop	
@@ -58,8 +58,8 @@
 Comment[uz]=Fotoaparatni moslash
 Comment[uz@cyrillic]=Фотоапаратни мослаш
 Comment[vi]=Cấu hình Kamera
-Comment[x-test]=xxConfigure Kameraxx
 Comment[xh]=Qwalasela Umfoti
+Comment[x-test]=xxConfigure Kameraxx
 Comment[zh_CN]=配置 Kamera
 Comment[zh_HK]=設定 Kamera
 Comment[zh_TW]=設定照相機
@@ -170,8 +170,8 @@
 Name[uz]=Fotoaparat
 Name[uz@cyrillic]=Фотоапарат
 Name[vi]=Máy ảnh số
-Name[x-test]=xxDigital Cameraxx
 Name[xh]=Ikhamera Yesuntswana
+Name[x-test]=xxDigital Cameraxx
 Name[zh_CN]=数码相机
 Name[zh_HK]=數碼相機
 Name[zh_TW]=數位相機
--- kruler/kruler.notifyrc	
+++ kruler/kruler.notifyrc	
@@ -53,8 +53,8 @@
 Comment[uz]=KDE ekran lineykasi
 Comment[uz@cyrillic]=KDE экран линейкаси
 Comment[vi]=Thước đo màn hình của KDE
-Comment[x-test]=xxKDE Screen Rulerxx
 Comment[xh]=Umlawuli wekhusi le KDE
+Comment[x-test]=xxKDE Screen Rulerxx
 Comment[zh_CN]=KDE 屏幕标尺
 Comment[zh_HK]=KDE 螢幕尺規
 Comment[zh_TW]=KDE 螢幕尺規
@@ -108,8 +108,8 @@
 Name[th]=ย้ายด้วยปุ่มลูกศร
 Name[tr]=Yön Tuşlarıyla Hareket Ettirildi
 Name[uk]=Пересунуто клавішами курсора
-Name[x-test]=xxMoved by Cursor Keysxx
 Name[xh]=Ishukunyiswa zizitshixo zesalathisi
+Name[x-test]=xxMoved by Cursor Keysxx
 Name[zh_CN]=用光标键移动
 Name[zh_HK]=用游標鍵移動
 Name[zh_TW]=以游標移動
@@ -161,8 +161,8 @@
 Comment[th]=ไม้บรรทัดจะถูกย้ายทีละพิกเซลด้วยการใช้ปุ่มลูกศร
 Comment[tr]=Cetvel piksel piksel yön tuşlarıyla hareket ettirildi
 Comment[uk]=Лінійка пересувається по пікселях за допомогою клавіш курсора
-Comment[x-test]=xxThe ruler has moved pixelwise using the cursor keysxx
 Comment[xh]=Umlawuli ushukume jikelele kwipixel esebenzisa izitshixi zesalathisi
+Comment[x-test]=xxThe ruler has moved pixelwise using the cursor keysxx
 Comment[zh_CN]=标尺已经用光标键按像素移动
 Comment[zh_HK]=使用游標鍵移動尺規單一個像素
 Comment[zh_TW]=尺規已由游標移動數個像素
--- kolourpaint/mainWindow/kpMainWindow_File.cpp	
+++ kolourpaint/mainWindow/kpMainWindow_File.cpp	
@@ -50,7 +50,6 @@
 #include <kfiledialog.h>
 #include <kglobal.h>
 #include <kiconloader.h>
-#include <kimagefilepreview.h>
 #include <kimageio.h>
 #include <kio/netaccess.h>
 #include <klocale.h>
@@ -439,9 +438,6 @@
     if (allowMultipleURLs)
         fd.setMode (KFile::Files);
 
-    // COMPAT: Doesn't work.  KFileDialog bug.
-    fd.setPreviewWidget (new KImageFilePreview (&fd));
-
     if (fd.exec ())
         return fd.selectedUrls ();
     else
--- kolourpaint/kolourpaint.desktop	
+++ kolourpaint/kolourpaint.desktop	
@@ -71,8 +71,8 @@
 GenericName[uz@cyrillic]=Чизиш дастури
 GenericName[vi]=Chương trình vẽ
 GenericName[wa]=Program di dessinaedje
-GenericName[x-test]=xxPaint Programxx
 GenericName[xh]=Udweliso lwenkqubo lwepeyinti
+GenericName[x-test]=xxPaint Programxx
 GenericName[zh_CN]=绘图程序
 GenericName[zh_HK]=繪圖程式
 GenericName[zh_TW]=繪圖程式
--- ksnapshot/ksnapshot.desktop	
+++ ksnapshot/ksnapshot.desktop	
@@ -57,8 +57,8 @@
 GenericName[uz@cyrillic]=Скриншот олиш дастури
 GenericName[vi]=Chương trình chụp màn hình
 GenericName[wa]=Programe po fé des waitroûlêyes
-GenericName[x-test]=xxScreen Capture Programxx
 GenericName[xh]=Iinkcazelo Ezigcina Ikhusi
+GenericName[x-test]=xxScreen Capture Programxx
 GenericName[zh_CN]=屏幕截图程序
 GenericName[zh_HK]=螢幕擷取程式
 GenericName[zh_TW]=畫面擷取程式
--- kcolorchooser/kcolorchooser.desktop	
+++ kcolorchooser/kcolorchooser.desktop	
@@ -65,8 +65,8 @@
 GenericName[uz@cyrillic]=Ранг танловчи
 GenericName[vi]=Trình chọn màu
 GenericName[wa]=Tchoezixheu di coleurs
-GenericName[x-test]=xxColor Chooserxx
 GenericName[xh]=Mkhethi Wombala
+GenericName[x-test]=xxColor Chooserxx
 GenericName[zh_CN]=颜色选择器
 GenericName[zh_HK]=顏色選擇器
 GenericName[zh_TW]=顏色選擇程式
@@ -93,8 +93,8 @@
 Name[uk]=Селектор кольорів
 Name[uz]=Rang tanlovchi
 Name[uz@cyrillic]=Ранг танловчи
-Name[x-test]=xxKColorChooserxx
 Name[xh]=Umkhethi Wombala i K
+Name[x-test]=xxKColorChooserxx
 Name[zh_TW]=KColorChooser 顏色選擇器
 
 X-DBUS-StartupType=Multi

Property changes on: .
___________________________________________________________________
Added: svn:externals
   +

Places

File 4_3_BRANCH.diff of Package kdegraphics4 (Revision ee5c16e36be9ad14c4addadb46fc9a32)

Places