[rkward/frameworks] /: Fix a few TODOs

Wed Mar 16 21:03:30 UTC 2016

Git commit e325f8d00cb761edb59367df505bc96d768e6e9c by Thomas Friedrichsmeier.
Committed on 16/03/2016 at 21:03.
Pushed by tfry into branch 'frameworks'.

Fix a few TODOs

M  +1    -2    TODO
M  +1    -1    rkward/dialogs/rkloadlibsdialog.cpp
M  +0    -2    rkward/misc/rkdbusapi.cpp
M  +0    -1    rkward/misc/rkstandardactions.cpp
M  +2    -2    rkward/misc/rkxmlguipreviewarea.cpp
M  +1    -1    rkward/misc/rkxmlguipreviewarea.h
M  +2    -6    rkward/rkward_startup_wrapper.cpp
M  +1    -1    rkward/settings/rksettingsmodulegraphics.cpp
M  +1    -1    rkward/settings/rksettingsmoduleoutput.cpp
M  +7    -0    rkward/windows/rkcommandeditorwindow.cpp
M  +1    -0    rkward/windows/rkcommandeditorwindow.h
M  +1    -1    rkward/windows/rkwindowcatcher.h

http://commits.kde.org/rkward/e325f8d00cb761edb59367df505bc96d768e6e9c

diff --git a/TODO b/TODO
index 1e96aaa..d68ff16 100644
--- a/TODO
+++ b/TODO
@@ -5,8 +5,6 @@ All in all, this TODO list is mostly for internal purposes, and many parts may n
 KF5 port:
 Things to do:
 - Grep for "KF5 TODO"
-- Remove katepart status bar from all previews (including in wizard)
-- Replace Q_WS_* and Q_OS_X11 as appropriate
 Things to test at the end:
 - Everthing concerning loading / saving, from recent files, scripts, workspace, etc.
   - Moved installations, moved workspaces.
@@ -27,6 +25,7 @@ Upcoming porting efforts: Port from QtScript to QJSEngine:
 
 Port from QtWebKit to QtWebEngine
 - Should be mostly unproblematic
+  - Gah, QWebEngine does not compile with MinGW! Need some entirely custom solution, instead? https://github.com/GreatTux/CefMinGWQt
 - Somewhat unfortunate that QWebElement will be gone. We might be using this to amend the context menu, e.g. for copying one section to clipboard / deleting one section, etc.
   - Could perhaps be done by catching contextmenu event in JS, instead, then send to frontend, somehow.
 
diff --git a/rkward/dialogs/rkloadlibsdialog.cpp b/rkward/dialogs/rkloadlibsdialog.cpp
index 737f22f..9b013a4 100644
--- a/rkward/dialogs/rkloadlibsdialog.cpp
+++ b/rkward/dialogs/rkloadlibsdialog.cpp
@@ -703,7 +703,7 @@ InstallPackagesWidget::InstallPackagesWidget (RKLoadLibsDialog *dialog) : QWidge
 	RKCommonFunctions::setTips (i18n ("<p>You can limit the packages displayed in the list to with names or titles matching a filter string.</p>") + filter_edit->regexpTip (), label, filter_edit);
 	filter_edit->setModelToFilter (model);
 	// NOTE: Although the search line sets the filter in the model, automatically, we connect it, here, in order to expand new and updateable sections, when the filter changes.
-	connect (filter_edit, SIGNAL (searchChanged(QRegExp)), this, SLOT (filterChanged()));    // KF5 TODO
+	connect (filter_edit, &RKDynamicSearchLine::searchChanged, this, &InstallPackagesWidget::filterChanged);
 	rkward_packages_only = new QCheckBox (i18n ("Show only packages providing RKWard dialogs"), this);
 	RKCommonFunctions::setTips (i18n ("<p>Some but not all R packages come with plugins for RKWard. That means they provide a graphical user-interface in addition to R functions. Check this box to show only such packages.</p><p></p>"), rkward_packages_only);
 	connect (rkward_packages_only, &QCheckBox::stateChanged, this, &InstallPackagesWidget::filterChanged);
