[rkward-cvs] SF.net SVN: rkward: [2261] branches/KDE4_port

[tfry at users.sourceforge.net]

Revision: 2261
          http://rkward.svn.sourceforge.net/rkward/?rev=2261&view=rev
Author:   tfry
Date:     2007-11-22 03:12:05 -0800 (Thu, 22 Nov 2007)

Log Message:
-----------
Assorted small stuff

Modified Paths:
--------------
    branches/KDE4_port/ChangeLog
    branches/KDE4_port/rkward/dataeditor/twintable.cpp
    branches/KDE4_port/rkward/dialogs/rkloadlibsdialog.cpp

Modified: branches/KDE4_port/ChangeLog
===================================================================
--- branches/KDE4_port/ChangeLog	2007-11-20 15:33:56 UTC (rev 2260)
+++ branches/KDE4_port/ChangeLog	2007-11-22 11:12:05 UTC (rev 2261)
@@ -1,3 +1,4 @@
+- more icons added
 - data.frame editor can be set to read-only mode
 - code completion in script editor shows icons for the different object types
 - settings dialog is now shown in "page list" mode
@@ -5,6 +6,9 @@
 
 ---- KDE 3 versions
 
+--- Version 0.4.9 - Xxx-XX-XXXX
+
+- Fixed: correct installation of rkward.desktop file
 - Use the KDE default fixed spacing font for command log and object viewer
 
 --- Version 0.4.8a - Nov-11-2007

Modified: branches/KDE4_port/rkward/dataeditor/twintable.cpp
===================================================================
--- branches/KDE4_port/rkward/dataeditor/twintable.cpp	2007-11-20 15:33:56 UTC (rev 2260)
+++ branches/KDE4_port/rkward/dataeditor/twintable.cpp	2007-11-22 11:12:05 UTC (rev 2261)
@@ -388,7 +388,6 @@
 
 	QAbstractItemView::EditTriggers triggers = QAbstractItemView::NoEditTriggers;
 	if (rw) triggers = QAbstractItemView::DoubleClicked | QAbstractItemView::EditKeyPressed | QAbstractItemView::AnyKeyPressed;
-
 	metaview->setEditTriggers (triggers);
 	dataview->setEditTriggers (triggers);
 

Modified: branches/KDE4_port/rkward/dialogs/rkloadlibsdialog.cpp
===================================================================
--- branches/KDE4_port/rkward/dialogs/rkloadlibsdialog.cpp	2007-11-20 15:33:56 UTC (rev 2260)
+++ branches/KDE4_port/rkward/dialogs/rkloadlibsdialog.cpp	2007-11-22 11:12:05 UTC (rev 2261)
@@ -31,6 +31,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kvbox.h>
+#include <kuser.h>
 
 #include "../rkglobals.h"
 #include "../rbackend/rinterface.h"
@@ -41,12 +42,6 @@
 
 #include "../debug.h"
 
-#ifdef __FreeBSD__
-#include <sys/types.h>
-#include <unistd.h>
-#include <pwd.h>
-#endif
-
 #include <stdlib.h>
 
 
@@ -188,17 +183,14 @@
 		QTextStream stream (&file);
 		stream << "options (repos=" + repos_string + ")\n" + command_string;
 		if (as_root) {
-#ifdef __FreeBSD__
-			struct passwd *passe = getpwuid(getuid ());
-			stream << QString ("system (\"chown ") + passe->pw_name + ' ' + QDir (RKSettingsModuleGeneral::filesPath ()).filePath ("package_archive") + "/*\")\n";
-#else
-			stream << QString ("system (\"chown ") + cuserid (0) + ' ' + QDir (RKSettingsModuleGeneral::filesPath ()).filePath ("package_archive") + "/*\")\n";
-#endif
+			KUser user;
+			stream << QString ("system (\"chown ") + user.loginName() + ' ' + QDir (RKSettingsModuleGeneral::filesPath ()).filePath ("package_archive") + "/*\")\n";
 		}
 		stream << "q ()\n";
 		file.close();
 	}
 
+#warning kdesu may not be in the path. It might be in libexec.
 	QString R_binary (getenv ("R_binary"));
 	QString call;
 	QStringList params;
@@ -249,7 +241,7 @@
 	RK_TRACE (DIALOGS);
 	RK_ASSERT (installation_process);
 
-//TODO Somehow we add too many newlines, here
+//TODO Somehow we add too many newlines, here -> kdesu issue
 	emit (installationError (QString::fromLocal8Bit (installation_process->readAllStandardError ())));
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.