octave-lyh: libgui/src/files-dock-widget.h annotate

annotate libgui/src/files-dock-widget.h @ 16468:0f143f68078d

use signal/slot for updating workspace instead of using event listener * main-window.h, main-window.cc: Clean up list of include files. (main_window::prepare_to_exit): Rename from prepare_to_quit. Change all uses. (main_window::update_workspace): Delete. (main_window::construct): Don't connect _octave_qt_event_listener:update_workspace_signal to main_window::update_workspace. (main_window::construct_octave_qt_link): Connect _octave_qt_link::set_workspace_signal to _workspace_model::set_workspace. Connect _octave_qt_link::clear_workspace_signal to _workspace_model::clear_workspace. * symbol-information.h, symbol-information.cc: Delete * libgui/src/module.mk (noinst_HEADERS, src_libgui_src_la_SOURCES): Remove them from the lists. * octave-qt-link.h, octave-qt-link.cc: Don't use symbol_information to store workspace info. (octave_qt_link::do_update_workspace): Delete. (octave_qt_link::do_set_workspace, octave_qt_link::do_clear_workspace): New functions. (octave_qt_link::do_pre_input_event): Don't call do_update_workspace. (octave_qt_link::set_workspace_signal, octave_qt_link::clear_workspace_signal): New signals. * workspace-model.h, workspace-model.cc: Don't use symbol_information to store workspace info. Accept workspace info through a signal/slot combination, not by asking the symbol table. (workspace_model::request_update_workspace, (workspace_model::update_workspace_callback): Delete. (workspace_model::set_workspace, workspace_model::clear_workspace, workspace_model::clear_data, workspace_model::clear_tree, workspace_model::update_tree, workspace_model::append_tree): New functions. * workspace-view.h, workspace-view.cc (workspace_view::model_changed): Don't call update_workspace_callback. The model now signals the view when it has changed. * input.cc (octave_base_reader::octave_gets, get_debug_input): Call octave_link::set_workspace just prior to prompting for input. * workspace-element.h: New file. * libinterp/interpfcn/module.mk (INTERPFCN_INC): Include it in the list. * octave-link.cc: Don't include symtab.h. * octave-link.h (octave_link::update_workspace): Delete. (octave_link::set_workspace, octave_link::do_set_workspace, * octave_link::clear_workspace, octave_link::do_clear_workspace): New functions. * symtab.h, symtab.cc (symbol_table::workspace_info, symbol_table::do_workspace_info): New functions. * ov.h (octave_value::short_disp): New function. * ov-base.h, ov-base.cc (octave_base_value::short_disp): New function. * ov-base-scalar.h, ov-base-scalar.cc (octave_base_scalar<ST>::short_disp): New function. * ov-range.h, ov-range.cc (octave_range::short_disp): New function.

author	John W. Eaton <jwe@octave.org>
date	Mon, 08 Apr 2013 12:01:24 -0400
parents	094bd3627ead
children	605d7f0ee0d8

rev	line source
15204 359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	1 /*
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	2
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	3 Copyright (C) 2011-2012 Jacob Dawid
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	4
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	5 This file is part of Octave.
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	6
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	7 Octave is free software; you can redistribute it and/or modify it
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	8 under the terms of the GNU General Public License as published by the
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	9 Free Software Foundation; either version 3 of the License, or (at your
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	10 option) any later version.
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	11
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	12 Octave is distributed in the hope that it will be useful, but WITHOUT
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	15 for more details.
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	16
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	17 You should have received a copy of the GNU General Public License
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	18 along with Octave; see the file COPYING. If not, see
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	19 <http://www.gnu.org/licenses/>.
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	20
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	21 */
13495 11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	22
11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	23 #ifndef FILESDOCKWIDGET_H
11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	24 #define FILESDOCKWIDGET_H
11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	25
11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	26 #include <QListView>
11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	27 #include <QDate>
11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	28 #include <QObject>
11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	29 #include <QWidget>
11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	30 #include <QListWidget>
11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	31 #include <QFileSystemModel>
11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	32 #include <QToolBar>
11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	33 #include <QToolButton>
11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	34 #include <QVBoxLayout>
11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	35 #include <QAction>
11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	36 #include <QTreeView>
16413 28136851099a remove _terminal pointer from main_window, it is contained by other Qt object Daniel J Sebald <daniel.sebald@ieee.org> parents: 16057 diff changeset	37 #include <QSettings>
13495 11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	38
11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	39 #include <QLineEdit>
16057 c3057d80cf91 Created common octave_dock_widget class Richard Crozier <richard.crozier@yahoo.co.uk> parents: 15552 diff changeset	40 #include "octave-dock-widget.h"
13495 11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	41
14863 3ff18e21c742 Added a few comments. Jacob Dawid <jacob.dawid@gmail.com> parents: 14803 diff changeset	42 /**
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15300 diff changeset	43 \class files_dock_widget
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15300 diff changeset	44 \brief Dock widget to display files in the current directory.
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15300 diff changeset	45 */
16057 c3057d80cf91 Created common octave_dock_widget class Richard Crozier <richard.crozier@yahoo.co.uk> parents: 15552 diff changeset	46 class files_dock_widget : public octave_dock_widget
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	47 {
13536 869c62c15e95 Few minor improvements, added advanced settings for file browser. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13506 diff changeset	48 Q_OBJECT
16450 3207f1d62e74 improve encapsulation of file browser window object John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	49
3207f1d62e74 improve encapsulation of file browser window object John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	50 public:
3207f1d62e74 improve encapsulation of file browser window object John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	51
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	52 files_dock_widget (QWidget *parent = 0);
16450 3207f1d62e74 improve encapsulation of file browser window object John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	53
15461 1e64aff609c3 save/restore column state and sorting (column and order) in files-widget Torsten <ttl@justmail.de> parents: 15367 diff changeset	54 ~files_dock_widget ();
13536 869c62c15e95 Few minor improvements, added advanced settings for file browser. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13506 diff changeset	55
869c62c15e95 Few minor improvements, added advanced settings for file browser. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13506 diff changeset	56 public slots:
16057 c3057d80cf91 Created common octave_dock_widget class Richard Crozier <richard.crozier@yahoo.co.uk> parents: 15552 diff changeset	57
13536 869c62c15e95 Few minor improvements, added advanced settings for file browser. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13506 diff changeset	58 /** Slot for handling a change in directory via double click. */
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	59 void item_double_clicked (const QModelIndex & index);
13495 11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	60
13536 869c62c15e95 Few minor improvements, added advanced settings for file browser. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13506 diff changeset	61 /** Slot for handling the up-directory button in the toolbar. */
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16413 diff changeset	62 void change_directory_up ();
14863 3ff18e21c742 Added a few comments. Jacob Dawid <jacob.dawid@gmail.com> parents: 14803 diff changeset	63
3ff18e21c742 Added a few comments. Jacob Dawid <jacob.dawid@gmail.com> parents: 14803 diff changeset	64 /** Sets the current directory being displayed. */
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16413 diff changeset	65 void set_current_directory (const QString& dir);
14863 3ff18e21c742 Added a few comments. Jacob Dawid <jacob.dawid@gmail.com> parents: 14803 diff changeset	66
3ff18e21c742 Added a few comments. Jacob Dawid <jacob.dawid@gmail.com> parents: 14803 diff changeset	67 /** Accepts user input a the line edit for the current directory. */
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16413 diff changeset	68 void accept_directory_line_edit ();
14863 3ff18e21c742 Added a few comments. Jacob Dawid <jacob.dawid@gmail.com> parents: 14803 diff changeset	69
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16413 diff changeset	70 void display_directory (const QString& dir);
13495 11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	71
14863 3ff18e21c742 Added a few comments. Jacob Dawid <jacob.dawid@gmail.com> parents: 14803 diff changeset	72 /** Tells the widget to react on changed settings. */
16413 28136851099a remove _terminal pointer from main_window, it is contained by other Qt object Daniel J Sebald <daniel.sebald@ieee.org> parents: 16057 diff changeset	73 void notice_settings (const QSettings *settings);
14863 3ff18e21c742 Added a few comments. Jacob Dawid <jacob.dawid@gmail.com> parents: 14803 diff changeset	74
16461 094bd3627ead move common functionality to octave_dock_widget base class John W. Eaton <jwe@octave.org> parents: 16460 diff changeset	75 signals:
16450 3207f1d62e74 improve encapsulation of file browser window object John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	76
14863 3ff18e21c742 Added a few comments. Jacob Dawid <jacob.dawid@gmail.com> parents: 14803 diff changeset	77 /** Emitted, whenever the user requested to open a file. */
15300 fd27e10b9b05 pass QString by const reference instead of value John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	78 void open_file (const QString& fileName);
14863 3ff18e21c742 Added a few comments. Jacob Dawid <jacob.dawid@gmail.com> parents: 14803 diff changeset	79
3ff18e21c742 Added a few comments. Jacob Dawid <jacob.dawid@gmail.com> parents: 14803 diff changeset	80 /** Emitted, whenever the currently displayed directory changed. */
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16413 diff changeset	81 void displayed_directory_changed (const QString& dir);
13495 11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	82
16461 094bd3627ead move common functionality to octave_dock_widget base class John W. Eaton <jwe@octave.org> parents: 16460 diff changeset	83 private:
13577 e440b3f32f02 Fixed bug with closing subwindows. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13536 diff changeset	84
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	85 // TODO: Add toolbar with buttons for navigating the path, creating dirs, etc
13495 11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	86
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	87 /** Toolbar for file and directory manipulation. */
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	88 QToolBar * _navigation_tool_bar;
13495 11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	89
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	90 /** Variables for the up-directory action. */
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	91 QIcon _directory_icon;
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	92 QAction * _directory_up_action;
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	93 QToolButton * _up_directory_button;
13495 11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	94
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	95 /** The file system model. */
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	96 QFileSystemModel *_file_system_model;
13495 11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	97
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	98 /** The file system view. */
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	99 QTreeView * _file_tree_view;
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	100 QLineEdit * _current_directory;
13495 11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	101 };
11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	102
11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	103 #endif // FILESDOCKWIDGET_H

Mercurial > hg > octave-lyh

annotate libgui/src/files-dock-widget.h @ 16468:0f143f68078d