Mercurial > octave-nkf
view 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 |
line wrap: on
line source
/* Copyright (C) 2011-2013 Jacob Dawid This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #ifndef SETTINGSDIALOG_H #define SETTINGSDIALOG_H #include <QDialog> #include <QSettings> #include <QLineEdit> #include "color-picker.h" #ifdef HAVE_QSCINTILLA class QsciLexer; #endif namespace Ui { class settings_dialog; } class settings_dialog:public QDialog { Q_OBJECT public: explicit settings_dialog (QWidget * parent, const QString& desired_tab = QString ()); ~settings_dialog (); void show_tab (const QString&); signals: void apply_new_settings (); private slots: void get_octave_dir (); void get_file_browser_dir (); void get_dir (QLineEdit*, const QString&); void set_disabled_pref_file_browser_dir (bool disable); // slots for dialog's buttons void button_clicked (QAbstractButton *button); // slots for import/export-buttons of shortcut sets void import_shortcut_set1 (); void export_shortcut_set1 (); void import_shortcut_set2 (); void export_shortcut_set2 (); private: Ui::settings_dialog * ui; #ifdef HAVE_QSCINTILLA void read_lexer_settings (QsciLexer *lexer, QSettings *settings); void write_lexer_settings (QsciLexer *lexer, QSettings *settings); int get_valid_lexer_styles (QsciLexer *lexer, int styles[]); enum { MaxLexerStyles = 64, MaxStyleNumber = 128 }; #endif void write_changed_settings (bool closing); void read_workspace_colors (QSettings *settings); void write_workspace_colors (QSettings *settings); void read_terminal_colors (QSettings *settings); void write_terminal_colors (QSettings *settings); color_picker *_widget_title_bg_color; color_picker *_widget_title_bg_color_active; color_picker *_widget_title_fg_color; color_picker *_widget_title_fg_color_active; color_picker *_editor_current_line_color; }; #endif // SETTINGSDIALOG_H