rnovacek pushed to krusader (epel7). "- fix "rename selects extension" patch to actually select all"

[notifications at fedoraproject.org]

From 925ce575264dda98a20077821fa3cf51c9940323 Mon Sep 17 00:00:00 2001
From: Kevin Kofler <kkofler at fedoraproject.org>
Date: Thu, 3 Jun 2010 22:46:54 +0000
Subject: - fix "rename selects extension" patch to actually select all


diff --git a/krusader-2.2.0-beta1-rename-selects-ext-regression.patch b/krusader-2.2.0-beta1-rename-selects-ext-regression.patch
index 115d71a..bef930e 100644
--- a/krusader-2.2.0-beta1-rename-selects-ext-regression.patch
+++ b/krusader-2.2.0-beta1-rename-selects-ext-regression.patch
@@ -1,6 +1,6 @@
 diff -ur krusader-2.2.0-beta1/krusader/Panel/krinterviewitemdelegate.cpp krusader-2.2.0-beta1-rename-selects-ext-regression/krusader/Panel/krinterviewitemdelegate.cpp
 --- krusader-2.2.0-beta1/krusader/Panel/krinterviewitemdelegate.cpp	2010-04-30 18:41:02.000000000 +0200
-+++ krusader-2.2.0-beta1-rename-selects-ext-regression/krusader/Panel/krinterviewitemdelegate.cpp	2010-06-03 22:10:01.000000000 +0200
++++ krusader-2.2.0-beta1-rename-selects-ext-regression/krusader/Panel/krinterviewitemdelegate.cpp	2010-06-04 00:43:32.000000000 +0200
 @@ -24,6 +24,8 @@
  #include <QtGui/QPainter>
  #include <QtGui/QLineEdit>
@@ -10,14 +10,21 @@ diff -ur krusader-2.2.0-beta1/krusader/Panel/krinterviewitemdelegate.cpp krusade
  KrInterViewItemDelegate::KrInterViewItemDelegate(QObject *parent) :
          QItemDelegate(parent), _currentlyEdited(-1) {}
  
-@@ -50,7 +52,9 @@
- void KrInterViewItemDelegate::setEditorData(QWidget *editor, const QModelIndex &index) const
- {
-     QItemDelegate::setEditorData(editor, index);
--    if (editor->inherits("QLineEdit")) {
-+    KConfigGroup gl(krConfig, "Look&Feel");
-+    if (!gl.readEntry("Rename Selects Extension", true)
-+        && editor->inherits("QLineEdit")) {
+@@ -53,9 +55,14 @@
+     if (editor->inherits("QLineEdit")) {
          QLineEdit *lineEdit = qobject_cast<QLineEdit *> (editor);
          if (lineEdit) {
-             QString nameWithoutExt = index.data(Qt::UserRole).toString();
+-            QString nameWithoutExt = index.data(Qt::UserRole).toString();
+-            lineEdit->deselect();
+-            lineEdit->setSelection(0, nameWithoutExt.length());
++            KConfigGroup gl(krConfig, "Look&Feel");
++            if (gl.readEntry("Rename Selects Extension", true))
++                lineEdit->selectAll();
++            else {
++                QString nameWithoutExt = index.data(Qt::UserRole).toString();
++                lineEdit->deselect();
++                lineEdit->setSelection(0, nameWithoutExt.length());
++            }
+         }
+     }
+ }
diff --git a/krusader.spec b/krusader.spec
index f94a955..5bcd006 100644
--- a/krusader.spec
+++ b/krusader.spec
@@ -1,7 +1,7 @@
 Name:		krusader
 Version:	2.2.0
 %global beta beta1
-Release:	0.3.%{beta}%{?dist}
+Release:	0.4.%{beta}%{?dist}
 Summary:	An advanced twin-panel (commander-style) file-manager for KDE
 
 Group:		Applications/File
@@ -111,6 +111,9 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/kde4/services/*.protocol
 
 %changelog
+* Thu Jun 03 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.2.0-0.4.beta1
+- fix "rename selects extension" patch to actually select all
+
 * Thu Jun 03 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.2.0-0.3.beta1
 - fix regression making single-click mode unusable
 - fix regression: "rename selects extension" not working (SF#3003338)
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/krusader.git/commit/?h=epel7&id=925ce575264dda98a20077821fa3cf51c9940323