Mercurial > octave-nkf
comparison libgui/src/settings-dialog.h @ 19698:ff56a9899101
fix new shortcut dialog when applying new settings (fix #44196)
* settings-dialog.cc (write_changed_settings): new boolean parameter whether
settings dialog is closing or not, calling function for writing the shortcuts
with this parameter;
(button_clicked): calling write_changed_settings with new flag set to false
when button with accept role was clicked
* settings-dialog.h: write_changed_settings with boolean parameter
* shortcut-manager.cc (do_write_shortcuts): delete shortcut dialog only if
settings dialog is closing, setting to 0 after deletion;
(do_import_export): call do_write_shortcuts with new flag
* shortcut-manager.h: do_/write_shortcuts with new boolean parameter
| author | Torsten <ttl@justmail.de> |
|---|---|
| date | Fri, 06 Feb 2015 22:55:01 +0100 |
| parents | 101ce4eaa56c |
| children | 4197fc428c7d |
comparison
equal
deleted
inserted
replaced
| 19697:dfea01b3425f | 19698:ff56a9899101 |
|---|---|
| 72 int get_valid_lexer_styles (QsciLexer *lexer, int styles[]); | 72 int get_valid_lexer_styles (QsciLexer *lexer, int styles[]); |
| 73 enum { MaxLexerStyles = 64, | 73 enum { MaxLexerStyles = 64, |
| 74 MaxStyleNumber = 128 }; | 74 MaxStyleNumber = 128 }; |
| 75 #endif | 75 #endif |
| 76 | 76 |
| 77 void write_changed_settings (); | 77 void write_changed_settings (bool closing); |
| 78 | 78 |
| 79 void read_workspace_colors (QSettings *settings); | 79 void read_workspace_colors (QSettings *settings); |
| 80 void write_workspace_colors (QSettings *settings); | 80 void write_workspace_colors (QSettings *settings); |
| 81 | 81 |
| 82 void read_terminal_colors (QSettings *settings); | 82 void read_terminal_colors (QSettings *settings); |