aboutsummaryrefslogtreecommitdiff
path: root/src-qt5/core/lumina-desktop/AppMenu.cpp
diff options
context:
space:
mode:
authorKen Moore <moorekou@gmail.com>2018-08-22 18:10:20 -0400
committerKen Moore <moorekou@gmail.com>2018-08-22 18:10:20 -0400
commit4e30c44daf54e313024b1e2ce6e5bcc003cb7bac (patch)
tree1bd4292176c8ee56492a7dfd9135590fa404ce6e /src-qt5/core/lumina-desktop/AppMenu.cpp
parentFix up the port template for lumina-pdf (diff)
downloadlumina-4e30c44daf54e313024b1e2ce6e5bcc003cb7bac.tar.gz
lumina-4e30c44daf54e313024b1e2ce6e5bcc003cb7bac.tar.bz2
lumina-4e30c44daf54e313024b1e2ce6e5bcc003cb7bac.zip
A few fixes for Lumina:
1. Adjust the pkg-plist for FreeBSD to include the trident-dark color file. 2. Add a new function for fetching XDG standard directory paths (and create dir as needed) 3. Setup the desktop and lib classes to use the XDG standard path function now. 4. Add a bunch of fallback icons if the "start-here-lumina" icon could not be found in the current theme. These are all based on the OS name. 5. Ensure we run "xdg-user-dirs-update" before launching the session (if it is installed). This is used for the main standard dir detection. 6. Ensure that start-lumina-desktop *always* starts a new desktop session (bypassing any existing lock files for the desktop session).
Diffstat (limited to 'src-qt5/core/lumina-desktop/AppMenu.cpp')
-rw-r--r--src-qt5/core/lumina-desktop/AppMenu.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/src-qt5/core/lumina-desktop/AppMenu.cpp b/src-qt5/core/lumina-desktop/AppMenu.cpp
index 9ad51c93..136636e9 100644
--- a/src-qt5/core/lumina-desktop/AppMenu.cpp
+++ b/src-qt5/core/lumina-desktop/AppMenu.cpp
@@ -45,14 +45,8 @@ void AppMenu::updateAppList(){
APPS.clear(); //NOTE: Don't delete these pointers - the pointers are managed by the sysApps class and these are just references to them
//qDebug() << "New Apps List:";
if(LSession::handle()->sessionSettings()->value("AutomaticDesktopAppLinks",true).toBool() && !lastHashUpdate.isNull() ){
- QString desktop = QDir::homePath()+"/"+tr("Desktop")+"/"; //translated desktop folder
- if(!QFile::exists(desktop)){
- desktop = QDir::homePath()+"/Desktop/"; //desktop folder
- if(!QFile::exists(desktop)){
- desktop = QDir::homePath()+"/desktop/"; //lowercase desktop folder
- if(!QFile::exists(desktop)){ desktop.clear(); }
- }
- }
+ QString desktop = LUtils::standardDirectory(LUtils::Desktop);
+ desktop.append("/");
//qDebug() << "Update Desktop Folder:" << desktop << sysApps->removedApps << sysApps->newApps;
QStringList tmp = sysApps->removedApps;
for(int i=0; i<tmp.length() && !desktop.isEmpty(); i++){
bgstack15