From 3dfc37ec6be3e1cf08c5953df66703ccc49413b1 Mon Sep 17 00:00:00 2001 From: q5sys Date: Tue, 13 Jun 2017 12:37:41 -0400 Subject: redo dirtreepane to work the same as other options --- src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp | 15 +++++++++------ src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.h | 4 ++-- 2 files changed, 11 insertions(+), 8 deletions(-) (limited to 'src-qt5/desktop-utils/lumina-fm/widgets') diff --git a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp index 377a92d8..64cb4718 100644 --- a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp +++ b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp @@ -223,7 +223,7 @@ kOpSS= new QShortcut(QKeySequence(Qt::Key_F6),this); kOpMM= new QShortcut(QKeySequence(Qt::Key_F7),this); kOpTerm = new QShortcut(QKeySequence(Qt::Key_F1),this); - kTreePane= new QShortcut(QKeySequence(Qt::CTRL+Qt::Key_),this); +// kTreePane = new QShortcut(QKeySequence(Qt::CTRL+Qt::Key_P),this); connect(kZoomIn, SIGNAL(activated()), this, SLOT(on_tool_zoom_in_clicked()) ); connect(kZoomOut, SIGNAL(activated()), this, SLOT(on_tool_zoom_out_clicked()) ); @@ -754,12 +754,15 @@ // Folder Pane //==================== - void DirWidget::showFolderPane(){ - //ui->folderViewPane->setVisible(true); - } + void DirWidget::showDirTreePane(bool showdirtree){ + if(showdirtree !=showHidden){ + showHidden = showdirtree; + if(!currentDir.isEmpty()){ QTimer::singleShot(0, this, SLOT(loadDirectory()) ); } + } + } - void DirWidget::hideFolderPane(){ - //ui->folderViewPane->setVisible(false); + bool DirWidget::showingDirTreePane(){ + return showHidden; } diff --git a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.h b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.h index c8453e65..3626e85d 100644 --- a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.h +++ b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.h @@ -63,8 +63,8 @@ public slots: //Theme change functions void UpdateIcons(); void UpdateText(); - void showFolderPane(); - void hideFolderPane(); + void showDirTreePane(bool); + bool showingDirTreePane(); private: -- cgit