Clean up the default filemanager/terminal settings. Put them in the main session file (instead of desktop settings), and also have lumina-config safe it to the lumina-open defaults file directly (in the case of the file manager).

3 files changed, 3 insertions, 8 deletions

diff --git a/lumina-desktop/AppMenu.cpp b/lumina-desktop/AppMenu.cpp
index 2b14edec..da1f43c9 100644
--- a/lumina-desktop/AppMenu.cpp
+++ b/lumina-desktop/AppMenu.cpp
@@ -6,7 +6,6 @@
 //===========================================
 #include "AppMenu.h"
 #include "LSession.h"
-#include "LDesktop.h"
 #include <LuminaOS.h>
 
 AppMenu::AppMenu(QWidget* parent) : QMenu(parent){
@@ -103,17 +102,14 @@ void AppMenu::watcherUpdate(){
 
 void AppMenu::launchStore(){
   LSession::LaunchApplication("lumina-open \""+appstorelink+"\"");
-  //QProcess::startDetached("lumina-open \""+appstorelink+"\"");
 }
 
 void AppMenu::launchControlPanel(){
   LSession::LaunchApplication("lumina-open \""+controlpanellink+"\"");
-  //QProcess::startDetached("lumina-open \""+controlpanellink+"\"");
 }
 
 void AppMenu::launchFileManager(){
-  QSettings::setPath(QSettings::NativeFormat, QSettings::UserScope, QDir::homePath()+"/.lumina");
-  QString fm = QSettings("LuminaDE", "desktopsettings").value("default-filemanager","lumina-fm").toString();
+  QString fm = LSession::sessionSettings()->value("default-filemanager","lumina-fm").toString();
   LSession::LaunchApplication(fm);
 }
 
diff --git a/lumina-desktop/AppMenu.h b/lumina-desktop/AppMenu.h
index 2d737284..f3d3c3e5 100644
--- a/lumina-desktop/AppMenu.h
+++ b/lumina-desktop/AppMenu.h
@@ -35,7 +35,6 @@ public:
 	QDateTime lastHashUpdate;
 
 private:
-	QSettings *settings;
 	QFileSystemWatcher *watcher;
 	QString appstorelink, controlpanellink;
 	QList<QMenu> MLIST;
diff --git a/lumina-desktop/LDesktop.cpp b/lumina-desktop/LDesktop.cpp
index a76edb53..b230d375 100644
--- a/lumina-desktop/LDesktop.cpp
+++ b/lumina-desktop/LDesktop.cpp
@@ -86,12 +86,12 @@ void LDesktop::SystemLogout(){
 }
 
 void LDesktop::SystemTerminal(){
-  QString term = settings->value("default-terminal","xterm").toString();
+  QString term = LSession::sessionSettings()->value("default-terminal","xterm").toString();
   LSession::LaunchApplication(term);
 }
 
 void LDesktop::SystemFileManager(){
-  QString fm = settings->value("default-filemanager","lumina-fm").toString();
+  QString fm = LSession::sessionSettings()->value("default-filemanager","lumina-fm").toString();
   LSession::LaunchApplication(fm);
 }