diff --git a/rkward/misc/rkdbusapi.cpp b/rkward/misc/rkdbusapi.cpp
index c862fee..bcdac13 100644
--- a/rkward/misc/rkdbusapi.cpp
+++ b/rkward/misc/rkdbusapi.cpp
@@ -48,11 +48,9 @@ void RKDBusAPI::openAnyUrl (const QStringList& urls, bool warn_external) {
 	main->show();
 	main->activateWindow();
 	main->raise();
-#ifdef Q_WS_X11
 	KWindowSystem::forceActiveWindow (main->winId ());
 	KWindowSystem::raiseWindow (main->winId ());
 	KWindowSystem::demandAttention (main->winId ());
-#endif
 	// end
 
 	RKWardMainWindow::getMain ()->openUrlsFromCommandLineOrDBus (warn_external, urls);
diff --git a/rkward/misc/rkstandardactions.cpp b/rkward/misc/rkstandardactions.cpp
index ae9fc55..652c42b 100644
--- a/rkward/misc/rkstandardactions.cpp
+++ b/rkward/misc/rkstandardactions.cpp
@@ -179,7 +179,6 @@ private:
 QAction* RKStandardActions::onlineHelp (RKMDIWindow *window, RKScriptContextProvider *context_provider) {
 	RK_TRACE (MISC);
 
-	// KF5 TODO: Add / replace with submenu to select search provider -> KUriFilterSearchProviderActions
 	QAction* ret = new RKSearchOnlineHelpAction (window, context_provider);
 	window->standardActionCollection ()->addAction ("search_online", ret);
 	return ret;
diff --git a/rkward/misc/rkxmlguipreviewarea.cpp b/rkward/misc/rkxmlguipreviewarea.cpp
index 43aa635..b50962a 100644
--- a/rkward/misc/rkxmlguipreviewarea.cpp
+++ b/rkward/misc/rkxmlguipreviewarea.cpp
@@ -40,8 +40,7 @@ RKXMLGUIPreviewArea::RKXMLGUIPreviewArea (QWidget* parent) : KXmlGuiWindow (pare
 	menu_button->setPopupMode (QToolButton::InstantPopup);
 	menu_button->setIcon (RKStandardIcons::getIcon (RKStandardIcons::ActionShowMenu));
 	menu_button->setMenu (menu = new QMenu ());
-	// KF5 TODO:
-	connect (menu, SIGNAL (aboutToShow()), this, SLOT (prepareMenu()));
+	connect (menu, &QMenu::aboutToShow, this, &RKXMLGUIPreviewArea::prepareMenu);
 	current = 0;
 	setWindowFlags (Qt::Widget);
 	setMenuBar (new QMenuBar (this));
@@ -71,6 +70,7 @@ void RKXMLGUIPreviewArea::childEvent (QChildEvent *event) {
 				removeChildClient (current);
 				factory ()->removeClient (current);  // _always_ remove before adding, or the previous child will be leaked in the factory
 			}
+			child->setWindowStyleHint ("preview");
 			current = child->getPart ();
 			insertChildClient (current);
 			setCentralWidget (child);
diff --git a/rkward/misc/rkxmlguipreviewarea.h b/rkward/misc/rkxmlguipreviewarea.h
index 4981b8e..177a204 100644
--- a/rkward/misc/rkxmlguipreviewarea.h
+++ b/rkward/misc/rkxmlguipreviewarea.h
@@ -36,7 +36,7 @@ public:
 protected:
 	/** build / destroy menu, when child is added removed. Note that we are in the fortunate situation that RKMDIWindow-children only ever get to the
 	 *  preview area via reparenting, i.e. contrary to usual QEvent::ChildAdded semnatics, they are always fully constructed, when added. */
-	void childEvent (QChildEvent *event);  // KF5 TODO: override keyword
+	void childEvent (QChildEvent *event) override;
 protected slots:
 	void prepareMenu ();
 private:
diff --git a/rkward/rkward_startup_wrapper.cpp b/rkward/rkward_startup_wrapper.cpp
index 879c897..d42577d 100644
--- a/rkward/rkward_startup_wrapper.cpp
+++ b/rkward/rkward_startup_wrapper.cpp
@@ -204,14 +204,10 @@ int main (int argc, char *argv[]) {
 	QDir kde_dir (QFileInfo (marker_exe).absolutePath ());
 	kde_dir.makeAbsolute ();
 	QString kde_dir_safe_path = quoteCommand (kde_dir.path ());
-        if (syspath.indexOf (kde_dir.path ()) < 0) {
+	if (syspath.indexOf (kde_dir.path ()) < 0) {
 		if (debug_level > 3) qDebug ("Adding %s to the system path", qPrintable (kde_dir_safe_path));
-	qputenv ("PATH", QString (kde_dir_safe_path + PATH_VAR_SEP + qgetenv ("PATH")).toLocal8Bit ());
+		qputenv ("PATH", QString (kde_dir_safe_path + PATH_VAR_SEP + qgetenv ("PATH")).toLocal8Bit ());
 	}
-/* KF5 TODO: Still needed? 
-	// important if RKWard is not in KDEPREFIX/bin but e.g. KDEPREFIX/lib/libexec
-	qputenv ("RKWARD_ENSURE_PREFIX", kde_dir_safe_path.toLocal8Bit ());
-	if (debug_level > 3) qDebug ("Setting environment variable RKWARD_ENSURE_PREFIX=%s", qPrintable (kde_dir_safe_path)); */
 
 	QString rkward_frontend_exe = findRKWardAtPath (app.applicationDirPath ());	// this is for running directly from a build tree
 #ifdef Q_OS_MAC
diff --git a/rkward/settings/rksettingsmodulegraphics.cpp b/rkward/settings/rksettingsmodulegraphics.cpp
index 91248a9..cacee0d 100644
--- a/rkward/settings/rksettingsmodulegraphics.cpp
+++ b/rkward/settings/rksettingsmodulegraphics.cpp
@@ -90,7 +90,7 @@ RKSettingsModuleGraphics::RKSettingsModuleGraphics (RKSettings *gui, QWidget *pa
 	button = new QRadioButton (i18n ("Embed original device"), group);
 	replace_standard_devices_group->addButton (button, (int) EmbedDevice);
 	group_layout->addWidget (button);
-#if not (defined Q_WS_X11 || defined Q_OS_WIN)
+#ifndef Q_OS_MAC
 	button->setEnabled (false);
 #endif
 	button = new QRadioButton (i18n ("No device integration"), group);
diff --git a/rkward/settings/rksettingsmoduleoutput.cpp b/rkward/settings/rksettingsmoduleoutput.cpp
index 0a0e6ec..dcb80c6 100644
--- a/rkward/settings/rksettingsmoduleoutput.cpp
+++ b/rkward/settings/rksettingsmoduleoutput.cpp
@@ -169,7 +169,7 @@ RKSettingsModuleOutput::RKSettingsModuleOutput (RKSettings *gui, QWidget *parent
 	main_vbox->addWidget (group);
 
 	custom_css_file_box = new GetFileNameWidget (this, GetFileNameWidget::ExistingFile, true, i18n ("CSS file to use for output (leave empty for default)"), i18n ("Select CSS file"), QString ());
-	connect (custom_css_file_box, SIGNAL (locationChanged()), this, SLOT (boxChanged()));  // KF5 TODO new syntax
+	connect (custom_css_file_box, &GetFileNameWidget::locationChanged, this, &RKSettingsModuleOutput::boxChanged);
 	RKCommonFunctions::setTips (i18n ("Select a CSS file for custom formatting of the output window. Leave empty to use the default CSS file shipped with RKWard. Note that this setting takes effect, when initializing an output file (e.g. after flushing the output), only."), custom_css_file_box);
 	main_vbox->addWidget (custom_css_file_box);
 
diff --git a/rkward/windows/rkcommandeditorwindow.cpp b/rkward/windows/rkcommandeditorwindow.cpp
index c4356ca..0ce8c30 100644
--- a/rkward/windows/rkcommandeditorwindow.cpp
+++ b/rkward/windows/rkcommandeditorwindow.cpp
@@ -337,6 +337,13 @@ void RKCommandEditorWindow::closeEvent (QCloseEvent *e) {
 	QWidget::closeEvent (e);
 }
 
+void RKCommandEditorWindow::setWindowStyleHint (const QString& hint) {
+	RK_TRACE (COMMANDEDITOR);
+
+	m_view->setStatusBarEnabled (hint != "preview");
+	RKMDIWindow::setWindowStyleHint (hint);
+}
+
 void RKCommandEditorWindow::copy () {
 	RK_TRACE (COMMANDEDITOR);
 
diff --git a/rkward/windows/rkcommandeditorwindow.h b/rkward/windows/rkcommandeditorwindow.h
index 4e044b2..2a152cf 100644
--- a/rkward/windows/rkcommandeditorwindow.h
+++ b/rkward/windows/rkcommandeditorwindow.h
@@ -208,6 +208,7 @@ public slots:
 protected:
 /** reimplemented from RKMDIWindow: give the editor window a chance to object to being closed (if unsaved) */
 	void closeEvent (QCloseEvent *e) override;
+	void setWindowStyleHint (const QString& hint) override;
 private slots:
 /** mark current selection as a block */
 	void markBlock ();
diff --git a/rkward/windows/rkwindowcatcher.h b/rkward/windows/rkwindowcatcher.h
index 3d44d30..33534eb 100644
--- a/rkward/windows/rkwindowcatcher.h
+++ b/rkward/windows/rkwindowcatcher.h
@@ -170,7 +170,7 @@ public slots:
 /** reimplemented to keep window alive while saving history */
 	bool close (bool also_delete) override;
 	void setKilledInR () { killed_in_r = true; };
-	void setWindowStyleHint (const QString& hint); // KF5 TODO: add override keyword
+	void setWindowStyleHint (const QString& hint) override;
 private slots:
 	void doEmbed ();
 private:

