[rkward/releases/0.6.5] /: Fix setting output CSS file via GUI.

[Thomas Friedrichsmeier]

Git commit a3fa002f3b4571e487bc2c715b8be88374e0dee2 by Thomas Friedrichsmeier.
Committed on 05/04/2016 at 18:35.
Pushed by tfry into branch 'releases/0.6.5'.

Fix setting output CSS file via GUI.

BUG: 361370

M  +2    -1    ChangeLog
M  +3    -1    rkward/settings/rksettingsmoduleoutput.cpp

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

diff --git a/ChangeLog b/ChangeLog
index 202e1a0..6cb32c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 --- Version 0.6.5a - UNRELEASED
-- Fix bug report feature on Windows 		TODO: Really test this!
+- Fixed: Setting an output CSS file via the GUI did not work
+- Fixed: Bug report feature on Windows did nothing 		TODO: Really test this!
 - Avoid some potential encoding issues, that could cause graphical select.list to fail for certain strings, under some circumstances
 
 --- Version 0.6.5 - Apr-02-2016
diff --git a/rkward/settings/rksettingsmoduleoutput.cpp b/rkward/settings/rksettingsmoduleoutput.cpp
index 07ff5b6..7d78436 100644
--- a/rkward/settings/rksettingsmoduleoutput.cpp
+++ b/rkward/settings/rksettingsmoduleoutput.cpp
@@ -168,7 +168,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 ());
+	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"), custom_css_file);
 	connect (custom_css_file_box, SIGNAL (locationChanged()), this, SLOT (boxChanged()));  // KF5 TODO new syntax
 	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);
@@ -235,6 +235,8 @@ void RKSettingsModuleOutput::applyChanges () {
 	auto_show = auto_show_box->isChecked ();
 	auto_raise = auto_raise_box->isChecked ();
 
+	custom_css_file = custom_css_file_box->getLocation ();
+
 	graphics_type = graphics_type_box->itemData (graphics_type_box->currentIndex ()).toString ();
 	graphics_width = graphics_width_box->value ();
 	graphics_height = graphics_height_box->value ();