Hello community,
here is the log from the commit of package kdebase4 for openSUSE:Factory
checked in at Fri Feb 4 18:17:58 CET 2011.
--------
--- KDE/kdebase4/kdebase4.changes 2011-01-19 23:36:39.000000000 +0100
+++ kdebase4/kdebase4.changes 2011-02-03 22:10:40.000000000 +0100
@@ -1,0 +2,5 @@
+Thu Feb 3 21:04:41 UTC 2011 - wstephenson@novell.com
+
+- Patch Plasma folderview doubleclick behaviour (bko#259335)
+
+-------------------------------------------------------------------
@@ -7 +11,0 @@
-
@@ -20 +23,0 @@
-
@@ -28 +30,0 @@
-
@@ -41 +42,0 @@
-
calling whatdependson for head-i586
New:
----
bko#259335-plasma-doubleclick-dnd.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4.spec ++++++
--- /var/tmp/diff_new_pack.x1YWI8/_old 2011-02-04 18:14:17.000000000 +0100
+++ /var/tmp/diff_new_pack.x1YWI8/_new 2011-02-04 18:14:17.000000000 +0100
@@ -19,7 +19,7 @@
Name: kdebase4
Version: 4.6.0
-Release: 1
+Release: 2
License: GPLv2+
Summary: The Base KDE Apps
Url: http://www.kde.org/
@@ -59,6 +59,7 @@
Patch0: 4_5_BRANCH.diff
Patch7: dolphin-go_up.diff
Patch8: plasma-new-default-panel.diff
+Patch9: bko#259335-plasma-doubleclick-dnd.diff
Suggests: dolphin
Suggests: kdebase4-libkonq
Suggests: kdebase4-nsplugin
@@ -85,6 +86,9 @@
%patch7
###KDE44: rediff?
#%patch8
+pushd apps
+%patch9 -p1
+popd
%build
%cmake_kde4 -d build
++++++ bko#259335-plasma-doubleclick-dnd.diff ++++++
commit 40e65858d62915c6ea57c48207242729ea063053
Author: Aaron Seigo
Date: Sun Jan 30 12:13:37 2011 -0800
From: wstephenson@suse.de
Subject: fix folderview drag and drop when double-click to select is enable (bko#259335)
Patch-upstream: 40e65858d62915c6ea57c48207242729ea063053
fix 2-click drag, w/correct painting on selection
(cherry picked from commit 0714dda8df441519009961148318011b6577c71b)
diff --git a/plasma/applets/folderview/iconview.cpp b/plasma/applets/folderview/iconview.cpp
index 83c28f7..937e6b2 100644
--- a/plasma/applets/folderview/iconview.cpp
+++ b/plasma/applets/folderview/iconview.cpp
@@ -1732,9 +1732,8 @@ void IconView::keyPressEvent(QKeyEvent *event)
}
nextIndex = currentIndex.sibling(newItem, currentIndex.column());
- }
-
- else { //If the user has moved the icons, i.e. the view is no longer sorted
+ } else {
+ //If the user has moved the icons, i.e. the view is no longer sorted
QPoint currentPos = visualRect(currentIndex).center();
//Store distance between the first and the current index-
@@ -1813,8 +1812,7 @@ void IconView::mousePressEvent(QGraphicsSceneMouseEvent *event)
const QModelIndex index = indexAt(pos);
// If an icon was pressed
- if (index.isValid())
- {
+ if (index.isValid()) {
//if ctrl is held
if (event->modifiers() & Qt::ControlModifier) {
m_selectionModel->select(index, QItemSelectionModel::Toggle);
@@ -1833,16 +1831,11 @@ void IconView::mousePressEvent(QGraphicsSceneMouseEvent *event)
m_selectionModel->select(index, QItemSelectionModel::ClearAndSelect);
m_selectionModel->setCurrentIndex(index, QItemSelectionModel::NoUpdate);
markAreaDirty(visibleArea());
- }
- else {
+ } else {
markAreaDirty(visualRect(index));
}
- if (!(event->modifiers() & (Qt::ControlModifier | Qt::ShiftModifier)) &&
- KGlobalSettings::singleClick()) {
- m_pressedIndex = index;
- }
-
+ m_pressedIndex = index;
m_buttonDownPos = pos;
return;
}
@@ -1882,8 +1875,7 @@ void IconView::mousePressEvent(QGraphicsSceneMouseEvent *event)
void IconView::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
{
- if (event->button() == Qt::LeftButton)
- {
+ if (event->button() == Qt::LeftButton) {
if (m_rubberBand.isValid()) {
markAreaDirty(m_rubberBand);
m_rubberBand = QRect();
@@ -1894,22 +1886,27 @@ void IconView::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
const QModelIndex index = indexAt(pos);
bool ctrlOrShiftPressed = (event->modifiers() & (Qt::ControlModifier | Qt::ShiftModifier));
- if (index.isValid() && index == m_pressedIndex && !ctrlOrShiftPressed) {
- if (!m_doubleClick && KGlobalSettings::singleClick()) {
- emit activated(index);
- m_selectionModel->clearSelection();
- markAreaDirty(visibleArea());
- }
- // We don't clear and update the selection and current index in
- // mousePressEvent() if the item is already selected when it's pressed,
- // so we need to do that here.
- if (m_selectionModel->currentIndex() != index ||
- m_selectionModel->selectedIndexes().count() > 1) {
- m_selectionModel->select(index, QItemSelectionModel::ClearAndSelect);
- m_selectionModel->setCurrentIndex(index, QItemSelectionModel::NoUpdate);
+ if (index.isValid() && index == m_pressedIndex) {
+ if (ctrlOrShiftPressed) {
markAreaDirty(visibleArea());
+ } else {
+ if (!m_doubleClick) {
+ if (KGlobalSettings::singleClick()) {
+ emit activated(index);
+ m_selectionModel->clearSelection();
+ }
+ markAreaDirty(visibleArea());
+ }
+ // We don't clear and update the selection and current index in
+ // mousePressEvent() if the item is already selected when it's pressed,
+ // so we need to do that here.
+ if (m_selectionModel->currentIndex() != index ||
+ m_selectionModel->selectedIndexes().count() > 1) {
+ m_selectionModel->select(index, QItemSelectionModel::ClearAndSelect);
+ m_selectionModel->setCurrentIndex(index, QItemSelectionModel::NoUpdate);
+ markAreaDirty(visibleArea());
+ }
}
- m_doubleClick = false;
}
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org