From 8a61a9bc5493faf7771520eb1050a1ea770d71f8 Mon Sep 17 00:00:00 2001 From: Defman21 Date: Thu, 4 May 2017 20:29:15 +0300 Subject: [PATCH 1/2] Misc: use xdg-open for the show in finder command fixed #250 Signed-off-by: Defman21 --- src/components/koSysUtils.py | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/components/koSysUtils.py b/src/components/koSysUtils.py index 0b071e5977..b01135aecf 100644 --- a/src/components/koSysUtils.py +++ b/src/components/koSysUtils.py @@ -258,21 +258,15 @@ def ShowFileInFileManager(self, filename): manager = self._getManager() if os.path.isfile(filename): filename = os.path.dirname(filename) - if manager == "gnome": + xdg_open = self.Which('xdg-open') + if xdg_open: + os.system('xdg-open "%s" &' % filename) + elif manager == "gnome": os.system('nautilus "%s" &' % filename) elif manager == "kde": - os.system('konqueror --profile filemanagement "%s" &' % filename) + os.system('dolphin "%s" &' % filename) else: - # see if nautilus or konqueror exists, and use them - nautilus = self.Which("nautilus") - if nautilus: - os.system('nautilus "%s" &' % filename) - return - konqueror = self.Which("konqueror") - if konqueror: - os.system('konqueror --profile filemanagement "%s" &' % filename) - return - raise "NOT IMPLEMENTED" + raise "File manager not found / xdg-open not installed" def OpenFile(self, filename): """OpenFile From 4ed9a98946879553ae79ea43b20319b9e531c0e4 Mon Sep 17 00:00:00 2001 From: Defman21 Date: Sat, 17 Jun 2017 10:47:08 +0300 Subject: [PATCH 2/2] Always use xdg-open because it's a standard in Linux DEs Signed-off-by: Defman21 --- src/components/koSysUtils.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/components/koSysUtils.py b/src/components/koSysUtils.py index b01135aecf..0b3466c1c4 100644 --- a/src/components/koSysUtils.py +++ b/src/components/koSysUtils.py @@ -261,12 +261,8 @@ def ShowFileInFileManager(self, filename): xdg_open = self.Which('xdg-open') if xdg_open: os.system('xdg-open "%s" &' % filename) - elif manager == "gnome": - os.system('nautilus "%s" &' % filename) - elif manager == "kde": - os.system('dolphin "%s" &' % filename) else: - raise "File manager not found / xdg-open not installed" + raise "xdg-open is not installed (or it's not on your $PATH)" def OpenFile(self, filename): """OpenFile