Mercurial > hg > octave-terminal
changeset 13397:54756573cc1b
Refactored variable names.
author | Jacob Dawid <jacob.dawid@googlemail.com> |
---|---|
date | Mon, 11 Apr 2011 14:59:19 +0200 |
parents | a02705c67ec2 |
children | 877f82caaee3 |
files | gui//src/FilesDockWidget.cpp gui//src/FilesDockWidget.h |
diffstat | 2 files changed, 28 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/gui//src/FilesDockWidget.cpp +++ b/gui//src/FilesDockWidget.cpp @@ -8,19 +8,19 @@ setWidget(new QWidget(this)); // Create a toolbar - toolbar = new QToolBar("", widget()); - toolbar->setAllowedAreas(Qt::TopToolBarArea); - toolbar->setMovable(false); - toolbar->setIconSize(QSize (20,20)); + m_navigationToolBar = new QToolBar("", widget()); + m_navigationToolBar->setAllowedAreas(Qt::TopToolBarArea); + m_navigationToolBar->setMovable(false); + m_navigationToolBar->setIconSize(QSize (20,20)); // Add a button to the toolbar with the QT standard icon for up-directory // TODO: Maybe change this to be an up-directory icon that is OS specific??? QStyle *style = QApplication::style(); - dirIcon = style->standardIcon(QStyle::SP_FileDialogToParent); - dirAction = new QAction(dirIcon, "", toolbar); + m_directoryIcon = style->standardIcon(QStyle::SP_FileDialogToParent); + m_directoryUpAction = new QAction(m_directoryIcon, "", m_navigationToolBar); - toolbar->addAction(dirAction); - connect(dirAction, SIGNAL(triggered()), this, SLOT(onUpDirectory())); + m_navigationToolBar->addAction(m_directoryUpAction); + connect(m_directoryUpAction, SIGNAL(triggered()), this, SLOT(onUpDirectory())); // TODO: Add other buttons for creating directories @@ -28,33 +28,33 @@ QString homePath = QDir::homePath(); // TODO: This should occur after Octave has been initialized and the startup directory of Octave is established - fileSystemModel = new QFileSystemModel(this); - fileSystemModel->setFilter(QDir::NoDotAndDotDot | QDir::AllEntries); - QModelIndex rootPathIndex = fileSystemModel->setRootPath(homePath); + m_fileSystemModel = new QFileSystemModel(this); + m_fileSystemModel->setFilter(QDir::NoDotAndDotDot | QDir::AllEntries); + QModelIndex rootPathIndex = m_fileSystemModel->setRootPath(homePath); // Attach the model to the QTreeView and set the root index - fileTreeView = new QTreeView(widget()); - fileTreeView->setModel(fileSystemModel); - fileTreeView->setRootIndex(rootPathIndex); - fileTreeView->setSortingEnabled(true); + m_fileTreeView = new QTreeView(widget()); + m_fileTreeView->setModel(m_fileSystemModel); + m_fileTreeView->setRootIndex(rootPathIndex); + m_fileTreeView->setSortingEnabled(true); - connect(fileTreeView, SIGNAL(doubleClicked(const QModelIndex &)), this, SLOT(itemDoubleClicked(const QModelIndex &))); + connect(m_fileTreeView, SIGNAL(doubleClicked(const QModelIndex &)), this, SLOT(itemDoubleClicked(const QModelIndex &))); // Layout the widgets vertically with the toolbar on top QVBoxLayout *layout = new QVBoxLayout(); layout->setSpacing(0); - layout->addWidget(toolbar); - layout->addWidget(fileTreeView); + layout->addWidget(m_navigationToolBar); + layout->addWidget(m_fileTreeView); widget()->setLayout(layout); // TODO: Add right-click contextual menus for copying, pasting, deleting files (and others) } void FilesDockWidget::itemDoubleClicked(const QModelIndex &index) { - QFileInfo fileInfo = fileSystemModel->fileInfo(index); + QFileInfo fileInfo = m_fileSystemModel->fileInfo(index); if (fileInfo.isDir()) { - fileSystemModel->setRootPath(fileInfo.absolutePath()); - fileTreeView->setRootIndex(index); + m_fileSystemModel->setRootPath(fileInfo.absolutePath()); + m_fileTreeView->setRootIndex(index); } else { // TODO: Open the file appropriately based on the mime type } @@ -63,8 +63,8 @@ void FilesDockWidget::onUpDirectory(void) { // Move up an index node - QDir dir = QDir(fileSystemModel->filePath(fileTreeView->rootIndex())); + QDir dir = QDir(m_fileSystemModel->filePath(m_fileTreeView->rootIndex())); dir.cdUp(); - fileTreeView->setRootIndex(fileSystemModel->index(dir.absolutePath())); + m_fileTreeView->setRootIndex(m_fileSystemModel->index(dir.absolutePath())); }
--- a/gui//src/FilesDockWidget.h +++ b/gui//src/FilesDockWidget.h @@ -45,18 +45,18 @@ // TODO: Add toolbar with buttons for navigating the path, creating dirs, etc /** Toolbar for file and directory manipulation. */ - QToolBar *toolbar; + QToolBar *m_navigationToolBar; /** Variables for the up-directory action. */ - QIcon dirIcon; - QAction *dirAction; + QIcon m_directoryIcon; + QAction *m_directoryUpAction; QToolButton *upDirectoryButton; /** The file system model. */ - QFileSystemModel *fileSystemModel; + QFileSystemModel *m_fileSystemModel; /** The file system view. */ - QTreeView *fileTreeView; + QTreeView *m_fileTreeView; }; #endif // FILESDOCKWIDGET_H