Merge remote-tracking branch 'origin/master'

2 files changed, 126 insertions, 25 deletions

diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/ContextMenu.cpp b/src-qt5/core/lumina-desktop-unified/src-desktop/ContextMenu.cpp
index c3e9a1db..47f0e3d7 100644
--- a/src-qt5/core/lumina-desktop-unified/src-desktop/ContextMenu.cpp
+++ b/src-qt5/core/lumina-desktop-unified/src-desktop/ContextMenu.cpp
@@ -6,67 +6,105 @@
 //===========================================
 #include "ContextMenu.h"
 #include <global-objects.h>
+#include <JsonMenu.h>
 
 void DesktopContextMenu::SettingsChanged(DesktopSettings::File file){
-  if(file == DesktopSettings::ContextMenu){ UpdateMenu(); }
+  if(file == DesktopSettings::ContextMenu){ UpdateMenu(false); }
 }
 
-void DesktopContextMenu::UpdateMenu(){
+void DesktopContextMenu::UpdateMenu(bool fast){
   //Put a label at the top
   unsigned int num = Lumina::NWS->currentWorkspace();
   workspaceLabel->setText( "<b>"+QString(tr("Workspace %1")).arg(QString::number(num+1))+"</b>");
+  if(fast && usewinmenu){ updateWinMenu(); }
+  if(fast){ return; } //already done
   this->clear(); //clear it for refresh
   this->addAction(wkspaceact);
   this->addSeparator();
   //Now load the user's menu setup and fill the menu
-  QStringList items = DesktopSettings::instance()->value(DesktopSettings::ContextMenu, "itemlist", QStringList()<< "terminal" << "filemanager" << "line" << "settings" <<"lockdesktop").toStringList();
-  //usewinmenu=false;
+  QStringList items = DesktopSettings::instance()->value(DesktopSettings::ContextMenu, "itemlist", QStringList()<< "terminal" << "filemanager" << "line" << "applications" << "windowlist" << "settings" << "lockdesktop").toStringList();
+  usewinmenu=false;
   for(int i=0; i<items.length(); i++){
-    if(items[i]=="terminal"){ this->addAction(LXDG::findIcon("utilities-terminal",""), tr("Terminal"))->setWhatsThis("lumina-open -terminal"); }
-    else if(items[i]=="lockdesktop"){ this->addAction(LXDG::findIcon("system-lock-screen",""), tr("Lock Session"), this, SIGNAL(LockSession()) ); }
-    else if(items[i]=="filemanager"){ this->addAction( LXDG::findIcon("user-home",""), tr("Browse Files"))->setWhatsThis("lumina-open \""+QDir::homePath()+"\""); }
-    //else if(items[i]=="applications"){ this->addMenu( LSession::handle()->applicationMenu() ); }
+    if(items[i]=="terminal"){
+      QAction *act = this->addAction( tr("Terminal"));
+      LIconCache::instance()->loadIcon(act, "utilities-terminal");
+      act->setWhatsThis("--terminal");
+    }
+    else if(items[i]=="lockdesktop"){
+      QAction *act = this->addAction( tr("Lock Session"), this, SIGNAL(LockSession()) );
+      LIconCache::instance()->loadIcon(act, "system-lock-screen");
+    }
+    else if(items[i]=="filemanager"){
+      QAction *act = this->addAction( tr("Browse Files"));
+      LIconCache::instance()->loadIcon(act, "user-home");
+      act->setWhatsThis(QDir::homePath());
+    }
+    else if(items[i]=="applications"){
+      if(appMenu==0){ updateAppMenu(); }
+      this->addMenu( appMenu );
+    }
     else if(items[i]=="line"){ this->addSeparator(); }
     //else if(items[i]=="settings"){ this->addMenu( LSession::handle()->settingsMenu() ); }
-    //else if(items[i]=="windowlist"){ this->addMenu( winMenu); usewinmenu=true;}
-    else if(items[i].startsWith("app::::") && items[i].endsWith(".desktop")){
+    else if(items[i]=="windowlist"){
+      if(winMenu==0){ updateWinMenu(); }
+      this->addMenu( winMenu);
+      usewinmenu=true;
+    }else if(items[i].startsWith("app::::") && items[i].endsWith(".desktop")){
       //Custom *.desktop application
       QString file = items[i].section("::::",1,1).simplified();
-      XDGDesktop xdgf(file);// = LXDG::loadDesktopFile(file, ok);
-      if(xdgf.type!=XDGDesktop::BAD){
-        this->addAction( LXDG::findIcon(xdgf.icon,""), xdgf.name)->setWhatsThis("lumina-open \""+file+"\"");
-	}else{
-	  qDebug() << "Could not load application file:" << file;
-	}
-    }/*else if(items[i].startsWith("jsonmenu::::")){
+      //Try to use the pre-loaded app entry for this
+      XDGDesktop *xdg = XDGDesktopList::instance()->findAppFile(file);
+      if(xdg!=0){ xdg->addToMenu(this); }
+      else{
+        XDGDesktop xdgf(file);// = LXDG::loadDesktopFile(file, ok);
+        if(xdgf.type!=XDGDesktop::BAD){ xdgf.addToMenu(this); }
+	  }
+    }else if(items[i].startsWith("jsonmenu::::")){
       //Custom JSON menu system (populated on demand via external scripts/tools
       QStringList info = items[i].split("::::"); //FORMAT:[ "jsonmenu",exec,name, icon(optional)]
       if(info.length()>=3){
-        qDebug() << "Custom JSON Menu Loaded:" << info;
-        JsonMenu *tmp = new JsonMenu(info[1], deskMenu);
+        //qDebug() << "Custom JSON Menu Loaded:" << info;
+        JsonMenu *tmp = new JsonMenu(info[1], this);
         tmp->setTitle(info[2]);
         connect(tmp, SIGNAL(triggered(QAction*)), this, SLOT(SystemApplication(QAction*)) );
         if(info.length()>=4){ tmp->setIcon( LXDG::findIcon(info[3],"") ); }
         this->addMenu(tmp);
       }
-    }*/
+    }
   }
   //Now add the system quit options
   this->addSeparator();
   this->addAction(LXDG::findIcon("system-log-out",""), tr("Leave"), this, SIGNAL(showLeaveDialog()) );
 }
 
+// === PRIVATE ===
+void DesktopContextMenu::AddWindowToMenu(NativeWindow *win){
+  QString label = win->property(NativeWindow::ShortTitle).toString();
+  if(label.isEmpty()){ label = win->property(NativeWindow::Title).toString(); }
+  if(label.isEmpty()){ label = win->property(NativeWindow::Name).toString(); }
+  QAction *tmp = winMenu->addAction( win->property(NativeWindow::Icon).value<QIcon>(), label, win, SLOT(toggleVisibility()) );
+  //Need to change the visual somehow to indicate whether it is visible or not
+  //bool visible = win->property(NativeWindow::Visible).toBool();
+  // TODO
+}
+
 // === PUBLIC ===
 DesktopContextMenu::DesktopContextMenu(QWidget *parent) : QMenu(parent){
   if(parent!=0){
     parent->setContextMenuPolicy(Qt::CustomContextMenu);
     connect(parent, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(showMenu(const QPoint&)) );
   }
+  appMenu = 0;
+  winMenu = 0;
+  usewinmenu = false;
   workspaceLabel = new QLabel(0);
+    workspaceLabel->setAlignment(Qt::AlignCenter);
   wkspaceact = new QWidgetAction(0);
     wkspaceact->setDefaultWidget(workspaceLabel);
   connect(this, SIGNAL(triggered(QAction*)), this, SLOT(LaunchAction(QAction*)) );
-
+  //Connect to a couple global objects
+  connect(this, SIGNAL(aboutToShow()), this, SLOT(UpdateMenu()) ); //this will do a "fast" update
+  qDebug() << "Done Creating Context Menu";
 }
 
 DesktopContextMenu::~DesktopContextMenu(){
@@ -78,9 +116,9 @@ DesktopContextMenu::~DesktopContextMenu(){
 void DesktopContextMenu::start(){
   connect(DesktopSettings::instance(), SIGNAL(FileModified(DesktopSettings::File)), this, SLOT(SettingsChanged(DesktopSettings::File)) );
   connect(this, SIGNAL(LockSession()), Lumina::SS, SLOT(LockScreenNow()) );
-
+  connect(XDGDesktopList::instance(), SIGNAL(appsUpdated()), this, SLOT(updateAppMenu()) );
+  UpdateMenu(false);
   //Still need to connect to some "workspaceChanged(int)" signal
-  QTimer::singleShot(0, this, SLOT(UpdateMenu()) ); //initial update
 }
 
 // === PRIVATE SLOTS ===
@@ -89,9 +127,63 @@ void DesktopContextMenu::LaunchAction(QAction *act){
   if(act->whatsThis().isEmpty() || act->parent()!=this ){ return; }
   qDebug() << "Launch Menu Action:" << act->whatsThis();
   QString cmd = act->whatsThis();
-  ExternalProcess::launch(cmd);
+  if(cmd.startsWith("-action ")){
+    LaunchApp(act); //forward this to the XDGDesktop parser
+  }else if(cmd.startsWith("--") || cmd.endsWith(".desktop")){
+    LSession::instance()->LaunchStandardApplication(cmd);
+  }else if(QFile::exists(cmd)){
+    QString mime = XDGMime::fromFileName(cmd);
+    LSession::instance()->LaunchStandardApplication(mime, QStringList() << cmd);
+  }
+}
+
+void DesktopContextMenu::LaunchApp(QAction *act){
+
+  // The "whatsThis() field is set by the XDGDesktop object/format
+  if(act->whatsThis().isEmpty()){ return; }
+  QString action, file;
+  QString wt = act->whatsThis();
+  if(wt.startsWith("-action")){
+    action = wt.section(" ",1,1); action=action.remove("\"");
+    file = wt.section(" ",2,-1); file=file.remove("\"");
+  }
+  else{ file = wt; }
+  LSession::instance()->LaunchDesktopApplication(file, action);
+
 }
 
 void DesktopContextMenu::showMenu(const QPoint &pt){
   this->popup(pt);
 }
+
+void DesktopContextMenu::updateAppMenu(){
+  //qDebug() << "Update App Menu";
+  if(appMenu==0){
+    appMenu = new QMenu(this);
+    appMenu->setTitle( tr("Applications"));
+    LIconCache::instance()->loadIcon( appMenu, "system-run");
+    connect(appMenu, SIGNAL(triggered(QAction*)), this, SLOT(LaunchApp(QAction*)) );
+  }
+  //qDebug() << "Populate App Menu";
+  XDGDesktopList::instance()->populateMenu(appMenu);
+}
+
+void DesktopContextMenu::updateWinMenu(){
+  //qDebug() << "Update Win Menu";
+  if(winMenu==0){
+    winMenu = new QMenu(this);
+    winMenu->setTitle( tr("Task Manager") );
+    LIconCache::instance()->loadIcon( winMenu, "preferences-system-windows");
+  }
+  winMenu->clear();
+  QList<NativeWindow*> wins = Lumina::NWS->currentWindows();
+  unsigned int wkspace = Lumina::NWS->currentWorkspace();
+  for(int i=0; i<wins.length(); i++){
+    //First check if this window is in the current workspace (or is "sticky")
+    if(wins.at(i)->property(NativeWindow::Workspace).toUInt() != wkspace
+	      && wins.at(i)->property(NativeWindow::States).value< QList<NativeWindow::State> >().contains(NativeWindow::S_STICKY) ){
+      continue;
+    }
+    AddWindowToMenu(wins.at(i));
+  }
+}
diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/ContextMenu.h b/src-qt5/core/lumina-desktop-unified/src-desktop/ContextMenu.h
index 7fd21967..78756e8c 100644
--- a/src-qt5/core/lumina-desktop-unified/src-desktop/ContextMenu.h
+++ b/src-qt5/core/lumina-desktop-unified/src-desktop/ContextMenu.h
@@ -13,11 +13,15 @@ class DesktopContextMenu : public QMenu{
 	Q_OBJECT
 public slots:
 	void SettingsChanged(DesktopSettings::File);
-	void UpdateMenu(); //re-create the menu
+	void UpdateMenu(bool fast = true); //re-create the menu
 
 private:
 	QLabel *workspaceLabel;
 	QWidgetAction *wkspaceact;
+	QMenu *appMenu, *winMenu;
+	bool usewinmenu;
+
+	void AddWindowToMenu(NativeWindow*);
 
 public:
 	DesktopContextMenu(QWidget *parent = 0);
@@ -27,8 +31,13 @@ public:
 
 private slots:
 	void LaunchAction(QAction *act);
+	void LaunchApp(QAction *act);
+
 	void showMenu(const QPoint&);
 
+	void updateAppMenu();
+	void updateWinMenu();
+
 signals:
 	void LockSession();
 	void showLeaveDialog();