Revision bump adds patch to fix selection and focus issues by Franz Fellner <alpine.art.de@googlemail.com> wrt bug #414693.

Package-Manager: portage-2.2.0_alpha101/cvs/Linux i686

5 files changed, 74 insertions, 36 deletions

diff --git a/kde-base/dolphin/ChangeLog b/kde-base/dolphin/ChangeLog
index 54ad93c559fd..a620df98c797 100644
--- a/kde-base/dolphin/ChangeLog
+++ b/kde-base/dolphin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/dolphin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/ChangeLog,v 1.133 2012/05/03 20:07:58 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/ChangeLog,v 1.134 2012/05/07 09:23:57 johu Exp $
+
+*dolphin-4.8.3-r1 (07 May 2012)
+
+  07 May 2012; Johannes Huber <johu@gentoo.org> +dolphin-4.8.3-r1.ebuild,
+  +files/dolphin-4.8.3-fix-selection.patch, -dolphin-4.8.3.ebuild,
+  -files/dolphin-4.8.0-fix-selection.patch:
+  Revision bump adds patch to fix selection and focus issues by Franz Fellner
+  <alpine.art.de@googlemail.com> wrt bug #414693.
 
 *dolphin-4.8.3 (03 May 2012)
 
diff --git a/kde-base/dolphin/Manifest b/kde-base/dolphin/Manifest
index 16cddeee6ef1..c5c74a770fdd 100644
--- a/kde-base/dolphin/Manifest
+++ b/kde-base/dolphin/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX dolphin-4.8.0-fix-selection.patch 1290 RMD160 9b958f2e61842b8bcd3bd30a84747daa0fb60dda SHA1 959aa785922627359ea363539a6609c6b5689a8a SHA256 8c6369476a4ef86a2af882e3c1edc3c096dd454b6302c003866ce13fb0f883f9
+AUX dolphin-4.8.3-fix-selection.patch 2053 RMD160 c7b407cac8fa6a7c5b867cdbd3b32d1f672d1a2f SHA1 63cb9bedf7286b8d9f172ae805143bb761595866 SHA256 04d5fa0278874fd9e2cae7ba90370b4d764ed5015d0489de21d63007113e2062
 DIST kde-baseapps-4.7.4.tar.bz2 2684721 RMD160 cedc577cb3449e36b7e7dab1192688c8014c46d1 SHA1 ad4b6d8479bcf8be49b5f53ee8fdcc1b3d1106d6 SHA256 0a59e87b0019bb5d80abbc9cb2fc691ec838d43e9b168e7a15b11d40ac1db51c
 DIST kde-baseapps-4.8.1.tar.xz 2625748 RMD160 cd653960c92e454389ed6a1a92f2d765023ef42e SHA1 bfbc51930a81ea272ddbb1fc9a9cefb9cf9a81d6 SHA256 508fe80d5b1e2c8b1b76e84aa3e5520ed4994e42de1627d1dd3242b90c8fae3d
 DIST kde-baseapps-4.8.2.tar.xz 2663404 RMD160 31def2b20abfc1df8cf03c830b7d7c01ba42678b SHA1 13dc2e6c8639feadc9a5a334d0720a60b1e3ccb6 SHA256 70dea309c01243226fc5b0e1153edf5feaf9477859cd8ea6016f8f4e6d55a239
@@ -9,17 +9,17 @@ DIST kde-baseapps-4.8.3.tar.xz 2712232 RMD160 8e8382f0f117adefee0bfd71c862ec9d19
 EBUILD dolphin-4.7.4.ebuild 1083 RMD160 71fee14e8d47e33cb89508e791e91d01268e1444 SHA1 4f578d03322979cef8fe9f4045182c149daff7c0 SHA256 ba64ffe637131cf76eae029dda5225d1ffcbc0e0862c109e65df0f08eef8ee25
 EBUILD dolphin-4.8.1.ebuild 1066 RMD160 1eb00c637bd0bdf8c612e0f134f0dcdfefb57bfb SHA1 242b8ee55bda11cf351990250a2ae0845073b6ca SHA256 6742e5c0eebdc5099732b79bf69fec363af859cac7218ffe57adc830deb66e15
 EBUILD dolphin-4.8.2.ebuild 1066 RMD160 ae42112070c457ce5eb8953f49994182376ebccb SHA1 8cb58db6a647eca5148a8d0da592ede8b381f3a3 SHA256 1cab3eb9b0de54aef8120eafbc6d87b8215a386630f4e0c318091877bd6f0321
-EBUILD dolphin-4.8.3.ebuild 1066 RMD160 f0f031442b9cc9155759de080b5ff778d459dfc9 SHA1 aefadb56a3dc9c6c6b02b4d873699b0f3f549232 SHA256 a71139340a28da6542ba96e411ed40f23457294425464a3056ab69afbc24cc6e
-MISC ChangeLog 17701 RMD160 9c64d05faaa73f21ddf9dfbf8f0def12fc0dbc97 SHA1 5d0bc61be5adce704a57e9e042ac2394b843b292 SHA256 8ae4341d95e9f6a9fb0349c68b59010d4ea5ca5923cf492c0f9ba21d8e1af9b4
+EBUILD dolphin-4.8.3-r1.ebuild 1121 RMD160 c881f2a5aa7d7f588e1013e571285a51148e65f4 SHA1 382b9a01f55c973ed7aaa4297f3a93aa4f1424ca SHA256 013e4baabbfb4a4fef32eeb989dd890327d48f134c8c1b81c83b898c479fbb5b
+MISC ChangeLog 18048 RMD160 8550fb0d423d5e7ac23af857a115aed1de7237e8 SHA1 3f7906fb43043d288cb58c86c07475ccbccd4841 SHA256 971da5410398839179b48d2cefe275f22e3bc6cb2f053ebee33f0a1a65f3e5b6
 MISC metadata.xml 287 RMD160 6079a550c87093424f04a1d307864f6558608f59 SHA1 cd35c8ff7336bf936094660061f6ef58dd16276d SHA256 f8ca0fcb27fae3e13bce985f13164013ba54c573c50a047622953f03c48a6969
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPouYLAAoJEO+t9ga+3I3aL4gH/3UmpeTcpAH0segn6IYEPYCz
-9MbKf0slEPhupXvk5VIecGXBTTQOi0LA556MaZraEllD8ww58BPtDANB/ty3uiXE
-KZIviIAaHdC9rO1F4eCE49GqOvp9UjRvzhrPcTMUuNKlZpmKFJY9Jv4tTc8c1KpG
-1toVHBaDbjWlZLnmRCETOA7k3EMpm/p5ngukVxck2McYmFYMsk7cvOKB54zS4iCV
-pjSDnZtUg7atU+YD1zNPB6CNJuOuYX0vImXBlgu+MPoPL3uQUGQAbbqzHuu/rqsu
-j8tBllzfo9HKra/ayJ8mKoe1rBwVjIkZz/EipKz9XhigT4DIwXZO3kGWHGXZF2M=
-=QsZt
+iQEcBAEBCgAGBQJPp5T/AAoJEO+t9ga+3I3aN8QIAMjjpCMWy8AQtDpjC8jkVgYE
+c+aizpnjvoQwtFgNLm+MP9ek7VkhAV612MRko+k+QK0Fp7/+wQe542+c97CLj7r6
+DwLSANjfKsnOtL/Z0Q1updm0rrvm3wQCFLCyrx1h/O6GQZanANYjbxNttBaQH0fq
+FAyXYCTOXrEU6M/oT1xTrH2qxuk8opQqB5cne7OI1xeqQ57STV+k9x11NAb7EFG/
+UuoqcjBHhpvMLk/S9SNI2sDYa/wZnRj5jyVo4i0FFURx7gB3SPMwKD2qZxNrPO87
+DLMQUcdPZIynwqU91YnV+b6nF/6nnLvLGG+SqliuF3nbZYwPHO4QbQsR145yUwY=
+=ewTL
 -----END PGP SIGNATURE-----
diff --git a/kde-base/dolphin/dolphin-4.8.3.ebuild b/kde-base/dolphin/dolphin-4.8.3-r1.ebuild
index b422504ba438..77cd1772e053 100644
--- a/kde-base/dolphin/dolphin-4.8.3.ebuild
+++ b/kde-base/dolphin/dolphin-4.8.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/dolphin-4.8.3.ebuild,v 1.1 2012/05/03 20:07:58 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/dolphin-4.8.3-r1.ebuild,v 1.1 2012/05/07 09:23:57 johu Exp $
 
 EAPI=4
 
@@ -35,6 +35,8 @@ KMLOADLIBS="libkonq"
 RESTRICT="test"
 # bug 393129
 
