Mercurial > octave
diff libgui/src/gui-preferences-global.h @ 29511:2a4980872234
remove default-qt-settings
* configure.ac: remove mk-default-qt-settings.sh from
OCTAVE_CONFIG_MOVE_IF_CHANGE_FILES
* default-qt-settings.in: remove file
* libgui/module.mk: remove all occurrences of default-qt-settings and
mk-default-qt-settings.in.sh
* gui-preferences-global.h: set defaults for the custom editor
depending on the target system here and not in the resource
manager
* resource-manager.cc (default_qt_settings_file): remove;
(reload_settings): if settings file does not yet exist, determine
default font and custom editor - possibly from environment variable -
and write them into the newly created settings file, otherwise
use existing settings file;
(set_settings): create settings and write a test settings to make
sure a newly created file does really exist
* run-octave.in: remove setting the environment variable
OCTAVE_DEFAULT_QT_SETTINGS
author | Torsten Lilge <ttl-octave@mailbox.org> |
---|---|
date | Thu, 08 Apr 2021 21:19:10 +0200 |
parents | 7854d5752dd2 |
children | 0b429d1a4974 |
line wrap: on
line diff
--- a/libgui/src/gui-preferences-global.h Thu Apr 08 13:20:17 2021 -0400 +++ b/libgui/src/gui-preferences-global.h Thu Apr 08 21:19:10 2021 +0200 @@ -115,8 +115,14 @@ const gui_pref global_use_custom_editor ("useCustomFileEditor", QVariant (false)); + +#if defined (Q_OS_WIN32) +const gui_pref +global_custom_editor ("customFileEditor", QVariant ("notepad++ -n%l %f")); +#else const gui_pref global_custom_editor ("customFileEditor", QVariant ("emacs +%l %f")); +#endif const gui_pref global_prompt_to_exit ("prompt_to_exit", QVariant (false));