Mercurial > octave
comparison libgui/src/main-window.h @ 29206:a0a892829b6d
fix handling global shortcuts when preventing conflicts with readline
* main-window.cc (focus_changed): check for focus changes of the
terminal widget and reconfigure the shortcuts is required;
(notice_settings): use the derived gui_settings::value method
for shorter code, remove call to obsolete set_global_shortcuts;
(set_global_shortcuts) remove obsolete method
(configure_shortcuts): test for terminal having focus and whether
conflicts with readline have to be avoided, call set_shortcut with
the resulting flag, making set_global_shortcuts obsolete;
* main-window.h: remove set_global_shortcuts
* shortcut-manager.cc (set_shortcut): add boolean argument for
setting an empty shortcuts if shortcuts should be disabled
* shortcut-manager.h: set_shirtcut with additional boolean argument
| author | Torsten Lilge <ttl-octave@mailbox.org> |
|---|---|
| date | Sun, 20 Dec 2020 18:08:57 +0100 |
| parents | 6e0952fa5a4f |
| children | 7854d5752dd2 |
comparison
equal
deleted
inserted
replaced
| 29205:5749eec4e2f2 | 29206:a0a892829b6d |
|---|---|
| 227 //!@{ | 227 //!@{ |
| 228 void find_files (const QString& startdir = QDir::currentPath ()); | 228 void find_files (const QString& startdir = QDir::currentPath ()); |
| 229 void find_files_finished (int) { } | 229 void find_files_finished (int) { } |
| 230 //!@} | 230 //!@} |
| 231 | 231 |
| 232 //! Setting global shortcuts. | |
| 233 | |
| 234 void set_global_shortcuts (bool enable); | |
| 235 | |
| 236 void set_screen_size (int ht, int wd); | 232 void set_screen_size (int ht, int wd); |
| 237 | 233 |
| 238 //! Handling the clipboard. | 234 //! Handling the clipboard. |
| 239 //!@{ | 235 //!@{ |
| 240 void clipboard_has_changed (void); | 236 void clipboard_has_changed (void); |