+PATCHES=( "${FILESDIR}/${P}-fix-selection.patch" )
+
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_with semantic-desktop Nepomuk)
diff --git a/kde-base/dolphin/files/dolphin-4.8.0-fix-selection.patch b/kde-base/dolphin/files/dolphin-4.8.0-fix-selection.patch
deleted file mode 100644
index 4e194e8863e5..000000000000
--- a/kde-base/dolphin/files/dolphin-4.8.0-fix-selection.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 84a9cc4bf6e9decc4c102102c4b04162369eb0fe
-Author: Frank Reininghaus <frank78ac@googlemail.com>
-Date:   Mon Jan 23 19:28:21 2012 +0100
-
-    Make sure that Control+click toggles the selection state
-    
-    This commit fixes a regression caused by the recent commit
-    9f711b5f2e1d1fd856cd6b033e6adb96f9b46d8a.
-    BUG: 292250
-
-diff --git a/dolphin/src/kitemviews/kitemlistcontroller.cpp b/dolphin/src/kitemviews/kitemlistcontroller.cpp
-index 0f22d70..560d160 100644
---- a/dolphin/src/kitemviews/kitemlistcontroller.cpp
-+++ b/dolphin/src/kitemviews/kitemlistcontroller.cpp
-@@ -471,7 +471,7 @@ bool KItemListController::mousePressEvent(QGraphicsSceneMouseEvent* event, const
-                                 (!shiftOrControlPressed && !pressedItemAlreadySelected);
-     if (clearSelection) {
-         m_selectionManager->clearSelection();
--    } else if (pressedItemAlreadySelected && (event->buttons() & Qt::LeftButton)) {
-+    } else if (pressedItemAlreadySelected && !shiftOrControlPressed && (event->buttons() & Qt::LeftButton)) {
-         // The user might want to start dragging multiple items, but if he clicks the item
-         // in order to trigger it instead, the other selected items must be deselected.
-         // However, we do not know yet what the user is going to do.
diff --git a/kde-base/dolphin/files/dolphin-4.8.3-fix-selection.patch b/kde-base/dolphin/files/dolphin-4.8.3-fix-selection.patch
new file mode 100644
index 000000000000..c237fb9acd38
--- /dev/null
+++ b/kde-base/dolphin/files/dolphin-4.8.3-fix-selection.patch
@@ -0,0 +1,51 @@
+commit 0139537a35d636356fa088c61557baf13bb2e71b
+Author: Peter Penz <peter.penz19@gmail.com>
+Date:   Sat May 5 21:51:26 2012 +0200
+
+    Assure that a newly created item gets selected/focused and visible
+    
+    Thanks to Franz Fellner for the patch!
+    
+    BUG: 291064
+    FIXED-IN: 4.8.4
+    CCMAIL: alpine.art.de@googlemail.com
+
+diff --git a/dolphin/src/views/dolphinview.cpp b/dolphin/src/views/dolphinview.cpp
+index 3a220e7..c5b2004 100644
+--- a/dolphin/src/views/dolphinview.cpp
++++ b/dolphin/src/views/dolphinview.cpp
+@@ -1015,23 +1015,23 @@ KFileItem DolphinView::rootItem() const
+ void DolphinView::observeCreatedItem(const KUrl& url)
+ {
+     m_createdItemUrl = url;
+-    //connect(m_dirModel, SIGNAL(rowsInserted(QModelIndex,int,int)),
+-    //        this, SLOT(selectAndScrollToCreatedItem()));
++    connect(fileItemModel(), SIGNAL(loadingCompleted()),
++            this, SLOT(selectAndScrollToCreatedItem()));
+ }
+ 
+ void DolphinView::selectAndScrollToCreatedItem()
+ {
+-    /*const QModelIndex dirIndex = m_viewAccessor.dirModel()->indexForUrl(m_createdItemUrl);
+-    if (dirIndex.isValid()) {
+-        const QModelIndex proxyIndex = m_viewAccessor.proxyModel()->mapFromSource(dirIndex);
+-        QAbstractItemView* view = m_viewAccessor.itemView();
+-        if (view) {
+-            view->setCurrentIndex(proxyIndex);
+-        }
++    KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
++    const int index = fileItemModel()->index(m_createdItemUrl);
++    if (index != -1) {
++        selectionManager->setCurrentItem(index);
++        selectionManager->clearSelection();
++        selectionManager->setSelected(index);
++        m_container->controller()->view()->scrollToItem(index);
+     }
+ 
+-    disconnect(m_viewAccessor.dirModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
+-               this, SLOT(selectAndScrollToCreatedItem()));*/
++    disconnect(fileItemModel(), SIGNAL(loadingCompleted()),
++               this, SLOT(selectAndScrollToCreatedItem()));
+     m_createdItemUrl = KUrl();
+ }
+