rpms/krusader/F-11 krusader-2.2.0-beta1-rename-selects-ext-regression.patch, 1.1, 1.2 krusader.spec, 1.30, 1.31
Kevin Kofler
kkofler at fedoraproject.org
Thu Jun 3 23:03:16 UTC 2010
- Previous message: rpms/exim/F-13 .cvsignore, 1.16, 1.17 exim.init, 1.4, 1.5 exim.spec, 1.72, 1.73 sources, 1.16, 1.17
- Next message: rpms/krusader/F-12 krusader-2.2.0-beta1-rename-selects-ext-regression.patch, 1.1, 1.2 krusader.spec, 1.32, 1.33
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kkofler
Update of /cvs/pkgs/rpms/krusader/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14398/F-11
Modified Files:
krusader-2.2.0-beta1-rename-selects-ext-regression.patch
krusader.spec
Log Message:
Sync from devel:
* 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
krusader-2.2.0-beta1-rename-selects-ext-regression.patch:
krinterviewitemdelegate.cpp | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
Index: krusader-2.2.0-beta1-rename-selects-ext-regression.patch
===================================================================
RCS file: /cvs/pkgs/rpms/krusader/F-11/krusader-2.2.0-beta1-rename-selects-ext-regression.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- krusader-2.2.0-beta1-rename-selects-ext-regression.patch 3 Jun 2010 22:13:42 -0000 1.1
+++ krusader-2.2.0-beta1-rename-selects-ext-regression.patch 3 Jun 2010 23:03:16 -0000 1.2
@@ -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/P
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());
++ }
+ }
+ }
+ }
Index: krusader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krusader/F-11/krusader.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- krusader.spec 3 Jun 2010 22:13:42 -0000 1.30
+++ krusader.spec 3 Jun 2010 23:03:16 -0000 1.31
@@ -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)
- Previous message: rpms/exim/F-13 .cvsignore, 1.16, 1.17 exim.init, 1.4, 1.5 exim.spec, 1.72, 1.73 sources, 1.16, 1.17
- Next message: rpms/krusader/F-12 krusader-2.2.0-beta1-rename-selects-ext-regression.patch, 1.1, 1.2 krusader.spec, 1.32, 1.33
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list