From 911ef5bfce34ebcd8bc3fc6507108dc384d52de2 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Wed, 8 Jun 2016 16:41:31 -0400 Subject: Move to using the "application/[email/terminal]" mimetypes for registering/finding the default email/terminal applications. --- src-qt5/core/libLumina/LuminaUtils.cpp | 15 +++++++++------ src-qt5/core/lumina-desktop/LDesktop.cpp | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) (limited to 'src-qt5') diff --git a/src-qt5/core/libLumina/LuminaUtils.cpp b/src-qt5/core/libLumina/LuminaUtils.cpp index 5340d223..28ef5ad3 100644 --- a/src-qt5/core/libLumina/LuminaUtils.cpp +++ b/src-qt5/core/libLumina/LuminaUtils.cpp @@ -623,17 +623,20 @@ void LUtils::LoadSystemDefaults(bool skipOS){ if(var=="session_enablenumlock"){ sset = "EnableNumlock="+ istrue; } else if(var=="session_playloginaudio"){ sset = "PlayStartupAudio="+istrue; } else if(var=="session_playlogoutaudio"){ sset = "PlayLogoutAudio="+istrue; } - else if(var=="session_default_terminal"){ sset = "default-terminal="+val; } - else if(var=="session_default_filemanager"){ + else if(var=="session_default_terminal"){ + LXDG::setDefaultAppForMime("application/terminal", val); + //sset = "default-terminal="+val; + }else if(var=="session_default_filemanager"){ LXDG::setDefaultAppForMime("inode/directory", val); - sset = "default-filemanager="+val; - loset = "directory="+val; + //sset = "default-filemanager="+val; + //loset = "directory="+val; }else if(var=="session_default_webbrowser"){ - loset = "webbrowser="+val; + //loset = "webbrowser="+val; LXDG::setDefaultAppForMime("x-scheme-handler/http", val); LXDG::setDefaultAppForMime("x-scheme-handler/https", val); }else if(var=="session_default_email"){ - loset = "email="+val; + LXDG::setDefaultAppForMime("application/email",val); + //loset = "email="+val; } //Put the line into the file (overwriting any previous assignment as necessary) if(!loset.isEmpty()){ diff --git a/src-qt5/core/lumina-desktop/LDesktop.cpp b/src-qt5/core/lumina-desktop/LDesktop.cpp index 113b7efc..11d99581 100644 --- a/src-qt5/core/lumina-desktop/LDesktop.cpp +++ b/src-qt5/core/lumina-desktop/LDesktop.cpp @@ -104,7 +104,7 @@ void LDesktop::SystemLogout(){ void LDesktop::SystemTerminal(){ LSession::handle()->sessionSettings()->sync(); //make sure it is up to date - QString term = LSession::handle()->sessionSettings()->value("default-terminal","xterm").toString(); + QString term = LXDG::findDefaultAppForMime("application/terminal"); //LSession::handle()->sessionSettings()->value("default-terminal","xterm").toString(); if(term.endsWith(".desktop")){ term = "lumina-open \""+term+"\""; } LSession::LaunchApplication(term); } -- cgit