aboutsummaryrefslogtreecommitdiff
path: root/src-qt5
diff options
context:
space:
mode:
authorKen Moore <ken@ixsystems.com>2017-06-19 10:22:06 -0400
committerKen Moore <ken@ixsystems.com>2017-06-19 10:22:06 -0400
commit56fa3fad7b4d5d4d548057c15410d2174f0fc3a2 (patch)
treeded9eb9fa0084cc4b7a8f99c086d8095fb089980 /src-qt5
parentFix the fallback icon routine for desktop entries. (diff)
parentclean up unneeded comment formatting (diff)
downloadlumina-56fa3fad7b4d5d4d548057c15410d2174f0fc3a2.tar.gz
lumina-56fa3fad7b4d5d4d548057c15410d2174f0fc3a2.tar.bz2
lumina-56fa3fad7b4d5d4d548057c15410d2174f0fc3a2.zip
Merge branch 'master' of github.com:trueos/lumina
Diffstat (limited to 'src-qt5')
-rw-r--r--src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp18
1 files changed, 5 insertions, 13 deletions
diff --git a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp
index 23269ec2..9633df89 100644
--- a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp
+++ b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp
@@ -65,8 +65,6 @@
connect(BW, SIGNAL(updateDirectoryStatus(QString)), this, SLOT(dirStatusChanged(QString)) );
connect(BW, SIGNAL(hasFocus(QString)), this, SLOT(setCurrentBrowser(QString)) );
- //---------------------------------------------------//
-
// Create treeviewpane QFileSystemModel model and populate
QString folderTreePath = QDir::rootPath();
dirtreeModel = new QFileSystemModel(this);
@@ -74,7 +72,11 @@
dirtreeModel->setRootPath(folderTreePath);
ui->folderViewPane->setModel(dirtreeModel);
ui->splitter->setSizes( QList<int>() << this->width()/3 << 2*this->width()/3);
- //---------------------------------------------------//
+ ui->folderViewPane->setHeaderHidden(true);
+ ui->folderViewPane->resizeColumnToContents(0);
+ ui->folderViewPane->setColumnHidden(1, true);
+ ui->folderViewPane->setColumnHidden(2, true);
+ ui->folderViewPane->setColumnHidden(3, true);
//Now update the rest of the UI
canmodify = false; //initial value
@@ -143,7 +145,6 @@
ui->tool_zoom_out->setEnabled(px >16); //lower limit on image sizes
}
- //---------------------------------------------------//
//====================
// Folder Pane
//====================
@@ -163,9 +164,6 @@
ChangeDir(tPath);
}
- //---------------------------------------------------//
-
-
// ================
// PUBLIC SLOTS
// ================
@@ -572,9 +570,7 @@
contextMenu->addAction(LXDG::findIcon("edit-rename",""), tr("Rename..."), this, SLOT(renameFiles()), kRename->key() )->setEnabled(canmodify);
contextMenu->addAction(LXDG::findIcon("edit-cut",""), tr("Cut Selection"), this, SLOT(cutFiles()), kCut->key() )->setEnabled(canmodify);
contextMenu->addAction(LXDG::findIcon("edit-copy",""), tr("Copy Selection"), this, SLOT(copyFiles()), kCopy->key() )->setEnabled(canmodify);
- //---------------------------------------------------//
if(LUtils::isValidBinary("lumina-archiver") && sel.length() ==1){ contextMenu->addAction(LXDG::findIcon("archive",""), tr("Auto-Extract"), this, SLOT(autoExtractFiles()), kExtract->key() )->setEnabled(canmodify); }
- //---------------------------------------------------//
}
if( QApplication::clipboard()->mimeData()->hasFormat("x-special/lumina-copied-files") ){
contextMenu->addAction(LXDG::findIcon("edit-paste",""), tr("Paste"), this, SLOT(pasteFiles()), QKeySequence(Qt::CTRL+Qt::Key_V) )->setEnabled(canmodify);
@@ -848,7 +844,6 @@
if(!list.isEmpty()){ emit PlayFiles(list); }
}
- //---------------------------------------------------//
void DirWidget::autoExtractFiles(){
QStringList files = currentBrowser()->currentSelection();
qDebug() << "Starting auto-extract:" << files;
@@ -860,9 +855,6 @@
QString runline = program + files[i];
pExtract->start(runline);*/
}
- //---------------------------------------------------//
-
-
//====================
// PROTECTED
bgstack15