Mercurial > hg > octave-lyh
view libinterp/interpfcn/octave-link.h @ 16437:919796a440c6
use signal for changing directory
* files-dockwidget.cc (files_dock_widget::files_dock_widget):
Set title to "File Browser", not "Current Directory".
* files-dockwidget.h, files-dockwidget.cc
(files_dock_widget::change_directory_up): Rename from
files_dock_widget::do_up_directory. Change all uses.
(files_dock_widget::_last_current_directory): Delete variable and all
uses.
(files_dock_widget::accept_directory_line_edit): Rename from
handle_directory_entered. Change all uses.
(files_dock_widget::item_double_clicked): Call set_current_directory
instead of display_directory.
(files_dock_widget::set_current_directory): Also emit
displayed_directory_changed signal.
(files_dock_widget::display_directory): Sort list. Don't emit
displayed_directory_changed.
private:
* file-editor-tab.cc (file_editor_tab::run_file): Delete unused local
variable current_path.
* main-window.h, main-window.cc
(main_window::current_working_directory_has_changed): Delete function
and all uses.
(main_window::browse_for_directory): Rename from
main_window::change_current_working_directory. Change all uses.
(main_window::change_directory): Rename from
main_window::set_current_working_directory. Change all uses. Update
display.
(main_window::change_directory_up): Rename from
main_window::current_working_directory_up. Change all uses. Use
absolute path for ".." directory.
(main_window::accept_directory_line_edit): Rename from
main_window::current_working_directory_entered. Change all uses.
(main_window::construct): Set initial working directory to current
directory at startup.
* octave-qt-link.h, octave-qt-link.cc
(octave_qt_link::do_change_directory): New function.
(octave_qt_link::change_directory_signal): New signal.
* octave-event-listener.h
(octave_event_listener::current_directory_has_changed): Delete.
* dirfns.cc (octave_change_to_directory): Also call
octave_link::change_directory.
* octave-link.h, octave-link.cc (octave_link::last_cwd): Delete
variable and all uses.
(octave_link::do_generate_events): Don't track current directory or
post directory changed event.
(octave_link::last_working_directory,
octave_link::do_last_working_directory): Delete.
(octave_link::do_change_directory): Rename from
octave_link::do_last_working_directory.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 05 Apr 2013 00:40:12 -0400 |
parents | 5982d469f79b |
children | a971d8bdaadc |
line wrap: on
line source
/* Copyright (C) 2013 John W. Eaton Copyright (C) 2011-2012 Jacob Dawid Copyright (C) 2011-2012 John P. Swensen 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/>. */ #if !defined (octave_link_h) #define octave_link_h 1 #include <string> #include "event-queue.h" #include "octave-event-listener.h" class octave_mutex; class string_vector; // \class OctaveLink // \brief Provides threadsafe access to octave. // \author Jacob Dawid // // This class is a wrapper around octave and provides thread safety by // buffering access operations to octave and executing them in the // readline event hook, which lives in the octave thread. class octave_link { protected: octave_link (void); public: virtual ~octave_link (void) { } static void register_event_listener (octave_event_listener *el) { if (instance_ok ()) instance->do_register_event_listener (el); } static void generate_events (void) { if (instance_ok ()) instance->do_generate_events (); } static void process_events (void) { if (instance_ok ()) instance->do_process_events (); } template <class T> static void post_event (T *obj, void (T::*method) (void)) { if (instance_ok ()) instance->do_post_event (obj, method); } template <class T, class A> static void post_event (T *obj, void (T::*method) (A), A arg) { if (instance_ok ()) instance->do_post_event (obj, method, arg); } template <class T, class A> static void post_event (T *obj, void (T::*method) (const A&), const A& arg) { if (instance_ok ()) instance->do_post_event (obj, method, arg); } static void about_to_exit (void) { if (instance_ok ()) instance->do_about_to_exit (); } static void entered_readline_hook (void) { if (instance_ok ()) instance->do_entered_readline_hook (); } static void finished_readline_hook (void) { if (instance_ok ()) instance->do_finished_readline_hook (); } static void change_directory (const std::string& dir) { if (instance_ok ()) instance->do_change_directory (dir); } static void update_workspace (void) { if (instance_ok ()) instance->do_update_workspace (); } static void set_history (const string_vector& hist) { if (instance_ok ()) instance->do_set_history (hist); } static void append_history (const std::string& hist_entry) { if (instance_ok ()) instance->do_append_history (hist_entry); } static void clear_history (void) { if (instance_ok ()) instance->do_clear_history (); } static void pre_input_event (void) { if (instance_ok ()) instance->do_pre_input_event (); } static void post_input_event (void) { if (instance_ok ()) instance->do_post_input_event (); } static void enter_debugger_event (const std::string& file, int line) { if (instance_ok ()) instance->do_enter_debugger_event (file, line); } static void exit_debugger_event (const std::string& file, int line) { if (instance_ok ()) instance->do_exit_debugger_event (file, line); } static void update_breakpoint (bool insert, const std::string& file, int line) { if (instance_ok ()) instance->do_update_breakpoint (insert, file, line); } static bool edit_file (const std::string& file) { return instance_ok () ? instance->do_edit_file (file) : false; } static void connect_link (octave_link *); private: static octave_link *instance; static void cleanup_instance (void) { delete instance; instance = 0; } // No copying! octave_link (const octave_link&); octave_link& operator = (const octave_link&); static bool instance_ok (void); protected: octave_event_listener *event_listener; // Semaphore to lock access to the event queue. octave_mutex *event_queue_mutex; // Event Queue. event_queue gui_event_queue; bool debugging; void do_register_event_listener (octave_event_listener *oel); void do_generate_events (void); void do_process_events (void); template <class T> void do_post_event (T *obj, void (T::*method) (void)) { gui_event_queue.add_method (obj, method); } template <class T, class A> void do_post_event (T *obj, void (T::*method) (A), A arg) { gui_event_queue.add_method (obj, method, arg); } template <class T, class A> void do_post_event (T *obj, void (T::*method) (const A&), const A& arg) { gui_event_queue.add_method (obj, method, arg); } void do_about_to_exit (void); void do_entered_readline_hook (void) { } void do_finished_readline_hook (void) { } virtual void do_change_directory (const std::string& dir) = 0; virtual void do_update_workspace (void) = 0; virtual void do_set_history (const string_vector& hist) = 0; virtual void do_append_history (const std::string& hist_entry) = 0; virtual void do_clear_history (void) = 0; virtual void do_pre_input_event (void) = 0; virtual void do_post_input_event (void) = 0; virtual void do_enter_debugger_event (const std::string& file, int line) = 0; virtual void do_exit_debugger_event (const std::string& file, int line) = 0; virtual void do_update_breakpoint (bool insert, const std::string& file, int line) = 0; virtual bool do_edit_file (const std::string& file) = 0; }; #endif // OCTAVELINK_H