aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Moore <ken@ixsystems.com>2017-11-17 12:35:33 -0500
committerKen Moore <ken@ixsystems.com>2017-11-17 12:35:33 -0500
commit974fb8858662eb47d20f6d090264e052c4d4594c (patch)
treeae75dc1f77eba26635d3ee87206ad49d2ea40bfb
parentGet rid of the updates available dialog/prompt in Lumina. (diff)
parentre-implement zip/iso autoextraction in lumina-fm (diff)
downloadlumina-974fb8858662eb47d20f6d090264e052c4d4594c.tar.gz
lumina-974fb8858662eb47d20f6d090264e052c4d4594c.tar.bz2
lumina-974fb8858662eb47d20f6d090264e052c4d4594c.zip
Merge branch 'master' of github.com:trueos/lumina
-rw-r--r--src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp
index 66c4c237..b778b49c 100644
--- a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp
+++ b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp
@@ -577,7 +577,14 @@ void DirWidget::UpdateContextMenu(){
}
if(LUtils::isValidBinary("lumina-archiver") && sel.length() >=1 && canmodify){
cArchiveMenu->clear();
- if(sel.length()==1 && XDGMime::fromFileName(sel[0]).endsWith("-tar") ){
+ if(sel.length()==1 && ( XDGMime::fromFileName(sel[0]).endsWith("-tar") ||
+ XDGMime::fromFileName(sel[0]).endsWith("-image") ||
+ ( XDGMime::fromFileName(sel[0]).contains("zip") &&
+ !XDGMime::fromFileName(sel[0]).endsWith("epub+zip") &&
+ !XDGMime::fromFileName(sel[0]).endsWith("vnd.comicbook+zip" )
+ )
+ )
+ ){
cArchiveMenu->addAction(LXDG::findIcon("archive",""), tr("Extract Here"), this, SLOT(autoExtractFiles()), kExtract->key() );
}else{
cArchiveMenu->addAction(LXDG::findIcon("archive",""), tr("Archive Selection"), this, SLOT(autoArchiveFiles()), kArchive->key() );
bgstack15