rpms/krusader/F-13 krusader-2.2.0-beta1-force-reload.patch, NONE, 1.1 krusader-2.2.0-beta1-readonly.patch, NONE, 1.1 krusader-2.2.0-beta1-rename-selects-ext-regression.patch, NONE, 1.1 krusader-2.2.0-beta1-singleclick-regression.patch, NONE, 1.1 krusader-2.2.0-beta1-viewer-menu.patch, NONE, 1.1 krusader.spec, 1.31, 1.32

Thu Jun 3 22:13:43 UTC 2010

Author: kkofler

Update of /cvs/pkgs/rpms/krusader/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9673/F-13

Modified Files:
	krusader.spec 
Added Files:
	krusader-2.2.0-beta1-force-reload.patch 
	krusader-2.2.0-beta1-readonly.patch 
	krusader-2.2.0-beta1-rename-selects-ext-regression.patch 
	krusader-2.2.0-beta1-singleclick-regression.patch 
	krusader-2.2.0-beta1-viewer-menu.patch 
Log Message:
Sync from devel:

* 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)
- force reloading when opening a file in the viewer (SF#2969403)
- fix bogus toplevel entries being shown in the viewer menu (SF#2981303)
- fix the text viewer not being read-only (SF#2898151)

krusader-2.2.0-beta1-force-reload.patch:
 panelviewer.cpp |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE krusader-2.2.0-beta1-force-reload.patch ---
diff -ur krusader-2.2.0-beta1/krusader/KViewer/panelviewer.cpp krusader-2.2.0-beta1-force-reload/krusader/KViewer/panelviewer.cpp
--- krusader-2.2.0-beta1/krusader/KViewer/panelviewer.cpp	2010-04-30 18:41:03.000000000 +0200
+++ krusader-2.2.0-beta1-force-reload/krusader/KViewer/panelviewer.cpp	2010-06-03 23:09:52.000000000 +0200
@@ -177,7 +177,9 @@
         addWidget(cpart->widget());
         setCurrentWidget(cpart->widget());
     }
-    if (cpart && cpart->openUrl(curl)) {
+    KParts::OpenUrlArguments args;
+    args.setReload(true);
+    if (cpart && (cpart->setArguments(args), cpart->openUrl(curl))) {
         curl = url;
         connect(cpart, SIGNAL(destroyed()), this, SLOT(slotCPartDestroyed()));
         return cpart;
@@ -294,6 +296,9 @@
             return cpart;
         }
     } else {
+        KParts::OpenUrlArguments args;
+        args.setReload(true);
+        cpart->setArguments(args);
         if (cpart->openUrl(curl)) {
             connect(cpart, SIGNAL(destroyed()), this, SLOT(slotCPartDestroyed()));
             return cpart;

krusader-2.2.0-beta1-readonly.patch:
 panelviewer.cpp |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE krusader-2.2.0-beta1-readonly.patch ---
diff -ur krusader-2.2.0-beta1/krusader/KViewer/panelviewer.cpp krusader-2.2.0-beta1-readonly/krusader/KViewer/panelviewer.cpp
--- krusader-2.2.0-beta1/krusader/KViewer/panelviewer.cpp	2010-04-30 18:41:03.000000000 +0200
+++ krusader-2.2.0-beta1-readonly/krusader/KViewer/panelviewer.cpp	2010-06-03 23:57:13.000000000 +0200
@@ -172,6 +172,8 @@
 
     if (!cpart) cpart = getPart("text/plain");
     if (!cpart) cpart = getPart("all/allfiles");
+    if (cpart && cpart->inherits("KParts::ReadWritePart"))
+      static_cast<KParts::ReadWritePart *>(cpart.data())->setReadWrite(false);
 
     if (cpart) {
         addWidget(cpart->widget());

krusader-2.2.0-beta1-rename-selects-ext-regression.patch:
 krinterviewitemdelegate.cpp |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE krusader-2.2.0-beta1-rename-selects-ext-regression.patch ---
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
@@ -24,6 +24,8 @@
 #include <QtGui/QPainter>
 #include <QtGui/QLineEdit>
 
+#include "../krglobal.h"
+
 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")) {
         QLineEdit *lineEdit = qobject_cast<QLineEdit *> (editor);
         if (lineEdit) {
             QString nameWithoutExt = index.data(Qt::UserRole).toString();

krusader-2.2.0-beta1-singleclick-regression.patch:
 krmousehandler.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE krusader-2.2.0-beta1-singleclick-regression.patch ---
diff -ur krusader-2.2.0-beta1/krusader/Panel/krmousehandler.cpp krusader-2.2.0-beta1-singleclick-regression/krusader/Panel/krmousehandler.cpp
--- krusader-2.2.0-beta1/krusader/Panel/krmousehandler.cpp	2010-04-30 18:41:02.000000000 +0200
+++ krusader-2.2.0-beta1-singleclick-regression/krusader/Panel/krmousehandler.cpp	2010-06-03 21:48:04.000000000 +0200
@@ -161,7 +161,7 @@
         _rightClickedItem = 0;
         _contextMenuTimer.stop();
     }
-    if (_singleClick && e->button() == Qt::LeftButton) {
+    if (_singleClick && e->button() == Qt::LeftButton && e->modifiers() == Qt::NoModifier) {
         CANCEL_TWO_CLICK_RENAME;
         e->accept();
         if (item == 0)

krusader-2.2.0-beta1-viewer-menu.patch:
 CMakeLists.txt |    1 +
 krviewer.rc    |    5 +++++
 2 files changed, 6 insertions(+)

--- NEW FILE krusader-2.2.0-beta1-viewer-menu.patch ---
diff -Nur krusader-2.2.0-beta1/krusader/CMakeLists.txt krusader-2.2.0-beta1-viewer-menu/krusader/CMakeLists.txt
--- krusader-2.2.0-beta1/krusader/CMakeLists.txt	2010-04-30 18:41:03.000000000 +0200
+++ krusader-2.2.0-beta1-viewer-menu/krusader/CMakeLists.txt	2010-06-03 23:23:06.000000000 +0200
@@ -94,6 +94,7 @@
         DESTINATION ${XDG_APPS_INSTALL_DIR} )
 install(FILES krusaderui.rc
               krusaderlisterui.rc
+              krviewer.rc
               midnight_commander.color
               total_commander.color
               total_commander.keymap
diff -Nur krusader-2.2.0-beta1/krusader/krviewer.rc krusader-2.2.0-beta1-viewer-menu/krusader/krviewer.rc
--- krusader-2.2.0-beta1/krusader/krviewer.rc	1970-01-01 01:00:00.000000000 +0100
+++ krusader-2.2.0-beta1-viewer-menu/krusader/krviewer.rc	2010-06-03 23:21:40.000000000 +0200
@@ -0,0 +1,5 @@
+<!DOCTYPE kpartgui >
+<kpartgui version="1" name="krviewer" >
+ <MenuBar>
+ </MenuBar>
+</kpartgui>


Index: krusader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krusader/F-13/krusader.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- krusader.spec	3 Jun 2010 18:39:23 -0000	1.31
+++ krusader.spec	3 Jun 2010 22:13:43 -0000	1.32
@@ -1,7 +1,7 @@
 Name:		krusader
 Version:	2.2.0
 %global beta beta1
-Release:	0.2.%{beta}%{?dist}
+Release:	0.3.%{beta}%{?dist}
 Summary:	An advanced twin-panel (commander-style) file-manager for KDE
 
 Group:		Applications/File
@@ -14,6 +14,17 @@ Patch0:		krusader-2.2.0-beta1-xz.patch
 # https://sourceforge.net/tracker/?func=detail&atid=306488&aid=3011061&group_id=6488
 # adds default MIME type handlers for LZMA and XZ archives (#593525 part 2)
 Patch1:		krusader-2.2.0-beta1-default-mimetypes-xz.patch
+# fix regression making single-click mode unusable
+Patch2:		krusader-2.2.0-beta1-singleclick-regression.patch
+# fix regression: "rename selects extension" not working (SF#3003338)
+Patch3:		krusader-2.2.0-beta1-rename-selects-ext-regression.patch
+# force reloading when opening a file in the viewer (SF#2969403)
+Patch4:		krusader-2.2.0-beta1-force-reload.patch
+# fix bogus toplevel entries being shown in the viewer menu (SF#2981303)
+Patch5:		krusader-2.2.0-beta1-viewer-menu.patch
+# fix the text viewer not being read-only (SF#2898151)
+Patch6:		krusader-2.2.0-beta1-readonly.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cmake
@@ -38,6 +49,11 @@ friendly, fast and looks great on your d
 %setup -q -n %{name}-%{version}%{?beta:-%{beta}}
 %patch0 -p1 -b .xz
 %patch1 -p1 -b .mime-xz
+%patch2 -p1 -b .singleclick
+%patch3 -p1 -b .rename-selects-ext
+%patch4 -p1 -b .force-reload
+%patch5 -p1 -b .viewer-menu
+%patch6 -p1 -b .readonly
 
 %build
 mkdir -p %{_target_platform}
@@ -95,6 +111,13 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/kde4/services/*.protocol
 
 %changelog
+* 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)
+- force reloading when opening a file in the viewer (SF#2969403)
+- fix bogus toplevel entries being shown in the viewer menu (SF#2981303)
+- fix the text viewer not being read-only (SF#2898151)
+
 * Thu Jun 03 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.2.0-0.2.beta1
 - BR kdebase4-devel for libkonq
 - Drop explicit Requires: kdebase-runtime because it is dragged in by kdebase

