packages: kde4-kdebase/kde4-kdebase-branch.diff, kde4-kdebase/kde4-kdebase....
arekm
arekm at pld-linux.org
Wed Sep 1 14:58:43 CEST 2010
Author: arekm Date: Wed Sep 1 12:58:43 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 2; branch diff is back
---- Files affected:
packages/kde4-kdebase:
kde4-kdebase-branch.diff (1.18 -> 1.19) , kde4-kdebase.spec (1.133 -> 1.134)
---- Diffs:
================================================================
Index: packages/kde4-kdebase/kde4-kdebase-branch.diff
diff -u packages/kde4-kdebase/kde4-kdebase-branch.diff:1.18 packages/kde4-kdebase/kde4-kdebase-branch.diff:1.19
--- packages/kde4-kdebase/kde4-kdebase-branch.diff:1.18 Thu Aug 19 19:29:41 2010
+++ packages/kde4-kdebase/kde4-kdebase-branch.diff Wed Sep 1 14:58:38 2010
@@ -1,1445 +1,112 @@
-Index: apps/konqueror/src/konqtabs.h
+Index: apps/konqueror/src/konqmainwindow.cpp
===================================================================
---- 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;
- };
-
-Index: apps/konqueror/src/konqcombo.cpp
-===================================================================
---- 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;
-
-- m_MouseMiddleClickClosesTab = KonqSettings::mouseMiddleClickClosesTab();
--
- m_permanentCloseButtons = KonqSettings::permanentCloseButton();
- if (m_permanentCloseButtons) {
- setTabsClosable( true );
-@@ -379,7 +377,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);
-
- 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;
+--- apps/konqueror/src/konqmainwindow.cpp (.../tags/KDE/4.5.1/kdebase) (wersja 1170567)
++++ apps/konqueror/src/konqmainwindow.cpp (.../branches/KDE/4.5/kdebase) (wersja 1170567)
+@@ -1674,7 +1674,10 @@
+ // Reuse current servicetype for local files, but not for remote files (it could have changed, e.g. over HTTP)
+ QString serviceType = reloadView->url().isLocalFile() ? reloadView->serviceType() : QString();
+ // By using locationBarURL instead of url, we preserve name filters (#54687)
+- openUrl( reloadView, reloadView->locationBarURL(), serviceType, req );
++ KUrl reloadUrl = reloadView->locationBarURL();
++ if (reloadUrl.isEmpty()) // e.g. initial screen
++ reloadUrl = reloadView->url();
++ openUrl(reloadView, reloadUrl, serviceType, req);
}
-
- 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;
-+ }
-
-- 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();
-+
-+ emit startedPathLoading(url);
-+
-+ // Reconnect to the (probably) new selection model
-+ view = m_viewAccessor.itemView();
-+ connect(view->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
-+ this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection)));
- }
-
- void DolphinView::selectAll()
-@@ -1271,28 +1273,28 @@
-
- void DolphinView::createView()
- {
-+ 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();
- }
-+
-+ layoutColumns();
}
- #include "dolphincolumnviewcontainer.moc"
-Index: apps/dolphin/src/tooltips/filemetadatatooltip.h
+Index: apps/konqueror/settings/kio/kcookiespolicies.cpp
===================================================================
---- 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 *
- ***************************************************************************/
+--- apps/konqueror/settings/kio/kcookiespolicies.cpp (.../tags/KDE/4.5.1/kdebase) (wersja 1170567)
++++ apps/konqueror/settings/kio/kcookiespolicies.cpp (.../branches/KDE/4.5/kdebase) (wersja 1170567)
+@@ -270,6 +270,7 @@
+ if (!nextItem)
+ nextItem = dlg->lvDomainPolicy->itemAbove(item);
--#ifndef DOLPHINCONTROLLER_H
--#define DOLPHINCONTROLLER_H
-+#ifndef FILEMETADATATOOLTIP_H
-+#define FILEMETADATATOOLTIP_H
-
- #include <QWidget>
-
-@@ -40,14 +40,26 @@
- virtual ~FileMetaDataToolTip();
-
- void setPreview(const QPixmap& pixmap);
-- const QPixmap* preview() const;
-+ QPixmap preview() const;
-
- void setName(const QString& name);
- QString name() const;
-
-+ /**
-+ * 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;
-
-+signals:
-+ /**
-+ * Is emitted after the meta data has been received for the items
-+ * set by FileMetaDataToolTip::setItems().
-+ */
-+ void metaDataRequestFinished(const KFileItemList& items);
-+
- protected:
- virtual void paintEvent(QPaintEvent* event);
++ m_pDomainPolicy.remove(item);
+ delete item;
+ }
-Index: apps/dolphin/src/tooltips/tooltipmanager.cpp
+Index: apps/konqueror/settings/konqhtml/filteropts.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 @@
-
- #include "tooltipmanager.h"
-
--#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>
-+
- 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 @@
- {
- }
+--- apps/konqueror/settings/konqhtml/filteropts.cpp (.../tags/KDE/4.5.1/kdebase) (wersja 1170567)
++++ apps/konqueror/settings/konqhtml/filteropts.cpp (.../branches/KDE/4.5/kdebase) (wersja 1170567)
+@@ -486,6 +486,7 @@
--void ToolTipManager::hideTip()
-+void ToolTipManager::hideToolTip()
- {
-- hideToolTip();
-+ QApplication::restoreOverrideCursor();
-+
-+ m_toolTipRequested = false;
-+ m_metaDataRequested = false;
-+ m_showToolTipTimer->stop();
-+ m_contentRetrievalTimer->stop();
-+
-+ m_fileMetaDataToolTip->setItems(KFileItemList());
-+ m_fileMetaDataToolTip->hide();
- }
-
- bool ToolTipManager::eventFilter(QObject* watched, QEvent* event)
-@@ -128,7 +126,7 @@
- void ToolTipManager::requestToolTip(const QModelIndex& index)
- {
- hideToolTip();
--
-+
- // 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);
- }
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebase/kde4-kdebase-branch.diff?r1=1.18&r2=1.19&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebase/kde4-kdebase.spec?r1=1.133&r2=1.134&f=u
More information about the pld-cvs-commit
mailing list