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

annotate libgui/src/files-dockwidget.cc @ 15368:36ececf69385

avoid some GCC warnings in the libgui code * file-editor-interface.h, lexer-octave-gui.cc, main-window.cc, settings-dialog.cc, workspace-model.cc, workspace-view.cc: Avoid some shadowed variable, unused switch case, and C-style cast warnings.

author	John W. Eaton <jwe@octave.org>
date	Wed, 12 Sep 2012 20:32:57 -0400
parents	501a9cc2c68f
children	1e64aff609c3

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 */
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	22
15286 ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15204 diff changeset	23 #ifdef HAVE_CONFIG_H
ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15204 diff changeset	24 #include <config.h>
ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15204 diff changeset	25 #endif
ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15204 diff changeset	26
14707 674740c44c09 Changed various files to matche file naming conventions. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14703 diff changeset	27 #include "resource-manager.h"
674740c44c09 Changed various files to matche file naming conventions. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14703 diff changeset	28 #include "files-dockwidget.h"
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	29
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	30 #include <QApplication>
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	31 #include <QFileInfo>
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	32 #include <QCompleter>
13531 bb3676025b36 User can set a custom file editor instead of the built-in one. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13522 diff changeset	33 #include <QSettings>
bb3676025b36 User can set a custom file editor instead of the built-in one. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13522 diff changeset	34 #include <QProcess>
13539 a4b5cad8f7c6 Added command line parser class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13537 diff changeset	35 #include <QDebug>
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	36
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	37 files_dock_widget::files_dock_widget (QWidget *p)
36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	38 : QDockWidget (p)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	39 {
c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	40 setObjectName ("FilesDockWidget");
13589 ee49f1a15c06 Changed "Current Folder" to "Current Directory". Jacob Dawid <jacob.dawid@googlemail.com> parents: 13577 diff changeset	41 setWindowTitle (tr ("Current Directory"));
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	42 setWidget (new QWidget (this));
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	43
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	44 // Create a toolbar
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	45 _navigation_tool_bar = new QToolBar ("", widget ());
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	46 _navigation_tool_bar->setAllowedAreas (Qt::TopToolBarArea);
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	47 _navigation_tool_bar->setMovable (false);
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	48 _navigation_tool_bar->setIconSize (QSize (20, 20));
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	49
14728 ddd9c2a91de5 Adjusted file browser up directory icon. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14712 diff changeset	50 _directory_icon = QIcon(":/actions/icons/up.png");
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	51 _directory_up_action = new QAction (_directory_icon, "", _navigation_tool_bar);
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	52 _directory_up_action->setStatusTip (tr ("Move up one directory."));
13549 807e5e9b7591 Added lots of status tips. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13539 diff changeset	53
14803 625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	54 _last_current_directory = "";
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	55 _current_directory = new QLineEdit (_navigation_tool_bar);
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	56 _current_directory->setStatusTip (tr ("Enter the path or filename."));
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	57
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	58 _navigation_tool_bar->addAction (_directory_up_action);
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	59 _navigation_tool_bar->addWidget (_current_directory);
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	60 connect (_directory_up_action, SIGNAL (triggered ()), this,
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	61 SLOT (do_up_directory ()));
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	62
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	63 // TODO: Add other buttons for creating directories
c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	64
c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	65 // Create the QFileSystemModel starting in the home directory
14803 625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	66 QString homePath = QDir::homePath ();
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	67
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	68 _file_system_model = new QFileSystemModel (this);
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	69 _file_system_model->setFilter (QDir::NoDotAndDotDot \| QDir::AllEntries);
14803 625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	70 QModelIndex rootPathIndex = _file_system_model->setRootPath (homePath);
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	71
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	72 // Attach the model to the QTreeView and set the root index
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	73 _file_tree_view = new QTreeView (widget ());
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	74 _file_tree_view->setModel (_file_system_model);
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	75 _file_tree_view->setRootIndex (rootPathIndex);
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	76 _file_tree_view->setSortingEnabled (true);
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	77 _file_tree_view->setAlternatingRowColors (true);
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	78 _file_tree_view->setAnimated (true);
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	79 _file_tree_view->setColumnHidden (1, true);
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	80 _file_tree_view->setColumnHidden (2, true);
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	81 _file_tree_view->setColumnHidden (3, true);
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	82 _file_tree_view->setStatusTip (tr ("Doubleclick a file to open it."));
13549 807e5e9b7591 Added lots of status tips. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13539 diff changeset	83
14803 625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	84 _current_directory->setText(_file_system_model->fileInfo (rootPathIndex).
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15300 diff changeset	85 absoluteFilePath ());
13501 86d6c3b90ad7 Added new gui 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 connect (_file_tree_view, SIGNAL (doubleClicked (const QModelIndex &)), this,
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	88 SLOT (item_double_clicked (const QModelIndex &)));
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	89
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	90 // Layout the widgets vertically with the toolbar on top
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	91 QVBoxLayout *vbox_layout = new QVBoxLayout ();
36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	92 vbox_layout->setSpacing (0);
36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	93 vbox_layout->addWidget (_navigation_tool_bar);
36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	94 vbox_layout->addWidget (_file_tree_view);
36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	95 vbox_layout->setMargin (1);
36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	96 widget ()->setLayout (vbox_layout);
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	97 // TODO: Add right-click contextual menus for copying, pasting, deleting files (and others)
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	98
14803 625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	99 connect (_current_directory, SIGNAL (returnPressed ()),
625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	100 this, SLOT (handle_directory_entered ()));
625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	101
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	102 QCompleter *
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	103 completer = new QCompleter (_file_system_model, this);
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	104 _current_directory->setCompleter (completer);
13577 e440b3f32f02 Fixed bug with closing subwindows. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13549 diff changeset	105
14803 625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	106 connect (this, SIGNAL (visibilityChanged (bool)),
625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	107 this, SLOT (handle_visibility_changed (bool)));
14812 9d9eb9bac65e Improved menu structure of file, edit and window menu. Removed ambiguous shortcuts, improved focus handling for operating the GUI with the keyboard. Added new shortcuts to focus subwindows directly. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14803 diff changeset	108
9d9eb9bac65e Improved menu structure of file, edit and window menu. Removed ambiguous shortcuts, improved focus handling for operating the GUI with the keyboard. Added new shortcuts to focus subwindows directly. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14803 diff changeset	109 setFocusProxy (_current_directory);
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	110 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	111
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	112 void
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	113 files_dock_widget::item_double_clicked (const QModelIndex & index)
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	114 {
13531 bb3676025b36 User can set a custom file editor instead of the built-in one. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13522 diff changeset	115 // Retrieve the file info associated with the model index.
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	116 QFileInfo fileInfo = _file_system_model->fileInfo (index);
14803 625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	117 display_directory (fileInfo.absoluteFilePath ());
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	118 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	119
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	120 void
15300 fd27e10b9b05 pass QString by const reference instead of value John W. Eaton <jwe@octave.org> parents: 15286 diff changeset	121 files_dock_widget::set_current_directory (const QString& currentDirectory)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	122 {
14803 625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	123 display_directory (currentDirectory);
625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	124 }
625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	125
625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	126 void
625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	127 files_dock_widget::handle_directory_entered ()
625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	128 {
625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	129 display_directory (_current_directory->text ());
625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	130 }
625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	131
625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	132 void
625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	133 files_dock_widget::do_up_directory ()
625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	134 {
625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	135 QDir dir = QDir (_file_system_model->filePath (_file_tree_view->rootIndex ()));
625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	136 dir.cdUp ();
625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	137 display_directory (dir.absolutePath ());
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	138 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	139
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	140 void
15300 fd27e10b9b05 pass QString by const reference instead of value John W. Eaton <jwe@octave.org> parents: 15286 diff changeset	141 files_dock_widget::display_directory (const QString& directory)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	142 {
14803 625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	143 QFileInfo fileInfo (directory);
625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	144 if (fileInfo.exists ())
625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	145 {
625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	146 if (fileInfo.isDir ())
625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	147 {
625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	148 _file_tree_view->setRootIndex (_file_system_model->
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15300 diff changeset	149 index (fileInfo.absoluteFilePath ()));
14803 625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	150 _file_system_model->setRootPath (fileInfo.absoluteFilePath ());
625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	151 _current_directory->setText (fileInfo.absoluteFilePath ());
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	152
14803 625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	153 if (_last_current_directory != fileInfo.absoluteFilePath ())
625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	154 {
625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	155 emit displayed_directory_changed (fileInfo.absoluteFilePath ());
625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	156 }
625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	157
625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	158 _last_current_directory = fileInfo.absoluteFilePath ();
625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	159 }
625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	160 else
625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	161 {
625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	162 if (QFile::exists (fileInfo.absoluteFilePath ()))
625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	163 emit open_file (fileInfo.absoluteFilePath ());
625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14728 diff changeset	164 }
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	165 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	166 }
13536 869c62c15e95 Few minor improvements, added advanced settings for file browser. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13535 diff changeset	167
869c62c15e95 Few minor improvements, added advanced settings for file browser. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13535 diff changeset	168 void
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	169 files_dock_widget::notice_settings ()
13536 869c62c15e95 Few minor improvements, added advanced settings for file browser. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13535 diff changeset	170 {
15164 bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 14812 diff changeset	171 QSettings *settings = resource_manager::get_settings ();
bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 14812 diff changeset	172
bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 14812 diff changeset	173 // FIXME -- what should happen if settings is 0?
bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 14812 diff changeset	174
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	175 _file_tree_view->setColumnHidden (0, !settings->value ("showFilenames").toBool ());
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	176 _file_tree_view->setColumnHidden (1, !settings->value ("showFileSize").toBool ());
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	177 _file_tree_view->setColumnHidden (2, !settings->value ("showFileType").toBool ());
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	178 _file_tree_view->setColumnHidden (3, !settings->value ("showLastModified").toBool ());
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	179 _file_tree_view->setAlternatingRowColors (settings->value ("useAlternatingRowColors").toBool ());
13537 a43ecce77eec Introduced a central ResourceManager class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13536 diff changeset	180 //if (settings.value ("showHiddenFiles").toBool ())
13539 a4b5cad8f7c6 Added command line parser class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13537 diff changeset	181 // TODO: React on option for hidden files.
13536 869c62c15e95 Few minor improvements, added advanced settings for file browser. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13535 diff changeset	182 }
13577 e440b3f32f02 Fixed bug with closing subwindows. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13549 diff changeset	183
e440b3f32f02 Fixed bug with closing subwindows. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13549 diff changeset	184 void
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	185 files_dock_widget::handle_visibility_changed (bool visible)
13577 e440b3f32f02 Fixed bug with closing subwindows. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13549 diff changeset	186 {
e440b3f32f02 Fixed bug with closing subwindows. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13549 diff changeset	187 if (visible)
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	188 emit active_changed (true);
13577 e440b3f32f02 Fixed bug with closing subwindows. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13549 diff changeset	189 }
e440b3f32f02 Fixed bug with closing subwindows. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13549 diff changeset	190
e440b3f32f02 Fixed bug with closing subwindows. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13549 diff changeset	191 void
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	192 files_dock_widget::closeEvent (QCloseEvent *e)
13577 e440b3f32f02 Fixed bug with closing subwindows. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13549 diff changeset	193 {
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	194 emit active_changed (false);
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	195 QDockWidget::closeEvent (e);
13577 e440b3f32f02 Fixed bug with closing subwindows. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13549 diff changeset	196 }

Mercurial > octave

annotate libgui/src/files-dockwidget.cc @ 15368:36ececf69385