[rkward/frameworks] /: Remove windows-only setInternet2-option. No longer supported by R.

[Thomas Friedrichsmeier]

Git commit f3274d69247bb593c49f918a38730d21f1c9337f by Thomas Friedrichsmeier.
Committed on 20/05/2017 at 07:59.
Pushed by tfry into branch 'frameworks'.

Remove windows-only setInternet2-option. No longer supported by R.

(Essentially, setInternet2(TRUE) is the new default behavior since R 3.2.2).

M  +1    -0    ChangeLog
M  +0    -25   rkward/settings/rksettingsmoduler.cpp
M  +0    -2    rkward/settings/rksettingsmoduler.h

https://commits.kde.org/rkward/f3274d69247bb593c49f918a38730d21f1c9337f

diff --git a/ChangeLog b/ChangeLog
index fc4ff8b0..dd0b2ac0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+- Remove Windows-only UI for setInternet2()-option (no longer available in R, with setInternet2(TRUE) the default since R 3.2.2)
 - Remove startup wrapper script (moving the still-needed functionality into the main executable)
     TODO: This is still mostly EXPERIMENTAL, and only vaguely tested on Linux so far. It should help resolve a number of long standing quirks, though, such as command windows (on Windows), icons,
           startup notification quirks, etc.
diff --git a/rkward/settings/rksettingsmoduler.cpp b/rkward/settings/rksettingsmoduler.cpp
index cb819495..59431f8c 100644
--- a/rkward/settings/rksettingsmoduler.cpp
+++ b/rkward/settings/rksettingsmoduler.cpp
@@ -56,7 +56,6 @@ bool RKSettingsModuleR::options_checkbounds;
 QString RKSettingsModuleR::options_editor;
 QString RKSettingsModuleR::options_pager;
 QString RKSettingsModuleR::options_further;
-bool RKSettingsModuleR::options_internet2;
 // static constants
 QString RKSettingsModuleR::builtin_editor = "<rkward>";
 // session constants
@@ -198,17 +197,6 @@ RKSettingsModuleR::RKSettingsModuleR (RKSettings *gui, QWidget *parent) : RKSett
 	connect (pager_input, &QComboBox::editTextChanged, this, &RKSettingsModuleR::settingChanged);
 	grid->addWidget (pager_input, row, 1);
 
-#ifdef Q_OS_WIN
-	grid->addWidget (label = new QLabel (i18n ("Use Internet Explorer functions for internet access"), this), ++row, 0);
-	internet2_input = new QCheckBox (this);
-	internet2_input->setChecked (options_internet2);
-	connect (internet2_input, &QCheckBox::stateChanged, this, &RKSettingsModuleR::settingChanged);
-	grid->addWidget (internet2_input, row, 1);
-	RKCommonFunctions::setTips (i18n ("<p>Use Internet Explorer functions for accessing the internet from R. "
-									"Enabling this option may help in case of problems with accessing the internet from R (e.g. for "
-									"installing packages).</p>"), internet2_input, label);
-#endif
-
 	grid->addWidget (new QLabel (i18n ("Further (option) commands to run in each session"), this), ++row, 0, 1, 2);
 	further_input = new QTextEdit (this);
 	further_input->setWordWrapMode (QTextOption::NoWrap);
@@ -250,9 +238,6 @@ void RKSettingsModuleR::applyChanges () {
 	options_editor = editor_input->currentText ();
 	options_pager = pager_input->currentText ();
 	options_further = further_input->toPlainText ();
-#ifdef Q_OS_WIN
-	options_internet2 = internet2_input->isChecked ();
-#endif
 
 // apply run time options in R
 	QStringList commands = makeRRunTimeOptionCommands ();
@@ -285,9 +270,6 @@ QStringList RKSettingsModuleR::makeRRunTimeOptionCommands () {
 	if (options_pager == builtin_editor) list.append ("options (pager=rk.show.files)\n");
 	else list.append ("options (pager=\"" + options_pager + "\")\n");
 	if (!options_further.isEmpty ()) list.append (options_further + '\n');
-#ifdef Q_OS_WIN
-	list.append (QString ("setInternet2 (") + (options_internet2 ? "TRUE)\n" : "FALSE)\n"));
-#endif
 
 #ifdef __GNUC__
 #	warning TODO make the following options configurable
@@ -322,9 +304,6 @@ void RKSettingsModuleR::saveSettings (KConfig *config) {
 	cg.writeEntry ("editor", options_editor);
 	cg.writeEntry ("pager", options_pager);
 	cg.writeEntry ("further init commands", options_further);
-#ifdef Q_OS_WIN
-	cg.writeEntry ("internet2", options_internet2);
-#endif
 }
 
 void RKSettingsModuleR::loadSettings (KConfig *config) {
@@ -344,10 +323,6 @@ void RKSettingsModuleR::loadSettings (KConfig *config) {
 	options_editor = cg.readEntry ("editor", builtin_editor);
 	options_pager = cg.readEntry ("pager", builtin_editor);
 	options_further = cg.readEntry ("further init commands", QString ());
-#ifdef Q_OS_WIN
-	options_internet2 = cg.readEntry ("internet2", true);
-	if (RKSettingsModuleGeneral::storedConfigVersion () < RKSettingsModuleGeneral::RKWardConfig_0_6_4) options_internet2 = true;
-#endif
 }
 
 //#################################################
diff --git a/rkward/settings/rksettingsmoduler.h b/rkward/settings/rksettingsmoduler.h
index bc124833..d0cc6a53 100644
--- a/rkward/settings/rksettingsmoduler.h
+++ b/rkward/settings/rksettingsmoduler.h
@@ -71,7 +71,6 @@ private:
 	QComboBox *editor_input;
 	QComboBox *pager_input;
 	QTextEdit *further_input;
-	QCheckBox *internet2_input;
 
 	static QString options_outdec;
 	static int options_width;
@@ -86,7 +85,6 @@ private:
 	static QString options_editor;
 	static QString options_pager;
 	static QString options_further;
-	static bool options_internet2;
 
 // constants
 	static QString builtin_editor;