Hello community, here is the log from the commit of package kdebase4 for openSUSE:Factory checked in at 2014-05-22 06:49:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4 (Old) and /work/SRC/openSUSE:Factory/.kdebase4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4/kdebase4.changes 2014-05-06 17:39:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebase4.new/kdebase4.changes 2014-05-22 06:49:16.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 9 16:40:50 UTC 2014 - [email protected] + +- Update to 4.13.1 + * KDE 4.13.1 bug fix release + * See http://www.kde.org/announcements/announce-4.13.1.php + +------------------------------------------------------------------- Old: ---- kde-baseapps-4.13.0.tar.xz New: ---- kde-baseapps-4.13.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.WODyWp/_old 2014-05-22 06:49:17.000000000 +0200 +++ /var/tmp/diff_new_pack.WODyWp/_new 2014-05-22 06:49:17.000000000 +0200 @@ -17,7 +17,7 @@ Name: kdebase4 -Version: 4.13.0 +Version: 4.13.1 Release: 0 Summary: The Base KDE Apps License: GPL-2.0+ ++++++ kde-baseapps-4.13.0.tar.xz -> kde-baseapps-4.13.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.13.0/dolphin/src/dolphinmainwindow.cpp new/kde-baseapps-4.13.1/dolphin/src/dolphinmainwindow.cpp --- old/kde-baseapps-4.13.0/dolphin/src/dolphinmainwindow.cpp 2014-04-03 09:03:47.000000000 +0200 +++ new/kde-baseapps-4.13.1/dolphin/src/dolphinmainwindow.cpp 2014-04-30 09:34:32.000000000 +0200 @@ -217,6 +217,7 @@ toggleSplitView(); } updateEditActions(); + updatePasteAction(); updateViewActions(); updateGoActions(); @@ -356,6 +357,7 @@ if (view) { view->setUrl(url); updateEditActions(); + updatePasteAction(); updateViewActions(); updateGoActions(); setUrlAsCaption(url); @@ -481,6 +483,8 @@ m_viewTab.append(viewTab); actionCollection()->action("close_tab")->setEnabled(true); + actionCollection()->action("activate_prev_tab")->setEnabled(true); + actionCollection()->action("activate_next_tab")->setEnabled(true); // Provide a split view, if the startup settings are set this way if (GeneralSettings::splitView()) { @@ -1155,6 +1159,8 @@ if (m_viewTab.count() == 1) { m_tabBar->removeTab(0); actionCollection()->action("close_tab")->setEnabled(false); + actionCollection()->action("activate_prev_tab")->setEnabled(false); + actionCollection()->action("activate_next_tab")->setEnabled(false); } else { m_tabBar->blockSignals(false); } @@ -1451,6 +1457,7 @@ updateHistory(); updateEditActions(); + updatePasteAction(); updateViewActions(); updateGoActions(); @@ -1634,11 +1641,13 @@ KAction* activateNextTab = actionCollection()->addAction("activate_next_tab"); activateNextTab->setText(i18nc("@action:inmenu", "Activate Next Tab")); + activateNextTab->setEnabled(false); connect(activateNextTab, SIGNAL(triggered()), SLOT(activateNextTab())); activateNextTab->setShortcuts(QApplication::isRightToLeft() ? prevTabKeys : nextTabKeys); KAction* activatePrevTab = actionCollection()->addAction("activate_prev_tab"); activatePrevTab->setText(i18nc("@action:inmenu", "Activate Previous Tab")); + activatePrevTab->setEnabled(false); connect(activatePrevTab, SIGNAL(triggered()), SLOT(activatePrevTab())); activatePrevTab->setShortcuts(QApplication::isRightToLeft() ? nextTabKeys : prevTabKeys); @@ -1811,7 +1820,6 @@ deleteWithTrashShortcut->setEnabled(capabilities.supportsDeleting() && !enableMoveToTrash); cutAction->setEnabled(capabilities.supportsMoving()); } - updatePasteAction(); } void DolphinMainWindow::updateViewActions() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.13.0/dolphin/src/kitemviews/kfileitemmodel.cpp new/kde-baseapps-4.13.1/dolphin/src/kitemviews/kfileitemmodel.cpp --- old/kde-baseapps-4.13.0/dolphin/src/kitemviews/kfileitemmodel.cpp 2014-04-03 09:03:47.000000000 +0200 +++ new/kde-baseapps-4.13.1/dolphin/src/kitemviews/kfileitemmodel.cpp 2014-04-30 09:34:32.000000000 +0200 @@ -216,7 +216,7 @@ m_dirLister->setShowingDotFiles(show); m_dirLister->emitChanges(); if (show) { - slotCompleted(); + dispatchPendingItemsToInsert(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.13.0/dolphin/src/kitemviews/kitemlistselectionmanager.cpp new/kde-baseapps-4.13.1/dolphin/src/kitemviews/kitemlistselectionmanager.cpp --- old/kde-baseapps-4.13.0/dolphin/src/kitemviews/kitemlistselectionmanager.cpp 2014-04-03 09:03:47.000000000 +0200 +++ new/kde-baseapps-4.13.1/dolphin/src/kitemviews/kitemlistselectionmanager.cpp 2014-04-30 09:34:32.000000000 +0200 @@ -331,6 +331,11 @@ // Store the current selection (needed in the selectionChanged() signal) const KItemSet previousSelection = selectedItems(); + // endAnchoredSelection() adds all items between m_currentItem and + // m_anchorItem to m_selectedItems. They can then be moved + // individually later in this function. + endAnchoredSelection(); + // Update the current item if (m_currentItem >= itemRange.index && m_currentItem < itemRange.index + itemRange.count) { const int previousCurrentItem = m_currentItem; @@ -342,10 +347,8 @@ emit currentChanged(newCurrentItem, previousCurrentItem); } - // Update the anchor item - if (m_anchorItem >= itemRange.index && m_anchorItem < itemRange.index + itemRange.count) { - m_anchorItem = movedToIndexes.at(m_anchorItem - itemRange.index); - } + // Start a new anchored selection. + beginAnchoredSelection(m_currentItem); // Update the selections if (!m_selectedItems.isEmpty()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.13.0/dolphin/src/kitemviews/kstandarditemlistwidget.cpp new/kde-baseapps-4.13.1/dolphin/src/kitemviews/kstandarditemlistwidget.cpp --- old/kde-baseapps-4.13.0/dolphin/src/kitemviews/kstandarditemlistwidget.cpp 2014-04-03 09:03:47.000000000 +0200 +++ new/kde-baseapps-4.13.1/dolphin/src/kitemviews/kstandarditemlistwidget.cpp 2014-04-30 09:34:32.000000000 +0200 @@ -658,6 +658,12 @@ dirtyRoles = roles; } + // The URL might have changed (i.e., if the sort order of the items has + // been changed). Therefore, the "is cut" state must be updated. + KFileItemClipboard* clipboard = KFileItemClipboard::instance(); + const KUrl itemUrl = data().value("url").value<KUrl>(); + m_isCut = clipboard->isCut(itemUrl); + // The icon-state might depend from other roles and hence is // marked as dirty whenever a role has been changed dirtyRoles.insert("iconPixmap"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.13.0/dolphin/src/panels/places/placespanel.cpp new/kde-baseapps-4.13.1/dolphin/src/panels/places/placespanel.cpp --- old/kde-baseapps-4.13.0/dolphin/src/panels/places/placespanel.cpp 2014-04-03 09:03:47.000000000 +0200 +++ new/kde-baseapps-4.13.1/dolphin/src/panels/places/placespanel.cpp 2014-04-30 09:34:32.000000000 +0200 @@ -283,8 +283,9 @@ } else if (action == hideAction) { item->setHidden(hideAction->isChecked()); } else if (action == openInNewTabAction) { - const KUrl url = m_model->item(index)->dataValue("url").value<KUrl>(); - emit placeMiddleClicked(url); + // TriggerItem does set up the storage first and then it will + // emit the slotItemMiddleClicked signal, because of Qt::MiddleButton. + triggerItem(index, Qt::MiddleButton); } else if (action == teardownAction) { m_model->requestTeardown(index); } else if (action == ejectAction) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.13.0/dolphin/src/tests/kitemlistselectionmanagertest.cpp new/kde-baseapps-4.13.1/dolphin/src/tests/kitemlistselectionmanagertest.cpp --- old/kde-baseapps-4.13.0/dolphin/src/tests/kitemlistselectionmanagertest.cpp 2014-04-03 09:03:47.000000000 +0200 +++ new/kde-baseapps-4.13.1/dolphin/src/tests/kitemlistselectionmanagertest.cpp 2014-04-30 09:34:32.000000000 +0200 @@ -78,6 +78,7 @@ void testChangeSelection(); void testDeleteCurrentItem_data(); void testDeleteCurrentItem(); + void testAnchoredSelectionAfterMovingItems(); private: void verifySelectionChange(QSignalSpy& spy, const KItemSet& currentSelection, const KItemSet& previousSelection) const; @@ -413,6 +414,15 @@ << QVariant::fromValue(QList<int>() << 4 << 5 << 2 << 3)) << (KItemSet() << 0 << 1 << 4 << 5); + QTest::newRow("Move items with active anchored selection") + << KItemSet() + << 0 << 3 + << (KItemSet() << 0 << 1 << 2 << 3) + << MoveItems + << (QList<QVariant>() << QVariant::fromValue(KItemRange(2, 4)) + << QVariant::fromValue(QList<int>() << 4 << 5 << 2 << 3)) + << (KItemSet() << 0 << 1 << 4 << 5); + // Revert sort order QTest::newRow("Revert sort order") << (KItemSet() << 0 << 1) @@ -519,6 +529,22 @@ QCOMPARE(m_selectionManager->currentItem(), newCurrentItemIndex); } +void KItemListSelectionManagerTest::testAnchoredSelectionAfterMovingItems() +{ + m_selectionManager->setCurrentItem(4); + m_selectionManager->beginAnchoredSelection(4); + + // Reverse the items between 0 and 5. + m_selectionManager->itemsMoved(KItemRange(0, 6), QList<int>() << 5 << 4 << 3 << 2 << 1 << 0); + + QCOMPARE(m_selectionManager->currentItem(), 1); + QCOMPARE(m_selectionManager->m_anchorItem, 1); + + // Make 2 the current item -> 1 and 2 should be selected. + m_selectionManager->setCurrentItem(2); + QCOMPARE(m_selectionManager->selectedItems(), KItemSet() << 1 << 2); +} + void KItemListSelectionManagerTest::verifySelectionChange(QSignalSpy& spy, const KItemSet& currentSelection, const KItemSet& previousSelection) const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.13.0/dolphin/src/views/versioncontrol/updateitemstatesthread.cpp new/kde-baseapps-4.13.1/dolphin/src/views/versioncontrol/updateitemstatesthread.cpp --- old/kde-baseapps-4.13.0/dolphin/src/views/versioncontrol/updateitemstatesthread.cpp 2014-04-03 09:03:47.000000000 +0200 +++ new/kde-baseapps-4.13.1/dolphin/src/views/versioncontrol/updateitemstatesthread.cpp 2014-04-30 09:34:32.000000000 +0200 @@ -64,9 +64,9 @@ items[i].version = static_cast<KVersionControlPlugin2::ItemVersion>(state); } } - - m_plugin->endRetrieval(); } + + m_plugin->endRetrieval(); } } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
