octave: libgui/src/files-dockwidget.h annotate

annotate libgui/src/files-dockwidget.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	28136851099a
children	3207f1d62e74

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
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15300 diff changeset	49 public:
14863 3ff18e21c742 Added a few comments. Jacob Dawid <jacob.dawid@gmail.com> parents: 14803 diff changeset	50 /** Constructs a new files_dock_widget. */
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	51 files_dock_widget (QWidget *parent = 0);
15461 1e64aff609c3 save/restore column state and sorting (column and order) in files-widget Torsten <ttl@justmail.de> parents: 15367 diff changeset	52 ~files_dock_widget ();
13536 869c62c15e95 Few minor improvements, added advanced settings for file browser. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13506 diff changeset	53
869c62c15e95 Few minor improvements, added advanced settings for file browser. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13506 diff changeset	54 public slots:
16057 c3057d80cf91 Created common octave_dock_widget class Richard Crozier <richard.crozier@yahoo.co.uk> parents: 15552 diff changeset	55
13536 869c62c15e95 Few minor improvements, added advanced settings for file browser. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13506 diff changeset	56 /** 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	57 void item_double_clicked (const QModelIndex & index);
13495 11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	58
13536 869c62c15e95 Few minor improvements, added advanced settings for file browser. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13506 diff changeset	59 /** 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	60 void change_directory_up ();
14863 3ff18e21c742 Added a few comments. Jacob Dawid <jacob.dawid@gmail.com> parents: 14803 diff changeset	61
3ff18e21c742 Added a few comments. Jacob Dawid <jacob.dawid@gmail.com> parents: 14803 diff changeset	62 /** Sets the current directory being displayed. */
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16413 diff changeset	63 void set_current_directory (const QString& dir);
14863 3ff18e21c742 Added a few comments. Jacob Dawid <jacob.dawid@gmail.com> parents: 14803 diff changeset	64
3ff18e21c742 Added a few comments. Jacob Dawid <jacob.dawid@gmail.com> parents: 14803 diff changeset	65 /** 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	66 void accept_directory_line_edit ();
14863 3ff18e21c742 Added a few comments. Jacob Dawid <jacob.dawid@gmail.com> parents: 14803 diff changeset	67
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16413 diff changeset	68 void display_directory (const QString& dir);
13495 11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	69
14863 3ff18e21c742 Added a few comments. Jacob Dawid <jacob.dawid@gmail.com> parents: 14803 diff changeset	70 /** 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	71 void notice_settings (const QSettings *settings);
14863 3ff18e21c742 Added a few comments. Jacob Dawid <jacob.dawid@gmail.com> parents: 14803 diff changeset	72
13536 869c62c15e95 Few minor improvements, added advanced settings for file browser. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13506 diff changeset	73 signals:
14863 3ff18e21c742 Added a few comments. Jacob Dawid <jacob.dawid@gmail.com> parents: 14803 diff changeset	74 /** 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	75 void open_file (const QString& fileName);
14863 3ff18e21c742 Added a few comments. Jacob Dawid <jacob.dawid@gmail.com> parents: 14803 diff changeset	76
3ff18e21c742 Added a few comments. Jacob Dawid <jacob.dawid@gmail.com> parents: 14803 diff changeset	77 /** Emitted, whenever the currently displayed directory changed. */
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16413 diff changeset	78 void displayed_directory_changed (const QString& dir);
13495 11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	79
13577 e440b3f32f02 Fixed bug with closing subwindows. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13536 diff changeset	80 protected:
e440b3f32f02 Fixed bug with closing subwindows. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13536 diff changeset	81
13495 11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	82 private:
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	83 // 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	84
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	85 /** Toolbar for file and directory manipulation. */
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	86 QToolBar * _navigation_tool_bar;
13495 11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	87
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	88 /** Variables for the up-directory action. */
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	89 QIcon _directory_icon;
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	90 QAction * _directory_up_action;
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	91 QToolButton * _up_directory_button;
13495 11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	92
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	93 /** The file system model. */
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	94 QFileSystemModel *_file_system_model;
13495 11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	95
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	96 /** The file system view. */
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	97 QTreeView * _file_tree_view;
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	98 QLineEdit * _current_directory;
13495 11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	99 };
11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	100
11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	101 #endif // FILESDOCKWIDGET_H

Mercurial > octave

annotate libgui/src/files-dockwidget.h @ 16437:919796a440c6