Mercurial > octave

diff libgui/src/resource-manager.cc @ 17515:c8c0dff02538

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gui: welcome wizard with new message text * resource-manager.cc(do_get_settings_path): new function for the path of the settings path (do_get_settings_file): new function for the name of the settings file (do_reload_settings): use new functions do_get_settings_path and -file * resource-manager.h(get_settings_file): new static function returning the the name of the settings file; new internal functions do_get_settings_path and do_get_settings_file * welcome-wizard.ui: removed extra pages, new text messages * welcome-wizard.cc(constructor): no more buttons to connect, replace placeholder by the settings file name (next,previous): remove unnecessary functions * welcome-wizard.h: removed unnecessary functions next and previous
author Torsten <ttl@justmail.de>
date Sun, 29 Sep 2013 20:56:39 +0200
parents 096280194ca3
children d63878346099
line wrap: on
line diff
--- a/libgui/src/resource-manager.cc	Sat Sep 28 17:36:27 2013 -0700
+++ b/libgui/src/resource-manager.cc	Sun Sep 29 20:56:39 2013 +0200
@@ -153,13 +153,28 @@
   return home_path;
 }
 
+QString
+resource_manager::do_get_settings_path (void)
+{
+  QDesktopServices desktopServices;
+  home_path = desktopServices.storageLocation (QDesktopServices::HomeLocation);
+  QString settings_path = home_path + "/.config/octave/";
+  return settings_path;
+}
+
+QString
+resource_manager::do_get_settings_file (void)
+{
+  return do_get_settings_path ()  + "qt-settings";
+}
+
 void
 resource_manager::do_reload_settings (void)
 {
   QDesktopServices desktopServices;
   home_path = desktopServices.storageLocation (QDesktopServices::HomeLocation);
-  QString settings_path = home_path + "/.config/octave/";
-  QString settings_file = settings_path + "qt-settings";
+  QString settings_path = do_get_settings_path ();
+  QString settings_file = do_get_settings_file ();
 
   if (!QFile::exists (settings_file))
     {