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

[tfry at users.sourceforge.net]

Revision: 4369
          http://rkward.svn.sourceforge.net/rkward/?rev=4369&view=rev
Author:   tfry
Date:     2012-10-15 15:32:35 +0000 (Mon, 15 Oct 2012)
Log Message:
-----------
Correctly label the option to install suggested packages, and turn it off by default.

Modified Paths:
--------------
    trunk/rkward/ChangeLog
    trunk/rkward/rkward/dialogs/rkloadlibsdialog.cpp
    trunk/rkward/rkward/dialogs/rkloadlibsdialog.h

Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog	2012-10-15 11:31:42 UTC (rev 4368)
+++ trunk/rkward/ChangeLog	2012-10-15 15:32:35 UTC (rev 4369)
@@ -1,3 +1,4 @@
+- Fixed: Option to include suggested packages in install was mis-labelled "install dependencies"
 - rk.set.output.html.file() gains argument to allow addition of custom content to the html header
 
 --- Version 0.6.0 - Oct-XX-2012

Modified: trunk/rkward/rkward/dialogs/rkloadlibsdialog.cpp
===================================================================
--- trunk/rkward/rkward/dialogs/rkloadlibsdialog.cpp	2012-10-15 11:31:42 UTC (rev 4368)
+++ trunk/rkward/rkward/dialogs/rkloadlibsdialog.cpp	2012-10-15 15:32:35 UTC (rev 4369)
@@ -241,7 +241,7 @@
 	return true;
 }
 
-bool RKLoadLibsDialog::installPackages (const QStringList &packages, QString to_libloc, bool install_dependencies, const QStringList& repos) {
+bool RKLoadLibsDialog::installPackages (const QStringList &packages, QString to_libloc, bool install_suggested_packages, const QStringList& repos) {
 	RK_TRACE (DIALOGS);
 
 	if (packages.isEmpty ()) return false;
@@ -275,7 +275,7 @@
 		QDir (RKSettingsModuleGeneral::filesPath ()).mkdir ("package_archive");
 		command_string += ", destdir=\"" + downloaddir + "\"";
 	}
-	if (install_dependencies) command_string += ", dependencies=TRUE";
+	if (install_suggested_packages) command_string += ", suggested_packages=TRUE";
 	command_string += ")\n";
 
 	QString repos_string = "options (repos= c(";
@@ -747,7 +747,7 @@
 	if (!install.isEmpty ()) {
 		QString dest = install_params->installLocation ();
 		if (!dest.isEmpty ()) {
-			changed |= parent->installPackages (install, dest, install_params->installDependencies (), packages_status->currentRepositories ());
+			changed |= parent->installPackages (install, dest, install_params->installSuggestedPackages (), packages_status->currentRepositories ());
 		}
 	}
 
@@ -789,20 +789,21 @@
 	libloc_selector = new QComboBox (this);
 	vbox->addWidget (libloc_selector);
 
-	dependencies = new QCheckBox (i18n ("Include dependencies"), this);
-	dependencies->setChecked (true);
+	suggested_packages = new QCheckBox (i18n ("Install suggested packages"), this);
+	suggested_packages->setChecked (false);
+	RKCommonFunctions::setTips (QString ("<p>%1</p>").arg (i18n ("Some packages \"suggest\" additional packages, which are not strictly necessary for using that package, but which may provide additional related functionality. Check this option to include such additional suggested packages.")), suggested_packages);
 	vbox->addStretch ();
-	vbox->addWidget (dependencies);
+	vbox->addWidget (suggested_packages);
 }
 
 PackageInstallParamsWidget::~PackageInstallParamsWidget () {
 	RK_TRACE (DIALOGS);
 }
 
-bool PackageInstallParamsWidget::installDependencies () {
+bool PackageInstallParamsWidget::installSuggestedPackages () {
 	RK_TRACE (DIALOGS);
 
-	return dependencies->isChecked ();
+	return suggested_packages->isChecked ();
 }
 
 QString PackageInstallParamsWidget::installLocation () {

Modified: trunk/rkward/rkward/dialogs/rkloadlibsdialog.h
===================================================================
--- trunk/rkward/rkward/dialogs/rkloadlibsdialog.h	2012-10-15 11:31:42 UTC (rev 4368)
+++ trunk/rkward/rkward/dialogs/rkloadlibsdialog.h	2012-10-15 15:32:35 UTC (rev 4369)
@@ -2,7 +2,7 @@
                           rkloadlibsdialog  -  description
                              -------------------
     begin                : Mon Sep 6 2004
-    copyright            : (C) 2004, 2006, 2007, 2009, 2011 by Thomas Friedrichsmeier
+    copyright            : (C) 2004, 2006, 2007, 2009, 2011, 2012 by Thomas Friedrichsmeier
     email                : tfry at users.sourceforge.net
  ***************************************************************************/
 
@@ -55,7 +55,7 @@
 
 	~RKLoadLibsDialog ();
 
-	bool installPackages (const QStringList &packages, QString to_libloc, bool install_dependencies, const QStringList& repos);
+	bool installPackages (const QStringList &packages, QString to_libloc, bool install_suggested_packages, const QStringList& repos);
 	bool removePackages (QStringList packages, QStringList from_liblocs);
 
 /** opens a modal RKLoadLibsDialog with the "Install new Packages" tab on front (To be used when a require () fails in the R backend
@@ -271,13 +271,13 @@
 	
 	~PackageInstallParamsWidget ();
 
-	bool installDependencies ();
+	bool installSuggestedPackages ();
 	QString installLocation ();
 public slots:
 	void liblocsChanged (const QStringList &newlist);
 private:
 	QComboBox *libloc_selector;
-	QCheckBox *dependencies;
+	QCheckBox *suggested_packages;
 };
 
 #endif

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