Mercurial > octave
diff libgui/src/m-editor/file-editor-tab.h @ 25883:cfdc768b661c
allow native dialogs for remaining file open/save dialogs (bug #5
* files-dock-widget.cc (popdownmenu_search_dir): allow native dialogs for
selecting a new file browser directory
* file-editor-tab.cc (load_file): read file in binary form and test for errors
when decoding text using the currently set default encoding, allows user
to continue editing or close the file in case of invalid characters;
(handle_decode_warning_answer): analyze users choice in case of
detection of invalid chars during decoding
(save_file_as): allow native dialogs for file selection dialog and remove
the extra items for encoding and line ending from the dialog;
(handle_combo_eol_current_index, handle_combo_enc_current_index):
removed obsolete slots for removed dialog items
* file-editor-tab.h: update includes, new slot handle_decode_warning_answer,
removed slots handle_combo_eol_current_index, handle_combo_enc_current_index
* main-window.cc (request_open_file): allow native file dialogs and remove
extra items for selecting encoding and line ending from the dialog
* shortcut-manager.cc (do_import_export): allow native file dialogs
* variable-editor.cc (variable_editor_stack::save): allow native file dialogs
author | Torsten <mttl@mailbox.org> |
---|---|
date | Fri, 14 Sep 2018 18:47:23 +0200 |
parents | c89fa0989e7b |
children | bb0c58796275 |
line wrap: on
line diff
--- a/libgui/src/m-editor/file-editor-tab.h Thu Sep 13 16:24:18 2018 -0400 +++ b/libgui/src/m-editor/file-editor-tab.h Fri Sep 14 18:47:23 2018 +0200 @@ -23,6 +23,7 @@ #if ! defined (octave_file_editor_tab_h) #define octave_file_editor_tab_h 1 +#include <QAbstractButton> #include <QWidget> #include <QCloseEvent> #include <QDateTime> @@ -32,7 +33,6 @@ #include <Qsci/qsciapis.h> #include <QStatusBar> #include <QLabel> -#include <QComboBox> #include "find-dialog.h" #include "octave-qscintilla.h" @@ -194,6 +194,9 @@ private slots: + // When user closes message box for decoding problems + void handle_decode_warning_answer (QAbstractButton *btn); + // When user closes message box for reload question. void handle_file_reload_answer (int decision); @@ -211,8 +214,6 @@ void handle_save_file_as_answer_close (const QString& fileName); void handle_save_file_as_answer_cancel (void); void handle_save_as_filter_selected (const QString& filter); - void handle_combo_eol_current_index (int index); - void handle_combo_enc_current_index (QString text); // When apis preparation has finished and is ready to save void save_apis_info (void);