diff libgui/src/m-editor/file-editor.h @ 23379:2a122c3fd80f

Backed out changeset 2cee3976d88f
author Torsten <mttl@mailbox.org>
date Sun, 09 Apr 2017 22:21:46 +0200
parents 2cee3976d88f
children c319e6d737f2
line wrap: on
line diff
--- a/libgui/src/m-editor/file-editor.h	Sun Apr 09 20:08:15 2017 +0200
+++ b/libgui/src/m-editor/file-editor.h	Sun Apr 09 22:21:46 2017 +0200
@@ -205,6 +205,7 @@
   bool check_closing (void);
 
   void request_new_file (const QString& commands);
+  void request_open_file (void);
   void request_close_file (bool);
   void request_close_all_files (bool);
   void request_close_other_files (bool);
@@ -297,6 +298,7 @@
 
 private slots:
 
+  void request_open_files (const QStringList&);
   void request_open_file (const QString& fileName,
                           const QString& encoding = QString (),
                           int line = -1, bool debug_pointer = false,
@@ -305,6 +307,8 @@
   void request_preferences (bool);
   void request_styles_preferences (bool);
 
+  void handle_combo_enc_current_index (QString new_encoding);
+
   void show_line_numbers (bool);
   void show_white_space (bool);
   void show_eol_chars (bool);
@@ -463,6 +467,8 @@
 
   bool _closed;
 
+  QString _file_encoding;
+
   enum { MaxMRUFiles = 10 };
   QMenu *_mru_file_menu;
   QAction *_mru_file_actions[MaxMRUFiles];