-Index: apps/nsplugins/sdk/prcpucfg.h
-===================================================================
---- apps/nsplugins/sdk/prcpucfg.h (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
-+++ apps/nsplugins/sdk/prcpucfg.h (.../branches/KDE/4.4/kdebase) (wersja 1104128)
-@@ -600,8 +600,49 @@
- #define PR_BYTES_PER_WORD_LOG2 2
- #define PR_BYTES_PER_DWORD_LOG2 3
-
-+#elif defined(__sh__)
-+
-+#ifdef __LITTLE_ENDIAN__
-+#define IS_LITTLE_ENDIAN 1
-+#undef IS_BIG_ENDIAN
- #else
-+#define IS_BIG_ENDIAN 1
-+#undef IS_LITTLE_ENDIAN
-+#endif
-
-+#define PR_BYTES_PER_BYTE 1
-+#define PR_BYTES_PER_SHORT 2
-+#define PR_BYTES_PER_INT 4
-+#define PR_BYTES_PER_INT64 8
-+#define PR_BYTES_PER_LONG 4
-+#define PR_BYTES_PER_FLOAT 4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD 4
-+#define PR_BYTES_PER_DWORD 8
-+
-+#define PR_BITS_PER_BYTE 8
-+#define PR_BITS_PER_SHORT 16
-+#define PR_BITS_PER_INT 32
-+#define PR_BITS_PER_INT64 64
-+#define PR_BITS_PER_LONG 32
-+#define PR_BITS_PER_FLOAT 32
-+#define PR_BITS_PER_DOUBLE 64
-+#define PR_BITS_PER_WORD 32
-+
-+#define PR_ALIGN_OF_SHORT 2
-+#define PR_ALIGN_OF_INT 4
-+#define PR_ALIGN_OF_LONG 4
-+#define PR_ALIGN_OF_INT64 8
-+#define PR_ALIGN_OF_FLOAT 4
-+#define PR_ALIGN_OF_DOUBLE 8
-+#define PR_ALIGN_OF_POINTER 4
-+#define PR_ALIGN_OF_WORD 4
-+
-+#define PR_BYTES_PER_WORD_LOG2 2
-+#define PR_BYTES_PER_DWORD_LOG2 3
-+
-+#else
-+
- #error "Unknown CPU architecture"
+Index: apps/konqueror/src/konqtabs.h
+===================================================================
+--- apps/konqueror/src/konqtabs.h (.../tags/KDE/4.5.0/kdebase) (wersja 1165575)
++++ apps/konqueror/src/konqtabs.h (.../branches/KDE/4.5/kdebase) (wersja 1165575)
+@@ -143,7 +143,6 @@
+ NewTabToolButton* m_leftWidget;
+ bool m_permanentCloseButtons;
+ bool m_alwaysTabBar;
+- bool m_MouseMiddleClickClosesTab;
+ QMap<QString,QAction*> m_popupActions;
+ };
- #endif
-Index: apps/konqueror/CMakeLists.txt
+Index: apps/konqueror/src/konqcombo.cpp
===================================================================
---- apps/konqueror/CMakeLists.txt (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
-+++ apps/konqueror/CMakeLists.txt (.../branches/KDE/4.4/kdebase) (wersja 1104128)
-@@ -1,8 +1,6 @@
-
- add_definitions(-D_LARGEFILE64_SOURCE )
+--- apps/konqueror/src/konqcombo.cpp (.../tags/KDE/4.5.0/kdebase) (wersja 1165575)
++++ apps/konqueror/src/konqcombo.cpp (.../branches/KDE/4.5/kdebase) (wersja 1165575)
+@@ -869,6 +869,8 @@
+ const bool blocked = completionbox->blockSignals(true);
+ completionbox->setCurrentItem(matchedItem);
+ completionbox->blockSignals(blocked);
++ } else {
++ completionbox->setCurrentRow(-1);
+ }
+ }
+ else { // completion box not visible yet -> show it
+Index: apps/konqueror/src/konqtabs.cpp
+===================================================================
+--- apps/konqueror/src/konqtabs.cpp (.../tags/KDE/4.5.0/kdebase) (wersja 1165575)
++++ apps/konqueror/src/konqtabs.cpp (.../branches/KDE/4.5/kdebase) (wersja 1165575)
+@@ -74,8 +74,6 @@
+ m_pActiveChild = 0L;
+ m_pViewManager = viewManager;
--add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
+- m_MouseMiddleClickClosesTab = KonqSettings::mouseMiddleClickClosesTab();
-
- add_subdirectory( src )
- add_subdirectory( client )
+ m_permanentCloseButtons = KonqSettings::permanentCloseButton();
+ if (m_permanentCloseButtons) {
+ setTabsClosable( true );
+@@ -379,7 +377,7 @@
-Index: apps/konqueror/sidebar/web_module/web_module.cpp
-===================================================================
---- apps/konqueror/sidebar/web_module/web_module.cpp (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
-+++ apps/konqueror/sidebar/web_module/web_module.cpp (.../branches/KDE/4.4/kdebase) (wersja 1104128)
-@@ -17,6 +17,7 @@
- */
+ void KonqFrameTabs::slotMouseMiddleClick(QWidget *w)
+ {
+- if (m_MouseMiddleClickClosesTab) {
++ if (KonqSettings::mouseMiddleClickClosesTab()) {
+ slotCloseRequest(w);
+ } else {
+ KUrl filteredURL(KonqMisc::konqFilteredURL(this, QApplication::clipboard()->text(QClipboard::Selection)));
+Index: apps/konqueror/settings/kio/kcookiespolicies.cpp
+===================================================================
+--- apps/konqueror/settings/kio/kcookiespolicies.cpp (.../tags/KDE/4.5.0/kdebase) (wersja 1165575)
++++ apps/konqueror/settings/kio/kcookiespolicies.cpp (.../branches/KDE/4.5/kdebase) (wersja 1165575)
+@@ -191,9 +191,9 @@
+ if ( !handleDuplicate(domain, advice) )
+ {
+ const char* strAdvice = KCookieAdvice::adviceToStr(advice);
+- QTreeWidgetItem* index = new QTreeWidgetItem (dlg->lvDomainPolicy,
+- QStringList()<< domain << i18n(strAdvice));
+- m_pDomainPolicy.insert (index, strAdvice);
++ QTreeWidgetItem* item = new QTreeWidgetItem (dlg->lvDomainPolicy,
++ QStringList()<< domain << i18n(strAdvice));
++ m_pDomainPolicy.insert (item, strAdvice);
+ configChanged();
+ }
+ }
+@@ -395,12 +395,14 @@
+ group.writeEntry("CookieGlobalAdvice", advice);
- #include "web_module.h"
-+#include <kaction.h>
- #include "favicon_interface.h"
+ QStringList domainConfig;
+- QTreeWidgetItem *at = dlg->lvDomainPolicy->topLevelItem(0);
+-
+- while( at )
+- {
+- domainConfig.append(QString::fromLatin1("%1:%2").arg(QString(tolerantToAce(at->text(0)))).arg(m_pDomainPolicy[at]));
+- at = dlg->lvDomainPolicy->itemBelow(at);
++ QMapIterator<QTreeWidgetItem*, const char*> it (m_pDomainPolicy);
++ while (it.hasNext()) {
++ it.next();
++ QTreeWidgetItem *item = it.key();
++ QString policy = tolerantToAce(item->text(0));
++ policy += QLatin1Char(':');
++ policy += QLatin1String(it.value());
++ domainConfig << policy;
+ }
- #include <QtCore/QFileInfo>
-@@ -35,6 +36,52 @@
- #include <khbox.h>
+ group.writeEntry("CookieDomainAdvice", domainConfig);
+Index: apps/konqueror/settings/kio/uasproviders/safari40.desktop
+===================================================================
+--- apps/konqueror/settings/kio/uasproviders/safari40.desktop (.../tags/KDE/4.5.0/kdebase) (wersja 1165575)
++++ apps/konqueror/settings/kio/uasproviders/safari40.desktop (.../branches/KDE/4.5/kdebase) (wersja 1165575)
+@@ -12,6 +12,7 @@
+ Name[en_GB]=UADescription (Safari 4.0 on MacOS X)
+ Name[es]=UADescription (Safari 4.0 en MacOS X)
+ Name[et]=UADescription (Safari 4.0 MacOS X platvormil)
++Name[eu]=UA azalpena (Safari 4.0 MacOS X-en)
+ Name[fr]=UADescription (Safari 4.0 sous MacOS X)
+ Name[fy]=UADescription (Safari 4.0 op MacOS X)
+ Name[ga]=UADescription (Safari 4.0 ar MacOS X)
+@@ -34,6 +35,7 @@
+ Name[nb]=Brukeragent (Safari 4.0 på MacOS X)
+ Name[nds]=UA-Beschrieven (Safari 4.0 op MacOS X)
+ Name[nl]=GA-beschrijving (Safari 4.0 op MacOS X)
++Name[nn]=Brukaragent (Safari 4.0 på MacOS X)
+ Name[pa]=UADescription (MacOS X ਉੱਤੇ ਸਫ਼ਾਰੀ ੪.੦)
+ Name[pl]=UADescription (Safari 4.0 w MacOS X)
+ Name[pt]=UADescription (Safari 4.0 no MacOS X)
+Index: apps/konqueror/settings/kio/uasproviders/firefox36oncurrent.desktop
+===================================================================
+--- apps/konqueror/settings/kio/uasproviders/firefox36oncurrent.desktop (.../tags/KDE/4.5.0/kdebase) (wersja 1165575)
++++ apps/konqueror/settings/kio/uasproviders/firefox36oncurrent.desktop (.../branches/KDE/4.5/kdebase) (wersja 1165575)
+@@ -12,6 +12,7 @@
+ Name[en_GB]=UADescription (Firefox 3.6 on current)
+ Name[es]=UADescription (Firefox 3.6 en actual)
+ Name[et]=UADescription (Selles masinas töötav Firefox 3.6)
++Name[eu]=UA azalpena (Firefox 3.6 unekoan)
+ Name[fr]=UADescription (Firefox 3.6 sous le système actuel)
+ Name[fy]=UADescription (Firefox 3.6 op aktive)
+ Name[ga]=UADescription (Firefox 3.6 ar an gcóras reatha)
+@@ -34,6 +35,7 @@
+ Name[nb]=Brukeragent (Firefox 3.6 herifra)
+ Name[nds]=UA-Beschrieven (Firefox 3.6 op dit Systeem)
+ Name[nl]=UADescription (Firefox 3.6 op huidige)
++Name[nn]=Brukaragent (Firefox 3.6 herifrå)
+ Name[pa]=UADescription (ਮੌਜੂਦਾ ਉੱਤੇ ਫਾਇਰਫਾਕਸ ੩.੬)
+ Name[pl]=UADescription (Firefox 3.6, bieżący)
+ Name[pt]=UADescription (Firefox 3.6 no sistema actual)
+Index: apps/konqueror/settings/kio/uasproviders/chrome50oncurrent.desktop
+===================================================================
+--- apps/konqueror/settings/kio/uasproviders/chrome50oncurrent.desktop (.../tags/KDE/4.5.0/kdebase) (wersja 1165575)
++++ apps/konqueror/settings/kio/uasproviders/chrome50oncurrent.desktop (.../branches/KDE/4.5/kdebase) (wersja 1165575)
+@@ -12,6 +12,7 @@
+ Name[en_GB]=UADescription (Google Chrome 5.0)
+ Name[es]=UADescription (Google Chrome 5.0)
+ Name[et]=UADescription (Google Chrome 5.0)
++Name[eu]=UA azalpena (Google Chrome 5.0)
+ Name[fr]=UADescription (Google Chrome 5.0)
+ Name[fy]=UADescription (Google Chrome 5.0)
+ Name[ga]=UADescription (Google Chrome 5.0)
+@@ -34,6 +35,7 @@
+ Name[nb]=Brukeragent (Google Chrome 5.0)
+ Name[nds]=UA-Beschrieven (Google Chrome 5.0)
+ Name[nl]=GA-beschrijving (Google Chrome 5.0)
++Name[nn]=Brukaragent (Google Chrome 5.0)
+ Name[pa]=UADescription (ਗੂਗਲ ਕਰੋਮ ੫.੦)
+ Name[pl]=UADescription (Google Chrome 5.0)
+ Name[pt]=UADescription (Google Chrome 5.0)
+Index: apps/konqueror/settings/kio/uasproviders/firefox30oncurrent.desktop
+===================================================================
+--- apps/konqueror/settings/kio/uasproviders/firefox30oncurrent.desktop (.../tags/KDE/4.5.0/kdebase) (wersja 1165575)
++++ apps/konqueror/settings/kio/uasproviders/firefox30oncurrent.desktop (.../branches/KDE/4.5/kdebase) (wersja 1165575)
+@@ -14,7 +14,7 @@
+ Name[eo]=UA-Priskribo (Fajrovulpo 3.0 sub nuna)
+ Name[es]=UADescription (Firefox 3.0 en actual)
+ Name[et]=UADescription (Selles masinas töötav Firefox 3.0)
+-Name[eu]=UADescription (Firefox 3.0 unekoan)
++Name[eu]=UA azalpena (Firefox 3.0 unekoan)
+ Name[fi]=Käyttäjäagenttikuvaus (Firefox 3.0 nykyisellä)
+ Name[fr]=UADescription (Firefox 3.0 sous le système actuel)
+ Name[fy]=UA-beskriuwing (Firefox 3.0 op aktive)
+Index: apps/konqueror/sidebar/places_module/konqsidebar_places.desktop
+===================================================================
+--- apps/konqueror/sidebar/places_module/konqsidebar_places.desktop (.../tags/KDE/4.5.0/kdebase) (wersja 1165575)
++++ apps/konqueror/sidebar/places_module/konqsidebar_places.desktop (.../branches/KDE/4.5/kdebase) (wersja 1165575)
+@@ -13,12 +13,14 @@
+ Name[en_GB]=Places SideBar Module
+ Name[es]=Módulo de la barra lateral de lugares
+ Name[et]=Asukohtade külgriba moodul
++Name[eu]=Lekuen alboko barraren modulua
+ Name[fi]=Sijainnit sivupalkki-moduuli
+ Name[fr]=Placer le module de barre de navigation
+ Name[fy]=Places sydbalke module
+ Name[ga]=Modúl Barra Taoibh Áiteanna
+ Name[he]=מודול סרגל צד מקומות
+ Name[hi]= बाज़ूपट्टी मॉड्यू लगाता हैल
++Name[hr]=Postavlja modul bočne trake
+ Name[ia]=Modulo de Barra Lateral de Placias
+ Name[id]=Tempat Modul Batang Sisi
+ Name[is]=Staðahliðarsláreining
+@@ -34,6 +36,7 @@
+ Name[nb]=Modul for steder-sidestolpe
+ Name[nds]=Steden-Sietpaneelmoduul
+ Name[nl]=Plaatst module voor zijbalk
++Name[nn]=Modul for stad-sidestolpe
+ Name[pa]=ਥਾਵਾਂ ਬਾਹਰੀ ਮੋਡੀਊਲ
+ Name[pl]=Moduł paska bocznego miejsc
+ Name[pt]=Módulo da Barra Lateral dos Locais
+Index: apps/konqueror/sidebar/default_entries/places.desktop
+===================================================================
+--- apps/konqueror/sidebar/default_entries/places.desktop (.../tags/KDE/4.5.0/kdebase) (wersja 1165575)
++++ apps/konqueror/sidebar/default_entries/places.desktop (.../branches/KDE/4.5/kdebase) (wersja 1165575)
+@@ -83,6 +83,7 @@
+ Comment[en_GB]=This is the list of places.
+ Comment[es]=Esta es la lista de lugares.
+ Comment[et]=Asukohtade loend.
++Comment[eu]=Hau da lekuen zerrenda.
+ Comment[fi]=Tämä on sijaintien luettelo.
+ Comment[fr]=Ceci est la liste des emplacements.
+ Comment[fy]=Dit is de opsomming fan places.
+@@ -105,6 +106,7 @@
+ Comment[nb]=Dette er lista over steder.
+ Comment[nds]=Dit is de List mit Steden.
+ Comment[nl]=Dit is de lijst met plaatsen.
++Comment[nn]=Dette er lista over stader.
+ Comment[pa]=ਇਹ ਥਾਵਾਂ ਦੀ ਲਿਸਟ ਹੈ।
+ Comment[pl]=To jest lista miejsc.
+ Comment[pt]=Esta é a lista de locais.
+Index: apps/konqueror/preloader/konqy_preloader.desktop
+===================================================================
+--- apps/konqueror/preloader/konqy_preloader.desktop (.../tags/KDE/4.5.0/kdebase) (wersja 1165575)
++++ apps/konqueror/preloader/konqy_preloader.desktop (.../branches/KDE/4.5/kdebase) (wersja 1165575)
+@@ -12,6 +12,7 @@
+ Name[en_GB]=Konqueror Browser Preloader
+ Name[es]=Módulo de precarga del navegador Konqueror
+ Name[et]=Konquerori brauseri eellaadimise moodul
++Name[eu]=Konqueror arakatzailearen aurrezamatzailea
+ Name[fi]=Konqueror-selaimen esilataaja
+ Name[fr]=Module de préchargement du navigateur Konqueror
+ Name[fy]=Konqueror Blêder foarlader
+@@ -35,6 +36,7 @@
+ Name[nb]=Forhåndslaster for Konqueror nettleser
+ Name[nds]=Konqueror vörladen
+ Name[nl]=Konqueror browser preloader-module
++Name[nn]=Førehandslastar for nettlesaren Konqueror
+ Name[pa]=ਕੋਨਕਿਉਰੋਰ ਬਰਾਊਜ਼ਰ ਪਹਿਲਾਂ ਲੋਡ ਮੋਡੀਊਲ
+ Name[pl]=Wstępne wczytywanie dla Konquerora
+ Name[pt]=Pré-Carregamento do Navegador Konqueror
+Index: apps/dolphin/src/viewextensionsfactory.cpp
+===================================================================
+--- apps/dolphin/src/viewextensionsfactory.cpp (.../tags/KDE/4.5.0/kdebase) (wersja 1165575)
++++ apps/dolphin/src/viewextensionsfactory.cpp (.../branches/KDE/4.5/kdebase) (wersja 1165575)
+@@ -61,7 +61,7 @@
+ m_toolTipManager = new ToolTipManager(view, proxyModel);
+
+ connect(dolphinViewController, SIGNAL(hideToolTip()),
+- m_toolTipManager, SLOT(hideTip()));
++ m_toolTipManager, SLOT(hideToolTip()));
+ }
+ // initialize preview generator
+Index: apps/dolphin/src/dolphinview.cpp
+===================================================================
+--- apps/dolphin/src/dolphinview.cpp (.../tags/KDE/4.5.0/kdebase) (wersja 1165575)
++++ apps/dolphin/src/dolphinview.cpp (.../branches/KDE/4.5/kdebase) (wersja 1165575)
+@@ -93,7 +93,6 @@
+ m_dolphinViewController(0),
+ m_viewModeController(0),
+ m_viewAccessor(proxyModel),
+- m_selectionModel(0),
+ m_selectionChangedTimer(0),
+ m_rootUrl(),
+ m_activeItemUrl(),
+@@ -540,30 +539,33 @@
+
+ void DolphinView::setUrl(const KUrl& url)
+ {
+- if (m_viewModeController->url() != url) {
+- m_newFileNames.clear();
++ if (m_viewModeController->url() == url) {
++ return;
++ }
-+KHTMLSideBar::KHTMLSideBar()
-+ : KHTMLPart()
-+{
-+ setStatusMessagesEnabled(false);
-+ setMetaRefreshEnabled(true);
-+ setJavaEnabled(false);
-+ setPluginsEnabled(false);
-+
-+ setFormNotification(KHTMLPart::Only);
-+ connect(this,
-+ SIGNAL(formSubmitNotification(const char*,QString,QByteArray,QString,QString,QString)),
-+ this,
-+ SLOT(formProxy(const char*,QString,QByteArray,QString,QString,QString))
-+ );
-+
+- m_viewModeController->setUrl(url); // emits urlChanged, which we forward
+- m_viewAccessor.prepareUrlChange(url);
+- applyViewProperties();
+- loadDirectory(url);
++ // The selection model might change in the case of the column view. Disconnect
++ // from the current selection model and reconnect later after the URL switch.
++ QAbstractItemView* view = m_viewAccessor.itemView();
++ disconnect(view->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
++ this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection)));
+
+- // When changing the URL there is no need to keep the version
+- // data of the previous URL.
+- m_viewAccessor.dirModel()->clearVersionData();
++ m_newFileNames.clear();
+
+- emit startedPathLoading(url);
+- }
++ m_viewModeController->setUrl(url); // emits urlChanged, which we forward
++ m_viewAccessor.prepareUrlChange(url);
++ applyViewProperties();
++ loadDirectory(url);
+
+- // the selection model might have changed in the case of a column view
+- QItemSelectionModel* selectionModel = m_viewAccessor.itemView()->selectionModel();
+- if (m_selectionModel != selectionModel) {
+- disconnect(m_selectionModel, SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
+- this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection)));
+- m_selectionModel = selectionModel;
+- connect(m_selectionModel, SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
+- this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection)));
+- }
++ // When changing the URL there is no need to keep the version
++ // data of the previous URL.
++ m_viewAccessor.dirModel()->clearVersionData();
+
-+ _linkMenu = new KMenu(widget());
-+
-+ KAction* openLinkAction = new KAction(i18n("&Open Link"), this);
-+ _linkMenu->addAction(openLinkAction);
-+ connect(openLinkAction, SIGNAL(triggered()), this, SLOT(loadPage()));
-+
-+ KAction* openWindowAction = new KAction(i18n("Open in New &Window"), this);
-+ _linkMenu->addAction(openWindowAction);
-+ connect(openWindowAction, SIGNAL(triggered()), this, SLOT(loadNewWindow()));
-+
-+
-+ _menu = new KMenu(widget());
-+
-+ KAction* reloadAction = new KAction(i18n("&Reload"), this);
-+ reloadAction->setIcon(KIcon("view-refresh"));
-+ _menu->addAction(reloadAction);
-+ connect(reloadAction, SIGNAL(triggered()), this, SIGNAL(reload()));
-+
-+ KAction* autoReloadAction = new KAction(i18n("Set &Automatic Reload"), this);
-+ autoReloadAction->setIcon(KIcon("view-refresh"));
-+ _menu->addAction(autoReloadAction);
-+ connect(autoReloadAction, SIGNAL(triggered()), this, SIGNAL(setAutoReload()));
-+
-+ connect(this, SIGNAL(popupMenu(QString,QPoint)),
-+ this, SLOT(showMenu(QString,QPoint)));
-+
-+}
++ emit startedPathLoading(url);
+
-+////
-+
- KonqSideBarWebModule::KonqSideBarWebModule(const KComponentData &componentData, QWidget *parent, const KConfigGroup& configGroup)
- : KonqSidebarModule(componentData, parent, configGroup)
- {
-@@ -43,9 +90,9 @@
- connect(_htmlPart, SIGNAL(reload()), this, SLOT(reload()));
- connect(_htmlPart, SIGNAL(completed()), this, SLOT(pageLoaded()));
- connect(_htmlPart,
-- SIGNAL(setWindowCaption(const QString&)),
-+ SIGNAL(setWindowCaption(QString)),
- this,
-- SLOT(setTitle(const QString&)));
-+ SLOT(setTitle(QString)));
- connect(_htmlPart,
- SIGNAL(openUrlRequest(QString, KParts::OpenUrlArguments, KParts::BrowserArguments)),
- this,
-@@ -61,9 +108,9 @@
- this,
- SLOT(urlNewWindow(QString,KParts::OpenUrlArguments,KParts::BrowserArguments,KParts::WindowArgs)));
- connect(_htmlPart,
-- SIGNAL(submitFormRequest(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&)),
-+ SIGNAL(submitFormRequest(const char*,QString,const QByteArray&,QString,QString,QString)),
- this,
-- SIGNAL(submitFormRequest(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&)));
-+ SIGNAL(submitFormRequest(const char*,QString,const QByteArray&,QString,QString,QString)));
-
- reloadTimeout = configGroup.readEntry("Reload", 0);
- _url = configGroup.readPathEntry("URL", QString());
-@@ -83,7 +130,8 @@
- return _htmlPart->widget();
++ // Reconnect to the (probably) new selection model
++ view = m_viewAccessor.itemView();
++ connect(view->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
++ this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection)));
}
--void KonqSideBarWebModule::setAutoReload(){
-+void KonqSideBarWebModule::setAutoReload()
-+{
- KDialog dlg( 0 );
- dlg.setModal( true );
- dlg.setCaption( i18n("Set Refresh Timeout (0 disables)" ) );
-@@ -92,10 +140,11 @@
- KHBox *hbox = new KHBox( &dlg );
- dlg.setMainWidget( hbox );
-
-- QSpinBox *mins = new QSpinBox( hbox );
-+ QSpinBox *mins = new QSpinBox(hbox);
- mins->setRange(0, 120);
- mins->setSuffix( i18n(" min") );
-- QSpinBox *secs = new QSpinBox( 0, 59, 1, hbox );
-+ QSpinBox *secs = new QSpinBox(hbox);
-+ secs->setRange(0, 59);
- secs->setSuffix( i18n(" sec") );
-
- if( reloadTimeout > 0 ) {
-Index: apps/konqueror/sidebar/web_module/web_module.h
-===================================================================
---- apps/konqueror/sidebar/web_module/web_module.h (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
-+++ apps/konqueror/sidebar/web_module/web_module.h (.../branches/KDE/4.4/kdebase) (wersja 1104128)
-@@ -31,41 +31,11 @@
- // A wrapper for KHTMLPart to make it behave the way we want it to.
- class KHTMLSideBar : public KHTMLPart
- {
-- Q_OBJECT
-- public:
-- KHTMLSideBar() : KHTMLPart() {
-- setStatusMessagesEnabled(false);
-- setMetaRefreshEnabled(true);
-- setJavaEnabled(false);
-- setPluginsEnabled(false);
-+ Q_OBJECT
-+public:
-+ KHTMLSideBar();
-+ virtual ~KHTMLSideBar() {}
-
-- setFormNotification(KHTMLPart::Only);
-- connect(this,
-- SIGNAL(formSubmitNotification(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&)),
-- this,
-- SLOT(formProxy(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&))
-- );
--
--
-- _linkMenu = new KMenu(widget());
--
-- _linkMenu->insertItem(i18n("&Open Link"),
-- this, SLOT(loadPage()));
-- _linkMenu->insertItem(i18n("Open in New &Window"),
-- this, SLOT(loadNewWindow()));
-- _menu = new KMenu(widget());
-- _menu->insertItem(SmallIcon("view-refresh"), i18n("&Reload"),
-- this, SIGNAL(reload()));
-- _menu->insertItem(SmallIcon("view-refresh"), i18n("Set &Automatic Reload"), this, SIGNAL(setAutoReload()));
--
-- connect(this,
-- SIGNAL(popupMenu(const QString&,const QPoint&)),
-- this,
-- SLOT(showMenu(const QString&, const QPoint&)));
--
-- }
-- virtual ~KHTMLSideBar() {}
--
- Q_SIGNALS:
- void submitFormRequest(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&);
- void openUrlRequest(const QString& url,
-Index: apps/konqueror/sidebar/trees/CMakeLists.txt
-===================================================================
---- apps/konqueror/sidebar/trees/CMakeLists.txt (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
-+++ apps/konqueror/sidebar/trees/CMakeLists.txt (.../branches/KDE/4.4/kdebase) (wersja 1104128)
-@@ -9,6 +9,8 @@
- kde4_add_library(sidebar_tree STATIC ${libkonq_sidebar_tree_SRCS})
- endif(WIN32)
-
-+add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
-+
- add_subdirectory( init )
- add_subdirectory( dirtree_module )
- add_subdirectory( bookmark_module )
-Index: apps/konqueror/sidebar/konq_sidebartng.desktop
-===================================================================
---- apps/konqueror/sidebar/konq_sidebartng.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
-+++ apps/konqueror/sidebar/konq_sidebartng.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104128)
-@@ -7,7 +7,7 @@
- Name[ca@valencia]=Barra lateral
- Name[csb]=Bòcznô listew
- Name[da]=Sidepanel
--Name[de]=Seitenleiste
-+Name[de]=Navigationsbereich
- Name[el]=Πλευρική μπάρα
- Name[en_GB]=Sidebar
- Name[eo]=Flanka breto
-@@ -29,6 +29,7 @@
- Name[km]=របារចំហៀង
- Name[kn]=ಬದಿಯ ಪಟ್ಟಿ
- Name[ko]=사이드바
-+Name[lt]=Šoninė juosta
- Name[lv]=Sānjosla
- Name[mai]=स्लाइडबार
- Name[mk]=Странична лента
-Index: apps/konqueror/sidebar/history_module/konqsidebar_history.desktop
-===================================================================
---- apps/konqueror/sidebar/history_module/konqsidebar_history.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
-+++ apps/konqueror/sidebar/history_module/konqsidebar_history.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104128)
-@@ -28,6 +28,7 @@
- Name[km]=ម៉ូឌុលរបារចំហៀងប្រវត្តិ
- Name[kn]=ಚರಿತ್ರೆ ಬದಿಪಟ್ಟಿ ಘಟಕ
- Name[ko]=과거 기록 사이드바 모듈
-+Name[lt]=Istorijos šoninės juostos modulis
- Name[lv]=Vēstures sānjoslas modulis
- Name[mk]=Модул „Лента за историја“
- Name[ml]=നാള്വഴികള് വശത്തു് കാണിയ്ക്കുന്ന ഭാഗം
-Index: apps/konqueror/sidebar/CMakeLists.txt
-===================================================================
---- apps/konqueror/sidebar/CMakeLists.txt (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
-+++ apps/konqueror/sidebar/CMakeLists.txt (.../branches/KDE/4.4/kdebase) (wersja 1104128)
-@@ -1,6 +1,9 @@
- include_directories (${CMAKE_CURRENT_SOURCE_DIR})
-
-+# TODO: rewrite to KDirModel
-+if (${QT_QT3SUPPORT_FOUND})
- add_subdirectory( trees )
-+endif()
- add_subdirectory( web_module )
- add_subdirectory( history_module )
- add_subdirectory( default_entries )
-Index: apps/kfind/kquery.cpp
-===================================================================
---- apps/kfind/kquery.cpp (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
-+++ apps/kfind/kquery.cpp (.../branches/KDE/4.4/kdebase) (wersja 1104128)
-@@ -418,7 +418,7 @@
- QString str = stream->readLine();
- matchingLineNumber++;
-
-- if (str.isEmpty()) break;
-+ if (str.isNull()) break;
- if(isZippedOfficeDocument)
- str.remove(xmlTags);
-
-Index: apps/dolphin/src/panels/information/kmetadatawidget.cpp
-===================================================================
---- apps/dolphin/src/panels/information/kmetadatawidget.cpp (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
-+++ apps/dolphin/src/panels/information/kmetadatawidget.cpp (.../branches/KDE/4.4/kdebase) (wersja 1104128)
-@@ -136,7 +136,8 @@
-
- QMap<KUrl, Nepomuk::Resource> m_files;
-
-- KLoadMetaDataThread* m_loadMetaDataThread;
-+ QList<KLoadMetaDataThread*> m_metaDataThreads;
-+ KLoadMetaDataThread* m_latestMetaDataThread;
- #endif
+ void DolphinView::selectAll()
+@@ -1271,28 +1273,28 @@
- private:
-@@ -163,7 +164,8 @@
- m_taggingWidget(0),
- m_commentWidget(0),
- m_files(),
-- m_loadMetaDataThread(0),
-+ m_metaDataThreads(),
-+ m_latestMetaDataThread(0),
- #endif
- q(parent)
+ void DolphinView::createView()
{
-@@ -209,11 +211,15 @@
- KMetaDataWidget::Private::~Private()
- {
- #ifdef HAVE_NEPOMUK
-- if (m_loadMetaDataThread != 0) {
-- disconnect(m_loadMetaDataThread, SIGNAL(finished()), q, SLOT(slotLoadingFinished()));
-- m_loadMetaDataThread->cancelAndDelete();
-- m_loadMetaDataThread = 0;
-+ // If there are still threads that receive meta data, tell them
-+ // that they should cancel as soon as possible. No waiting is done
-+ // here, the threads delete themselves after finishing.
-+ foreach (KLoadMetaDataThread* thread, m_metaDataThreads) {
-+ disconnect(thread, SIGNAL(finished()), q, SLOT(slotLoadingFinished()));
-+ thread->cancelAndDelete();
++ QAbstractItemView* view = m_viewAccessor.itemView();
++ if ((view != 0) && (view->selectionModel() != 0)) {
++ disconnect(view->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
++ this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection)));
++ }
++
+ deleteView();
+
+ Q_ASSERT(m_viewAccessor.itemView() == 0);
+ m_viewAccessor.createView(this, m_dolphinViewController, m_viewModeController, m_mode);
+
+- QAbstractItemView* view = m_viewAccessor.itemView();
++ view = m_viewAccessor.itemView();
+ Q_ASSERT(view != 0);
+ view->installEventFilter(this);
+ view->viewport()->installEventFilter(this);
+
+ m_dolphinViewController->setItemView(view);
+
+- // When changing the view mode, the selection is lost due to reinstantiating
+- // a new item view with a custom selection model. Pass the ownership of the
+- // selection model to DolphinView, so that it can be shared by all item views.
+- if (m_selectionModel != 0) {
+- view->setSelectionModel(m_selectionModel);
+- } else {
+- m_selectionModel = view->selectionModel();
+- }
+- m_selectionModel->setParent(this);
+- connect(m_selectionModel, SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
++ const int zoomLevel = ZoomLevelInfo::zoomLevelForIconSize(view->iconSize());
++ m_viewModeController->setZoomLevel(zoomLevel);
++
++ connect(view->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
+ this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection)));
+
+ setFocusProxy(m_viewAccessor.layoutTarget());
+Index: apps/dolphin/src/dolphincolumnviewcontainer.cpp
+===================================================================
+--- apps/dolphin/src/dolphincolumnviewcontainer.cpp (.../tags/KDE/4.5.0/kdebase) (wersja 1165575)
++++ apps/dolphin/src/dolphincolumnviewcontainer.cpp (.../branches/KDE/4.5/kdebase) (wersja 1165575)
+@@ -108,7 +108,7 @@
+
+ int columnIndex = 0;
+ foreach (DolphinColumnView* column, m_columns) {
+- if (column->url() == url) {
++ if (column->url().equals(url, KUrl::CompareWithoutTrailingSlash)) {
+ // the column represents already the requested URL, hence activate it
+ requestActivation(column);
+ layoutColumns();
+@@ -411,6 +411,8 @@
+ } else {
+ column->deleteLater();
}
-+ m_metaDataThreads.clear();
-+ m_latestMetaDataThread = 0;
- #endif
++
++ layoutColumns();
}
-@@ -352,18 +358,28 @@
- void KMetaDataWidget::Private::slotLoadingFinished()
- {
- #ifdef HAVE_NEPOMUK
-- if (m_loadMetaDataThread == 0) {
-- // The signal finished() has been emitted, but the thread has been marked
-- // as invalid in the meantime. Just ignore the signal in this case.
-- return;
-+ // The thread that has emitted the finished() signal
-+ // will get deleted and removed from m_metaDataThreads.
-+ const int threadsCount = m_metaDataThreads.count();
-+ for (int i = 0; i < threadsCount; ++i) {
-+ KLoadMetaDataThread* thread = m_metaDataThreads[i];
-+ if (thread == q->sender()) {
-+ m_metaDataThreads.removeAt(i);
-+ if (thread != m_latestMetaDataThread) {
-+ // Ignore data of older threads, as the data got
-+ // obsolete by m_latestMetaDataThread.
-+ thread->deleteLater();
-+ return;
-+ }
-+ }
- }
--
-+
- Q_ASSERT(m_ratingWidget != 0);
- Q_ASSERT(m_commentWidget != 0);
- Q_ASSERT(m_taggingWidget != 0);
-- m_ratingWidget->setRating(m_loadMetaDataThread->rating());
-- m_commentWidget->setText(m_loadMetaDataThread->comment());
-- m_taggingWidget->setTags(m_loadMetaDataThread->tags());
-+ m_ratingWidget->setRating(m_latestMetaDataThread->rating());
-+ m_commentWidget->setText(m_latestMetaDataThread->comment());
-+ m_taggingWidget->setTags(m_latestMetaDataThread->tags());
-
- // Show the remaining meta information as text. The number
- // of required rows may very. Existing rows are reused to
-@@ -372,7 +388,7 @@
- const int rowCount = m_rows.count();
- Q_ASSERT(rowCount >= index);
-
-- const QList<KLoadMetaDataThread::Item> items = mergedItems(m_loadMetaDataThread->items());
-+ const QList<KLoadMetaDataThread::Item> items = mergedItems(m_latestMetaDataThread->items());
- foreach (const KLoadMetaDataThread::Item& item, items) {
- const QString itemLabel = item.label;
- QString itemValue = item.value;
-@@ -413,10 +429,8 @@
- m_rows.pop_back();
- }
+ #include "dolphincolumnviewcontainer.moc"
+Index: apps/dolphin/src/tooltips/filemetadatatooltip.h
+===================================================================
+--- apps/dolphin/src/tooltips/filemetadatatooltip.h (.../tags/KDE/4.5.0/kdebase) (wersja 1165575)
++++ apps/dolphin/src/tooltips/filemetadatatooltip.h (.../branches/KDE/4.5/kdebase) (wersja 1165575)
+@@ -18,8 +18,8 @@
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
+ ***************************************************************************/
-- m_files = m_loadMetaDataThread->files();
--
-- m_loadMetaDataThread->deleteLater();
-- m_loadMetaDataThread = 0;
-+ m_files = m_latestMetaDataThread->files();
-+ m_latestMetaDataThread->deleteLater();
- #endif
+-#ifndef DOLPHINCONTROLLER_H
+-#define DOLPHINCONTROLLER_H
++#ifndef FILEMETADATATOOLTIP_H
++#define FILEMETADATATOOLTIP_H
- q->updateGeometry();
-@@ -590,14 +604,17 @@
- }
- }
+ #include <QWidget>
-- if (d->m_loadMetaDataThread != 0) {
-- disconnect(d->m_loadMetaDataThread, SIGNAL(finished()), this, SLOT(slotLoadingFinished()));
-- d->m_loadMetaDataThread->cancelAndDelete();
-+ // Cancel all threads that have not emitted a finished() signal.
-+ // The deleting of those threads is done in slotLoadingFinished().
-+ foreach (KLoadMetaDataThread* thread, d->m_metaDataThreads) {
-+ thread->cancel();
- }
--
-- d->m_loadMetaDataThread = new KLoadMetaDataThread();
-- connect(d->m_loadMetaDataThread, SIGNAL(finished()), this, SLOT(slotLoadingFinished()));
-- d->m_loadMetaDataThread->load(urls);
-+
-+ // create a new thread that will provide the meeta data for the items
-+ d->m_latestMetaDataThread = new KLoadMetaDataThread();
-+ connect(d->m_latestMetaDataThread, SIGNAL(finished()), this, SLOT(slotLoadingFinished()));
-+ d->m_latestMetaDataThread->load(urls);
-+ d->m_metaDataThreads.append(d->m_latestMetaDataThread);
- }
- #endif
- }
-Index: apps/dolphin/src/panels/information/kloadmetadatathread_p.h
-===================================================================
---- apps/dolphin/src/panels/information/kloadmetadatathread_p.h (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
-+++ apps/dolphin/src/panels/information/kloadmetadatathread_p.h (.../branches/KDE/4.4/kdebase) (wersja 1104128)
-@@ -55,8 +55,16 @@
- * metaInfoValues() and files() return valid data.
- */
- void load(const KUrl::List& urls);
--
-+
- /**
-+ * Tells the thread that it should cancel as soon
-+ * as possible. It is undefined when the thread
-+ * gets cancelled. The signal finished() will emitted
-+ * after the cancelling has been done.
-+ */
-+ void cancel();
-+
-+ /**
- * Cancels the thread and assures that the thread deletes
- * itself as soon as the cancelling has been successful. In
- * opposite to QThread::wait() the caller of cancelAndDelete()
-Index: apps/dolphin/src/panels/information/kloadmetadatathread.cpp
-===================================================================
---- apps/dolphin/src/panels/information/kloadmetadatathread.cpp (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
-+++ apps/dolphin/src/panels/information/kloadmetadatathread.cpp (.../branches/KDE/4.4/kdebase) (wersja 1104128)
-@@ -50,15 +50,27 @@
- start();
- }
+@@ -40,14 +40,26 @@
+ virtual ~FileMetaDataToolTip();
--void KLoadMetaDataThread::cancelAndDelete()
-+void KLoadMetaDataThread::cancel()
- {
-- connect(this, SIGNAL(finished()), this, SLOT(slotFinished()));
-+ // Setting m_canceled to true will cancel KLoadMetaDataThread::run()
-+ // as soon as run() gets the chance to check m_cancel.
- m_canceled = true;
-- // Setting m_canceled to true will cancel KLoadMetaDataThread::run()
-- // as soon as possible. Afterwards the thread will delete itself
-- // asynchronously inside slotFinished().
- }
+ void setPreview(const QPixmap& pixmap);
+- const QPixmap* preview() const;
++ QPixmap preview() const;
-+void KLoadMetaDataThread::cancelAndDelete()
-+{
-+ if (isFinished()) {
-+ Q_ASSERT(!isRunning());
-+ deleteLater();
-+ } else {
-+ connect(this, SIGNAL(finished()), this, SLOT(slotFinished()));
-+ // Setting m_canceled to true will cancel KLoadMetaDataThread::run()
-+ // as soon as run() gets the chance to check m_cancel.
-+ m_canceled = true;
-+ // Afterwards the thread will delete itself
-+ // asynchronously inside slotFinished().
-+ }
-+}
- void KLoadMetaDataThread::run()
- {
- KConfig config("kmetainformationrc", KConfig::NoGlobals);
-Index: apps/dolphin/src/panels/terminal/terminalpanel.h
-===================================================================
---- apps/dolphin/src/panels/terminal/terminalpanel.h (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
-+++ apps/dolphin/src/panels/terminal/terminalpanel.h (.../branches/KDE/4.4/kdebase) (wersja 1104128)
-@@ -1,5 +1,5 @@
- /***************************************************************************
-- * Copyright (C) 2007 by Peter Penz <peter.penz@gmx.at> *
-+ * Copyright (C) 2007-2010 by Peter Penz <peter.penz@gmx.at> *
- * *
- * 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 *
-@@ -26,6 +26,10 @@
- class QVBoxLayout;
- class QWidget;
-
-+namespace KIO {
-+ class StatJob;
-+};
-+
- /**
- * @brief Shows the terminal which is synchronized with the URL of the
- * active view.
-@@ -57,10 +61,13 @@
- void slotMostLocalUrlResult(KJob* job);
+ void setName(const QString& name);
+ QString name() const;
- private:
-- void cdUrl(const KUrl& url);
-- void cdDirectory(const QString& path);
-+ void changeDir(const KUrl& url);
-+ void sendCdToTerminal(const QString& path);
++ /**
++ * Sets the items for which the meta data should be shown.
++ * The signal metaDataRequestFinished() will be emitted,
++ * as soon as the meta data for the items has been received.
++ */
+ void setItems(const KFileItemList& items);
+ KFileItemList items() const;
- private:
-+ bool m_clearTerminal;
-+ KIO::StatJob* m_mostLocalUrlJob;
++signals:
++ /**
++ * Is emitted after the meta data has been received for the items
++ * set by FileMetaDataToolTip::setItems().
++ */
++ void metaDataRequestFinished(const KFileItemList& items);
+
- QVBoxLayout* m_layout;
- TerminalInterfaceV2* m_terminal;
- QWidget* m_terminalWidget;
-Index: apps/dolphin/src/panels/terminal/terminalpanel.cpp
-===================================================================
---- apps/dolphin/src/panels/terminal/terminalpanel.cpp (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
-+++ apps/dolphin/src/panels/terminal/terminalpanel.cpp (.../branches/KDE/4.4/kdebase) (wersja 1104128)
-@@ -1,5 +1,5 @@
- /***************************************************************************
-- * Copyright (C) 2007 by Peter Penz <peter.penz@gmx.at> *
-+ * Copyright (C) 2007-2010 by Peter Penz <peter.penz@gmx.at> *
- * *
- * 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 *
-@@ -29,10 +29,10 @@
- #include <QBoxLayout>
- #include <QShowEvent>
-
--#include <kdebug.h>
--
- TerminalPanel::TerminalPanel(QWidget* parent) :
- Panel(parent),
-+ m_clearTerminal(true),
-+ m_mostLocalUrlJob(0),
- m_layout(0),
- m_terminal(0),
- m_terminalWidget(0)
-@@ -64,7 +64,7 @@
- && (m_terminal->foregroundProcessId() == -1)
- && isVisible();
- if (sendInput) {
-- cdUrl(url);
-+ changeDir(url);
- }
- }
-
-@@ -82,6 +82,7 @@
- }
+ protected:
+ virtual void paintEvent(QPaintEvent* event);
- if (m_terminal == 0) {
-+ m_clearTerminal = true;
- KPluginFactory* factory = KPluginLoader("libkonsolepart").factory();
- KParts::ReadOnlyPart* part = factory ? (factory->create<KParts::ReadOnlyPart>(this)) : 0;
- if (part != 0) {
-@@ -93,28 +94,47 @@
- }
- if (m_terminal != 0) {
- m_terminal->showShellInDir(url().toLocalFile());
-- cdUrl(url());
-- m_terminal->sendInput("clear\n"); // TODO do clear after slotMostLocalUrlResult is called, for remote dirs?
-+ changeDir(url());
- m_terminalWidget->setFocus();
- }
+Index: apps/dolphin/src/tooltips/tooltipmanager.cpp
+===================================================================
+--- apps/dolphin/src/tooltips/tooltipmanager.cpp (.../tags/KDE/4.5.0/kdebase) (wersja 1165575)
++++ apps/dolphin/src/tooltips/tooltipmanager.cpp (.../branches/KDE/4.5/kdebase) (wersja 1165575)
+@@ -19,13 +19,9 @@
- Panel::showEvent(event);
- }
+ #include "tooltipmanager.h"
--void TerminalPanel::cdUrl(const KUrl& url)
-+void TerminalPanel::changeDir(const KUrl& url)
- {
-+ delete m_mostLocalUrlJob;
-+ m_mostLocalUrlJob = 0;
+-#include "dolphinmodel.h"
+-#include "dolphinsortfilterproxymodel.h"
+-
+ #include "filemetadatatooltip.h"
+-#include <kicon.h>
+-#include <kio/previewjob.h>
+-#include <kwindowsystem.h>
++#include <KIcon>
++#include <KIO/PreviewJob>
+
+ #include <QApplication>
+ #include <QDesktopWidget>
+@@ -33,22 +29,22 @@
+ #include <QScrollBar>
+ #include <QTimer>
+
++#include <dolphinmodel.h>
++#include <dolphinsortfilterproxymodel.h>
+
- if (url.isLocalFile()) {
-- cdDirectory(url.toLocalFile());
-+ sendCdToTerminal(url.toLocalFile());
- } else {
-- KIO::StatJob* job = KIO::mostLocalUrl(url, KIO::HideProgressInfo);
-- job->ui()->setWindow(this);
-- connect(job, SIGNAL(result(KJob*)), this, SLOT(slotMostLocalUrlResult(KJob*)));
-+ m_mostLocalUrlJob = KIO::mostLocalUrl(url, KIO::HideProgressInfo);
-+ m_mostLocalUrlJob->ui()->setWindow(this);
-+ connect(m_mostLocalUrlJob, SIGNAL(result(KJob*)), this, SLOT(slotMostLocalUrlResult(KJob*)));
+ ToolTipManager::ToolTipManager(QAbstractItemView* parent,
+ DolphinSortFilterProxyModel* model) :
+ QObject(parent),
+ m_view(parent),
+ m_dolphinModel(0),
+ m_proxyModel(model),
+- m_prepareToolTipTimer(0),
+- m_startPreviewJobTimer(0),
+- m_waitOnPreviewTimer(0),
+- m_showToolTipDelayedTimer(0),
++ m_showToolTipTimer(0),
++ m_contentRetrievalTimer(0),
+ m_fileMetaDataToolTip(0),
++ m_toolTipRequested(false),
++ m_metaDataRequested(false),
+ m_item(),
+- m_itemRect(),
+- m_generatingPreview(false),
+- m_hasDefaultIcon(false),
+- m_previewPixmap()
++ m_itemRect()
+ {
+ static FileMetaDataToolTip* sharedToolTip = 0;
+ if (sharedToolTip == 0) {
+@@ -58,7 +54,9 @@
+ // not work.
}
+ m_fileMetaDataToolTip = sharedToolTip;
+-
++ connect(m_fileMetaDataToolTip, SIGNAL(metaDataRequestFinished(KFileItemList)),
++ this, SLOT(slotMetaDataRequestFinished()));
++
+ m_dolphinModel = static_cast<DolphinModel*>(m_proxyModel->sourceModel());
+ connect(parent, SIGNAL(entered(const QModelIndex&)),
+ this, SLOT(requestToolTip(const QModelIndex&)));
+@@ -66,33 +64,25 @@
+ this, SLOT(hideToolTip()));
+
+ // Initialize timers
+- m_prepareToolTipTimer = new QTimer(this);
+- m_prepareToolTipTimer->setSingleShot(true);
+- m_prepareToolTipTimer->setInterval(500);
+- connect(m_prepareToolTipTimer, SIGNAL(timeout()), this, SLOT(prepareToolTip()));
+-
+- m_startPreviewJobTimer = new QTimer(this);
+- m_startPreviewJobTimer->setSingleShot(true);
+- m_startPreviewJobTimer->setInterval(200);
+- connect(m_startPreviewJobTimer, SIGNAL(timeout()), this, SLOT(startPreviewJob()));
+-
+- m_waitOnPreviewTimer = new QTimer(this);
+- m_waitOnPreviewTimer->setSingleShot(true);
+- m_waitOnPreviewTimer->setInterval(250);
+- connect(m_waitOnPreviewTimer, SIGNAL(timeout()), this, SLOT(prepareToolTip()));
++ m_showToolTipTimer = new QTimer(this);
++ m_showToolTipTimer->setSingleShot(true);
++ m_showToolTipTimer->setInterval(500);
++ connect(m_showToolTipTimer, SIGNAL(timeout()), this, SLOT(showToolTip()));
+
+- m_showToolTipDelayedTimer = new QTimer(this);
+- m_showToolTipDelayedTimer->setSingleShot(true);
+- m_showToolTipDelayedTimer->setInterval(100);
+- connect(m_showToolTipDelayedTimer, SIGNAL(timeout()), this, SLOT(showToolTip()));
+-
++ m_contentRetrievalTimer = new QTimer(this);
++ m_contentRetrievalTimer->setSingleShot(true);
++ m_contentRetrievalTimer->setInterval(200);
++ connect(m_contentRetrievalTimer, SIGNAL(timeout()), this, SLOT(startContentRetrieval()));
++
++ Q_ASSERT(m_contentRetrievalTimer->interval() < m_showToolTipTimer->interval());
++
+ // When the mousewheel is used, the items don't get a hovered indication
+ // (Qt-issue #200665). To assure that the tooltip still gets hidden,
+ // the scrollbars are observed.
+ connect(parent->horizontalScrollBar(), SIGNAL(valueChanged(int)),
+- this, SLOT(hideTip()));
++ this, SLOT(hideToolTip()));
+ connect(parent->verticalScrollBar(), SIGNAL(valueChanged(int)),
+- this, SLOT(hideTip()));
++ this, SLOT(hideToolTip()));
+
+ m_view->viewport()->installEventFilter(this);
+ m_view->installEventFilter(this);
+@@ -102,9 +92,17 @@
+ {
}
--void TerminalPanel::cdDirectory(const QString& dir)
-+void TerminalPanel::sendCdToTerminal(const QString& dir)
+-void ToolTipManager::hideTip()
++void ToolTipManager::hideToolTip()
{
-+ if (!m_clearTerminal) {
-+ // The TerminalV2 interface does not provide a way to delete the
-+ // current line before sending a new input. This is mandatory,
-+ // otherwise sending a 'cd x' to a existing 'rm -rf *' might
-+ // result in data loss. As workaround backspaces are send...
-+ QString clearLine;
-+ for (int i = 0; i < 256; ++i) {
-+ clearLine.append(QChar(8));
-+ }
-+ m_terminal->sendInput(clearLine);
-+ }
+- hideToolTip();
++ QApplication::restoreOverrideCursor();
+
- m_terminal->sendInput("cd " + KShell::quoteArg(dir) + '\n');
++ m_toolTipRequested = false;
++ m_metaDataRequested = false;
++ m_showToolTipTimer->stop();
++ m_contentRetrievalTimer->stop();
+
-+ if (m_clearTerminal) {
-+ m_terminal->sendInput("clear\n");
-+ m_clearTerminal = false;
-+ }
++ m_fileMetaDataToolTip->setItems(KFileItemList());
++ m_fileMetaDataToolTip->hide();
}
- void TerminalPanel::slotMostLocalUrlResult(KJob* job)
-@@ -122,8 +142,10 @@
- KIO::StatJob* statJob = static_cast<KIO::StatJob *>(job);
- const KUrl url = statJob->mostLocalUrl();
- if (url.isLocalFile()) {
-- cdDirectory(url.toLocalFile());
-+ sendCdToTerminal(url.toLocalFile());
- }
+ bool ToolTipManager::eventFilter(QObject* watched, QEvent* event)
+@@ -128,7 +126,7 @@
+ void ToolTipManager::requestToolTip(const QModelIndex& index)
+ {
+ hideToolTip();
+-
+
-+ m_mostLocalUrlJob = 0;
+ // Only request a tooltip for the name column and when no selection or
+ // drag & drop operation is done (indicated by the left mouse button)
+ if ((index.column() == DolphinModel::Name) && !(QApplication::mouseButtons() & Qt::LeftButton)) {
+@@ -139,44 +137,27 @@
+ const QModelIndex dirIndex = m_proxyModel->mapToSource(index);
+ m_item = m_dolphinModel->itemForIndex(dirIndex);
+
+- // Only start the previewJob when the mouse has been over this item for 200 milliseconds.
+- // This prevents a lot of useless preview jobs when passing rapidly over a lot of items.
+- m_startPreviewJobTimer->start();
+- m_previewPixmap = QPixmap();
+- m_hasDefaultIcon = false;
+-
+- m_prepareToolTipTimer->start();
++ // Only start the retrieving of the content, when the mouse has been over this
++ // item for 200 milliseconds. This prevents a lot of useless preview jobs and
++ // meta data retrieval, when passing rapidly over a lot of items.
++ m_contentRetrievalTimer->start();
++ m_showToolTipTimer->start();
++ m_toolTipRequested = true;
++ Q_ASSERT(!m_metaDataRequested);
+ }
}
- #include "terminalpanel.moc"
-Index: apps/dolphin/src/dolphinmainwindow.cpp
-===================================================================
---- apps/dolphin/src/dolphinmainwindow.cpp (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
-+++ apps/dolphin/src/dolphinmainwindow.cpp (.../branches/KDE/4.4/kdebase) (wersja 1104128)
-@@ -120,7 +120,8 @@
- m_actionHandler(0),
- m_remoteEncoding(0),
- m_settingsDialog(0),
-- m_captionStatJob(0)
-+ m_captionStatJob(0),
-+ m_lastHandleUrlStatJob(0)
+-void ToolTipManager::hideToolTip()
++void ToolTipManager::startContentRetrieval()
{
- setObjectName("Dolphin#");
-
-@@ -1750,15 +1751,36 @@
+- m_prepareToolTipTimer->stop();
+- m_startPreviewJobTimer->stop();
+- m_waitOnPreviewTimer->stop();
+- m_showToolTipDelayedTimer->stop();
++ if (!m_toolTipRequested) {
++ return;
++ }
- void DolphinMainWindow::handleUrl(const KUrl& url)
+- m_fileMetaDataToolTip->hide();
+-}
++ m_fileMetaDataToolTip->setName(m_item.text());
+
+-void ToolTipManager::prepareToolTip()
+-{
+- if (m_generatingPreview) {
+- m_waitOnPreviewTimer->start();
+- }
++ m_metaDataRequested = true;
++ m_fileMetaDataToolTip->setItems(KFileItemList() << m_item);
+
+- if (!m_previewPixmap.isNull()) {
+- showToolTipDelayed(m_previewPixmap);
+- } else if (!m_hasDefaultIcon) {
+- const QPixmap image(KIcon(m_item.iconName()).pixmap(128, 128));
+- showToolTipDelayed(image);
+- m_hasDefaultIcon = true;
+- }
+-}
+-
+-void ToolTipManager::startPreviewJob()
+-{
+- m_generatingPreview = true;
+ KIO::PreviewJob* job = KIO::filePreview(KFileItemList() << m_item, 256, 256);
+
+ connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)),
+@@ -189,44 +170,98 @@
+ void ToolTipManager::setPreviewPix(const KFileItem& item,
+ const QPixmap& pixmap)
{
-- if (KProtocolManager::supportsListing(url)) {
-+ delete m_lastHandleUrlStatJob;
-+ m_lastHandleUrlStatJob = 0;
-+
-+ if (url.isLocalFile() && QFileInfo(url.toLocalFile()).isDir()) {
- activeViewContainer()->setUrl(url);
-+ } else if (KProtocolManager::supportsListing(url)) {
-+ // stat the URL to see if it is a dir or not
-+ m_lastHandleUrlStatJob = KIO::stat(url, KIO::HideProgressInfo);
-+ connect(m_lastHandleUrlStatJob, SIGNAL(result(KJob*)),
-+ this, SLOT(slotHandleUrlStatFinished(KJob*)));
+- if ((m_item.url() != item.url()) || pixmap.isNull()) {
+- // An old preview or an invalid preview has been received
++ if (!m_toolTipRequested || (m_item.url() != item.url())) {
++ // No tooltip is requested anymore or an old preview has been received
++ return;
++ }
+
++ if (pixmap.isNull()) {
+ previewFailed();
} else {
- new KRun(url, this);
+- m_previewPixmap = pixmap;
+- m_generatingPreview = false;
++ m_fileMetaDataToolTip->setPreview(pixmap);
++ if (!m_showToolTipTimer->isActive()) {
++ showToolTip();
++ }
}
}
-+void DolphinMainWindow::slotHandleUrlStatFinished(KJob* job)
-+{
-+ m_lastHandleUrlStatJob = 0;
-+ const KIO::UDSEntry entry = static_cast<KIO::StatJob*>(job)->statResult();
-+ const KUrl url = static_cast<KIO::StatJob*>(job)->url();
-+ if ( entry.isDir() ) {
-+ activeViewContainer()->setUrl(url);
-+ } else {
-+ new KRun(url, this);
+ void ToolTipManager::previewFailed()
+ {
+- m_generatingPreview = false;
++ if (!m_toolTipRequested) {
++ return;
+ }
-+}
+
- void DolphinMainWindow::slotCaptionStatFinished(KJob* job)
--{
-+{
- m_captionStatJob = 0;
- const KIO::UDSEntry entry = static_cast<KIO::StatJob*>(job)->statResult();
- const QString name = entry.stringValue(KIO::UDSEntry::UDS_DISPLAY_NAME);
-Index: apps/dolphin/src/versioncontrol/fileviewversioncontrolplugin.desktop
-===================================================================
---- apps/dolphin/src/versioncontrol/fileviewversioncontrolplugin.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
-+++ apps/dolphin/src/versioncontrol/fileviewversioncontrolplugin.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104128)
-@@ -24,6 +24,7 @@
- Comment[kk]=Файл көрнісіне арналған Нұсқаларды басқару плагины
- Comment[km]=កំណែកម្មវិធីជំនួយវត្ថុបញ្ជាសម្រាប់មើលឯកសារ
- Comment[ko]=파일 보기를 위한 버전 관리 플러그인
-+Comment[lt]=Versijų kontrolės priedas failų tvarkyklėms
- Comment[lv]=Versiju kontroles spraudnis Failu skatiem
- Comment[mk]=Приклучок за „Преглед на датотеки“ за контрола на верзии
- Comment[ml]=ഫയല് അവതരണത്തിനുള്ള വേര്ഷന് കണ്ട്രോള് സംയോജകം
-Index: apps/dolphin/src/dolphinmainwindow.h
-===================================================================
---- apps/dolphin/src/dolphinmainwindow.h (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
-+++ apps/dolphin/src/dolphinmainwindow.h (.../branches/KDE/4.4/kdebase) (wersja 1104128)
-@@ -425,6 +425,12 @@
- void handleUrl(const KUrl& url);
-
- /**
-+ * handleUrl() can trigger a stat job to see if the url can actually
-+ * be listed.
-+ */
-+ void slotHandleUrlStatFinished(KJob* job);
-+
-+ /**
- * setUrlAsCaption() will trigger a stat job which reports its result in
- * this slot.
- */
-@@ -532,6 +538,7 @@
- QPointer<DolphinSettingsDialog> m_settingsDialog;
-
- KJob* m_captionStatJob;
-+ KJob* m_lastHandleUrlStatJob;
- };
++ const QPixmap pixmap = KIcon(m_item.iconName()).pixmap(128, 128);
++ m_fileMetaDataToolTip->setPreview(pixmap);
++ if (!m_showToolTipTimer->isActive()) {
++ showToolTip();
++ }
+ }
- inline DolphinViewContainer* DolphinMainWindow::activeViewContainer() const
-Index: apps/doc/konqueror/basics.docbook
-===================================================================
---- apps/doc/konqueror/basics.docbook (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
-+++ apps/doc/konqueror/basics.docbook (.../branches/KDE/4.4/kdebase) (wersja 1104128)
-@@ -154,7 +154,7 @@
- of the bars and move them around by holding the &LMB; down while you
- drag these bars around. </para></listitem>
- <listitem><para>This screenshot does not show the optional <link linkend="sidebar">
--Navigation Panel</link>.</para></listitem>
-+Sidebar</link>.</para></listitem>
- </itemizedlist>
-
- <para>For more details of how to change &konqueror;'s appearance, see the <link
-@@ -174,7 +174,7 @@
- <para>If <guilabel>Tooltips</guilabel> have been enabled in &kde; (
- in &systemsettings; <menuchoice><guimenu>Appearance</guimenu>
- <guisubmenu>Windows</guisubmenu></menuchoice>, <guilabel>Buttons</guilabel> tab)
--then when you hover the mouse pointer over a Toolbar or Navigation Panel
-+then when you hover the mouse pointer over a Toolbar or Sidebar tab
- button it should bring up a terse description of what that button does.</para>
-
- <para><guimenuitem>What's This?</guimenuitem> is invoked by the Menubar
-Index: apps/doc/konqueror/sidebar.docbook
-===================================================================
---- apps/doc/konqueror/sidebar.docbook (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
-+++ apps/doc/konqueror/sidebar.docbook (.../branches/KDE/4.4/kdebase) (wersja 1104128)
-@@ -6,27 +6,27 @@
- <!-- TRANS:ROLES_OF_TRANSLATORS -->
- </authorgroup>
-
--<date>2002-09-22</date>
--<releaseinfo>3.1</releaseinfo>
-+<date>2010-02-26</date>
-+<releaseinfo>&kde; 4.4</releaseinfo>
- </chapterinfo>
-
--<title>The Navigation Panel</title>
-+<title>The Sidebar</title>
-
--<para>The Navigation Panel appears as a separate view at the left of
-+<para>The Sidebar appears as a separate view at the left of
- &konqueror;'s window. It can be invoked with <menuchoice><guimenu>Window
--</guimenu><guimenuitem>Show Navigation Panel</guimenuitem></menuchoice> or
-+</guimenu><guimenuitem>Show Sidebar</guimenuitem></menuchoice> or
- toggled on and off with the <keycap>F9</keycap> key.</para>
-
- <mediaobject>
- <imageobject><imagedata format="PNG" fileref="dirtree.png"/></imageobject>
- <textobject>
--<phrase>With the Navigation Panel</phrase>
-+<phrase>With the Sidebar</phrase>
- </textobject>
- </mediaobject>
-
- <para>It contains a number of tabbed pages; <mousebutton>left</mousebutton>
- click on a tab's icon to view that page. <mousebutton>Left</mousebutton>
--clicking on the icon for the visible page will collapse the Navigation Panel
-+clicking on the icon for the visible page will collapse the Sidebar
- so that only the tab icons are visible.</para>
- <variablelist>
-
-@@ -42,11 +42,11 @@
- <listitem><para>This page shows a tree view of your browsing History.
- <mousebutton>Left</mousebutton> clicking on an item will open it in the main
- view, or you can open it in a new &konqueror; window by <mousebutton>right
--</mousebutton> clicking and selecting <guimenuitem>New Window</guimenuitem>
-+</mousebutton> clicking and selecting <guimenuitem>Open in New Window</guimenuitem>
- from the pop up menu.</para>
- <para>You can remove an item from the history by <mousebutton>right
- </mousebutton> clicking on it and selecting <guimenuitem>Remove Entry
--</guimenuitem>. Selecting <guimenuitem>Clear History...</guimenuitem> will
-+</guimenuitem>. Selecting <guimenuitem>Clear History</guimenuitem> will
- clear out the entire history.</para>
- <para>The pop up menu you get when you <mousebutton>right</mousebutton> click
- on any entry in the History page also gives you the option of choosing
-@@ -63,7 +63,7 @@
-
- <varlistentry>
- <term><guilabel>Home Folder</guilabel></term>
--<listitem><para>This page shows a tree view of the subfolders your home
-+<listitem><para>This page shows a tree view of the subfolders of your home
- folder. Note that <quote>hidden</quote> folders (those with names
- beginning with a dot) are not shown.
- <mousebutton>Left</mousebutton> click on an item to open it in the
-@@ -86,13 +86,14 @@
- new ones just as you would make any other subfolder. The items within
- these folders are held as <literal role="extension">.desktop</literal> files
- and can be created with &konqueror;'s <menuchoice><guisubmenu>Create New</guisubmenu>
--<guimenuitem>Link to Location (URL)...</guimenuitem></menuchoice> option.</para>
-+<guimenuitem>Link to Location (URL)...</guimenuitem></menuchoice> option in the
-+<guimenu>Edit</guimenu> menu.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><guilabel>Root Folder</guilabel></term>
--<listitem><para>The Root Folder tree has the path <filename
-+<listitem><para>The <guilabel>Root Folder</guilabel> tree has the path <filename
- class="directory">/</filename>, and is the base folder of your system's
- local files. If you expand the <quote>Root</quote> folder you will find
- another folder called <filename class="directory">root</filename>. This
-@@ -107,7 +108,9 @@
- <term><guilabel>Services</guilabel></term>
- <listitem><para>This page provides quick access to the following services:
- </para>
--<para>The <guilabel>Audio CD Browser</guilabel>.</para>
-+<para><guilabel>Applications</guilabel>, <guilabel>Audio CD Browser</guilabel>
-+and <guilabel>Fonts</guilabel>.</para>
-+<!-- not in 4.4
- <para><guilabel>Devices</guilabel>. This shows your hard disc
- partitions, floppy and &CD-ROM;. <mousebutton>Left</mousebutton> click on
- a device or partition name to mount it and display its contents in the main
-@@ -119,39 +122,38 @@
- machines connected to your Local Area Network.</para>
- <para>The <guilabel>Print System Browser</guilabel> tree gives you quick
- access to &kde;'s print manager <application>Kprinter</application>.</para>
-+-->
- </listitem>
- </varlistentry>
- </variablelist>
-
--<para>The Navigation Panel configuration can be changed by <mousebutton>right
-+<para>The sidebar configuration can be changed by <mousebutton>right
- </mousebutton> clicking on the empty area below the bottom tab icon or by
- <mousebutton>left</mousebutton> clicking on the <guilabel>Configuration
--Button</guilabel> icon (the top icon in the previous screenshot, it may not
--be present in your setup). Doing this brings up a menu with the following
--options:</para>
-+Button</guilabel> icon, this is enabled in the contextmenu. Doing this
-+brings up a menu with the following options:</para>
- <variablelist>
-
- <varlistentry>
- <term><guisubmenu>Add New</guisubmenu></term>
--<listitem><para>This option lets you add a new tab page to the Navigation
--Panel. The new page can contain the <guimenuitem>Sidebar Media Player
--</guimenuitem> (a <link linkend="konq-plugin">&konqueror; Plugin</link>
--feature) or a new
--<guimenuitem>Folder</guimenuitem> tree view.</para>
-+<listitem><para>This option lets you add a new tab page to the Sidebar.
-+The new page can contain different sidebar modules or a new
-+<guimenuitem>Folder</guimenuitem> tree view. The last option in this
-+submenu allows you to rollback to system default.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><guimenuitem>Multiple Views</guimenuitem></term>
--<listitem><para>Selecting this option splits the Navigation Panel so that
-+<listitem><para>Selecting this option splits the Sidebar so that
- two tab pages can be seen at once.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
--<term><guimenuitem>Show Tabs Left</guimenuitem></term>
-+<term><guimenuitem>Show Tabs Left</guimenuitem>, <guimenuitem>Show Tabs Right</guimenuitem></term>
- <listitem><para>This option lets you choose whether the tab icons are shown at
--the left or right of the Navigation Panel.</para>
-+the left or right of the sidebar.</para>
- </listitem>
- </varlistentry>
-
-@@ -169,8 +171,14 @@
-
- <variablelist>
- <varlistentry>
-+<term><guimenuitem>Set Name</guimenuitem></term>
-+<listitem><para>This option lets you
-+change the Name of that page.</para></listitem>
-+</varlistentry>
-+
-+<varlistentry>
- <term><guimenuitem>Set URL</guimenuitem></term>
--<listitem><para>Only available for folder pages, this option lets you
-+<listitem><para>This option lets you
- change the &URL; (path) of the folder viewed in that page.</para></listitem>
- </varlistentry>
-
-@@ -181,10 +189,17 @@
-
- <varlistentry>
- <term><guimenuitem>Remove</guimenuitem></term>
--<listitem><para>To remove the tab page from the Navigation Panel.</para>
-+<listitem><para>To remove the tab page from the sidebar.</para>
- </listitem>
- </varlistentry>
-
-+<varlistentry>
-+<term><guimenuitem>Configure Sidebar</guimenuitem></term>
-+<listitem><para>The last item offers a configuration submenu of the
-+sidebar as described above.</para>
-+</listitem>
-+</varlistentry>
-+
- </variablelist>
-
-
-Index: apps/doc/konqueror/bookmarks.docbook
-===================================================================
---- apps/doc/konqueror/bookmarks.docbook (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
-+++ apps/doc/konqueror/bookmarks.docbook (.../branches/KDE/4.4/kdebase) (wersja 1104128)
-@@ -5,8 +5,8 @@
- <!-- TRANS:ROLES_OF_TRANSLATORS -->
- </authorgroup>
-
--<date>2003-11-05</date>
--<releaseinfo>3.2</releaseinfo>
-+<date>2010-02-26</date>
-+<releaseinfo>&kde; 4.4</releaseinfo>
- </chapterinfo>
-
- <title>Using Bookmarks</title>
-@@ -32,13 +32,13 @@
-
- <para>The <guimenu>Bookmarks</guimenu> list can contain subfolders containing
- other bookmarks, you can create these with <menuchoice><guimenu>Bookmarks
--</guimenu><guimenuitem>New Bookmark Folder...</guimenuitem></menuchoice> .
-+</guimenu><guimenuitem>New Bookmark Folder...</guimenuitem></menuchoice>
- To add a bookmark into a subfolder rather than into the main Bookmark list,
- select the folder from within the <guimenu>Bookmarks</guimenu> list and use
- the <guimenuitem>Add Bookmark</guimenuitem> item in that folder.</para>
-
- <para>You can also access your bookmarks from the <link linkend="sidebar">
--<guilabel>Navigation Panel</guilabel></link>.</para>
-+<guilabel>Sidebar</guilabel></link>.</para>
-
- <sect1 id="orgbmark">
- <title>The Bookmark Editor</title>
-@@ -64,13 +64,13 @@
- normal Drag and Drop or <guimenuitem>Cut</guimenuitem> and <guimenuitem>
- Paste</guimenuitem> methods. The order in which the items appear in
- the <guilabel>Bookmark Editor</guilabel> is the order they will appear in the
--<guimenu>Bookmarks</guimenu> drop down list. The <menuchoice><guimenu>Insert
-+<guimenu>Bookmarks</guimenu> drop down list. The <menuchoice><guimenu>Folder
- </guimenu><guimenuitem>Insert Separator</guimenuitem></menuchoice> option can
- be used to insert separating lines into the list wherever you wish.</para>
-
- <para>A new subfolder can be created at the selected point in the list by
--using the <guimenuitem>Create New Folder...</guimenuitem> option in the
--<guimenu>Insert</guimenu> menu or from the drop down menu you get when you
-+using the <guimenuitem>New Folder...</guimenuitem> option in the
-+<guimenu>Folder</guimenu> menu or from the drop down menu you get when you
- <mousebutton>right</mousebutton> click on an item in the main part of the
- window, or with <keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo>
- </para>
-@@ -90,13 +90,6 @@
- </menuchoice> option can be used to export &konqueror;'s bookmarks to a
- &Netscape; or Mozilla browser.</para>
-
--<para>If you often use the &Netscape; browser as well as &konqueror;, then
--rather than importing your &Netscape; bookmarks into &konqueror; it is
--better to select the <guimenuitem>Show Netscape Bookmarks in Konqueror
--Windows</guimenuitem> item in the <guimenu>Settings</guimenu> menu. If you
--do this any updates to &Netscape;'s bookmarks are automatically seen by
--&konqueror;.</para>
--
- <para>To select which bookmark subfolder is used to hold the Bookmark
- Toolbar items select the subfolder then choose <guimenuitem>Set as Toolbar
- Folder</guimenuitem> from the <guimenu>Edit</guimenu> menu.</para>
-@@ -108,11 +101,9 @@
- the pop up menu. If you just want to check that the &URL; is still valid
- select <guimenuitem>Check Status</guimenuitem> instead.</para>
-
--<important><para>Don't forget to save your changes with <menuchoice>
--<guimenu>File</guimenu><guimenuitem>Save</guimenuitem></menuchoice> or
--<keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo> before you leave
-+<note><para>All your changes are automatically saved if you close
- the <guilabel>Bookmark Editor</guilabel>.
--</para></important>
-+</para></note>
- </sect1>
-
-
-Index: apps/doc/konqueror/save-settings.docbook
-===================================================================
---- apps/doc/konqueror/save-settings.docbook (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
-+++ apps/doc/konqueror/save-settings.docbook (.../branches/KDE/4.4/kdebase) (wersja 1104128)
-@@ -6,8 +6,8 @@
- <!-- TRANS:ROLES_OF_TRANSLATORS -->
- </authorgroup>
-
--<date>2003-11-06</date>
--<releaseinfo>3.2</releaseinfo>
-+<date>2010-02-26</date>
-+<releaseinfo>&kde; 4.4</releaseinfo>
- </chapterinfo>
-
- <title>Saving Settings & Profiles</title>
-@@ -19,26 +19,23 @@
- </guimenuitem> items) are not automatically saved as the default
- options; however, you can have &konqueror; remember these settings by
- selecting <menuchoice><guimenu>Settings</guimenu><guimenuitem>Save View
--Profile "Web Browsing"...</guimenuitem></menuchoice> and the current
-+Profile As...</guimenuitem></menuchoice> and the current
- setting will become the default option to be used the next time
- &konqueror; is started.</para>
-
- <para>But you can also specify different <guimenu>View</guimenu> menu settings
--for an individual folder. To do this check the <guimenuitem>View Properties
--Saved in Folder</guimenuitem> box in the <guimenu>Settings</guimenu> menu,
--change the <guimenu>View</guimenu> settings to whatever you want then uncheck
--the
--<guimenuitem>View Properties saved in Folder</guimenuitem> box. Doing this
-+for an individual folder. To do this select <menuchoice><guimenu>View</guimenu>
-+<guimenuitem>Adjust View Properties...</guimenuitem></menuchoice>,
-+change the <guimenu>View</guimenu> settings in the dialog to whatever you want. Then apply
-+the view properties to the <guilabel>Current folder</guilabel>. Doing this
- creates a <filename>.directory</filename> file in that folder to hold the
--folder <guimenu>View</guimenu> settings. Use the <menuchoice><guimenu>
--Settings</guimenu><guimenuitem>Remove Folder Properties</guimenuitem>
--</menuchoice> option to remove the folder specific
-+folder <guimenu>View</guimenu> settings. Use this dialog again to remove the folder specific
- settings (or just delete the <filename>.directory</filename> file).</para>
- <note><para>One nice use of this feature is if you have a folder full of
- pictures. You can set that particular folder to display thumbnails of the
--pictures (by choosing <guimenuitem>Icon View</guimenuitem> and <menuchoice>
--<guisubmenu>Preview</guisubmenu><guimenuitem>Show Previews</guimenuitem>
--</menuchoice> from the <guimenu>View</guimenu> menu) when you open it, while
-+pictures (by choosing the <menuchoice><guisubmenu>View Mode</guisubmenu>
-+<guimenuitem>Icons</guimenuitem></menuchoice> and <guimenuitem>Preview</guimenuitem>
-+from the <guimenu>View</guimenu> menu) when you open it, while
- not displaying images as thumbnails in other folders.</para></note>
- </sect1>
-
-@@ -46,16 +43,18 @@
- <title>View Profiles</title>
- <para>&konqueror; can save a whole set of options as a <quote>View
- Profile</quote>. Some view profiles are part of the standard &konqueror;
--installation, such as <property>Web Browsing</property> and <property>File
--Management</property>, but you can add your own, too.</para>
-+installation, such as <property>Web Browsing</property>, <property>File
-+Management</property>, <property>KDE Development</property>,
-+<property>Midnight Commander</property> and <property>Tabbed Browsing</property>;
-+but you can add your own, too.</para>
-
- <para>To modify a view profile (say, the <property>Web Browsing</property>
- profile), load the profile with
- <menuchoice><guimenu>Settings</guimenu><guisubmenu>Load View
- Profile</guisubmenu><guimenuitem>Web Browsing</guimenuitem> </menuchoice>, and
- change the &konqueror; settings to whatever you want. Now select
--<menuchoice><guimenu>Settings</guimenu><guimenuitem>Save View Profile "Web
--Browsing"...</guimenuitem></menuchoice>. In the dialog which appears, you can
-+<menuchoice><guimenu>Settings</guimenu><guimenuitem>Save View Profile As...
-+</guimenuitem></menuchoice>. In the dialog which appears, you can
- change the name of the profile, which will create a new profile with that name,
- or you can leave the name as it is to modify the current profile. If you select
- <guilabel>Save URLs in profile</guilabel>, the current &URL; will be loaded
-@@ -66,17 +65,15 @@
-
- <note><para>You can create a desktop icon to start &konqueror; with your new
- profile. First create a desktop icon by dragging the &konqueror; icon from the
--<guimenu>K</guimenu> menu onto the desktop and selecting <guimenuitem>Copy
--Here</guimenuitem>. Then <mousebutton>right</mousebutton> click on the new
--icon, select
--<guimenuitem>Properties...</guimenuitem> and change <guilabel>Program
--Name</guilabel> in the <guilabel>Execute</guilabel> tab page to
-+application launcher menu onto the desktop. Then <mousebutton>right</mousebutton>
-+click on the new icon, select
-+<guimenuitem>Icon Settings</guimenuitem> and change <guilabel>
-+Command</guilabel> in the <guilabel>Application</guilabel> tab page to
- <userinput><command>kfmclient</command> <option>openProfile
- <replaceable>MyNewProfile</replaceable></option></userinput>,
- <replaceable>MyNewProfile</replaceable> being what you called the new
--profile. Then in the <guilabel>General</guilabel> tab page change the name to
--something like <filename>MyNewProfile</filename> and pick a more
--suitable icon.</para></note>
-+profile. Then change the name to something like <filename>MyNewProfile</filename>
-+.</para></note>
-
- </sect1>
- </chapter>
-Index: apps/doc/kwrite/index.docbook
-===================================================================
---- apps/doc/kwrite/index.docbook (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
-+++ apps/doc/kwrite/index.docbook (.../branches/KDE/4.4/kdebase) (wersja 1104128)
-@@ -40,8 +40,8 @@
- </copyright>
- <legalnotice>&FDLNotice;</legalnotice>
-
--<date>2009-02-05</date>
--<releaseinfo>4.2.00</releaseinfo>
-+<date>2010-02-17</date>
-+<releaseinfo>4.4</releaseinfo>
-
- <abstract>
- <para>&kwrite; is a text editor for &kde; allowing you to edit one file at the time per window.</para>
-@@ -73,11 +73,11 @@
- allowing you to edit one file at the time per window.
- </para>
- <para>
--&kappname; features two different modes, a simple mode with a straightforward interface
-+&kwrite; features two different modes, a simple mode with a straightforward interface
- and an advanced mode with more features and more extensive menu items.
- The advanced mode is enabled by checking the option <link linkend="appearance">
--Enable power user mode (&kde; 3 mode)</link>
--on the <guilabel>Appearance</guilabel> page in &kappname;s
-+Enable power user mode (&kde; 3 mode)</link>
-+on the <guilabel>Appearance</guilabel> page in &kappname;s
- settings.
- </para>
- </chapter>
-@@ -222,7 +222,11 @@
- </sect2>
- </sect1>
-
--<sect1 id="keybindings"> <!--has to be checked lueck-->
-+<sect1 id="keybindings"> <!--60 shortcuts here and 4.4.63 has 89 lueck
-+missing ctrl+6,7,8,9,T,Home,End
-+ctrl+shift+O,Home,End,PgUp,Left,Right,PgDown
-+Shift+Home
-+-->
- <title>Shortcuts</title>
-
- <para>Many of the shortcuts are configurable by way of the <link
-@@ -233,7 +237,7 @@
- <tbody>
-
- <row><entry><para><keycombo
--action="simul"><keycap>Insert</keycap></keycombo></para></entry>
-+action="simul"><keycap>Ins</keycap></keycombo></para></entry>
- <entry><para> Toggle between Insert and Overwrite mode. When in insert mode the
- editor will add any typed characters to the text while pushing along any data to
- the right of the text cursor. Overwrite mode causes the entry of each character
-@@ -268,7 +272,7 @@
- <row>
- <entry><para><keycombo action="simul">&Alt;<keycap>Page
- Up</keycap></keycombo></para></entry>
--<entry><para>Previous Bookmark </para></entry>
-+<entry><para>Previous Bookmark</para></entry>
- </row>
- <row>
- <entry><para><keycombo action="simul"><keycap>Page
-@@ -282,7 +286,7 @@
- </row>
- <row>
- <entry><para><keycombo
--action="simul"><keycap>Backspace</keycap></keycombo></para></entry>
-+action="simul">&Backspace;</keycombo></para></entry>
- <entry><para> Delete the character to the left of the cursor </para></entry>
- </row>
- <row>
-@@ -302,10 +306,10 @@
- text)</para></entry>
- </row>
- <row>
--<entry><para><keycombo action="simul">&Shift;<keycap>Enter</keycap></keycombo></para></entry>
-+<entry><para><keycombo action="simul">&Shift;&Enter;</keycombo></para></entry>
- <entry><para>Insert newline including leading characters of the current line which are not letters or numbers.
--It is useful ⪚ to write comments in the code: At the end of the line <quote>// some text</quote> press
--this shortcut and the next line starts already with <quote>// </quote>. So you do not have to enter the comment
-+It is useful ⪚ to write comments in the code: At the end of the line <quote>// some text</quote> press
-+this shortcut and the next line starts already with <quote>// </quote>. So you do not have to enter the comment
- characters at the beginning of each new line with comments.</para></entry>
- </row>
- <row>
-@@ -551,11 +555,11 @@
-
- <para>There are different menus and menu items in simple and advanced mode.
- The advanced mode is enabled by checking the option <link linkend="appearance">
--Enable power user mode (&kde; 3 mode)</link>
-+Enable power user mode (&kde; 3 mode)</link>
- on the <guilabel>Appearance</guilabel> page in &kappname;s settings.</para>
- <!-- This is also valid for kates menu file, kate has additional Save All Ctrl+L, Reload All, Close Other, Close All-->
--<sect1 id="file">
--<title>The <guimenu>File</guimenu> Menu</title>
-+<sect1 id="file">
-+<title>The File Menu</title>
-
- <variablelist>
-
-@@ -586,52 +590,9 @@
- </term>
-
- <listitem>
--<!--
--This is description of a standard dialog and so should go in the UG,
--with a pointer to it. In fact, I'll probably nick this very stuff for
--the UG
--- Phil
--<para>
--This command opens a file. It does this by means of a dialog box which
--allows the user to navigate the file system. The dialog operates like a
--small file manager. Clicking on folders displayed in the central
--window directs the dialog to enter that folder - displaying its
--contents. There is an entry/dropdown box which can be used to type in
--directly the location and name of the file or by clicking the arrow at
--the side choose from a drop down box of recently used locations. Below
--this is a filter which similarly may have data entered directly or
--chosen from a drop down box of recent filter types. The filter facility
--lets only files that meet its specifications be displayed in the central
--window. If the filter contained text such as <literal
--role="extension">*.txt</literal> then only files with the <literal
--role="extension">txt</literal> extension would be visible in the
--selection window. Below the filter is a status bar giving information
--about the number of files and subfolders within the current
--folder.
--</para>
--
--<para>
--The toolbar, which is located at the top of the dialog, has left and
--right arrow buttons that let the user move back and forth through
--previously selected folders as well as an up arrow button for moving
--up the folder tree. The button with the little house takes the user
--to his or her home folder and the one with the two arrows curved in
--on each other updates the view of the current folder. The flag button
--lets the user set a new bookmark at the current folder or go to one
--that was previously set.
--</para>
--
--<para>
--The last button on the toolbar allows you to create a new folder, and
--even change some basic settings for the dialog box, and finally there is
--dropdown box with a list of some commonly frequented folders.
--</para>
---->
- <para>Displays a standard &kde; <guilabel>Open File</guilabel>
- dialog. Use the file view to select the file you want to open, and
--click on <guibutton>Open</guibutton> to open it. You can find more
--information about the &kde; <guilabel>Open File</guilabel> dialog in
--the &kde; User Guide.</para>
-+click on <guibutton>Open</guibutton> to open it.</para>
-
- </listitem>
- </varlistentry>
-@@ -725,7 +686,7 @@
- </para>
- </listitem>
- </varlistentry>
--<varlistentry> <!-- only in power user mode -->
-+<varlistentry> <!-- from plugin Exporter -->
- <term id="export-as-html">
- <menuchoice>
- <guimenu>File</guimenu>
-@@ -735,6 +696,7 @@
- <listitem>
- <para>
- Export your file in &HTML; format so your document can be viewed as a web page.
-+This item is only displayed when the plugin <guilabel>Exporter</guilabel> is loaded.
- </para>
- </listitem>
- </varlistentry>
-@@ -781,7 +743,7 @@
- </sect1>
-
- <sect1 id="edit"> <!-- This is also valid for kates menu edit-->
--<title>The <guimenu>Edit</guimenu> Menu</title>
-+<title>The Edit Menu</title>
-
- <variablelist>
- <varlistentry>
-@@ -793,11 +755,6 @@
- <listitem>
- <para>This is used to eliminate or reverse the most recent user action
- or operation.
--<!--
--Just what constitutes such an action may be better
--understood by referring to the <link linkend="group-undos">Group
--Undos</link> portion of this help file.
---->
- </para>
- </listitem>
- </varlistentry>
-@@ -836,14 +793,6 @@
- to provide a way to transfer data between applications.</para>
- </listitem>
- </varlistentry>
--<varlistentry><!-- only in power user mode -->
--<term><anchor id="copy-as-html"/><menuchoice>
--<guimenu>Edit</guimenu><guimenuitem>Copy as
--HTML...</guimenuitem></menuchoice></term>
--<listitem>
--<para>This copies the currently selected text to the clipboard as &HTML;.</para>
-- </listitem>
--</varlistentry>
- <varlistentry>
- <term><anchor id="paste"/><menuchoice>
- <shortcut><keycombo
-@@ -855,6 +804,16 @@
- transfer data between applications.</para>
- </listitem>
- </varlistentry>
-+<varlistentry><!-- from plugin Exporter -->
-+<term><anchor id="copy-as-html"/><menuchoice>
-+<guimenu>Edit</guimenu><guimenuitem>Copy as
-+HTML</guimenuitem></menuchoice></term>
-+<listitem>
-+<para>This copies the currently selected text to the clipboard as &HTML;.
-+This item is only displayed when the plugin <guilabel>Exporter</guilabel> is loaded.
-+</para>
-+ </listitem>
-+</varlistentry>
-
- <varlistentry>
- <term><anchor id="select-all"/><menuchoice>
-@@ -883,9 +842,9 @@
- <keycombo action="simul">&Ctrl;&Shift;<keycap>B</keycap></keycombo>
- </shortcut>
- <guimenu>Edit</guimenu><guimenuitem>Block
--Selection Mode</guimenuitem></menuchoice></term>
-+Selection Mode</guimenuitem></menuchoice> (Power user mode)</term>
- <listitem>
--<para>Toggles Selection Mode. When the Selection Mode is <guilabel>BLOCK</guilabel>,
-+<para>Toggles Selection Mode. When the Selection Mode is <guilabel>BLOCK</guilabel>,
- you can make vertical selections, ⪚ select column 5 to 10 in lines 9 to 15.
- The status bar shows the current state of the Selection Mode, either <guilabel>BLOCK</guilabel> or
- <guilabel>LINE</guilabel>.</para>
-@@ -897,13 +856,13 @@
- <keycombo action="simul"><keysym>Meta</keysym>&Ctrl;<keycap>V</keycap></keycombo>
- </shortcut>
- <guimenu>Edit</guimenu><guimenuitem>VI input
--Mode</guimenuitem></menuchoice></term>
-+Mode</guimenuitem></menuchoice> (Power user mode)</term>
- <listitem>
--<para>Switch to a vi-like, modal editing mode. This mode supports the most used commands
-+<para>Switch to a vi-like, modal editing mode. This mode supports the most used commands
- and motions from vim's normal and visual mode and has an optional vi mode statusbar.
--This status bar shows commands while they are being entered, output from commands and
--the current mode.The behavior of this mode can be configured in the
--<link linkend="pref-edit-vi-input-mode">Vi Input Mode</link> section of the
-+This status bar shows commands while they are being entered, output from commands and
-+the current mode.The behavior of this mode can be configured in the
-+<link linkend="pref-edit-vi-input-mode">Vi Input Mode</link> section of the
- <guilabel>Editing</guilabel> page in &kappname;'s settings dialog.</para>
- </listitem>
- </varlistentry>
-@@ -930,40 +889,27 @@
- <guimenu>Edit</guimenu><guimenuitem>Find...</guimenuitem></menuchoice></term>
- <listitem>
- <para>This opens the incremental search bar at the bottom of the editor window.
--On the left side of the bar is an icon to close the bar, followed by a small text
-+On the left side of the bar is an icon to close the bar, followed by a small text
- box for entering the search pattern.</para>
--<para>When you start entering characters of your search pattern, the search starts
-+<para>When you start entering characters of your search pattern, the search starts
- immediately. If there is a match in the text this is highlighted and the background color
--of the entry field changes to light green. If the search pattern does not match any
--string in the text, this is indicated by a light red background color of the entry field
-+of the entry field changes to light green. If the search pattern does not match any
-+string in the text, this is indicated by a light red background color of the entry field
- and <guilabel>Not found</guilabel> is displayed at the right side of the bar.</para>
--<para>Use the <guilabel>Next</guilabel> or <guilabel>Previous</guilabel> button
--to jump to the next or previous match in the document.</para>
--<para>You can modify the search behavior by selecting different
--<guilabel>Options</guilabel>:
-+<para>Use the <guilabel>Next</guilabel> or <guilabel>Previous</guilabel> button
-+to jump to the next or previous match in the document.</para>
-+<para>You can modify the search behavior by selecting different
-+<guilabel>Options</guilabel>:
- The <guilabel>Highlight all</guilabel> option highlights all matches in the document.
- Selecting <guilabel>Match case</guilabel> will limit finds to entries that match the
- case (upper or lower) of each of the characters in the search pattern.
- The <guilabel>From cursor</guilabel> option begins the search
- from the current position of the cursor within the document rather than from
- the beginning.</para>
--<para>Click on the green arrow icon at the right side of the incremental search bar to
-+<para>Click on the green arrow icon at the right side of the incremental search bar to
- switch to the power search and replace bar.
--
--<!--This opens the find dialog which is used to specify the <guilabel>Text to
--Find</guilabel> in the document. There is small text box for entering the search
--pattern which also doubles as a dropdown box. Clicking on the dropdown arrow at
--the side of the box makes available other recent search patterns. Other
--parameters are included to make the search more efficient. Selecting
--<guilabel>Case Sensitive</guilabel> will limit finds to entries that match the
--case (upper or lower) of each of the characters in the search pattern.
--<guilabel>Find Backwards</guilabel> directs the search to proceed in an upwardly
--direction. The <guilabel>Selected Text</guilabel> option keeps the search
--within currently selected text. Checking <guilabel>Whole Words Only</guilabel>
--prevents the search from stopping on words that contain the searched for
--pattern. The <guilabel>Search from Cursor</guilabel> option begins the search
--from the current position of the cursor within the document rather than from
--the beginning.-->
-+<!--changed in 4.5 ???
-+options "Highlight all" + "From cursor" removed only "Match case" left-->
- </para>
- </listitem>
- </varlistentry>
-@@ -973,7 +919,7 @@
- <shortcut><keycombo action="simul"><keycap>F3</keycap></keycombo></shortcut>
- <guimenu>Edit</guimenu><guimenuitem>Find Next</guimenuitem></menuchoice></term>
- <listitem>
--<para>This repeats the last find operation, if any, without calling the incremental
-+<para>This repeats the last find operation, if any, without calling the incremental
- search bar.
- </para>
- </listitem>
-@@ -991,7 +937,7 @@
- </term>
- <listitem>
- <para>
--This repeats the last find operation, if any, without calling the incremental
-+This repeats the last find operation, if any, without calling the incremental
- search bar, and searching backwards instead of forwards through the
- document.
- </para>
-@@ -1005,42 +951,36 @@
- <guimenu>Edit</guimenu><guimenuitem>Replace...</guimenuitem></menuchoice></term>
- <listitem>
- <para>This command opens the power search and replace bar.
--On the upper left side of the bar is an icon to close the bar, followed by a small text
-+On the upper left side of the bar is an icon to close the bar, followed by a small text
- box for entering the search pattern.</para>
--<para>You can control the search mode by selecting <guilabel>Plain text</guilabel>
--<keycombo action="simul">&Alt;<keycap>1</keycap></keycombo>,
--<guilabel>Whole words</guilabel><keycombo action="simul">&Alt;<keycap>2</keycap></keycombo>,
--<guilabel>Escape sequences</guilabel><keycombo action="simul">&Alt;<keycap>3</keycap></keycombo>
--or <guilabel>Regular expression</guilabel><keycombo action="simul">&Alt;<keycap>4</keycap></keycombo>.
-+<para>You can control the search mode by selecting <guilabel>Plain text</guilabel>,
-+<guilabel>Whole words</guilabel>, <guilabel>Escape sequences</guilabel> or
-+<guilabel>Regular expression</guilabel> from the drop down box.
- </para>
- <para>If <guilabel>Escape sequences</guilabel> or <guilabel>Regular expression</guilabel> are
- selected, the <guibutton>Add...</guibutton> menuitem at the bottom of the context menu of the text boxes will be enabled
- and allows you to add escape sequences or regular expression items to the
- search or replace pattern from predefined lists.</para>
--<para>Use the <guilabel>Next</guilabel> or <guilabel>Previous</guilabel> button to jump
-+<para>Use the <guilabel>Next</guilabel> or <guilabel>Previous</guilabel> button to jump
- to the next or previous match in the document.</para>
- <para>Enter the text to replace with in the text box labeled <guilabel>Replace</guilabel>
- and click the <guibutton>Replace</guibutton> button to replace only the highlighted text or
- the <guibutton>Replace All</guibutton> button to replace the search text in the whole document.
- </para>
--<para>You can modify the search and replace behavior by selecting different
-+<para>You can modify the search and replace behavior by selecting different
- options on the right side of the bar.
--The <guilabel>Highlight all</guilabel> option highlights all matches in the document.
- Selecting <guilabel>Match case</guilabel> will limit finds to entries that match the
- case (upper or lower) of each of the characters in the search pattern.
-+The <guilabel>Highlight all</guilabel> option highlights all matches in the document.
- The <guilabel>From cursor</guilabel> option begins the search
- from the current position of the cursor within the document rather than from
- the beginning.
- <guilabel>Selection only</guilabel> will search and replace within the current selection only.</para>
--<para>Click on the green arrow icon at the right side of the power search and replace bar to
-+<para>Click on the green arrow icon at the right side of the power search and replace bar to
- switch to the incremental search bar.
--<!--This command opens the replace dialog box. The replace dialog is
--almost identical to the above-mentioned find dialog. In addition to the features
--in the find dialog it contains a <guilabel>Replace With:</guilabel> text
--entry/dropdown box. Using this dialog the user can specify both the text to be
--found and text with which to replace it. The additional <guilabel>Prompt
--On Replace</guilabel> option allows the user to have &kwrite; ask for
--confirmation before each replacement.-->
-+<!--changed in 4.5 ???
-+options "Highlight all" + "From cursor" removed only "Match case" left
-+-->
- </para>
- </listitem>
- </varlistentry>
-@@ -1091,7 +1031,7 @@
- </sect1>
- <sect1 id="view-menu">
- <!-- This is also valid for kates menu view, but kate does not have the New Window item -->
--<title>The <guimenu>View</guimenu> menu</title>
-+<title>The View menu</title>
-
- <para>The <guimenu>View</guimenu> menu allows you to manage settings
- specific to the active editor, and to manage frames.</para>
-@@ -1107,7 +1047,7 @@
- </menuchoice>
- </term>
- <listitem>
--<para>Create another window containing the current document. All changes to the
-+<para>Create another window containing the current document. All changes to the
- document in one window are reflected in the other window and vice versa.</para>
- </listitem>
- </varlistentry>
-@@ -1120,7 +1060,7 @@
- action="simul"><keycap>F7</keycap></keycombo></shortcut>
- <guimenu>View</guimenu>
- <guimenuitem>Switch to Command Line</guimenuitem>
--</menuchoice>
-+</menuchoice> (Power user mode)
- </term>
- <listitem>
- <para>Displays the Katepart command line at the bottom of the window.
-@@ -1135,7 +1075,7 @@
- <menuchoice>
- <guimenu>View</guimenu>
- <guisubmenu>Schema</guisubmenu>
--</menuchoice>
-+</menuchoice> (Power user mode)
- </term>
- <listitem>
- <para>Select a font schema.</para>
-@@ -1163,7 +1103,7 @@
- <menuchoice>
- <guimenu>View</guimenu>
- <guisubmenu>Dynamic Word Wrap Indicators</guisubmenu>
--</menuchoice>
-+</menuchoice> (Power user mode)
- </term>
- <listitem>
- <para>Choose when and how the dynamic word wrap indicators should be
-@@ -1178,7 +1118,7 @@
- <menuchoice>
- <guimenu>View</guimenu>
- <guimenuitem>Show Static Word Wrap Marker</guimenuitem>
--</menuchoice>
-+</menuchoice> (Power user mode)
- </term>
- <listitem>
- <para>If this option is checked, a vertical line will be drawn at the
-@@ -1197,7 +1137,7 @@
- <shortcut><keycombo action="simul"><keycap>F6</keycap></keycombo></shortcut>
- <guimenu>View</guimenu>
- <guimenuitem>Show Icon Border</guimenuitem>
--</menuchoice>
-+</menuchoice> (Power user mode)
- </term>
- <listitem>
- <para>This is a toggle item. Setting it on checked will make the Icon Border
-@@ -1227,7 +1167,7 @@
- <menuchoice>
- <guimenu>View</guimenu>
- <guisubmenu>Show Scrollbar Marks</guisubmenu>
--</menuchoice>
-+</menuchoice> (Power user mode)
- </term>
- <listitem>
- <para>If this option is checked, the view will show marks on the vertical
-@@ -1241,7 +1181,7 @@
- <menuchoice>
- <shortcut><keycombo action="simul"><keycap>F9</keycap></keycombo></shortcut>
- <guimenuitem>Show Folding Markers</guimenuitem>
--</menuchoice>
-+</menuchoice> (Power user mode)
- </term>
- <listitem>
- <para>If this option is checked, the marks for code folding will be
-@@ -1254,7 +1194,7 @@
- <anchor id="view-code-folding"/>
- <menuchoice>
- <guisubmenu>Code Folding</guisubmenu>
--</menuchoice>
-+</menuchoice> (Power user mode)
- </term>
- <listitem>
- <variablelist>
-@@ -1305,9 +1245,9 @@
-
- </sect1>
- <sect1 id="go"><!-- This is also valid for kates menu bookmarks-->
--<title>The <guimenu>Bookmarks</guimenu> Menu</title>
-+<title>The Bookmarks Menu</title>
- <para>This menu is only displayed, if you check the option <link linkend="appearance">
--Enable Power User Mode (&kde; 3 mode)</link>
-+Enable Power User Mode (&kde; 3 mode)</link>
- on the <guilabel>Appearance</guilabel> page in &kappname;s settings.</para>
- <variablelist>
-
-@@ -1377,7 +1317,7 @@
- <!-- This is also valid for kates menu tools, kate has additional items:
- Pipe to Terminal, Syncronizise Terminal with Current Document, Focus Terminal at top-->
- <sect1 id="tools">
--<title>The <guimenu>Tools</guimenu> Menu</title>
-+<title>The Tools Menu</title>
-
- <variablelist>
- <varlistentry>
-@@ -1393,7 +1333,7 @@
- <varlistentry><!-- only in power mode-->
- <term><anchor id="tools-filetype"/><menuchoice>
- <guimenu>Tools</guimenu>
--<guisubmenu>Mode</guisubmenu></menuchoice></term>
-+<guisubmenu>Mode</guisubmenu></menuchoice> (Power user mode)</term>
- <listitem>
- <para>Choose the filetype scheme you prefer for the active document. This
- overwrites the global filetype mode set in <menuchoice>
-@@ -1407,7 +1347,7 @@
- <varlistentry><!-- only in power mode-->
- <term><anchor id="tools-highlighting"/><menuchoice>
- <guimenu>Tools</guimenu>
--<guisubmenu>Highlighting</guisubmenu></menuchoice></term>
-+<guisubmenu>Highlighting</guisubmenu></menuchoice> (Power user mode)</term>
- <listitem>
- <para>Choose the Highlighting scheme you prefer for the active document. This
- overwrites the global highlighting mode set in <menuchoice>
-@@ -1420,7 +1360,7 @@
- <varlistentry><!-- only in power mode-->
- <term><anchor id="tools-indentation"/><menuchoice>
- <guimenu>Tools</guimenu>
--<guisubmenu>Indentation</guisubmenu></menuchoice></term>
-+<guisubmenu>Indentation</guisubmenu></menuchoice> (Power user mode)</term>
- <listitem>
- <para>Choose the style of indentation you want for your active document.
- This overwrites the global indentation mode set in <menuchoice>
-@@ -1430,7 +1370,7 @@
- </listitem>
- </varlistentry>
-
--<varlistentry><!-- only in power mode-->
-+<varlistentry>
- <term><anchor id="tools-encoding"/><menuchoice>
- <guimenu>Tools</guimenu>
- <guisubmenu>Encoding</guisubmenu></menuchoice></term>
-@@ -1447,7 +1387,7 @@
- <varlistentry><!-- only in power mode-->
- <term><anchor id="tools-end-of-line"/><menuchoice>
- <guimenu>Tools</guimenu>
--<guisubmenu>End of Line</guisubmenu></menuchoice></term>
-+<guisubmenu>End of Line</guisubmenu></menuchoice> (Power user mode)</term>
- <listitem>
- <para>Choose your preferred end of line mode for your active
- document. This overwrites the global end of line mode set in <menuchoice>
-@@ -1458,19 +1398,58 @@
- </varlistentry>
-
- <varlistentry>
-+<term><anchor id="tools-add-byte-mark-order"/><menuchoice>
-+<guimenu>Tools</guimenu>
-+<guisubmenu>Add Byte Mark Order</guisubmenu></menuchoice></term>
-+ <listitem>
-+<para>Checking this action you can explicitly add a byte order mark for unicode
-+encoded documents. The byte order mark (BOM) is a Unicode character used to signal
-+the endianness (byte order) of a text file or stream, for more information see
-+<ulink url="http://en.wikipedia.org/wiki/Byte_Order_Mark">Byte Order Mark</ulink>.</para>
-+</listitem>
-+</varlistentry>
-+
-+<varlistentry>
- <term><menuchoice>
- <shortcut>
- <keycombo action="simul">&Ctrl;<keycap>Space</keycap></keycombo>
- </shortcut>
- <guimenu>Tools</guimenu>
- <guimenuitem>Invoke Code Completion</guimenuitem>
--</menuchoice></term>
-+</menuchoice> (Power user mode)</term>
- <listitem>
- <para>Manually invoke command completion, usually by using a shortcut bound to this action.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
-+<term><menuchoice>
-+<guimenu>Tools</guimenu>
-+<guimenuitem>Word Completion</guimenuitem>
-+</menuchoice> (Power user mode)</term>
-+<listitem>
-+<para><guimenuitem>Reuse Word Below</guimenuitem> and <guimenuitem>Reuse Word
-+Above</guimenuitem> complete the currently typed text by searching for similar
-+words backward or forward from the current cursor position. <guimenuitem>Shell
-+Completion</guimenuitem> pops up a completion box with matching entries.</para>
-+</listitem>
-+</varlistentry>
-+
-+<varlistentry>
-+<term><menuchoice>
-+<shortcut>
-+<keycombo action="simul">&Ctrl;&Shift;<keycap>O</keycap></keycombo>
-+</shortcut>
-+<guimenu>Tools</guimenu>
-+<guimenuitem>Automatic Spelling</guimenuitem>
-+</menuchoice></term>
-+<listitem>
-+<para>When <guimenuitem>Automatic Spelling</guimenuitem> is enabled, wrong text
-+is underlined in the document on-the-fly.</para>
-+</listitem>
-+</varlistentry>
-+
-+<varlistentry>
- <term><anchor id="Spelling..."/><menuchoice>
- <guimenu>Tools</guimenu><guimenuitem>Spelling...</guimenuitem></menuchoice>
- </term>
-@@ -1532,7 +1511,7 @@
- <term><guibutton>Replace All</guibutton></term>
- <listitem><para> This button causes the checker to replace not only the current
- <guilabel>Unknown word:</guilabel> but to automatically make the same
--substitution for any other occurrences of this <guilabel>Unknown word</guilabel>
-+substitution for any other occurrences of this <guilabel>Unknown word</guilabel>
- in the document.</para></listitem>
- </varlistentry>
- <varlistentry>
-@@ -1550,17 +1529,6 @@
- </varlistentry>
- </variablelist>
-
--<!--<para>Located horizontally along the bottom of the spellcheck dialog is a
--progress bar. As the checking process proceeds the bar will fill from left to
--right providing a graphical representation of how far along in the document the
--process has reached. In addition, the progress is displayed numerically in
--the center of the progress bar.</para>//-->
--
--<!--<note><para>A numerical display of the spellcheck
--process is simultaneously displayed in the status bar of the editor. The <link
--linkend="show-statusbar">status bar</link> is the horizontal strip at the bottom
--of the editor just outside of the text entry area.</para></note>//-->
--
- <para>Three more buttons are located horizontally along the bottom of the
- spellcheck dialog. They are:</para>
-
-@@ -1608,6 +1576,17 @@
- </varlistentry>
-
- <varlistentry>
-+<term><anchor id="tools-change-dictionary"/><menuchoice>
-+<guimenu>Tools</guimenu>
-+<guimenuitem>Change Dictionary</guimenuitem></menuchoice></term>
-+ <listitem>
-+<para>Displays a drop down box with all available dictionaries for spellchecking
-+at the bottom of the editor window. This allows easy switching of the spellcheck
-+dictionary ⪚ for automatic spellcheck of text in different languages.</para>
-+ </listitem>
-+</varlistentry>
-+
-+<varlistentry>
- <term><anchor id="indent"/><menuchoice>
- <shortcut>
- <keycombo action="simul">&Ctrl;<keycap>I</keycap></keycombo>
-@@ -1661,7 +1640,7 @@
- </shortcut>
- <guimenu>Tools</guimenu>
- <guimenuitem>Comment</guimenuitem>
--</menuchoice></term>
-+</menuchoice> (Power user mode)</term>
- <listitem><para>This adds one space to the beginning of the line
- where the text cursor is located or to the beginning of any
- selected lines.</para>
-@@ -1675,7 +1654,7 @@
- </shortcut>
- <guimenu>Tools</guimenu>
- <guimenuitem>Uncomment</guimenuitem>
--</menuchoice></term>
-+</menuchoice> (Power user mode)</term>
- <listitem><para>This removes one space (if any exist) from the beginning of the
- line where the text cursor is located or from the beginning of any
- selected lines.</para></listitem>
-@@ -1744,21 +1723,15 @@
- </varlistentry>
-
- </variablelist>
--<para>Menu items for the selected <link linkend="pref-plugins">plugins</link>
--are displayed at the end of this menu
-+<para>If the <link linkend="pref-plugins">plugin</link> Insert File is enabled, you will
-+find here an additional menu item <guimenuitem>Insert File...</guimenuitem>.
- </para>
--<!--
--plugins
--<guimenu>Tools</guimenu><guimenuitem>Insert File...</guimenuitem>
--<guimenu>Tools</guimenu><guimenuitem>Word Completion</guimenuitem>
---->
--
- </sect1>
-
--<sect1 id="settings">
--<!-- This is also valid for kates menu settings,
-+<sect1 id="settings">
-+<!-- This is also valid for kates menu settings,
- only the items Show Toolbar and Show Statusbar are swapped and Configure kate is the last item-->
--<title>The <guimenu>Settings</guimenu> Menu</title>
-+<title>The Settings Menu</title>
-
- <variablelist>
- <varlistentry>
-@@ -1809,42 +1782,23 @@
- </para>
- </listitem>
- </varlistentry>
--<!-- can't see it in 4.1 0r 4.2, lueck
++void ToolTipManager::slotMetaDataRequestFinished()
++{
++ if (!m_toolTipRequested) {
++ return;
++ }
+
- <varlistentry>
--<term><anchor id="choose-editor"/><menuchoice>
--<guimenu>Settings</guimenu>
--<guimenuitem>Choose Editor...</guimenuitem>
--</menuchoice>
--</term>
--<listitem>
--<para>
--Choose the default text editing component that you wish to use in &kwrite;. You
--can choose <guilabel>System Default</guilabel>, <guilabel>Embedded
--Advanced Text Editor</guilabel> or <guilabel>&Qt; Designer Based
--Text Editor</guilabel> (note that the &Qt; Designer Based Text Editor is
--only available if you have KDevelop installed on your system). If you choose
--<guilabel>System Default</guilabel>, &kwrite; will honor your changes in
--&kcontrolcenter;. All other choices will override that setting.
--</para>
--</listitem>
--</varlistentry>
---->
--<varlistentry>
- <term><anchor id="configure-keybindings"/><menuchoice>
- <guimenu>Settings</guimenu><guimenuitem>Configure
- Shortcuts...</guimenuitem></menuchoice></term>
- <listitem>
- <para>This command opens a dialog box whereby the <link
- linkend="keybindings">shortcuts</link> may be changed.
--A display window shows the list of commands (actions) and their assigned
--shortcuts, alternates and global shortcuts. The <guilabel>Search</guilabel> line above
-+A display window shows the list of commands (actions) and their assigned
-+shortcuts, alternates and global shortcuts. The <guilabel>Search</guilabel> line above
- the list window is used to filter the shortcut list.
- Selecting an action with a &LMB; click (either on the action name or shortcut cell
--for the default shortcut or on the alternate cell for an alternative) displays the
--<guilabel>Default</guilabel> and <guilabel>Custom</guilabel> radio buttons
-+for the default shortcut or on the alternate cell for an alternative) displays the
-+<guilabel>Default</guilabel> and <guilabel>Custom</guilabel> radio buttons
- below the selected action.</para>
--<para>To assign or change a shortcut click on the <guilabel>None</guilabel> button. Its
--label changes then to <guilabel>Input</guilabel>, now press the new key combination
-+<para>To assign or change a shortcut click on the <guilabel>None</guilabel> button. Its
-+label changes then to <guilabel>Input</guilabel>, now press the new key combination
- for the action.</para>
- <para>For example, with the <guilabel>About &kde;</guilabel> action selected in the display
- window, press the &Ctrl;, &Alt; and the <keycap>K</keycap> key on the keyboard. This would
-@@ -1878,15 +1832,21 @@
- </sect1>
-
- <sect1 id="help">
--<title>The <guimenu>Help</guimenu> Menu</title>
-+<title>The Help Menu</title>
-
--<!-- additional "About Editor Component" + "Tip of the Day"-->
-+<!-- additional "About Editor Component" , but no "Tip of the Day"-->
-
- &help.menu.documentation;
-
- </sect1>
- </chapter>
-
-+<!-- https://bugs.kde.org/show_bug.cgi?id=202203
-+http://kate-editor.org/article/.kateconfig
-+Where is the proper place for this missing information?
-+The chapter 8 mentioned in apaku's comment for BR 202203 does not exist
-+-->
++ m_metaDataRequested = false;
++ if (!m_showToolTipTimer->isActive()) {
++ showToolTip();
++ }
++}
+
- <chapter id="pref-dialog">
- <title>Configure &kappname;</title>
-
-@@ -1906,7 +1866,7 @@
- <guibutton>OK</guibutton> button, or <guibutton>Cancel</guibutton> the
- process. The categories <guilabel>Appearance</guilabel>,
- <guilabel>Fonts & Colors</guilabel>, <guilabel>Editing</guilabel>,
--<guilabel>Open/Save</guilabel> and
-+<guilabel>Open/Save</guilabel> and
- <guilabel>Extensions</guilabel> are detailed below.
- </para>
-
-@@ -1982,7 +1942,7 @@
- <varlistentry>
- <term><guilabel>Sort Bookmarks Menu
- </guilabel></term>
--<listitem><para>These options are only displayed, if <guilabel>Enable power user mode
-+<listitem><para>These options are only displayed, if <guilabel>Enable power user mode
- (&kde; 3 mode)</guilabel> in the next section is checked.</para>
- <para>
- <variablelist>
-@@ -2010,8 +1970,8 @@
- <varlistentry>
- <term><guilabel>Enable power user mode (&kde; 3 mode)
- </guilabel></term>
--<listitem><para>Switch between simple and advanced mode.
--Changing this mode affects only newly opened / created documents.
-+<listitem><para>Switch between simple and advanced mode.
-+Changing this mode affects only newly opened / created documents.
- In &kappname; a restart is recommended.</para></listitem>
- </varlistentry>
- <varlistentry>
-@@ -2121,6 +2081,11 @@
- <listitem><para>This color is used to draw white space indicators when enabled.
- </para></listitem>
- </varlistentry>
-+<varlistentry>
-+<term><guilabel>Spelling mistake line</guilabel></term>
-+<listitem><para>sets the color of the line that is used to indicate spelling mistakes.
-+</para></listitem>
-+</varlistentry>
- </variablelist>
- </listitem>
- </varlistentry>
-@@ -2271,6 +2236,17 @@
- the user types a left bracket ([, (, or {) &kappname; automatically enters the
- right bracket (}, ), or ]) to the right of the cursor.</para></listitem>
- </varlistentry>
+ void ToolTipManager::showToolTip()
+ {
+- const QRect desktop = QApplication::desktop()->screenGeometry(m_itemRect.bottomRight());
+- const QSize size = m_fileMetaDataToolTip->sizeHint();
+-
++ Q_ASSERT(m_toolTipRequested);
++ QApplication::restoreOverrideCursor();
+
-+<varlistentry>
-+<term><guilabel>Copy/Cut the current line if no selection</guilabel></term> <listitem>
-+<para>If this option is enabled and the text selection is empty, copy and cut
-+action are performed for the line of text at the actual cursor position.</para></listitem>
-+</varlistentry>
++ if (QApplication::mouseButtons() & Qt::LeftButton) {
++ return;
++ }
+
-+<varlistentry>
-+<term><guilabel>Allow scrolling past the end of the document</guilabel></term> <listitem>
-+<para>This option lets you scroll past the end of the document. This can be used to vertically centre the bottom of the document, or put it on top of the current view.</para></listitem>
-+</varlistentry>
- </variablelist>
- </listitem>
- </varlistentry>
-@@ -2381,23 +2357,23 @@
- <varlistentry>
- <term><guilabel>Indentation width:</guilabel></term>
- <listitem>
--<para>The indentation width is the number of spaces which is used to indent a line.
--If the option <guilabel>Insert spaces instead of tabulators</guilabel>
--on the <guilabel>General</guilabel> tab in the <guilabel>Editing</guilabel>
--page is disabled, a 	 character is inserted
-+<para>The indentation width is the number of spaces which is used to indent a line.
-+If the option <guilabel>Insert spaces instead of tabulators</guilabel>
-+on the <guilabel>General</guilabel> tab in the <guilabel>Editing</guilabel>
-+page is disabled, a 	 character is inserted
- if the indentation is divisible by the tab width.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><guilabel>Keep Extra Spaces</guilabel></term>
--<listitem><para>If this option is disabled, changing the indentation
--level aligns a line to a multiple of the width specified in
-+<listitem><para>If this option is disabled, changing the indentation
-+level aligns a line to a multiple of the width specified in
- <guilabel>Indentation width</guilabel>.</para></listitem>
- </varlistentry>
- <varlistentry>
- <term><guilabel>Adjust indentation of code pasted from the clipboard</guilabel></term>
- <listitem>
--<para>If this option is selected, pasted code from the clipboard is indented.
-+<para>If this option is selected, pasted code from the clipboard is indented.
- Triggering the <guimenuitem>Undo</guimenuitem> action removes the indentation.</para>
- </listitem>
- </varlistentry>
-@@ -2412,7 +2388,7 @@
- <varlistentry>
- <term><guilabel>Backspace key in leading blank space unindents</guilabel></term>
- <listitem>
--<para>If this option is selected, the <keysym>Backspace</keysym> key decreases the indentation level
-+<para>If this option is selected, the &Backspace; key decreases the indentation level
- if the cursor is located in the leading blank space of a line.</para>
- </listitem>
- </varlistentry>
-@@ -2420,23 +2396,23 @@
- <term><guilabel>Tab key action (if no selection exists)</guilabel></term>
- <listitem>
- <para>
--If you want 	 to align the current line in the current code block
-+If you want 	 to align the current line in the current code block
- like in emacs, make 	 a shortcut to the action <guimenuitem>Align</guimenuitem>.
- </para>
- <variablelist>
- <varlistentry>
- <term><guilabel>Always advance to the next tab position</guilabel></term>
- <listitem>
--<para>If this option is selected, the 	 key always inserts white space
--so that the next tab position is reached. If the option <guilabel>Insert spaces instead of tabulators</guilabel>
--on the <guilabel>General</guilabel> tab in the <guilabel>Editing</guilabel>
-+<para>If this option is selected, the 	 key always inserts white space
-+so that the next tab position is reached. If the option <guilabel>Insert spaces instead of tabulators</guilabel>
-+on the <guilabel>General</guilabel> tab in the <guilabel>Editing</guilabel>
- page is enabled, spaces are inserted; otherwise, a single tabulator is inserted.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><guilabel>Always increase indentation level</guilabel></term>
- <listitem>
--<para>If this option is selected, the 	 key always indents the current
-+<para>If this option is selected, the 	 key always indents the current
- line by the number of character positions specified in <guilabel>Indentation width</guilabel>.</para>
- </listitem>
- </varlistentry>
-@@ -2444,14 +2420,14 @@
- <varlistentry>
- <term><guilabel>Increase indentation level if in leading blank space</guilabel></term>
- <listitem>
--<para>If this option is selected, the 	 key either indents the current line
--or advances to the next tab position. If the insertion point is at or before the
--first non-space character in the line, or if there is a selection, the current line
-+<para>If this option is selected, the 	 key either indents the current line
-+or advances to the next tab position. If the insertion point is at or before the
-+first non-space character in the line, or if there is a selection, the current line
- is indented by the number of character positions specified in <guilabel>Indentation width</guilabel>.
--If the insertion point is located after the first non-space character in the line
--and there is no selection, white space is inserted so that the next tab position is
--reached: if the option <guilabel>Insert spaces instead of tabulators</guilabel>
--on the <guilabel>General</guilabel> tab in the <guilabel>Editing</guilabel>
-+If the insertion point is located after the first non-space character in the line
-+and there is no selection, white space is inserted so that the next tab position is
-+reached: if the option <guilabel>Insert spaces instead of tabulators</guilabel>
-+on the <guilabel>General</guilabel> tab in the <guilabel>Editing</guilabel>
- page is enabled, spaces are inserted; otherwise, a single tabulator is inserted.</para>
- </listitem>
- </varlistentry>
-@@ -2477,14 +2453,23 @@
- <varlistentry>
- <term><guilabel>Auto Completion enabled</guilabel></term>
- <listitem>
--<para>If this is enabled, the editor will calculate the number
--of spaces up to the next tab position as defined by the tab width,
-+<para>If this is enabled, the editor will calculate the number
-+of spaces up to the next tab position as defined by the tab width,
- and insert that number of spaces instead of a 	 character.</para>
- </listitem>
- </varlistentry>
- </variablelist>
- </listitem>
- </varlistentry>
++ if (m_fileMetaDataToolTip->preview().isNull() || m_metaDataRequested) {
++ QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
++ return;
++ }
+
-+<varlistentry>
-+<term><guilabel>Minimal word length to complete</guilabel></term>
-+<listitem><para>While typing text, the word completion searches for words in the
-+document starting with the already typed text. This option configures the minimal
-+amount of characters that are needed to make the word completion active and pop
-+up a completion box.</para></listitem>
-+</varlistentry>
++ const QRect screen = QApplication::desktop()->screenGeometry(QCursor::pos());
+
- </variablelist>
-
- </sect2>
-@@ -2507,8 +2492,8 @@
- <varlistentry>
- <term><guilabel>Let VI commands override Kate shortcuts</guilabel></term>
- <listitem>
--<para>When selected, vi commands will override &kate;'s built-in commands. For
--example: <keycombo action="simul">&Ctrl;<keycap>R</keycap></keycombo> will redo,
-+<para>When selected, vi commands will override &kate;'s built-in commands. For
-+example: <keycombo action="simul">&Ctrl;<keycap>R</keycap></keycombo> will redo,
- and override the standard action (showing the search and replace dialog).</para>
- </listitem>
- </varlistentry>
-@@ -2524,14 +2509,32 @@
- </variablelist>
- </listitem>
- </varlistentry>
-+<varlistentry>
-+<term><guilabel>Key Mapping</guilabel></term>
-+<listitem><para>
-+Key mapping is used to change the meaning of typed keys. This allows you to
-+move commands to other keys or make special keypresses for doing a series of
-+commands.</para>
-+<para>Example:</para>
-+<para><keycap>F2</keycap> -> <keycap>I--</keycap> &Esc;</para>
-+<para>This will prepend <keycap>I--</keycap> to a line when pressing <keycap>F2</keycap>.
-+</para>
-+</listitem>
-+</varlistentry>
- </variablelist>
-
- </sect2>
-
-+<sect2 id="pref-edit-spellcheck">
-+<title>Spellcheck</title>
-+<para>These configuration options are described in the documentation for the
-+&systemsettings; module <ulink url="help:kcontrol/spellchecking">Spell Checker</ulink>.</para>
-+</sect2>
++ // Restrict tooltip size to current screen size when needed.
++ // Because layout controlling widget doesn't respect widget's maximumSize property
++ // (correct me if I'm wrong), we need to let layout do its work, then manually change
++ // geometry if resulting widget doesn't fit the screen.
+
- </sect1>
-
- <sect1 id="pref-open-save">
--<title>Open & Save</title>
-+<title>Open/Save</title>
-
- <sect2 id="pref-open-save-general">
- <title>General</title>
-@@ -2571,6 +2574,17 @@
- type. The first found end of line type will be used for the whole file.</para>
- </listitem>
- </varlistentry>
++ // Step #1 - make sizeHint return calculated tooltip size
++ m_fileMetaDataToolTip->layout()->setSizeConstraint(QLayout::SetFixedSize);
++ m_fileMetaDataToolTip->adjustSize();
++ QSize size = m_fileMetaDataToolTip->sizeHint();
+
-+<varlistentry>
-+<term><guilabel>Enable byte order marker</guilabel></term>
-+<listitem>
-+<para>The byte order mark is a special sequence at the beginning of unicode
-+encoded documents. It helps editors to open text documents with the correct
-+unicode encoding. For more information see <ulink
-+url="http://en.wikipedia.org/wiki/Byte_Order_Mark">Byte Order Mark</ulink>.</para>
-+</listitem>
-+</varlistentry>
++ // Step #2 - correct tooltip size when needed
++ if (size.width() > screen.width()) {
++ size.setWidth(screen.width());
++ }
++ if (size.height() > screen.height()) {
++ size.setHeight(screen.height());
++ }
+
- </variablelist>
- </listitem>
- </varlistentry>
-@@ -2605,7 +2619,9 @@
- <term><guilabel>Search depth for config file:</guilabel></term>
- <listitem>
- <para>The editor will search the given number of folder levels upwards
--for &kappname; config file and load the settings line from it.</para>
-+for &kappname; config file and load the settings line from it.
-+Further information about these hidden folder config files you find in the article
-+<ulink url="http://kate-editor.org/article/.kateconfig">The File .kateconfig</ulink>.</para>
- </listitem>
- </varlistentry>
- </variablelist>
-@@ -2682,7 +2698,7 @@
- </listitem> </varlistentry>
-
- <varlistentry>
--<term><guilabel>Properties of current filetype</guilabel></term>
-+<term><guilabel>Properties of <replaceable>current filetype</replaceable></guilabel></term>
- <listitem><para>The filetype with the highest priority is the one displayed in
- the first drop down box. If more filetypes were found, they are also
- listed.</para>
-@@ -2714,7 +2730,14 @@
- <listitem><para>If you create a new file type, this drop down box allows you to
- select a filetype for highlighting.</para></listitem>
- </varlistentry>
+ // m_itemRect defines the area of the item, where the tooltip should be
+ // shown. Per default the tooltip is shown in the bottom right corner.
+- // If the tooltip content exceeds the desktop borders, it must be assured that:
++ // It must be assured that:
+ // - the content is fully visible
+ // - the content is not drawn inside m_itemRect
+- const bool hasRoomToLeft = (m_itemRect.left() - size.width() >= desktop.left());
+- const bool hasRoomToRight = (m_itemRect.right() + size.width() <= desktop.right());
+- const bool hasRoomAbove = (m_itemRect.top() - size.height() >= desktop.top());
+- const bool hasRoomBelow = (m_itemRect.bottom() + size.height() <= desktop.bottom());
++ const bool hasRoomToLeft = (m_itemRect.left() - size.width() >= screen.left());
++ const bool hasRoomToRight = (m_itemRect.right() + size.width() <= screen.right());
++ const bool hasRoomAbove = (m_itemRect.top() - size.height() >= screen.top());
++ const bool hasRoomBelow = (m_itemRect.bottom() + size.height() <= screen.bottom());
+ if (!hasRoomAbove && !hasRoomBelow && !hasRoomToLeft && !hasRoomToRight) {
+ return;
+ }
+-
+- int x = 0;
+- int y = 0;
+
- <varlistentry>
-+<term><guilabel>Indentation Mode:</guilabel></term>
-+<listitem><para>The drop down box specifies the indentation mode for new
-+documents.</para></listitem>
-+</varlistentry>
++ int x, y;
+ if (hasRoomBelow || hasRoomAbove) {
+ x = QCursor::pos().x() + 16; // TODO: use mouse pointer width instead of the magic value of 16
+- if (x + size.width() >= desktop.right()) {
+- x = desktop.right() - size.width();
++ if (x + size.width() >= screen.right()) {
++ x = screen.right() - size.width() + 1;
+ }
+ if (hasRoomBelow) {
+ y = m_itemRect.bottom() + 1;
+@@ -240,38 +275,18 @@
+ } else {
+ x = m_itemRect.left() - size.width();
+ }
+-
+ // Put the tooltip at the bottom of the screen. The x-coordinate has already
+ // been adjusted, so that no overlapping with m_itemRect occurs.
+- y = desktop.bottom() - size.height();
++ y = screen.bottom() - size.height() + 1;
+ }
+-
+- m_fileMetaDataToolTip->move(qMax(x, 0), qMax(y, 0));
+
-+<varlistentry>
- <term><guilabel>File extensions:</guilabel></term>
- <listitem><para>The wildcards mask allows you to select files by filename. A
- typical mask uses an asterisk and the file extension, for example
-@@ -2751,16 +2774,68 @@
-
- <sect1 id="pref-plugins">
- <title>Extensions</title>
--<para>This <guilabel>Plugins</guilabel> tab lists all available plugins and you can check those you
-+<para>The <guilabel>Plugins</guilabel> tab lists all available plugins and you can check those you
- want to use. Click on the <guibutton>Information</guibutton> button to open the
--<guilabel>About</guilabel> dialog of this plugin.
--Once a plugin is checked, the
-+<guilabel>About</guilabel> dialog of this plugin.</para>
-+<para>Once a configurable plugin is checked, the
- <guibutton>Configure</guibutton> button is enabled and you can click it
- in order to configure the highlighted plugin.</para>
-+<variablelist>
-+<title>Editor Component Plugins</title>
-+<varlistentry>
-+<term><guilabel>AutoBrace</guilabel></term>
-+<listitem><para>The autobrace plugin supersedes the &kate; internal
-+<quote>Auto Brackets</quote> feature.
-+It automatically inserts a closing brace <keycap>}</keycap> at the beginning
-+of the next line after ending a line with an opening one <keycap>{</keycap>
-+and pressing the &Enter; key.</para></listitem>
-+</varlistentry>
-+<!--http://jakob.petsovits.at/topic/kate-->
-+<!--Right, it's the automatic insertion of a closing brace ("}") after you ended a line with an opening one ("{"). Kate's standard insertion of parentheses, brackets and braces is simply too obtrusive for me, so even if I tried it several times I always had to disable it again because I can't stand it. So here's how AutoBrace works.
-+You, the developer, are writing a line of code, and want to open a new block delimited by braces. Looks like this:
-+If you press Enter and AutoBrace is enabled, it will insert your favorite new brace where it belongs. Looks like this:
-+-->
-+<varlistentry>
-+<term><guilabel>DataTools</guilabel></term>
-+<listitem><para>Enables data tools like thesaurus and spell check (if installed).
-+Data tools are only available when text is selected, or when the right mouse
-+button is clicked over a word. If no data tools are offered even when text
-+is selected, you need to install them. Some data tools are part of the
-+&koffice; package.
-+If this plugin is enabled and data tools are installed, additional items
-+appear at the end of the context menu.</para></listitem>
-+</varlistentry>
-+<varlistentry>
-+<term><guilabel>Exporter</guilabel></term>
-+<listitem><para>This command allows you to export the current document with all highlighting
-+information into a HTML document using <menuchoice><guimenu>File</guimenu><guimenuitem>Export
-+as HTML</guimenuitem></menuchoice>. Additionally you can use <menuchoice><guimenu>Edit</guimenu>
-+<guimenuitem>Copy as HTML</guimenuitem></menuchoice> to copy the currently selected text
-+as HTML to the system clipboard.</para></listitem>
-+</varlistentry>
-+<varlistentry>
-+<term><guilabel>Insert File</guilabel></term>
-+<listitem><para>This plugin allows you to insert any readable file at the cursor position.
-+If enabled, the <guimenu>Tools</guimenu> menu has an additional menu item
-+<guimenuitem>Insert File</guimenuitem>.</para></listitem>
-+</varlistentry>
-+<varlistentry>
-+<term>Python Encoding check</term>
-+<listitem><para>This plugin is always enabled.
-+If you are trying to save a python file as non ASCII, without specifying a
-+correct source encoding line like ⪚ <quote># -*- coding: utf-8 -*-</quote>,
-+a warning dialog pops up and allows you to add a proper source encoding line for the
-+current encoding to the file.
-+</para></listitem>
-+</varlistentry>
-+</variablelist>
-+<!--
-+kdelibs/kate/plugins/ has additional plugins
-+autobookmark not build, its broken!
-+timedate not build? plugin is for howto-write-a-plugin purposes!
-+-->
-
--<para>The selected plugins are available in the <guimenu>Tools</guimenu> menu.</para>
++ // Step #3 - Alter tooltip geometry
++ m_fileMetaDataToolTip->setFixedSize(size);
++ m_fileMetaDataToolTip->layout()->setSizeConstraint(QLayout::SetNoConstraint);
++ m_fileMetaDataToolTip->setGeometry(x, y, size.width(), size.height());
+ m_fileMetaDataToolTip->show();
+-}
+
+-void ToolTipManager::showToolTipDelayed(const QPixmap& pixmap)
+-{
+- if (QApplication::mouseButtons() & Qt::LeftButton) {
+- return;
+- }
+-
+- m_fileMetaDataToolTip->setPreview(pixmap);
+- m_fileMetaDataToolTip->setName(m_item.text());
+- m_fileMetaDataToolTip->setItems(KFileItemList() << m_item);
-
--<!-- Scripts tab ??-->
-+<!-- Scripts tab ??? empty: Not implemented yet, hidden in 4.4 branch -->
- </sect1>
- </chapter>
-
-Index: apps/lib/konq/Templates/linkHD.desktop
-===================================================================
---- apps/lib/konq/Templates/linkHD.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
-+++ apps/lib/konq/Templates/linkHD.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104128)
-@@ -116,7 +116,7 @@
- Comment[he]=כונן קשיח חדש
- Comment[hi]=नया हार्ड डिस्क
- Comment[hne]=नवा हार्ड डिस्क
--Comment[hr]=Novi tvrdi disk
-+Comment[hr]=Novi čvrsti disk
- Comment[hsb]=Nowy kruty disk
- Comment[hu]=Új merevlemez-partíció
- Comment[id]=Cakram Keras Baru
-Index: apps/kinfocenter/info/processor.desktop
-===================================================================
---- apps/kinfocenter/info/processor.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
-+++ apps/kinfocenter/info/processor.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104128)
-@@ -161,7 +161,7 @@
- Comment[or]=ସଂଚାଳକ ସୂଚନା
- Comment[pa]=ਪਰੋਸੈਸਰ ਜਾਣਕਾਰੀ
- Comment[pl]=Informacje o procesorze
--Comment[pt]=Informação sobre o processador
-+Comment[pt]=Informação do processador
- Comment[pt_BR]=Informações sobre o processador
- Comment[ro]=Informații despre microprocesor
- Comment[ru]=Сведения о процессоре
-Index: apps/konsole/src/config-konsole.h.cmake
-===================================================================
---- apps/konsole/src/config-konsole.h.cmake (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
-+++ apps/konsole/src/config-konsole.h.cmake (.../branches/KDE/4.4/kdebase) (wersja 1104128)
-@@ -7,4 +7,8 @@
- /* Defined if your system has XRender support */
- #cmakedefine HAVE_XRENDER 1
-
-+/* Defined if you have sys/proc.h */
-+#cmakedefine HAVE_SYS_PROC_H 1
-
-+/* Defined if you have sys/proc_info.h */
-+#cmakedefine HAVE_SYS_PROC_INFO_H 1
-Index: apps/konsole/src/TerminalDisplay.cpp
-===================================================================
---- apps/konsole/src/TerminalDisplay.cpp (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
-+++ apps/konsole/src/TerminalDisplay.cpp (.../branches/KDE/4.4/kdebase) (wersja 1104128)
-@@ -1598,7 +1598,6 @@
- if ( _resizing )
- {
- showResizeNotification();
-- processFilters(); // Obtain new hotspot indicies
- emit changedContentSizeSignal(_contentHeight, _contentWidth); // expose resizeEvent
- }
-
-Index: apps/konsole/src/main.cpp
-===================================================================
---- apps/konsole/src/main.cpp (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
-+++ apps/konsole/src/main.cpp (.../branches/KDE/4.4/kdebase) (wersja 1104128)
-@@ -30,7 +30,7 @@
- #include <KCmdLineArgs>
- #include <KLocale>
+- // Because one tooltip instance is reused, the size hint always depends on the previous
+- // content (QWidgets don't update their layout geometry if they are invisible). To
+- // assure having a consistent size without relayout flickering, the tooltip is opened
+- // on an invisible position first. This gives the layout system some time to asynchronously
+- // update the content. Sadly this only works with compositing enabled.
+- if (KWindowSystem::compositingActive()) {
+- const QRect desktop = QApplication::desktop()->screenGeometry(m_itemRect.bottomRight());
+- m_fileMetaDataToolTip->move(desktop.bottomRight());
+- m_fileMetaDataToolTip->show();
+- }
+-
+- m_showToolTipDelayedTimer->start(); // Calls ToolTipManager::showToolTip()
++ m_toolTipRequested = false;
+ }
--#define KONSOLE_VERSION "2.4.1"
-+#define KONSOLE_VERSION "2.4.2"
+ #include "tooltipmanager.moc"
+Index: apps/dolphin/src/tooltips/tooltipmanager.h
+===================================================================
+--- apps/dolphin/src/tooltips/tooltipmanager.h (.../tags/KDE/4.5.0/kdebase) (wersja 1165575)
++++ apps/dolphin/src/tooltips/tooltipmanager.h (.../branches/KDE/4.5/kdebase) (wersja 1165575)
+@@ -23,7 +23,7 @@
+ #include <QObject>
+ #include <QRect>
- using namespace Konsole;
+-#include <kfileitem.h>
++#include <KFileItem>
-Index: apps/konsole/src/CMakeLists.txt
-===================================================================
---- apps/konsole/src/CMakeLists.txt (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
-+++ apps/konsole/src/CMakeLists.txt (.../branches/KDE/4.4/kdebase) (wersja 1104128)
-@@ -4,6 +4,10 @@
- macro_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER)
- macro_log_feature(XKB_FOUND "XKB" "X keyboard extension" "http://www.x.org" FALSE "" "Gives Konsole better keyboard support.")
+ class DolphinModel;
+ class DolphinSortFilterProxyModel;
+@@ -54,53 +54,38 @@
+ * only needed when the tooltip should be hidden although
+ * an item is hovered.
+ */
+- void hideTip();
++ void hideToolTip();
+
+ protected:
+ virtual bool eventFilter(QObject* watched, QEvent* event);
+
+ private slots:
+ void requestToolTip(const QModelIndex& index);
+- void hideToolTip();
+- void prepareToolTip();
+- void startPreviewJob();
++ void startContentRetrieval();
+ void setPreviewPix(const KFileItem& item, const QPixmap& pix);
+ void previewFailed();
++ void slotMetaDataRequestFinished();
+ void showToolTip();
+-
+-private:
+- void showToolTipDelayed(const QPixmap& pixmap);
-+include(CheckIncludeFiles)
-+check_include_files("sys/proc.h" HAVE_SYS_PROC_H)
-+check_include_files("sys/proc_info.h" HAVE_SYS_PROC_INFO_H)
+ private:
+ QAbstractItemView* m_view;
+ DolphinModel* m_dolphinModel;
+ DolphinSortFilterProxyModel* m_proxyModel;
+
+- /// Timeout from requesting a tooltip until the tooltip is shown
+- QTimer* m_prepareToolTipTimer;
+-
+- /// Timeout from requesting a tooltip until starting a job to
+- /// create a preview pixmap. The preview job is started before
+- /// m_prepareToolTipTimer has been exceeded, to have the preview
+- /// pixmap ideally before the tooltip will be shown.
+- QTimer* m_startPreviewJobTimer;
+-
+- /// Don't show the tooltip, before the preview has been received. The
+- /// time indicates the interval, when the check for a received
+- /// is done.
+- QTimer* m_waitOnPreviewTimer;
+-
+- /// The tooltip is shown slightly delayed to prevent a flickering
+- /// because of layouting the content.
+- QTimer* m_showToolTipDelayedTimer;
++ /// Timeout from requesting a tooltip until the tooltip
++ /// should be shown
++ QTimer* m_showToolTipTimer;
+
++ /// Timeout from requesting a tooltip until the retrieving of
++ /// the tooltip content like preview and meta data gets started.
++ QTimer* m_contentRetrievalTimer;
+
- configure_file (config-konsole.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-konsole.h )
-
- ### Tests
-Index: apps/konsole/src/Session.cpp
-===================================================================
---- apps/konsole/src/Session.cpp (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
-+++ apps/konsole/src/Session.cpp (.../branches/KDE/4.4/kdebase) (wersja 1104128)
-@@ -619,6 +619,7 @@
- {
- minLines = (minLines == -1) ? view->lines() : qMin( minLines , view->lines() );
- minColumns = (minColumns == -1) ? view->columns() : qMin( minColumns , view->columns() );
-+ view->processFilters();
- }
- }
+ FileMetaDataToolTip* m_fileMetaDataToolTip;
+
++ bool m_toolTipRequested;
++ bool m_metaDataRequested;
+ KFileItem m_item;
+ QRect m_itemRect;
+- bool m_generatingPreview;
+- bool m_hasDefaultIcon;
+- QPixmap m_previewPixmap;
+ };
-Index: apps/konsole/src/ProcessInfo.cpp
-===================================================================
---- apps/konsole/src/ProcessInfo.cpp (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
-+++ apps/konsole/src/ProcessInfo.cpp (.../branches/KDE/4.4/kdebase) (wersja 1104128)
-@@ -19,6 +19,7 @@
-
- // Own
- #include "ProcessInfo.h"
-+#include "config-konsole.h"
-
- // Unix
- #include <sys/socket.h>
-@@ -42,8 +43,12 @@
-
- #if defined(Q_OS_MAC)
- #include <sys/sysctl.h>
-+#ifdef HAVE_SYS_PROC_INFO_H
- #include <sys/proc_info.h>
-+#endif
-+#ifdef HAVE_SYS_PROC_H
- #include <sys/proc.h>
-+#endif
- #include <kde_file.h>
#endif
+Index: apps/dolphin/src/tooltips/filemetadatatooltip.cpp
+===================================================================
+--- apps/dolphin/src/tooltips/filemetadatatooltip.cpp (.../tags/KDE/4.5.0/kdebase) (wersja 1165575)
++++ apps/dolphin/src/tooltips/filemetadatatooltip.cpp (.../branches/KDE/4.5/kdebase) (wersja 1165575)
+@@ -20,10 +20,10 @@
+
+ #include "filemetadatatooltip.h"
+
+-#include <kcolorscheme.h>
++#include <KColorScheme>
+ #include <kfilemetadatawidget.h>
+-#include <kseparator.h>
+-#include <kwindowsystem.h>
++#include <KSeparator>
++#include <KWindowSystem>
+
+ #include <QLabel>
+ #include <QPainter>
+@@ -34,7 +34,6 @@
+ m_preview(0),
+ m_name(0),
+ m_fileMetaDataWidget(0)
+-
+ {
+ setAttribute(Qt::WA_TranslucentBackground);
+ setWindowFlags(Qt::ToolTip | Qt::FramelessWindowHint);
+@@ -47,30 +46,25 @@
+ QFont font = m_name->font();
+ font.setBold(true);
+ m_name->setFont(font);
+- m_name->setAlignment(Qt::AlignHCenter);
+
+ // Create widget for the meta data
+ m_fileMetaDataWidget = new KFileMetaDataWidget();
+ m_fileMetaDataWidget->setForegroundRole(QPalette::ToolTipText);
+ m_fileMetaDataWidget->setReadOnly(true);
++ connect(m_fileMetaDataWidget, SIGNAL(metaDataRequestFinished(KFileItemList)),
++ this, SIGNAL(metaDataRequestFinished(KFileItemList)));
+
+- // The stretchwidget allows the metadata widget to be top aligned and fills
+- // the remaining vertical space
+- QWidget* stretchWidget = new QWidget(this);
+- stretchWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding);
+-
+- QWidget* textContainer = new QWidget(this);
+- QVBoxLayout* textLayout = new QVBoxLayout(textContainer);
++ QVBoxLayout* textLayout = new QVBoxLayout();
++ textLayout->setAlignment(Qt::AlignTop);
+ textLayout->addWidget(m_name);
+ textLayout->addWidget(new KSeparator());
+ textLayout->addWidget(m_fileMetaDataWidget);
+- textLayout->addWidget(stretchWidget);
++ textLayout->setAlignment(m_name, Qt::AlignCenter);
++ textLayout->setAlignment(m_fileMetaDataWidget, Qt::AlignLeft);
+
+ QHBoxLayout* tipLayout = new QHBoxLayout(this);
+ tipLayout->addWidget(m_preview);
+- tipLayout->addWidget(textContainer);
+-
+- tipLayout->setSizeConstraint(QLayout::SetFixedSize);
++ tipLayout->addLayout(textLayout);
+ }
-Index: apps/konsole/data/profiles/Shell.profile
-===================================================================
---- apps/konsole/data/profiles/Shell.profile (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
-+++ apps/konsole/data/profiles/Shell.profile (.../branches/KDE/4.4/kdebase) (wersja 1104128)
-@@ -113,7 +113,7 @@
- Comment[he]=פרופיל ברירת־המחדל של קונסול
- Comment[hi]=कंसोल डिफ़ॉल्ट प्रोफ़ाइल
- Comment[hne]=कंसोल डिफाल्ट प्रोफाइल
--Comment[hr]=Zadani profil Konzole
-+Comment[hr]=Zadani profil Konsole
- Comment[hsb]=Standardny profil konsole
- Comment[hu]=Alapértelmezett Konsole-profil
- Comment[id]=Profil standar Konsole
-Index: apps/konsole/desktop/konsole.desktop
-===================================================================
---- apps/konsole/desktop/konsole.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
-+++ apps/konsole/desktop/konsole.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104128)
-@@ -38,7 +38,7 @@
- Name[he]=Konsole
- Name[hi]=कंसोल
- Name[hne]=कंसोल
--Name[hr]=Konzola
-+Name[hr]=Konsole
- Name[hsb]=Konsola
- Name[hu]=Konsole
- Name[id]=Konsole
-Index: apps/konsole/desktop/konsole.notifyrc
-===================================================================
---- apps/konsole/desktop/konsole.notifyrc (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
-+++ apps/konsole/desktop/konsole.notifyrc (.../branches/KDE/4.4/kdebase) (wersja 1104128)
-@@ -32,7 +32,7 @@
- Comment[he]=Konsole
- Comment[hi]=कंसोल
- Comment[hne]=कंसोल
--Comment[hr]=Konzola
-+Comment[hr]=Konsole
- Comment[hsb]=Konsola
- Comment[hu]=Konsole
- Comment[id]=Konsole
-Index: runtime/knotify/Info.plist.template
-===================================================================
-Index: runtime/knotify/CMakeLists.txt
-===================================================================
-Index: runtime/solid-device-automounter/kded/device_automounter.desktop
-===================================================================
-Index: runtime/solid-device-automounter/kcm/device_automounter_kcm.desktop
-===================================================================
-Index: runtime/localization/currency/all.desktop
-===================================================================
-Index: runtime/localization/currency/etb.desktop
-===================================================================
-Index: runtime/localization/currency/frf.desktop
-===================================================================
-Index: runtime/localization/currency/idr.desktop
-===================================================================
-Index: runtime/localization/currency/brl.desktop
-===================================================================
-Index: runtime/localization/currency/bzd.desktop
+ FileMetaDataToolTip::~FileMetaDataToolTip()
+@@ -82,9 +76,12 @@
+ m_preview->setPixmap(pixmap);
+ }
+
+-const QPixmap* FileMetaDataToolTip::preview() const
++QPixmap FileMetaDataToolTip::preview() const
+ {
+- return m_preview->pixmap();
++ if (m_preview->pixmap() != 0) {
++ return *m_preview->pixmap();
++ }
++ return QPixmap();
+ }
+
+ void FileMetaDataToolTip::setName(const QString& name)
+Index: apps/dolphin/src/dolphinview.h
+===================================================================
+--- apps/dolphin/src/dolphinview.h (.../tags/KDE/4.5.0/kdebase) (wersja 1165575)
++++ apps/dolphin/src/dolphinview.h (.../branches/KDE/4.5/kdebase) (wersja 1165575)
+@@ -796,7 +796,6 @@
+ ViewModeController* m_viewModeController;
+ ViewAccessor m_viewAccessor;
+
+- QItemSelectionModel* m_selectionModel; // allow to switch views without losing the selection
+ QTimer* m_selectionChangedTimer;
+
+ KUrl m_rootUrl;
+Index: apps/lib/konq/Templates/Floppy.desktop
+===================================================================
+--- apps/lib/konq/Templates/Floppy.desktop (.../tags/KDE/4.5.0/kdebase) (wersja 1165575)
++++ apps/lib/konq/Templates/Floppy.desktop (.../branches/KDE/4.5/kdebase) (wersja 1165575)
+@@ -13,11 +13,13 @@
+ Name[en_GB]=Format
+ Name[es]=Formato
+ Name[et]=Vormindamine
++Name[eu]=Formatua
+ Name[fi]=Alusta
+ Name[fr]=Format
+ Name[fy]=Opmaak
+ Name[ga]=Formáidigh
+ Name[hi]=फॉर्मेट
++Name[hr]=Formatiranje
+ Name[ia]=Format
+ Name[id]=Format
+ Name[is]=Forsníða
+@@ -33,6 +35,7 @@
+ Name[nb]=Format
+ Name[nds]=Formateren
+ Name[nl]=Formatteren
++Name[nn]=Formater
+ Name[pa]=ਫਾਰਮੈਟ
+ Name[pl]=Format
+ Name[pt]=Formatar
+Index: apps/lib/konq/favicons/favicons.desktop
+===================================================================
+--- apps/lib/konq/favicons/favicons.desktop (.../tags/KDE/4.5.0/kdebase) (wersja 1165575)
++++ apps/lib/konq/favicons/favicons.desktop (.../branches/KDE/4.5/kdebase) (wersja 1165575)
+@@ -82,6 +82,7 @@
+ Comment[en_GB]=Stores website icons
+ Comment[es]=Almacena iconos de sitios web
+ Comment[et]=Veebilehekülgede ikoonide salvestamine
++Comment[eu]=Webguneen ikonoak gordetzen ditu
+ Comment[fi]=Säilyttää nettisivujen kuvakkeita
+ Comment[fr]=Stocker les icônes des site Internet
+ Comment[fy]=Bewarret website byldkaikes
+@@ -103,6 +104,7 @@
+ Comment[nb]=Lagrer nettstedsikoner
+ Comment[nds]=Wohrt Nettsiedenlüttbiller
+ Comment[nl]=Slaat website pictogrammen op
++Comment[nn]=Lagrar nettstadikon
+ Comment[pa]=ਵੈੱਬਸਾਈਟ ਆਈਕਾਨ ਸਟੋਰ ਕਰਦਾ ਹੈ
+ Comment[pl]=Przechowuje ikony stron WWW
+ Comment[pt]=Guarda os ícones das páginas Web
+Index: apps/keditbookmarks/keditbookmarks.desktop
+===================================================================
+--- apps/keditbookmarks/keditbookmarks.desktop (.../tags/KDE/4.5.0/kdebase) (wersja 1165575)
++++ apps/keditbookmarks/keditbookmarks.desktop (.../branches/KDE/4.5/kdebase) (wersja 1165575)
+@@ -16,6 +16,7 @@
+ Name[en_GB]=Bookmark Editor
+ Name[es]=Editor de marcadores
+ Name[et]=Järjehoidjate redaktor
++Name[eu]=Laster-marka editorea
+ Name[fi]=Kirjanmerkkimuokkain
+ Name[fr]=Éditeur de signets
+ Name[fy]=Blêdwizerbewurker
+@@ -38,6 +39,7 @@
+ Name[nb]=Bokmerkeredigerer
+ Name[nds]=Leesteken-Editor
+ Name[nl]=Bladwijzerbewerker
++Name[nn]=Bokmerkeredigering
+ Name[pa]=ਬੁੱਕਮਾਰਕ ਐਡੀਟਰ
+ Name[pl]=Edytor zakładek
+ Name[pt]=Editor de Favoritos
+@@ -71,6 +73,7 @@
+ Comment[en_GB]=Bookmark Organiser and Editor
+ Comment[es]=Organizador y editor de marcadores
+ Comment[et]=Järjehoidjate korraldaja ja redaktor
++Comment[eu]=Laster-marka antolatzaile eta editorea
+ Comment[fi]=Kirjanmerkkimuokkain ja -järjestelijä
+ Comment[fr]=Éditeur et organisateur de signets
+ Comment[fy]=Blêdwizers organisearje en bewurker
+@@ -92,6 +95,7 @@
+ Comment[nb]=Bokmerkeordner og redigerer
+ Comment[nds]=Leestekenpleger un -editor
+ Comment[nl]=Bladwijzers organiseren en bewerken
++Comment[nn]=Bokmerkeordnar og redigering
+ Comment[pa]=ਬੁੱਕਮਾਰਕ ਪਰਬੰਧਕ ਤੇ ਐਡੀਟਰ
+ Comment[pl]=Organizacja i modyfikacja zakładek
+ Comment[pt]=Organizador e Editor de Favoritos
+Index: apps/keditbookmarks/kbookmarkmodel/model.cpp
+===================================================================
+--- apps/keditbookmarks/kbookmarkmodel/model.cpp (.../tags/KDE/4.5.0/kdebase) (wersja 1165575)
++++ apps/keditbookmarks/kbookmarkmodel/model.cpp (.../branches/KDE/4.5/kdebase) (wersja 1165575)
+@@ -33,8 +33,6 @@
+ #include <QtCore/QStringList>
+ #include <QtCore/QMimeData>
+
+-Q_DECLARE_METATYPE(KBookmark)
+-
+ class KBookmarkModel::Private
+ {
+ public:
+Index: apps/keditbookmarks/bookmarklistview.cpp
===================================================================
-Index: runtime/localization/currency/ghs.desktop
+--- apps/keditbookmarks/bookmarklistview.cpp (.../tags/KDE/4.5.0/kdebase) (wersja 1165575)
++++ apps/keditbookmarks/bookmarklistview.cpp (.../branches/KDE/4.5/kdebase) (wersja 1165575)
+@@ -200,8 +200,6 @@
+ return (source_column == 0);
+ }
+
+-Q_DECLARE_METATYPE(KBookmark)
+-
+ bool BookmarkFolderViewFilterModel::filterAcceptsRow ( int source_row, const QModelIndex & source_parent ) const
+ {
+ QModelIndex index = sourceModel()->index(source_row, 0, source_parent);
+Index: runtime/knotify/kde.notifyrc
===================================================================
-Index: runtime/localization/currency/ils.desktop
+Index: runtime/knotify/hardwarenotifications.notifyrc
===================================================================
-Index: runtime/localization/currency/ats.desktop
+Index: runtime/solid-device-automounter/kded/device_automounter.desktop
===================================================================
-Index: runtime/localization/currency/cad.desktop
+Index: runtime/kcontrol/knotify/kcmnotify.desktop
===================================================================
-Index: runtime/localization/currency/itl.desktop
+Index: runtime/desktoptheme/air/translucent/widgets/panel-background.svgz
===================================================================
-Index: runtime/localization/currency/aed.desktop
+Nie można wyświetlić: plik binarny.
+svn:mime-type = application/octet-stream
+Index: runtime/phonon/platform_kde/phonon.notifyrc
===================================================================
-Index: runtime/localization/currency/shp.desktop
+Index: runtime/phonon/kcm/kcm_phonon.desktop
===================================================================
-Index: runtime/localization/currency/lvl.desktop
+Index: runtime/phonon/kded-module/phononserver.desktop
===================================================================
-Index: runtime/localization/currency/amd.desktop
+Index: runtime/kpasswdserver/kpasswdserver.desktop
===================================================================
-Index: runtime/localization/currency/eek.desktop
+Index: runtime/khelpcenter/plugins/onlinehelp.desktop
===================================================================
-Index: runtime/localization/currency/bsd.desktop
+Index: runtime/doc/kioslave/CMakeLists.txt
===================================================================
-Index: runtime/localization/currency/aud.desktop
+Index: runtime/kwalletd/kwalletd.notifyrc
===================================================================
-Index: runtime/localization/currency/iep.desktop
+Index: runtime/ktimezoned/ktimezoned.desktop
===================================================================
-Index: runtime/localization/currency/gip.desktop
+Index: runtime/kioslave/archive/zip.protocol
===================================================================
-Index: runtime/localization/currency/fkp.desktop
+Index: runtime/kioslave/archive/tar.protocol
===================================================================
-Index: runtime/localization/currency/dop.desktop
+Index: runtime/kioslave/thumbnail/imagethumbnail.desktop
===================================================================
-Index: runtime/localization/currency/afa.desktop
+Index: runtime/kioslave/filter/xz.protocol
===================================================================
-Index: runtime/localization/currency/rsd.desktop
+Index: runtime/kioslave/filter/lzma.protocol
===================================================================
-Index: runtime/localization/currency/eur.desktop
+Index: runtime/kioslave/network/network/builder/upnp/upnpnetworkbuilder.cpp
===================================================================
-Index: runtime/localization/currency/xof.desktop
+Index: runtime/kioslave/network/network/builder/upnp/upnpnetworkbuilder.h
===================================================================
-Index: runtime/localization/currency/afn.desktop
+Index: runtime/kioslave/remote/kdedmodule/remotedirnotify.desktop
===================================================================
-Index: runtime/localization/currency/ang.desktop
+Index: runtime/kioslave/desktop/desktopnotifier.desktop
===================================================================
-Index: runtime/localization/currency/crc.desktop
+Index: runtime/nepomuk/services/removablestorage/nepomukremovablestorageservice.desktop
===================================================================
-Index: runtime/localization/currency/gbp.desktop
+Index: runtime/nepomuk/services/strigi/nepomukstrigiservice.notifyrc
===================================================================
-Index: runtime/localization/currency/bdt.desktop
+Index: runtime/nepomuk/services/activities/nepomukactivitiesservice.desktop
===================================================================
-Index: runtime/localization/currency/grd.desktop
+Index: runtime/nepomuk/services/storage/nepomukstorage.notifyrc
===================================================================
-Index: runtime/localization/currency/btn.desktop
+Index: runtime/nepomuk/services/queryservice/nepomukqueryservice.desktop
===================================================================
-Index: runtime/localization/currency/czk.desktop
+Index: runtime/nepomuk/server/nepomukserver.desktop
===================================================================
-Index: runtime/localization/currency/inr.desktop
+Index: runtime/solidautoeject/solidautoeject.desktop
===================================================================
-Index: runtime/localization/currency/xpd.desktop
+Index: runtime/activitymanager/activitymanager.desktop
===================================================================
-Index: runtime/localization/currency/bef.desktop
+Index: runtime/kurifilter-plugins/ikws/searchproviders/facebook.desktop
===================================================================
-Index: runtime/localization/currency/aoa.desktop
+Index: runtime/kurifilter-plugins/ikws/searchproviders/github.desktop
===================================================================
-Index: runtime/localization/currency/bmd.desktop
+Index: runtime/kurifilter-plugins/ikws/searchproviders/qt.desktop
===================================================================
-Index: runtime/localization/currency/jmd.desktop
+Index: runtime/kurifilter-plugins/ikws/searchproviders/identica_people.desktop
===================================================================
-Index: runtime/localization/currency/egp.desktop
+Index: runtime/kurifilter-plugins/ikws/searchproviders/blip.desktop
===================================================================
-Index: runtime/localization/currency/aon.desktop
+Index: runtime/kurifilter-plugins/ikws/searchproviders/beolingus.desktop
===================================================================
-Index: runtime/localization/currency/xaf.desktop
+Index: runtime/kurifilter-plugins/ikws/searchproviders/duckduckgo_shopping.desktop
===================================================================
-Index: runtime/localization/currency/awg.desktop
+Index: runtime/kurifilter-plugins/ikws/searchproviders/google_maps.desktop
===================================================================
-Index: runtime/localization/currency/xag.desktop
+Index: runtime/kurifilter-plugins/ikws/searchproviders/kde_forums.desktop
===================================================================
-Index: runtime/localization/currency/rub.desktop
+Index: runtime/kurifilter-plugins/ikws/searchproviders/kde_techbase.desktop
===================================================================
-Index: runtime/localization/currency/cdf.desktop
+Index: runtime/kurifilter-plugins/ikws/searchproviders/ecosia.desktop
===================================================================
-Index: runtime/localization/currency/xau.desktop
+Index: runtime/kurifilter-plugins/ikws/searchproviders/magnatune.desktop
===================================================================
-Index: runtime/localization/currency/ugx.desktop
+Index: runtime/kurifilter-plugins/ikws/searchproviders/flickrcc.desktop
===================================================================
-Index: runtime/localization/currency/djf.desktop
+Index: runtime/kurifilter-plugins/ikws/searchproviders/yahoo_image.desktop
===================================================================
-Index: runtime/localization/currency/bnd.desktop
+Index: runtime/kurifilter-plugins/ikws/searchproviders/yahoo_shopping.desktop
===================================================================
-Index: runtime/localization/currency/rur.desktop
+Index: runtime/kurifilter-plugins/ikws/searchproviders/kde_look.desktop
===================================================================
-Index: runtime/localization/currency/sdd.desktop
+Index: runtime/kurifilter-plugins/ikws/searchproviders/yahoo_local.desktop
===================================================================
-Index: runtime/localization/currency/sdg.desktop
+Index: runtime/kurifilter-plugins/ikws/searchproviders/youtube.desktop
===================================================================
-Index: runtime/localization/currency/clp.desktop
+Index: runtime/kurifilter-plugins/ikws/searchproviders/urbandictionary.desktop
===================================================================
-Index: runtime/localization/currency/dzd.desktop
+Index: runtime/kurifilter-plugins/ikws/searchproviders/amazon_mp3.desktop
===================================================================
-Index: runtime/localization/currency/hrk.desktop
+Index: runtime/kurifilter-plugins/ikws/searchproviders/yahoo_video.desktop
===================================================================
-Index: runtime/localization/currency/bob.desktop
+Index: runtime/kurifilter-plugins/ikws/searchproviders/google_code.desktop
===================================================================
-Index: runtime/localization/currency/bgl.desktop
+Index: runtime/kurifilter-plugins/ikws/searchproviders/flickr.desktop
===================================================================
-Index: runtime/localization/currency/bgn.desktop
+Index: runtime/kurifilter-plugins/ikws/searchproviders/imdb.desktop
===================================================================
-Index: runtime/localization/currency/gel.desktop
+Index: runtime/kurifilter-plugins/ikws/searchproviders/identica_groups.desktop
===================================================================
-Index: runtime/localization/currency/dkk.desktop
+Index: runtime/kurifilter-plugins/ikws/searchproviders/duckduckgo.desktop
===================================================================
-Index: runtime/localization/currency/cuc.desktop
+Index: runtime/kurifilter-plugins/ikws/searchproviders/php.desktop
===================================================================
-Index: runtime/localization/currency/iqd.desktop
+Index: runtime/kurifilter-plugins/ikws/searchproviders/opendesktop.desktop
===================================================================
-Index: runtime/localization/currency/tzs.desktop
+Index: runtime/kurifilter-plugins/ikws/searchproviders/kde_userbase.desktop
===================================================================
-Index: runtime/localization/currency/sek.desktop
+Index: runtime/kurifilter-plugins/ikws/searchproviders/7digital.desktop
===================================================================
-Index: runtime/localization/currency/bov.desktop
+Index: runtime/kurifilter-plugins/ikws/searchproviders/wikia.desktop
===================================================================
-Index: runtime/localization/currency/cup.desktop
+Index: runtime/kurifilter-plugins/ikws/searchproviders/jamendo.desktop
===================================================================
-Index: runtime/localization/currency/nok.desktop
+Index: runtime/kurifilter-plugins/ikws/searchproviders/vimeo.desktop
===================================================================
-Index: runtime/localization/currency/bwp.desktop
+Index: runtime/kurifilter-plugins/ikws/searchproviders/yahoo.desktop
===================================================================
-Index: runtime/localization/currency/bhd.desktop
+Index: runtime/kurifilter-plugins/ikws/searchproviders/gitorious.desktop
===================================================================
-Index: runtime/localization/currency/omr.desktop
+Index: runtime/kurifilter-plugins/ikws/searchproviders/amazon.desktop
===================================================================
-Index: runtime/localization/currency/ern.desktop
+Index: runtime/kurifilter-plugins/ikws/searchproviders/duckduckgo_info.desktop
===================================================================
-Index: runtime/localization/currency/ars.desktop
+Index: runtime/kurifilter-plugins/ikws/searchproviders/identica_notices.desktop
===================================================================
-Index: runtime/localization/currency/azm.desktop
+Index: runtime/soliduiserver/soliduiserver.desktop
===================================================================
-Index: runtime/localization/currency/azn.desktop
+Index: runtime/kglobalaccel/kglobalaccel.notifyrc
===================================================================
-Index: runtime/localization/currency/cny.desktop
+Index: runtime/attica/kcm/kcm_attica.desktop
===================================================================
-Index: runtime/localization/currency/pln.desktop
+Index: runtime/plasma/tools/plasmapkg/main.cpp
===================================================================
-Index: runtime/localization/currency/ltl.desktop
+Index: runtime/plasma/remotewidgetshelper/kcm_remotewidgets.actions
===================================================================
-Index: runtime/localization/currency/bam.desktop
+Index: workspace/ksmserver/kcm/kcmsmserver.desktop
===================================================================
-Index: runtime/localization/currency/bif.desktop
+Index: workspace/ConfigureChecks.cmake
===================================================================
-Index: runtime/localization/currency/dem.desktop
+Index: workspace/kcontrol/dateandtime/kcmclock_actions.actions
===================================================================
-Index: runtime/localization/currency/fim.desktop
+Index: workspace/kcontrol/desktoptheme/desktoptheme.desktop
===================================================================
-Index: runtime/localization/currency/sgd.desktop
+Index: workspace/kcontrol/keyboard/xkb_rules.cpp
===================================================================
-Index: runtime/localization/currency/cop.desktop
+Index: workspace/kcontrol/keyboard/layout_memory.cpp
===================================================================
-Index: runtime/localization/currency/huf.desktop
+Index: workspace/kcontrol/keyboard/kcm_view_models.cpp
===================================================================
-Index: runtime/localization/currency/isk.desktop
+Index: workspace/kcontrol/keyboard/keyboard_daemon.cpp
===================================================================
-Index: runtime/localization/currency/bbd.desktop
+Index: workspace/kcontrol/keyboard/plasma_applet_keyboard.desktop
===================================================================
-Index: runtime/localization/currency/esp.desktop
+Index: workspace/kcontrol/keyboard/CMakeLists.txt
===================================================================
-Index: runtime/localization/currency/adf.desktop
+Index: workspace/kcontrol/keyboard/xkb_rules.h
===================================================================
-Index: runtime/localization/currency/byr.desktop
+Index: workspace/kcontrol/keyboard/layout_memory.h
===================================================================
-Index: runtime/localization/currency/chf.desktop
+Index: workspace/kcontrol/keyboard/layout_widget.cpp
===================================================================
-Index: runtime/localization/currency/ghc.desktop
+Index: workspace/kcontrol/keyboard/xinput_helper.cpp
===================================================================
-Index: runtime/localization/currency/fjd.desktop
+Index: workspace/kcontrol/keyboard/keyboard.desktop
===================================================================
-Index: runtime/localization/currency/adp.desktop
+Index: workspace/kcontrol/keyboard/kcm_keyboard_widget.cpp
===================================================================
-Index: runtime/localization/currency/sos.desktop
+Index: workspace/kcontrol/randr/module/randrmonitor.desktop
===================================================================
-Index: runtime/kcontrol/componentchooser/CMakeLists.txt
+Index: workspace/kcontrol/workspaceoptions/workspaceoptions.desktop
===================================================================
-Index: runtime/phonon/platform_kde/phonon.notifyrc
+Index: workspace/kcontrol/kdm/kdm.desktop
===================================================================
-Index: runtime/khelpcenter/plugins/plasma.desktop
+Index: workspace/kcontrol/kdm/kcmkdm_actions.actions
===================================================================
-Index: runtime/doc/kdebugdialog/index.docbook
+Index: workspace/startkde.cmake
===================================================================
-Index: runtime/doc/kcontrol/index.docbook
+Index: workspace/statusnotifierwatcher/statusnotifierwatcher.desktop
===================================================================
-Index: runtime/doc/kcontrol/screenshot.png
+Index: workspace/doc/kmenuedit/kmenueditmain.png
===================================================================
Nie można wyświetlić: plik binarny.
-svn:mime-type = image/png
-Index: runtime/doc/kcontrol/language/index.docbook
+svn:mime-type = application/octet-stream
+Index: workspace/systemsettings/categories/settings-permissions.desktop
===================================================================
-Index: runtime/doc/kcontrol/CMakeLists.txt
+Index: workspace/systemsettings/categories/settings-account-details.desktop
===================================================================
-Index: runtime/kwalletd/backend/kwalletbackend.cc
+Index: workspace/systemsettings/categories/settings-input-devices.desktop
===================================================================
-Index: runtime/kwalletd/kwalletd.notifyrc
-===================================================================
-Index: runtime/kioslave/trash/trashimpl.cpp
+Index: workspace/systemsettings/categories/settings-workspace-appearance-and-behavior.desktop
===================================================================
-Index: runtime/kioslave/thumbnail/jpegthumbnail.desktop
+Index: workspace/systemsettings/categories/settings-lost-and-found.desktop
===================================================================
-Index: runtime/kioslave/thumbnail/svgthumbnail.desktop
+Index: workspace/systemsettings/categories/settings-application-and-system-notifications.desktop
===================================================================
-Index: runtime/kioslave/thumbnail/comicbookthumbnail.desktop
+Index: workspace/systemsettings/categories/settings-application-appearance-and-behavior.desktop
===================================================================
-Index: runtime/kioslave/network/kded/networkwatcher.desktop
+Index: workspace/systemsettings/categories/settings-locale.desktop
===================================================================
-Index: runtime/kioslave/sftp/kio_sftp.cpp
+Index: workspace/systemsettings/categories/settings-application-appearance.desktop
===================================================================
-Index: runtime/nepomuk/kioslaves/search/CMakeLists.txt
+Index: workspace/systemsettings/categories/settings-network-and-connectivity.desktop
===================================================================
-Index: runtime/nepomuk/kioslaves/search/kdedmodule/nepomuksearchmodule.desktop
+Index: workspace/systemsettings/categories/settings-desktop-appearance.desktop
===================================================================
-Index: runtime/nepomuk/kioslaves/timeline/kio_timeline.cpp
+Index: workspace/systemsettings/categories/settings-personal-information.desktop
===================================================================
-Index: runtime/nepomuk/services/removablestorage/nepomukremovablestorageservice.desktop
+Index: workspace/systemsettings/categories/settings-system-administration.desktop
===================================================================
-Index: runtime/nepomuk/services/strigi/indexscheduler.cpp
+Index: workspace/kwrited/kwrited.desktop
===================================================================
-Index: runtime/nepomuk/services/strigi/strigiserviceconfig.cpp
+Index: workspace/wallpapers/Blue_Wood/metadata.desktop
===================================================================
-Index: runtime/nepomuk/services/strigi/strigiserviceconfig.h
+Index: workspace/wallpapers/Grass/metadata.desktop
===================================================================
-Index: runtime/nepomuk/services/storage/nepomukstorage.notifyrc
+Index: workspace/wallpapers/Hanami/metadata.desktop
===================================================================
-Index: runtime/nepomuk/services/queryservice/CMakeLists.txt
+Index: workspace/wallpapers/Fresh_Morning/metadata.desktop
===================================================================
-Index: runtime/kstyles/themes/qtgtk.themerc
+Index: workspace/wallpapers/Autumn/metadata.desktop
===================================================================
-Index: runtime/kstyles/themes/qtmacintosh.themerc
+Index: workspace/wallpapers/Quadros/metadata.desktop
===================================================================
-Index: runtime/kstyles/themes/qtcleanlooks.themerc
+Index: workspace/wallpapers/Media_Life/metadata.desktop
===================================================================
-Index: runtime/kstyles/themes/qtwindowsvista.themerc
+Index: workspace/solid/networking/kded/networkstatus.desktop
===================================================================
-Index: runtime/kstyles/themes/qtwindowsxp.themerc
+Index: workspace/solid/kcm/kcm_solid.desktop
===================================================================
-Index: runtime/kstyles/themes/qtplastique.themerc
-===================================================================
-Index: runtime/kstyles/oxygen/oxygen.themerc
-===================================================================
-Index: runtime/kstyles/oxygen/helper.cpp
-===================================================================
-Index: runtime/kurifilter-plugins/ikws/searchproviders/imdb.desktop
-===================================================================
-Index: runtime/kurifilter-plugins/ikws/searchproviders/wolfram_alpha.desktop
-===================================================================
-Index: runtime/kurifilter-plugins/ikws/searchproviders/ethicle.desktop
-===================================================================
-Index: runtime/kurifilter-plugins/ikws/searchproviders/php.desktop
-===================================================================
-Index: runtime/attica/kcm/kcm_attica.desktop
-===================================================================
-Index: runtime/drkonqi/crashedapplication.cpp
-===================================================================
-Index: runtime/drkonqi/ui/assistantpage_bugzilla_duplicates.ui
-===================================================================
-Index: runtime/l10n/yt/entry.desktop
-===================================================================
-Index: runtime/l10n/re/entry.desktop
-===================================================================
-Index: runtime/l10n/gf/entry.desktop
-===================================================================
-Index: runtime/kdesu/kdesu/kdesu.cpp
-===================================================================
-Index: runtime/plasma/scriptengines/javascript/simplebindings/qscriptbookkeeping.cpp
-===================================================================
-Index: runtime/plasma/scriptengines/javascript/simplebindings/appletinterface.h
-===================================================================
-Index: runtime/plasma/scriptengines/javascript/simplebindings/easingcurve.cpp
-===================================================================
-Index: runtime/plasma/scriptengines/javascript/simplebindings/icon.cpp
-===================================================================
-Index: workspace/ksmserver/server.cpp
-===================================================================
-Index: workspace/kcontrol/dateandtime/clock.desktop
-===================================================================
-Index: workspace/kcontrol/randr/module/randrmonitor.desktop
-===================================================================
-Index: workspace/doc/plasma-desktop/tools/man-plasmaengineexplorer.1.docbook
-===================================================================
-Index: workspace/doc/plasma-desktop/tools/CMakeLists.txt
-===================================================================
-Index: workspace/doc/plasma-desktop/favorite-widgets.png
-===================================================================
-Nie można wyświetlić: plik binarny.
-svn:mime-type = image/png
-
-Zmiany atrybutów dla: workspace/doc/plasma-desktop/favorite-widgets.png
-___________________________________________________________________
-Dodane: svn:mime-type
- + image/png
-
-Index: workspace/doc/plasma-desktop/index.docbook
-===================================================================
-Index: workspace/doc/plasma-desktop/taskbar-settings.png
-===================================================================
-Nie można wyświetlić: plik binarny.
-svn:mime-type = image/png
-
-Zmiany atrybutów dla: workspace/doc/plasma-desktop/taskbar-settings.png
-___________________________________________________________________
-Dodane: svn:mime-type
- + image/png
-
-Index: workspace/doc/plasma-desktop/CMakeLists.txt
-===================================================================
-
-Zmiany atrybutów dla: workspace/doc/plasma-desktop
-___________________________________________________________________
-Dodane: svn:mergeinfo
- Połączono zmiany /branches/KDE/4.0/kdebase/workspace/doc/plasma:r758600,758610
-
-Index: workspace/doc/systemsettings/index.docbook
-===================================================================
-Index: workspace/doc/klipper/index.docbook
-===================================================================
-Index: workspace/doc/kdm/index.docbook
-===================================================================
-Index: workspace/doc/kdm/kdmrc-ref.docbook
-===================================================================
-Index: workspace/doc/CMakeLists.txt
-===================================================================
-Index: workspace/klipper/klipper.cpp
-===================================================================
-Index: workspace/klipper/klipper.h
-===================================================================
-Index: workspace/kwrited/kwrited.notifyrc
-===================================================================
-Index: workspace/solid/networkmanager-0.6/solid_networkmanager.desktop
+Index: workspace/CMakeLists.txt
===================================================================
Index: workspace/powerdevil/daemon/powerdevil.desktop
===================================================================
Index: workspace/powerdevil/powerdevil.notifyrc
===================================================================
-Index: workspace/krunner/screensaver/saverengine.cpp
-===================================================================
-Index: workspace/krunner/screensaver/saverengine.h
+Index: workspace/krunner/interfaces/default/interface.cpp
===================================================================
-Index: workspace/krunner/krunnerdialog.cpp
+Index: workspace/krunner/interfaces/default/interface.h
===================================================================
Index: workspace/krunner/lock/kscreenlocker.notifyrc
===================================================================
-Index: workspace/krunner/krunner.desktop
-===================================================================
-Index: workspace/libs/plasmagenericshell/widgetsexplorer/appleticon.cpp
-===================================================================
-Index: workspace/libs/plasmagenericshell/widgetsexplorer/applettooltip.cpp
-===================================================================
-Index: workspace/libs/plasmagenericshell/widgetsexplorer/appleticon.h
-===================================================================
-Index: workspace/libs/plasmagenericshell/widgetsexplorer/appletslist.cpp
-===================================================================
-Index: workspace/libs/plasmagenericshell/widgetsexplorer/applettooltip.h
-===================================================================
-Index: workspace/libs/kworkspace/kworkspace.cpp
-===================================================================
-Index: workspace/libs/ksysguard/processcore/actions.actions
-===================================================================
-Index: workspace/libs/ksysguard/processui/ksysguardprocesslist.cpp
-===================================================================
-Index: workspace/khotkeys/data/kde32b1.khotkeys
-===================================================================
-Index: workspace/ksplash/ksplashx/qrect.h
+Index: workspace/libs/plasmagenericshell/scripting/containment.cpp
===================================================================
-Index: workspace/ksplash/ksplashx/qpoint.h
+Index: workspace/libs/plasmagenericshell/scripting/widget.cpp
===================================================================
-Index: workspace/kwin/effects/desktopgrid/desktopgrid.cpp
+Index: workspace/libs/plasmagenericshell/scripting/applet.cpp
===================================================================
-Index: workspace/kwin/effects/desktopgrid/desktopgrid.h
+Index: workspace/libs/plasmagenericshell/scripting/applet.h
===================================================================
-Index: workspace/kwin/effects/presentwindows/presentwindows.h
+Index: workspace/libs/kworkspace/kactivityinfo.cpp
===================================================================
-Index: workspace/kwin/effects/presentwindows/presentwindows.cpp
+Index: workspace/libs/kworkspace/CMakeLists.txt
===================================================================
-Index: workspace/kwin/effects/slidingpopups/slidingpopups.desktop
+Index: workspace/libs/oxygen/oxygenhelper.cpp
===================================================================
-Index: workspace/kwin/effects/shadow/shadow_config.desktop
+Index: workspace/libs/ksysguard/scripts/smaps/smaps.desktop
===================================================================
-Index: workspace/kwin/effects/shadow/shadow.desktop
+Index: workspace/libs/taskmanager/taskgroup.cpp
===================================================================
-Index: workspace/kwin/effects/_test/swiveltabs/swiveltabs_config.desktop
+Index: workspace/freespacenotifier/freespacenotifier.desktop
===================================================================
-Index: workspace/kwin/effects/_test/swiveltabs/swiveltabs.desktop
+Index: workspace/freespacenotifier/freespacenotifier.notifyrc
===================================================================
-Index: workspace/kwin/effects/_test/gears.desktop
+Index: workspace/kstyles/themes/light-v2.themerc
===================================================================
-Index: workspace/kwin/effects/_test/slidetabs/slidetabs.desktop
+Index: workspace/kstyles/themes/light-v3.themerc
===================================================================
-Index: workspace/kwin/effects/_test/slidetabs/slidetabs_config.desktop
+Index: workspace/kstyles/oxygen/animations/oxygenmenubardata.cpp
===================================================================
-Index: workspace/kwin/clients/oxygen/oxygenclient.cpp
+Index: workspace/kstyles/oxygen/animations/oxygenprogressbardata.cpp
===================================================================
-Index: workspace/kwin/clients/oxygen/oxygenclient.h
+Index: workspace/kstyles/oxygen/oxygenstyle.cpp
===================================================================
-Index: workspace/kwin/clients/oxygen/config/oxygenconfigurationui.cpp
+Index: workspace/khotkeys/app/khotkeys.desktop
===================================================================
-Index: workspace/kwin/clients/oxygen/config/config.cpp
+Index: workspace/khotkeys/kcm_hotkeys/khotkeys.desktop
===================================================================
-Index: workspace/kwin/clients/oxygen/config/oxygenconfigurationui.ui
+Index: workspace/khotkeys/data/defaults.khotkeys
===================================================================
-Index: workspace/kwin/kcmkwin/kwinscreenedges/main.cpp
-===================================================================
-Index: workspace/kwin/kcmkwin/kwintabbox/kwintabbox.desktop
-===================================================================
-Index: workspace/kwin/tabbox/tabboxview.cpp
-===================================================================
-Index: workspace/kwin/lib/CMakeLists.txt
-===================================================================
-Index: workspace/kwin/CMakeLists.txt
-===================================================================
-Index: workspace/kdm/backend/bootman.c
-===================================================================
-Index: workspace/kdm/backend/util.c
-===================================================================
-Index: workspace/kdm/backend/client.c
-===================================================================
-Index: workspace/kdm/backend/auth.c
-===================================================================
-Index: workspace/kdm/backend/ctrl.c
-===================================================================
-Index: workspace/kdm/backend/dm.h
-===================================================================
-Index: workspace/kdm/backend/sessreg.c
-===================================================================
-Index: workspace/kdm/kfrontend/kdmconfig.cpp
-===================================================================
-Index: workspace/kdm/kfrontend/genkdmconf.c
-===================================================================
-Index: workspace/kdm/README
+Index: workspace/khotkeys/data/kde32b1.khotkeys
===================================================================
-Index: workspace/plasma/netbook/containments/sal/services/plasma-sal-graphics.desktop
+Index: workspace/khotkeys/data/printscreen.khotkeys
===================================================================
-Index: workspace/plasma/netbook/containments/sal/services/plasma-sal-utility.desktop
+Index: workspace/config-workspace.h.cmake
===================================================================
-Index: workspace/plasma/netbook/containments/sal/services/plasma-sal-system.desktop
+Index: workspace/kinfocenter/Modules/samba/smbstatus.desktop
===================================================================
-Index: workspace/plasma/netbook/containments/sal/services/plasma-sal-bookmarks.desktop
+Index: workspace/kinfocenter/Modules/infosummary/kcm_infosummary.desktop
===================================================================
-Index: workspace/plasma/netbook/containments/sal/services/plasma-sal-internet.desktop
+Index: workspace/kinfocenter/Modules/devinfo/devinfo.desktop
===================================================================
-Index: workspace/plasma/netbook/containments/sal/services/plasma-sal-multimedia.desktop
+Index: workspace/kinfocenter/Modules/nics/nic.desktop
===================================================================
-Index: workspace/plasma/netbook/containments/sal/services/plasma-sal-education.desktop
+Index: workspace/kwin/effects/glide/glide_config.desktop
===================================================================
-Index: workspace/plasma/netbook/containments/sal/services/plasma-sal-office.desktop
+Index: workspace/kwin/effects/glide/glide.desktop
===================================================================
-Index: workspace/plasma/netbook/containments/sal/services/plasma-sal-games.desktop
+Index: workspace/kwin/tabbox.cpp
===================================================================
-Index: workspace/plasma/netbook/containments/sal/services/plasma-sal-contacts.desktop
+Index: workspace/kwin/kcmkwin/kwindecoration/kwindecoration.desktop
===================================================================
-Index: workspace/plasma/netbook/containments/sal/plasma-sal-menu.desktop
+Index: workspace/kwin/kcmkwin/kwindesktop/desktop.desktop
===================================================================
-Index: workspace/plasma/netbook/shell/plasma-netbook.desktop
+Index: workspace/kwin/kcmkwin/kwinrules/kwinrules.desktop
===================================================================
-Index: workspace/plasma/netbook/applets/currentappcontrol/plasma-applet-currentappcontrol.desktop
+Index: workspace/kwin/kcmkwin/kwintabbox/kwintabbox.desktop
===================================================================
-Index: workspace/plasma/netbook/applets/searchbox/plasma-applet-searchbox.desktop
+Index: workspace/kwin/kwin.notifyrc
===================================================================
-Index: workspace/plasma/desktop/shell/data/plasma-desktop.notifyrc
+Index: workspace/kwin/geometry.cpp
===================================================================
-Index: workspace/plasma/desktop/shell/panelview.cpp
+Index: workspace/kwin/manage.cpp
===================================================================
-Index: workspace/plasma/desktop/applets/windowlist/plasma-applet-windowlist.desktop
+Index: workspace/kdm/kfrontend/pics/stripes.png.desktop
===================================================================
-Index: workspace/plasma/desktop/applets/tasks/taskgroupitem.cpp
+Index: workspace/kdm/kfrontend/sessions/ratpoison.desktop
===================================================================
-Index: workspace/plasma/desktop/applets/tasks/taskgroupitem.h
+Index: workspace/kdm/kfrontend/sessions/wmaker.desktop
===================================================================
-Index: workspace/plasma/desktop/runners/plasma-desktop/plasma-runner-plasma-desktop.desktop
+Index: workspace/kdm/kfrontend/sessions/lxde.desktop
===================================================================
-Index: workspace/plasma/generic/containmentactions/minimalcontextmenu/plasma-containmentactions-minimalcontextmenu.desktop
+Index: workspace/ksysguard/gui/ksysguard.desktop
===================================================================
-Index: workspace/plasma/generic/containmentactions/contextmenu/plasma-containmentactions-contextmenu.desktop
+Index: workspace/ksysguard/example/ksysguard.notifyrc
===================================================================
-Index: workspace/plasma/generic/containmentactions/switchdesktop/plasma-containmentactions-switchdesktop.desktop
+Index: workspace/plasma/netbook/containments/sal/itemcontainer.cpp
===================================================================
-Index: workspace/plasma/generic/containmentactions/switchactivity/plasma-containmentactions-switchactivity.desktop
+Index: workspace/plasma/netbook/containments/sal/sal.cpp
===================================================================
-Index: workspace/plasma/generic/dataengines/weather/plasma-dataengine-weather.desktop
+Index: workspace/plasma/netbook/containments/newspaper/appletsview.cpp
===================================================================
-Index: workspace/plasma/generic/dataengines/weather/ions/wetter.com/ion-wettercom.desktop
+Index: workspace/plasma/netbook/containments/newspaper/plasma-containment-newspaper.desktop
===================================================================
-Index: workspace/plasma/generic/dataengines/weather/ions/bbcukmet/ion-bbcukmet.desktop
+Index: workspace/plasma/netbook/containments/newspaper/newspaper.cpp
===================================================================
-Index: workspace/plasma/generic/dataengines/weather/ions/noaa/ion-noaa.desktop
+Index: workspace/plasma/netbook/shell/data/layouts/plasma-layout-org.kde.plasma-netbook.defaultPage.desktop
===================================================================
-Index: workspace/plasma/generic/dataengines/geolocation/location_gps.cpp
+Index: workspace/plasma/netbook/shell/data/layouts/org.kde.plasma-netbook.defaultPage/metadata.desktop
===================================================================
-Index: workspace/plasma/generic/dataengines/geolocation/CMakeLists.txt
+Index: workspace/plasma/netbook/shell/data/layouts/plasma-layout-org.kde.plasma-netbook.defaultSal.desktop
===================================================================
-Index: workspace/plasma/generic/dataengines/apps/plasma-dataengine-apps.desktop
+Index: workspace/plasma/netbook/shell/data/layouts/org.kde.plasma-netbook.defaultSal/metadata.desktop
===================================================================
-Index: workspace/plasma/generic/dataengines/notifications/notificationsengine.cpp
+Index: workspace/plasma/desktop/shell/panelappletoverlay.cpp
===================================================================
-Index: workspace/plasma/generic/dataengines/notifications/notificationaction.cpp
+Index: workspace/plasma/generic/dataengines/devicenotifications/plasma-dataengine-devicenotifications.desktop
===================================================================
-Index: workspace/plasma/generic/dataengines/notifications/notificationsengine.h
+Index: workspace/plasma/generic/dataengines/systemmonitor/plasma-dataengine-systemmonitor.desktop
===================================================================
-Index: workspace/plasma/generic/applets/devicenotifier/deviceitem.cpp
+Index: workspace/plasma/generic/dataengines/weather/ions/wetter.com/ion_wettercom.h
===================================================================
-Index: workspace/plasma/generic/applets/systemtray/statusnotifierwatcher/statusnotifierwatcher.desktop
+Index: workspace/plasma/generic/dataengines/statusnotifieritem/statusnotifieritemsource.cpp
===================================================================
-Index: workspace/plasma/generic/applets/systemtray/protocols/notifications/dbusnotificationprotocol.cpp
+Index: workspace/plasma/generic/dataengines/statusnotifieritem/plasma_engine_statusnotifieritem.desktop
===================================================================
-Index: workspace/plasma/generic/applets/systemtray/core/notification.cpp
+Index: workspace/plasma/generic/dataengines/statusnotifieritem/CMakeLists.txt
===================================================================
-Index: workspace/plasma/generic/applets/systemtray/core/notification.h
+Index: workspace/plasma/generic/applets/system-monitor/plasma-applet-system-monitor.desktop
===================================================================
-Index: workspace/plasma/generic/applets/systemtray/ui/applet.cpp
+Index: workspace/plasma/generic/applets/system-monitor/plasma-applet-sm_cpu.desktop
===================================================================
-Index: workspace/plasma/generic/applets/systemtray/ui/applet.h
+Index: workspace/plasma/generic/applets/system-monitor/plasma-applet-sm_hwinfo.desktop
===================================================================
-Index: workspace/plasma/generic/applets/icon/icon.cpp
+Index: workspace/plasma/generic/applets/system-monitor/plasma-applet-sm_temperature.desktop
===================================================================
-Index: workspace/plasma/generic/applets/icon/icon.h
+Index: workspace/plasma/generic/applets/system-monitor/plasma-applet-sm_ram.desktop
===================================================================
-Index: workspace/plasma/generic/applets/analog-clock/plasma-applet-analogclock.desktop
+Index: workspace/plasma/generic/applets/system-monitor/plasma-applet-sm_net.desktop
===================================================================
-Index: workspace/plasma/generic/runners/solid/plasma-runner-solid.desktop
+Index: workspace/plasma/generic/applets/system-monitor/plasma-applet-sm_hdd.desktop
===================================================================
-Index: workspace/plasma/generic/runners/windows/plasma-runner-windows.desktop
+Index: workspace/plasma/generic/applets/battery/plasma-battery-default.desktop
===================================================================
-Index: workspace/plasma/generic/runners/kill/plasma-runner-kill.desktop
+Index: workspace/plasma/generic/applets/battery/battery.cpp
===================================================================
-Index: workspace/plasma/generic/runners/kill/plasma-runner-kill_config.desktop
+Index: workspace/plasma/generic/runners/services/plasma-runner-services.desktop
===================================================================
-Index: workspace/plasma/generic/runners/locations/plasma-runner-locations.desktop
+Index: workspace/plasma/generic/runners/nepomuksearch/nepomuksearchrunner.cpp
===================================================================
-Index: workspace/plasma/generic/scriptengines/python/plasma-scriptengine-wallpaper-python.desktop
+Index: workspace/plasma/generic/runners/nepomuksearch/queryclientwrapper.cpp
===================================================================
-Index: workspace/plasma/generic/scriptengines/python/plasma-scriptengine-runner-python.desktop
+Index: workspace/plasma/generic/runners/nepomuksearch/CMakeLists.txt
===================================================================
-Index: workspace/plasma/generic/scriptengines/python/pyrunner.py
+Index: workspace/plasma/generic/runners/windowedwidgets/plasma-runner-windowedwidgets.desktop
===================================================================
projects / packages / kde4-kdebase.git / commitdiff