[rkward-cvs] SF.net SVN: rkward:[3793] trunk/rkward

[tfry at users.sourceforge.net]

Revision: 3793
          http://rkward.svn.sourceforge.net/rkward/?rev=3793&view=rev
Author:   tfry
Date:     2011-09-18 09:20:16 +0000 (Sun, 18 Sep 2011)
Log Message:
-----------
Add our new repository to the list of repos, by default

Modified Paths:
--------------
    trunk/rkward/ChangeLog
    trunk/rkward/rkward/settings/rksettingsmodulegeneral.h
    trunk/rkward/rkward/settings/rksettingsmoduler.cpp

Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog	2011-09-17 11:43:10 UTC (rev 3792)
+++ trunk/rkward/ChangeLog	2011-09-18 09:20:16 UTC (rev 3793)
@@ -1,6 +1,6 @@
 - The file filter for R script files is now configurable, and includes *.Rhistory, by default
 - More obvious coloring of variable entry fields requiring user input in plugins
-- Default size of the code display in plugin dialogs has been increased			TODO: bump config version enum
+- Default size of the code display in plugin dialogs has been increased
 - Added support for RKWard plugins shipped inside R packages 
 - Fixed: PDFs and many other types of documents linked from help pages would not be opened, correctly
 - Added support R 2.14.x

Modified: trunk/rkward/rkward/settings/rksettingsmodulegeneral.h
===================================================================
--- trunk/rkward/rkward/settings/rksettingsmodulegeneral.h	2011-09-17 11:43:10 UTC (rev 3792)
+++ trunk/rkward/rkward/settings/rksettingsmodulegeneral.h	2011-09-18 09:20:16 UTC (rev 3793)
@@ -72,7 +72,7 @@
 
 	enum RKWardConfigVersion {
 		RKWardConfig_Pre0_5_7,
-//		RKWardConfig_0_5_7,
+		RKWardConfig_0_5_7,
 		RKWardConfig_Next,		/**< add new configuration versions above / before this entry */
 		RKWardConfig_Latest = RKWardConfig_Next - 1
 	};

Modified: trunk/rkward/rkward/settings/rksettingsmoduler.cpp
===================================================================
--- trunk/rkward/rkward/settings/rksettingsmoduler.cpp	2011-09-17 11:43:10 UTC (rev 3792)
+++ trunk/rkward/rkward/settings/rksettingsmoduler.cpp	2011-09-18 09:20:16 UTC (rev 3793)
@@ -32,6 +32,7 @@
 #include <QPushButton>
 #include <QTextEdit>
 
+#include "rksettingsmodulegeneral.h"
 #include "../core/robject.h"
 #include "../misc/multistringselector.h"
 #include "../misc/rkprogresscontrol.h"
@@ -489,8 +490,12 @@
 	KConfigGroup cg = config->group ("R Settings");
 
 	cran_mirror_url = cg.readEntry ("CRAN mirror url", "@CRAN@");
-	package_repositories = cg.readEntry ("Repositories", QStringList ());
-	package_repositories.removeAll ("@CRAN@");	// COMPAT: Cran mirror was part of this list before 0.5.3
+	const QString rkward_repo ("http://rkward.sf.net/R/");
+	package_repositories = cg.readEntry ("Repositories", QStringList (rkward_repo));
+	if (RKSettingsModuleGeneral::storedConfigVersion () <= RKSettingsModuleGeneral::RKWardConfig_Pre0_5_7) {
+		package_repositories.removeAll ("@CRAN@");	// COMPAT: Cran mirror was part of this list before 0.5.3
+		package_repositories.append (rkward_repo);
+	}
 
 	liblocs = cg.readEntry ("LibraryLocations", QStringList ());
 	archive_packages = cg.readEntry ("archive packages", false);

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