aboutsummaryrefslogtreecommitdiff
path: root/src-qt5/core
diff options
context:
space:
mode:
authorKen Moore <ken@pcbsd.org>2016-09-23 09:44:43 -0400
committerKen Moore <ken@pcbsd.org>2016-09-23 09:44:43 -0400
commit63069bcc5f0cd5dd0f489ebdbd0c12250e01bd03 (patch)
tree881062a48de5940324231859fbad0d9d89dc33c6 /src-qt5/core
parentLarge update to how XDGDesktop files are created/used. (diff)
downloadlumina-63069bcc5f0cd5dd0f489ebdbd0c12250e01bd03.tar.gz
lumina-63069bcc5f0cd5dd0f489ebdbd0c12250e01bd03.tar.bz2
lumina-63069bcc5f0cd5dd0f489ebdbd0c12250e01bd03.zip
Finish up the depretiation of the old systemapps fetching function.
Diffstat (limited to 'src-qt5/core')
-rw-r--r--src-qt5/core/libLumina/LuminaXDG.cpp4
-rw-r--r--src-qt5/core/libLumina/LuminaXDG.h2
-rw-r--r--src-qt5/core/lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/src-qt5/core/libLumina/LuminaXDG.cpp b/src-qt5/core/libLumina/LuminaXDG.cpp
index 0e33f254..d89c7f46 100644
--- a/src-qt5/core/libLumina/LuminaXDG.cpp
+++ b/src-qt5/core/libLumina/LuminaXDG.cpp
@@ -906,13 +906,13 @@ QStringList LXDG::systemApplicationDirs(){
return sysapps;
}*/
-QList<XDGDesktop*> LXDG::systemDesktopFiles(bool showAll, bool showHidden){
+/*QList<XDGDesktop*> LXDG::systemDesktopFiles(bool showAll, bool showHidden){
//If this is going to be used regularly, it is better to use a custom instance of an XDGDesktopList() which self-updates instead.
// Since this function will need to re-read the entire system app registry every time.
XDGDesktopList sysapps;
sysapps.updateList();
return sysapps.apps(showAll, showHidden);
-}
+}*/
QHash<QString,QList<XDGDesktop*> > LXDG::sortDesktopCats(QList<XDGDesktop*> apps){
//Sort the list of applications into their different categories (main categories only)
diff --git a/src-qt5/core/libLumina/LuminaXDG.h b/src-qt5/core/libLumina/LuminaXDG.h
index f2b1e3e2..dd9d1c67 100644
--- a/src-qt5/core/libLumina/LuminaXDG.h
+++ b/src-qt5/core/libLumina/LuminaXDG.h
@@ -166,7 +166,7 @@ public:
static QStringList systemApplicationDirs();
//Get a list of all the *.desktop files available on the system
//static XDGDesktopList* systemAppsList(); //return a pointer to the entire class
- static QList<XDGDesktop*> systemDesktopFiles(bool showAll = false, bool showHidden = false); //simplification for getting just the files
+ //static QList<XDGDesktop*> systemDesktopFiles(bool showAll = false, bool showHidden = false); //simplification for getting just the files
//Sort a list of Desktop files into the proper categories
static QHash< QString, QList<XDGDesktop*> > sortDesktopCats(QList<XDGDesktop*> apps);
//Return the icon to use for the given category
diff --git a/src-qt5/core/lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.cpp b/src-qt5/core/lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.cpp
index bd8e79db..d1d6c7a8 100644
--- a/src-qt5/core/lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.cpp
+++ b/src-qt5/core/lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.cpp
@@ -126,7 +126,7 @@ void AppLauncherPlugin::buttonClicked(){
QString path = button->whatsThis();
if(path.isEmpty() || !QFile::exists(path) ){
//prompt for the user to select an application
- QList<XDGDesktop*> apps = LXDG::sortDesktopNames( LXDG::systemDesktopFiles() );
+ QList<XDGDesktop*> apps = LSession::handle()->applicationMenu()->currentAppHash()->value("All"); //LXDG::sortDesktopNames( LXDG::systemDesktopFiles() );
QStringList names;
for(int i=0; i<apps.length(); i++){ names << apps[i]->name; }
bool ok = false;
bgstack15