Hello community, here is the log from the commit of package kdebase4 for openSUSE:13.1 checked in at 2013-10-03 15:52:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1/kdebase4 (Old) and /work/SRC/openSUSE:13.1/.kdebase4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4" Changes: -------- --- /work/SRC/openSUSE:13.1/kdebase4/kdebase4.changes 2013-09-23 10:55:29.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.kdebase4.new/kdebase4.changes 2013-10-03 15:52:44.000000000 +0200 @@ -1,0 +2,9 @@ +Sat Sep 28 15:06:13 UTC 2013 - tittiatc...@gmail.com + +- Update to 4.11.2 + * KDE 4.11.2 bugfix release + * See http://www.kde.org/announcements/announce-4.11.2.php +- Dropped patches due to upstream inclusion: + konqueror-fix-bookmarks-in-toolbar.diff + +------------------------------------------------------------------- Old: ---- kde-baseapps-4.11.1.tar.xz konqueror-fix-bookmarks-in-toolbar.diff New: ---- kde-baseapps-4.11.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.I4AZUz/_old 2013-10-03 15:52:44.000000000 +0200 +++ /var/tmp/diff_new_pack.I4AZUz/_new 2013-10-03 15:52:44.000000000 +0200 @@ -17,7 +17,7 @@ Name: kdebase4 -Version: 4.11.1 +Version: 4.11.2 Release: 0 Summary: The Base KDE Apps License: GPL-2.0+ @@ -30,8 +30,6 @@ Patch1: dolphin-go_up.diff # PATCH-FIX-OPENSUSE folderview_align_to_grid_true.diff (created by Christian Trippe to make icon set to align the default in folderview bnc#327502) Patch2: folderview_align_to_grid_true.diff -# PATCH-FIX-UPSTREAM konqueror-fix-bookmarks-in-toolbar.diff -- Fix toplevel bookmarks not showing in toolbar, regression from d1963e23 -Patch3: konqueror-fix-bookmarks-in-toolbar.diff BuildRequires: fdupes BuildRequires: libkactivities-devel BuildRequires: libkde4-devel >= %{version} @@ -52,7 +50,6 @@ %setup -q -n kde-baseapps-%{version} %patch1 -p1 %patch2 -p1 -%patch3 -p1 %build %cmake_kde4 -d build ++++++ kde-baseapps-4.11.1.tar.xz -> kde-baseapps-4.11.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.1/doc/konqueror/index.docbook new/kde-baseapps-4.11.2/doc/konqueror/index.docbook --- old/kde-baseapps-4.11.1/doc/konqueror/index.docbook 2013-08-28 19:00:18.000000000 +0200 +++ new/kde-baseapps-4.11.2/doc/konqueror/index.docbook 2013-09-26 21:18:47.000000000 +0200 @@ -2449,7 +2449,19 @@ shellcmdplugin (file manager mode) kdenetwork - kget (browser mode) + Download Manager kget (browser mode) + +kdepim + Konqueror Feed Icon akregator + +extragear/network + Konqueror Choqok Plugin + +extragear/base + Nepomuk-Webminer Plugin + +playground/utils + Userscript (Grease Monkey) Support khtml_userscript --> <sect1 id="konq-plugin"> @@ -2462,12 +2474,16 @@ Extensions...</guimenuitem></menuchoice> to open a dialog with all installed plugins and select the ones you need. All plugins are accessible in the <guimenu>Tools</guimenu> menu.</para> -<para>Only plugins appropriate for the current mode (file manager or browser) +<para>Only plugins appropriate for the current mode (file manager or browser in KHTML/WebKit view) are listed in the dialog.</para> <variablelist> <title>Browser Mode</title> - +<!-- +FIXME 4.11 +KHTML: Adblock, Auto Refresh, Bookmarklets, Document Relations, DOM Tree Viewer, KHTML Settings, Search Bar, Text-to-Speech, Translate, UserAgent Changer, Web Archiver, Website Validators +WebKit: Auto Refresh, KHTML Settings, Search Bar, Text-to-Speech, Translate, UserAgent Changer, Website Validators +--> <varlistentry> <term>Web Page Translation</term> <listitem><para>This uses the machine translation service provided by <ulink @@ -2496,7 +2512,7 @@ </varlistentry> <varlistentry> -<term>DOM Tree Viewer</term> +<term>DOM Tree Viewer (KHTML view only)</term> <listitem> <para>The <acronym>DOM</acronym> Tree Viewer allows a developer to view the styles, attributes and elements of a web document.</para> @@ -2650,7 +2666,7 @@ </varlistentry> <varlistentry> -<term>Archive Web Page</term> +<term>Archive Web Page (KHTML view only)</term> <listitem><para>Invoked with <menuchoice><guimenu>Tools</guimenu><guisubmenu> Archive Web Page</guisubmenu></menuchoice>, this tool creates an archive (<literal role="extension">.war</literal> ) file containing the web page being @@ -3662,9 +3678,9 @@ <term><menuchoice> <shortcut> <keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo> + <!-- Alternate keycombo action="simul">&Shift;<keycap>/</keycap></keycombo--><!--FIXME not webkit--> </shortcut><guimenu>Edit</guimenu> -<guimenuitem>Find...</guimenuitem></menuchoice> -or <keycombo action="simul">&Shift;<keycap>/</keycap></keycombo> (Browser mode)</term> +<guimenuitem>Find...</guimenuitem></menuchoice> (Browser mode)</term> <listitem><para>Displays the search bar at the bottom of the current window. Start typing to find a text string in a text page you are previewing or in an &HTML; page.</para></listitem> @@ -4512,7 +4528,7 @@ </sect2> <sect2 id="menu-help"> -<title>The <guimenu>Help</guimenu> Menu</title> +<title>The Help Menu</title> <para>Apart from standard &kde; <guimenu>Help</guimenu> menu items described in the section <ulink url="help:/fundamentals/ui.html#menus-help">Help Menu</ulink> of the &kde; Fundamentals you will have the menu entry <guimenuitem>&konqueror; Introduction</guimenuitem> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.1/dolphin/src/dolphinviewcontainer.cpp new/kde-baseapps-4.11.2/dolphin/src/dolphinviewcontainer.cpp --- old/kde-baseapps-4.11.1/dolphin/src/dolphinviewcontainer.cpp 2013-08-28 19:00:18.000000000 +0200 +++ new/kde-baseapps-4.11.2/dolphin/src/dolphinviewcontainer.cpp 2013-09-26 21:18:47.000000000 +0200 @@ -98,6 +98,7 @@ m_searchBox = new DolphinSearchBox(this); m_searchBox->hide(); + connect(m_searchBox, SIGNAL(activated()), this, SLOT(activate())); connect(m_searchBox, SIGNAL(closeRequest()), this, SLOT(closeSearchBox())); connect(m_searchBox, SIGNAL(searchRequest()), this, SLOT(startSearching())); connect(m_searchBox, SIGNAL(returnPressed(QString)), this, SLOT(requestFocus())); @@ -195,6 +196,7 @@ void DolphinViewContainer::setActive(bool active) { + m_searchBox->setActive(active); m_urlNavigator->setActive(active); m_view->setActive(active); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.1/dolphin/src/kitemviews/kfileitemlistview.cpp new/kde-baseapps-4.11.2/dolphin/src/kitemviews/kfileitemlistview.cpp --- old/kde-baseapps-4.11.1/dolphin/src/kitemviews/kfileitemlistview.cpp 2013-08-28 19:00:18.000000000 +0200 +++ new/kde-baseapps-4.11.2/dolphin/src/kitemviews/kfileitemlistview.cpp 2013-09-26 21:18:47.000000000 +0200 @@ -37,7 +37,15 @@ // #define KFILEITEMLISTVIEW_DEBUG namespace { + // If the visible index range changes, KFileItemModelRolesUpdater is not + // informed immediatetly, but with a short delay. This ensures that scrolling + // always feels smooth and is not interrupted by icon loading (which can be + // quite expensive if a disk access is required to determine the final icon). const int ShortInterval = 50; + + // If the icon size changes, a longer delay is used. This prevents that + // the expensive re-generation of all previews is triggered repeatedly when + // chaning the zoom level. const int LongInterval = 300; } @@ -58,7 +66,7 @@ m_updateIconSizeTimer = new QTimer(this); m_updateIconSizeTimer->setSingleShot(true); - m_updateIconSizeTimer->setInterval(ShortInterval); + m_updateIconSizeTimer->setInterval(LongInterval); connect(m_updateIconSizeTimer, SIGNAL(timeout()), this, SLOT(updateIconSize())); setVisibleRoles(QList<QByteArray>() << "text"); @@ -309,7 +317,6 @@ void KFileItemListView::slotItemsRemoved(const KItemRangeList& itemRanges) { KStandardItemListView::slotItemsRemoved(itemRanges); - updateTimersInterval(); } void KFileItemListView::slotSortRoleChanged(const QByteArray& current, const QByteArray& previous) @@ -328,7 +335,12 @@ return; } m_modelRolesUpdater->setPaused(true); - m_updateVisibleIndexRangeTimer->start(); + + // If the icon size has been changed recently, wait until + // m_updateIconSizeTimer expires. + if (!m_updateIconSizeTimer->isActive()) { + m_updateVisibleIndexRangeTimer->start(); + } } void KFileItemListView::updateVisibleIndexRange() @@ -341,17 +353,7 @@ const int count = lastVisibleIndex() - index + 1; m_modelRolesUpdater->setMaximumVisibleItems(maximumVisibleItems()); m_modelRolesUpdater->setVisibleIndexRange(index, count); - - if (m_updateIconSizeTimer->isActive()) { - // If the icon-size update is pending do an immediate update - // of the icon-size before unpausing m_modelRolesUpdater. This prevents - // an unnecessary expensive recreation of all previews afterwards. - m_updateIconSizeTimer->stop(); - m_modelRolesUpdater->setIconSize(availableIconSize()); - } - m_modelRolesUpdater->setPaused(isTransactionActive()); - updateTimersInterval(); } void KFileItemListView::triggerIconSizeUpdate() @@ -361,6 +363,11 @@ } m_modelRolesUpdater->setPaused(true); m_updateIconSizeTimer->start(); + + // The visible index range will be updated when m_updateIconSizeTimer expires. + // Stop m_updateVisibleIndexRangeTimer to prevent an expensive re-generation + // of all previews (note that the user might change the icon size again soon). + m_updateVisibleIndexRangeTimer->stop(); } void KFileItemListView::updateIconSize() @@ -371,35 +378,13 @@ m_modelRolesUpdater->setIconSize(availableIconSize()); - if (m_updateVisibleIndexRangeTimer->isActive()) { - // If the visibility-index-range update is pending do an immediate update - // of the range before unpausing m_modelRolesUpdater. This prevents - // an unnecessary expensive recreation of all previews afterwards. - m_updateVisibleIndexRangeTimer->stop(); - const int index = firstVisibleIndex(); - const int count = lastVisibleIndex() - index + 1; - m_modelRolesUpdater->setVisibleIndexRange(index, count); - } + // Update the visible index range (which has most likely changed after the + // icon size change) before unpausing m_modelRolesUpdater. + const int index = firstVisibleIndex(); + const int count = lastVisibleIndex() - index + 1; + m_modelRolesUpdater->setVisibleIndexRange(index, count); m_modelRolesUpdater->setPaused(isTransactionActive()); - updateTimersInterval(); -} - -void KFileItemListView::updateTimersInterval() -{ - if (!model()) { - return; - } - - // The ShortInterval is used for cases like switching the directory: If the - // model is empty and filled later the creation of the previews should be done - // as soon as possible. The LongInterval is used when the model already contains - // items and assures that operations like zooming don't result in too many temporary - // recreations of the previews. - - const int interval = (model()->count() <= 0) ? ShortInterval : LongInterval; - m_updateVisibleIndexRangeTimer->setInterval(interval); - m_updateIconSizeTimer->setInterval(interval); } void KFileItemListView::applyRolesToModel() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.1/dolphin/src/kitemviews/kfileitemlistview.h new/kde-baseapps-4.11.2/dolphin/src/kitemviews/kfileitemlistview.h --- old/kde-baseapps-4.11.1/dolphin/src/kitemviews/kfileitemlistview.h 2013-08-28 19:00:18.000000000 +0200 +++ new/kde-baseapps-4.11.2/dolphin/src/kitemviews/kfileitemlistview.h 2013-09-26 21:18:47.000000000 +0200 @@ -103,8 +103,6 @@ void updateIconSize(); private: - void updateTimersInterval(); - /** * Applies the roles defined by KItemListView::visibleRoles() to the * KFileItemModel and KFileItemModelRolesUpdater. As the model does not diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.1/dolphin/src/kitemviews/kfileitemmodel.cpp new/kde-baseapps-4.11.2/dolphin/src/kitemviews/kfileitemmodel.cpp --- old/kde-baseapps-4.11.1/dolphin/src/kitemviews/kfileitemmodel.cpp 2013-08-28 19:00:18.000000000 +0200 +++ new/kde-baseapps-4.11.2/dolphin/src/kitemviews/kfileitemmodel.cpp 2013-09-26 21:18:47.000000000 +0200 @@ -190,33 +190,7 @@ m_itemData[index]->item.setUrl(url); } - emit itemsChanged(KItemRangeList() << KItemRange(index, 1), changedRoles); - - // Trigger a resorting if the item's correct position has changed. Note - // that this can happen even if the sort role has not changed at all - // because the file name can be used as a fallback. - if (changedRoles.contains(sortRole()) || changedRoles.contains(roleForType(NameRole))) { - // Compare the changed item with its neighbors to see - // if an expensive resorting is needed at all. - const ItemData* changedItem = m_itemData.at(index); - const ItemData* previousItem = (index == 0) ? 0 : m_itemData.at(index - 1); - const ItemData* nextItem = (index == m_itemData.count() - 1) ? 0 : m_itemData.at(index + 1); - - if ((previousItem && lessThan(changedItem, previousItem)) - || (nextItem && lessThan(nextItem, changedItem))) { - m_resortAllItemsTimer->start(); - } else if (groupedSorting() && changedRoles.contains(sortRole())) { - // The position is still correct, but the groups might have changed - // if the changed item is either the first or the last item in a - // group. - // In principle, we could try to find out if the item really is the - // first or last one in its group and then update the groups - // (possibly with a delayed timer to make sure that we don't - // re-calculate the groups very often if items are updated one by - // one), but starting m_resortAllItemsTimer is easier. - m_resortAllItemsTimer->start(); - } - } + emitItemsChangedAndTriggerResorting(KItemRangeList() << KItemRange(index, 1), changedRoles); return true; } @@ -945,11 +919,7 @@ itemRangeList.append(KItemRange(rangeIndex, rangeCount)); } - emit itemsChanged(itemRangeList, changedRoles); - - if (changedRoles.contains(sortRole())) { - m_resortAllItemsTimer->start(); - } + emitItemsChangedAndTriggerResorting(itemRangeList, changedRoles); } void KFileItemModel::slotClear() @@ -1229,6 +1199,58 @@ m_expandedDirs.clear(); } +void KFileItemModel::emitItemsChangedAndTriggerResorting(const KItemRangeList& itemRanges, const QSet<QByteArray>& changedRoles) +{ + emit itemsChanged(itemRanges, changedRoles); + + // Trigger a resorting if necessary. Note that this can happen even if the sort + // role has not changed at all because the file name can be used as a fallback. + if (changedRoles.contains(sortRole()) || changedRoles.contains(roleForType(NameRole))) { + foreach (const KItemRange& range, itemRanges) { + bool needsResorting = false; + + const int first = range.index; + const int last = range.index + range.count - 1; + + // Resorting the model is necessary if + // (a) The first item in the range is "lessThan" its predecessor, + // (b) the successor of the last item is "lessThan" the last item, or + // (c) the internal order of the items in the range is incorrect. + if (first > 0 + && lessThan(m_itemData.at(first), m_itemData.at(first - 1))) { + needsResorting = true; + } else if (last < count() - 1 + && lessThan(m_itemData.at(last + 1), m_itemData.at(last))) { + needsResorting = true; + } else { + for (int index = first; index < last; ++index) { + if (lessThan(m_itemData.at(index + 1), m_itemData.at(index))) { + needsResorting = true; + break; + } + } + } + + if (needsResorting) { + m_resortAllItemsTimer->start(); + return; + } + } + } + + if (groupedSorting() && changedRoles.contains(sortRole())) { + // The position is still correct, but the groups might have changed + // if the changed item is either the first or the last item in a + // group. + // In principle, we could try to find out if the item really is the + // first or last one in its group and then update the groups + // (possibly with a delayed timer to make sure that we don't + // re-calculate the groups very often if items are updated one by + // one), but starting m_resortAllItemsTimer is easier. + m_resortAllItemsTimer->start(); + } +} + void KFileItemModel::resetRoles() { for (int i = 0; i < RolesCount; ++i) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.1/dolphin/src/kitemviews/kfileitemmodel.h new/kde-baseapps-4.11.2/dolphin/src/kitemviews/kfileitemmodel.h --- old/kde-baseapps-4.11.1/dolphin/src/kitemviews/kfileitemmodel.h 2013-08-28 19:00:18.000000000 +0200 +++ new/kde-baseapps-4.11.2/dolphin/src/kitemviews/kfileitemmodel.h 2013-09-26 21:18:47.000000000 +0200 @@ -322,6 +322,13 @@ void removeExpandedItems(); /** + * This function is called by setData() and slotRefreshItems(). It emits + * the itemsChanged() signal, checks if the sort order is still correct, + * and starts m_resortAllItemsTimer if that is not the case. + */ + void emitItemsChangedAndTriggerResorting(const KItemRangeList& itemRanges, const QSet<QByteArray>& changedRoles); + + /** * Resets all values from m_requestRole to false. */ void resetRoles(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.1/dolphin/src/kitemviews/kitemlistview.cpp new/kde-baseapps-4.11.2/dolphin/src/kitemviews/kitemlistview.cpp --- old/kde-baseapps-4.11.1/dolphin/src/kitemviews/kitemlistview.cpp 2013-08-28 19:00:18.000000000 +0200 +++ new/kde-baseapps-4.11.2/dolphin/src/kitemviews/kitemlistview.cpp 2013-09-26 21:18:47.000000000 +0200 @@ -504,7 +504,11 @@ const qreal headerHeight = m_headerWidget->size().height(); viewGeometry.adjust(0, headerHeight, 0, 0); } - const QRectF currentRect = itemRect(index); + QRectF currentRect = itemRect(index); + + // Fix for Bug 311099 - View the underscore when using Ctrl + PagDown + currentRect.adjust(-m_styleOption.horizontalMargin, -m_styleOption.verticalMargin, + m_styleOption.horizontalMargin, m_styleOption.verticalMargin); if (!viewGeometry.contains(currentRect)) { qreal newOffset = scrollOffset(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.1/dolphin/src/search/dolphinsearchbox.cpp new/kde-baseapps-4.11.2/dolphin/src/search/dolphinsearchbox.cpp --- old/kde-baseapps-4.11.1/dolphin/src/search/dolphinsearchbox.cpp 2013-08-28 19:00:18.000000000 +0200 +++ new/kde-baseapps-4.11.2/dolphin/src/search/dolphinsearchbox.cpp 2013-09-26 21:18:47.000000000 +0200 @@ -58,6 +58,7 @@ QWidget(parent), m_startedSearching(false), m_readOnly(false), + m_active(true), m_topLayout(0), m_searchLabel(0), m_searchInput(0), @@ -171,6 +172,22 @@ return m_readOnly; } +void DolphinSearchBox::setActive(bool active) +{ + if (active != m_active) { + m_active = active; + + if (active) { + emit activated(); + } + } +} + +bool DolphinSearchBox::isActive() const +{ + return m_active; +} + bool DolphinSearchBox::event(QEvent* event) { if (event->type() == QEvent::Polish) { @@ -199,6 +216,21 @@ } } +bool DolphinSearchBox::eventFilter(QObject* obj, QEvent* event) +{ + switch (event->type()) { + case QEvent::FocusIn: + setActive(true); + setFocus(); + break; + + default: + break; + } + + return QObject::eventFilter(obj, event); +} + void DolphinSearchBox::emitSearchRequest() { m_startSearchTimer->stop(); @@ -253,6 +285,7 @@ void DolphinSearchBox::initButton(QToolButton* button) { + button->installEventFilter(this); button->setAutoExclusive(true); button->setAutoRaise(true); button->setCheckable(true); @@ -298,6 +331,7 @@ // Create search box m_searchInput = new KLineEdit(this); + m_searchInput->installEventFilter(this); m_searchInput->setClearButtonShown(true); m_searchInput->setFont(KGlobalSettings::generalFont()); setFocusProxy(m_searchInput); @@ -348,6 +382,7 @@ connect(m_facetsToggleButton, SIGNAL(clicked()), this, SLOT(slotFacetsButtonToggled())); m_facetsWidget = new DolphinFacetsWidget(this); + m_facetsWidget->installEventFilter(this); m_facetsWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum); connect(m_facetsWidget, SIGNAL(facetChanged()), this, SLOT(slotFacetChanged())); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.1/dolphin/src/search/dolphinsearchbox.h new/kde-baseapps-4.11.2/dolphin/src/search/dolphinsearchbox.h --- old/kde-baseapps-4.11.1/dolphin/src/search/dolphinsearchbox.h 2013-06-28 19:13:51.000000000 +0200 +++ new/kde-baseapps-4.11.2/dolphin/src/search/dolphinsearchbox.h 2013-09-26 21:18:47.000000000 +0200 @@ -87,10 +87,27 @@ void setReadOnly(bool readOnly, const KUrl& query = KUrl()); bool isReadOnly() const; + /** + * Set the search box to the active mode, if \a active + * is true. The active mode is default. The inactive mode only differs + * visually from the active mode, no change of the behavior is given. + * + * Using the search box in the inactive mode is useful when having split views, + * where the inactive view is indicated by an search box visually. + */ + void setActive(bool active); + + /** + * @return True, if the search box is in the active mode. + * @see DolphinSearchBox::setActive() + */ + bool isActive() const; + protected: virtual bool event(QEvent* event); virtual void showEvent(QShowEvent* event); virtual void keyReleaseEvent(QKeyEvent* event); + virtual bool eventFilter(QObject* obj, QEvent* event); signals: /** @@ -111,6 +128,13 @@ */ void closeRequest(); + /** + * Is emitted, if the searchbox has been activated by + * an user interaction + * @see DolphinSearchBox::setActive() + */ + void activated(); + private slots: void emitSearchRequest(); void emitCloseRequest(); @@ -137,6 +161,7 @@ private: bool m_startedSearching; bool m_readOnly; + bool m_active; QVBoxLayout* m_topLayout; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.1/dolphin/src/settings/serviceitemdelegate.cpp new/kde-baseapps-4.11.2/dolphin/src/settings/serviceitemdelegate.cpp --- old/kde-baseapps-4.11.1/dolphin/src/settings/serviceitemdelegate.cpp 2013-06-28 19:13:51.000000000 +0200 +++ new/kde-baseapps-4.11.2/dolphin/src/settings/serviceitemdelegate.cpp 2013-09-26 21:18:47.000000000 +0200 @@ -69,6 +69,9 @@ QList<QWidget*> ServiceItemDelegate::createItemWidgets() const { QCheckBox* checkBox = new QCheckBox(); + QPalette palette = checkBox->palette(); + palette.setColor(QPalette::WindowText, palette.color(QPalette::Text)); + checkBox->setPalette(palette); connect(checkBox, SIGNAL(clicked(bool)), this, SLOT(slotCheckBoxClicked(bool))); KPushButton* configureButton = new KPushButton(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.1/dolphin/src/statusbar/dolphinstatusbar.cpp new/kde-baseapps-4.11.2/dolphin/src/statusbar/dolphinstatusbar.cpp --- old/kde-baseapps-4.11.1/dolphin/src/statusbar/dolphinstatusbar.cpp 2013-08-28 19:00:18.000000000 +0200 +++ new/kde-baseapps-4.11.2/dolphin/src/statusbar/dolphinstatusbar.cpp 2013-09-26 21:18:47.000000000 +0200 @@ -30,7 +30,6 @@ #include "statusbarspaceinfo.h" #include <QApplication> -#include <QClipboard> #include <QHBoxLayout> #include <QLabel> #include <QProgressBar> @@ -261,7 +260,6 @@ KMenu menu(this); - QAction* copyAction = menu.addAction(i18nc("@action:inmenu", "Copy Text")); QAction* showZoomSliderAction = menu.addAction(i18nc("@action:inmenu", "Show Zoom Slider")); showZoomSliderAction->setCheckable(true); showZoomSliderAction->setChecked(GeneralSettings::showZoomSlider()); @@ -271,11 +269,7 @@ showSpaceInfoAction->setChecked(GeneralSettings::showSpaceInfo()); const QAction* action = menu.exec(QCursor::pos()); - if (action == copyAction) { - QMimeData* mimeData = new QMimeData(); - mimeData->setText(text()); - QApplication::clipboard()->setMimeData(mimeData); - } else if (action == showZoomSliderAction) { + if (action == showZoomSliderAction) { const bool visible = showZoomSliderAction->isChecked(); GeneralSettings::setShowZoomSlider(visible); m_zoomSlider->setVisible(visible); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.1/dolphin/src/tests/kfileitemmodeltest.cpp new/kde-baseapps-4.11.2/dolphin/src/tests/kfileitemmodeltest.cpp --- old/kde-baseapps-4.11.1/dolphin/src/tests/kfileitemmodeltest.cpp 2013-08-28 19:00:18.000000000 +0200 +++ new/kde-baseapps-4.11.2/dolphin/src/tests/kfileitemmodeltest.cpp 2013-09-26 21:18:47.000000000 +0200 @@ -391,6 +391,18 @@ QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsMoved(KItemRange,QList<int>)), DefaultTimeout)); QCOMPARE(itemsInModel(), QStringList() << "b.txt" << "c.txt" << "d.txt"); + + // We rename d.txt back to a.txt using the dir lister's refreshItems() signal. + const KFileItem fileItemD = m_model->fileItem(2); + KFileItem fileItemA = fileItemD; + KUrl urlA = fileItemA.url(); + urlA.setFileName("a.txt"); + fileItemA.setUrl(urlA); + + m_model->slotRefreshItems(QList<QPair<KFileItem, KFileItem> >() << qMakePair(fileItemD, fileItemA)); + + QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsMoved(KItemRange,QList<int>)), DefaultTimeout)); + QCOMPARE(itemsInModel(), QStringList() << "a.txt" << "b.txt" << "c.txt"); } void KFileItemModelTest::testModelConsistencyWhenInsertingItems() @@ -1246,6 +1258,24 @@ expectedGroups << QPair<int, QVariant>(2, QLatin1String("D")); expectedGroups << QPair<int, QVariant>(3, QLatin1String("E")); QCOMPARE(m_model->groups(), expectedGroups); + + // Change d.txt back to c.txt, but this time using the dir lister's refreshItems() signal. + const KFileItem fileItemD = m_model->fileItem(2); + KFileItem fileItemC = fileItemD; + KUrl urlC = fileItemC.url(); + urlC.setFileName("c.txt"); + fileItemC.setUrl(urlC); + + m_model->slotRefreshItems(QList<QPair<KFileItem, KFileItem> >() << qMakePair(fileItemD, fileItemC)); + QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsMoved(KItemRange,QList<int>)), DefaultTimeout)); + QCOMPARE(itemsInModel(), QStringList() << "a.txt" << "b.txt" << "c.txt" << "e.txt"); + + expectedGroups.clear(); + expectedGroups << QPair<int, QVariant>(0, QLatin1String("A")); + expectedGroups << QPair<int, QVariant>(1, QLatin1String("B")); + expectedGroups << QPair<int, QVariant>(2, QLatin1String("C")); + expectedGroups << QPair<int, QVariant>(3, QLatin1String("E")); + QCOMPARE(m_model->groups(), expectedGroups); } QStringList KFileItemModelTest::itemsInModel() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.1/konq-plugins/babelfish/plugin_translator.desktop new/kde-baseapps-4.11.2/konq-plugins/babelfish/plugin_translator.desktop --- old/kde-baseapps-4.11.1/konq-plugins/babelfish/plugin_translator.desktop 2013-08-28 19:00:18.000000000 +0200 +++ new/kde-baseapps-4.11.2/konq-plugins/babelfish/plugin_translator.desktop 2013-09-26 21:18:47.000000000 +0200 @@ -83,6 +83,7 @@ Comment[es]=Traducción de idioma para la página actual utilizando Google Comment[fi]=Nykyisen sivun kääntäminen toiselle kielelle käyttäen Googlea Comment[fr]=Traduction de la langue de la page actuelle à l'aide de Google +Comment[gl]=Tradución da páxina actual usando Google Comment[hu]=Az aktuális oldal fordítása a Google használatával Comment[ia]=Traduction de linguage pro le pagina currente usante Google Comment[it]=Traduzione della pagina corrente usando Google diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.1/konq-plugins/dirfilter/dirfilterplugin.desktop new/kde-baseapps-4.11.2/konq-plugins/dirfilter/dirfilterplugin.desktop --- old/kde-baseapps-4.11.1/konq-plugins/dirfilter/dirfilterplugin.desktop 2013-06-28 19:13:51.000000000 +0200 +++ new/kde-baseapps-4.11.2/konq-plugins/dirfilter/dirfilterplugin.desktop 2013-09-26 21:18:47.000000000 +0200 @@ -110,7 +110,7 @@ Comment[pt]=Filtra a visualização da pasta com um filtro de atributos Comment[pt_BR]=Filtra a visualização do diretório usando um filtro de atributos Comment[ro]=Filtrează vederea de directoare folosind un filtru de atribute -Comment[ru]=Отфильтровать директории по атрибуту +Comment[ru]=Отфильтровать каталоги по атрибуту Comment[sk]=Podľa atribútov filtruje zobrazenie adresárov Comment[sl]=Filtrira mape glede na izbrane lastnosti Comment[sr]=Филтрира приказ фасцикли помоћу филтера атрибута diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.1/konqueror/settings/ebrowsing/ebrowsing.desktop new/kde-baseapps-4.11.2/konqueror/settings/ebrowsing/ebrowsing.desktop --- old/kde-baseapps-4.11.1/konqueror/settings/ebrowsing/ebrowsing.desktop 2013-06-28 19:13:51.000000000 +0200 +++ new/kde-baseapps-4.11.2/konqueror/settings/ebrowsing/ebrowsing.desktop 2013-09-26 21:18:47.000000000 +0200 @@ -77,7 +77,7 @@ Name[pt]=Atalhos Web Name[pt_BR]=Atalhos da Web Name[ro]=Acceleratori de web -Name[ru]=Сокращения +Name[ru]=Веб-сокращения Name[se]=Fierpmádatlávkestagat Name[si]=වෙබ් කෙටිමං Name[sk]=Webové skratky @@ -169,7 +169,7 @@ Comment[pt]=Configuração da navegação melhorada Comment[pt_BR]=Configura a navegação melhorada Comment[ro]=Configurează navigarea de web avansată -Comment[ru]=Сокращения, используемые в адресной строке +Comment[ru]=Настройка расширенных возможностей браузера Comment[se]=Heivet viiddiduvvon fierbmegolgama Comment[si]=දියුණු කළ ගවේෂණ සැකසුම් Comment[sk]=Nastavenie rozšíreného prehliadania diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.1/konqueror/settings/kio/uasproviders/chrome22oncurrent.desktop new/kde-baseapps-4.11.2/konqueror/settings/kio/uasproviders/chrome22oncurrent.desktop --- old/kde-baseapps-4.11.1/konqueror/settings/kio/uasproviders/chrome22oncurrent.desktop 2013-08-28 19:00:18.000000000 +0200 +++ new/kde-baseapps-4.11.2/konqueror/settings/kio/uasproviders/chrome22oncurrent.desktop 2013-09-26 21:18:47.000000000 +0200 @@ -11,6 +11,7 @@ Name[fi]=Käyttäjäagenttikuvaus (Google Chrome 22.0) Name[fr]=UADescription (Google Chrome 22.0) Name[ga]=UADescription (Google Chrome 22.0) +Name[gl]=UADescription (Google Chrome 22.0) Name[hu]=Böngészőtípus (Google Chrome 22.0) Name[ia]=UADescription (Google Chrome 22.0) Name[it]=Descrizione UA (Google Chrome 22.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.1/konqueror/settings/kio/uasproviders/chrome23oncurrent.desktop new/kde-baseapps-4.11.2/konqueror/settings/kio/uasproviders/chrome23oncurrent.desktop --- old/kde-baseapps-4.11.1/konqueror/settings/kio/uasproviders/chrome23oncurrent.desktop 2013-08-28 19:00:18.000000000 +0200 +++ new/kde-baseapps-4.11.2/konqueror/settings/kio/uasproviders/chrome23oncurrent.desktop 2013-09-26 21:18:47.000000000 +0200 @@ -11,6 +11,7 @@ Name[fi]=Käyttäjäagenttikuvaus (Google Chrome 23.0) Name[fr]=UADescription (Google Chrome 23.0) Name[ga]=UADescription (Google Chrome 23.0) +Name[gl]=UADescription (Google Chrome 23.0) Name[hu]=Böngészőtípus (Google Chrome 23.0) Name[ia]=UADescription (Google Chrome 23.0) Name[it]=Descrizione UA (Google Chrome 23.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.1/konqueror/settings/kio/uasproviders/chrome24oncurrent.desktop new/kde-baseapps-4.11.2/konqueror/settings/kio/uasproviders/chrome24oncurrent.desktop --- old/kde-baseapps-4.11.1/konqueror/settings/kio/uasproviders/chrome24oncurrent.desktop 2013-08-28 19:00:18.000000000 +0200 +++ new/kde-baseapps-4.11.2/konqueror/settings/kio/uasproviders/chrome24oncurrent.desktop 2013-09-26 21:18:47.000000000 +0200 @@ -11,6 +11,7 @@ Name[fi]=Käyttäjäagenttikuvaus (Google Chrome 24.0) Name[fr]=UADescription (Google Chrome 24.0) Name[ga]=UADescription (Google Chrome 24.0) +Name[gl]=UADescription (Google Chrome 24.0) Name[hu]=Böngészőtípus (Google Chrome 24.0) Name[ia]=UADescription (Google Chrome 24.0) Name[it]=Descrizione UA (Google Chrome 24.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.1/konqueror/settings/kio/uasproviders/firefox15oncurrent.desktop new/kde-baseapps-4.11.2/konqueror/settings/kio/uasproviders/firefox15oncurrent.desktop --- old/kde-baseapps-4.11.1/konqueror/settings/kio/uasproviders/firefox15oncurrent.desktop 2013-08-28 19:00:18.000000000 +0200 +++ new/kde-baseapps-4.11.2/konqueror/settings/kio/uasproviders/firefox15oncurrent.desktop 2013-09-26 21:18:47.000000000 +0200 @@ -11,6 +11,7 @@ Name[fi]=Käyttäjäagenttikuvaus (Firefox 15 nykyisellä) Name[fr]=UADescription (Firefox 15 sous le système actuel) Name[ga]=UADescription (Firefox 15 ar an gcóras reatha) +Name[gl]=UADescription (Firefox 15 no actual) Name[hu]=Böngészőtípus (Firefox 15.0) Name[ia]=UADescription (Firefox 15 super le currente) Name[it]=Descrizione UA (Firefox 15 sul sistema attuale) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.1/konqueror/settings/kio/uasproviders/firefox16oncurrent.desktop new/kde-baseapps-4.11.2/konqueror/settings/kio/uasproviders/firefox16oncurrent.desktop --- old/kde-baseapps-4.11.1/konqueror/settings/kio/uasproviders/firefox16oncurrent.desktop 2013-08-28 19:00:18.000000000 +0200 +++ new/kde-baseapps-4.11.2/konqueror/settings/kio/uasproviders/firefox16oncurrent.desktop 2013-09-26 21:18:47.000000000 +0200 @@ -11,6 +11,7 @@ Name[fi]=Käyttäjäagenttikuvaus (Firefox 16 nykyisellä) Name[fr]=UADescription (Firefox 16 sous le système actuel) Name[ga]=UADescription (Firefox 16 ar an gcóras reatha) +Name[gl]=UADescription (Firefox 16 no actual) Name[hu]=Böngészőtípus (Firefox 16.0) Name[ia]=UADescription (Firefox 16 super le currente) Name[it]=Descrizione UA (Firefox 16 sul sistema attuale) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.1/konqueror/settings/kio/uasproviders/ie80onwinnt60.desktop new/kde-baseapps-4.11.2/konqueror/settings/kio/uasproviders/ie80onwinnt60.desktop --- old/kde-baseapps-4.11.1/konqueror/settings/kio/uasproviders/ie80onwinnt60.desktop 2013-08-28 19:00:18.000000000 +0200 +++ new/kde-baseapps-4.11.2/konqueror/settings/kio/uasproviders/ie80onwinnt60.desktop 2013-09-26 21:18:47.000000000 +0200 @@ -11,6 +11,7 @@ Name[fi]=Käyttäjäagenttikuvaus (IE 8.0 Windows Vistalla) Name[fr]=UADescription (IE 8.0 sous Windows Vista) Name[ga]=UADescription (IE 8.0 ar Windows Vista) +Name[gl]=UADescription (IE 8.0 en Windows Vista) Name[hu]=Böngészőtípus (IE 8.0, Windows Vista) Name[ia]=UADescription (IE 8.0 super Windows Vista ) Name[it]=Descrizione UA (IE 8.0 su Windows Vista) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.1/konqueror/settings/kio/uasproviders/ie90onwinnt71.desktop new/kde-baseapps-4.11.2/konqueror/settings/kio/uasproviders/ie90onwinnt71.desktop --- old/kde-baseapps-4.11.1/konqueror/settings/kio/uasproviders/ie90onwinnt71.desktop 2013-08-28 19:00:18.000000000 +0200 +++ new/kde-baseapps-4.11.2/konqueror/settings/kio/uasproviders/ie90onwinnt71.desktop 2013-09-26 21:18:47.000000000 +0200 @@ -11,6 +11,7 @@ Name[fi]=Käyttäjäagenttikuvaus (IE 9.0 Windows 7:llä) Name[fr]=UADescription (IE 9.0 sous Windows 7) Name[ga]=UADescription (IE 9.0 ar Windows 7) +Name[gl]=UADescription (IE 9.0 en Windows Vista) Name[hu]=Böngészőtípus (IE 9.0, Windows 7) Name[ia]=UADescription (IE 9.0 super Windows Seven) Name[it]=Descrizione UA (IE 9.0 su Windows 7) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.1/konqueror/settings/kio/uasproviders/op1162oncurrent.desktop new/kde-baseapps-4.11.2/konqueror/settings/kio/uasproviders/op1162oncurrent.desktop --- old/kde-baseapps-4.11.1/konqueror/settings/kio/uasproviders/op1162oncurrent.desktop 2013-08-28 19:00:18.000000000 +0200 +++ new/kde-baseapps-4.11.2/konqueror/settings/kio/uasproviders/op1162oncurrent.desktop 2013-09-26 21:18:47.000000000 +0200 @@ -11,6 +11,7 @@ Name[fi]=Käyttäjäagenttikuvaus (Opera 11.62 nykyisellä) Name[fr]=UADescription (Opera 11.62 sous le système actuel) Name[ga]=UADescription (Opera 11.62 ar an gcóras reatha) +Name[gl]=UADescription (Opera 11.62 no actual) Name[hu]=Böngészőtípus (Opera 11.62) Name[ia]=UADescription (Opera 11.62 super le currente) Name[it]=Descrizione UA (Opera 11.62 sul sistema attuale) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.1/konqueror/settings/kio/uasproviders/op1202oncurrent.desktop new/kde-baseapps-4.11.2/konqueror/settings/kio/uasproviders/op1202oncurrent.desktop --- old/kde-baseapps-4.11.1/konqueror/settings/kio/uasproviders/op1202oncurrent.desktop 2013-08-28 19:00:18.000000000 +0200 +++ new/kde-baseapps-4.11.2/konqueror/settings/kio/uasproviders/op1202oncurrent.desktop 2013-09-26 21:18:47.000000000 +0200 @@ -11,6 +11,7 @@ Name[fi]=Käyttäjäagenttikuvaus (Opera 12.02 nykyisellä) Name[fr]=UADescription (Opera 12.02 sous le système actuel) Name[ga]=UADescription (Opera 12.02 ar an gcóras reatha) +Name[gl]=UADescription (Opera 12.02 no actual) Name[hu]=Böngészőtípus (Opera 12.02) Name[ia]=UADescription (Opera 12.02 super le currente) Name[it]=Descrizione UA (Opera 12.02 sul sistema attuale) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.1/konqueror/settings/kio/uasproviders/safari517.desktop new/kde-baseapps-4.11.2/konqueror/settings/kio/uasproviders/safari517.desktop --- old/kde-baseapps-4.11.1/konqueror/settings/kio/uasproviders/safari517.desktop 2013-08-28 19:00:18.000000000 +0200 +++ new/kde-baseapps-4.11.2/konqueror/settings/kio/uasproviders/safari517.desktop 2013-09-26 21:18:47.000000000 +0200 @@ -11,6 +11,7 @@ Name[fi]=Käyttäjäagenttikuvaus (Safari 5.1.7 MacOS X:llä) Name[fr]=UADescription (Safari 5.1.7 sous MacOS X) Name[ga]=UADescription (Safari 5.1.7 ar MacOS X) +Name[gl]=UADescription (Safari 5.1.7 en MacOS X) Name[hu]=Böngészőtípus (Safari 5.1.7, Mac OS X) Name[ia]=UADescription (Safari 5.1.7 super MacOS X) Name[it]=Descrizione UA (Safari 5.1.7 su MacOS X) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.1/konqueror/settings/kio/uasproviders/safari60.desktop new/kde-baseapps-4.11.2/konqueror/settings/kio/uasproviders/safari60.desktop --- old/kde-baseapps-4.11.1/konqueror/settings/kio/uasproviders/safari60.desktop 2013-08-28 19:00:18.000000000 +0200 +++ new/kde-baseapps-4.11.2/konqueror/settings/kio/uasproviders/safari60.desktop 2013-09-26 21:18:47.000000000 +0200 @@ -11,6 +11,7 @@ Name[fi]=Käyttäjäagenttikuvaus (Safari 6.0 MacOS X:llä) Name[fr]=UADescription (Safari 6.0 sous MacOS X) Name[ga]=UADescription (Safari 6.0 ar MacOS X) +Name[gl]=UADescription (Safari 6.0 en MacOS X) Name[hu]=Böngészőtípus (Safari 6.0, Mac OS X) Name[ia]=UADescription (Safari 6.0 super MacOS X) Name[it]=Descrizione UA (Safari 6.0 su MacOS X) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.1/konqueror/src/konqbookmarkbar.cpp new/kde-baseapps-4.11.2/konqueror/src/konqbookmarkbar.cpp --- old/kde-baseapps-4.11.1/konqueror/src/konqbookmarkbar.cpp 2013-08-28 19:00:18.000000000 +0200 +++ new/kde-baseapps-4.11.2/konqueror/src/konqbookmarkbar.cpp 2013-09-26 21:18:47.000000000 +0200 @@ -184,10 +184,12 @@ if (!bm.isGroup()) { - if ( bm.isSeparator() ) + if ( bm.isSeparator() ) + { if (m_toolBar) { m_toolBar->addSeparator(); } + } else { KAction *action = new KBookmarkAction( bm, m_pOwner, 0 ); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
