Add a new menu plugin:

The "Window List" will show a menu of all the current windows, and activate the one that the user clicks on.

3 files changed, 6 insertions, 88 deletions

diff --git a/lumina-desktop/panel-plugins/taskmanager/LTaskButton.cpp b/lumina-desktop/panel-plugins/taskmanager/LTaskButton.cpp
index a605ae86..6ea7854e 100644
--- a/lumina-desktop/panel-plugins/taskmanager/LTaskButton.cpp
+++ b/lumina-desktop/panel-plugins/taskmanager/LTaskButton.cpp
@@ -80,7 +80,7 @@ void LTaskButton::UpdateButton(){
     }
     if(i==0 && !statusOnly){
       //Update the button visuals from the first window
-      this->setIcon(WINLIST[i].icon());
+      this->setIcon(WINLIST[i].icon(noicon));
       cname = WINLIST[i].Class();
       if(cname.isEmpty()){ 
 	//Special case (chrome/chromium does not register *any* information with X except window title)
@@ -88,6 +88,7 @@ void LTaskButton::UpdateButton(){
 	if(cname.contains(" - ")){ cname = cname.section(" - ",-1); }
       }
       this->setToolTip(cname);
+      /*
       if(this->icon().isNull()){
 	this->setIcon( LXDG::findIcon(cname.toLower(),"") );
 	if(this->icon().isNull()){
@@ -98,9 +99,10 @@ void LTaskButton::UpdateButton(){
 	}
       }else{
 	noicon = false;
-      }
+      }*/
     }
-    QAction *tmp = winMenu->addAction( WINLIST[i].icon(), WINLIST[i].text() );
+    bool junk;
+    QAction *tmp = winMenu->addAction( WINLIST[i].icon(junk), WINLIST[i].text() );
       tmp->setData(i); //save which number in the WINLIST this entry is for
     Lumina::STATES stat = WINLIST[i].status();
     if(stat==Lumina::NOTIFICATION){ showstate = stat; } //highest priority
diff --git a/lumina-desktop/panel-plugins/taskmanager/LTaskButton.h b/lumina-desktop/panel-plugins/taskmanager/LTaskButton.h
index 22278eba..0b2ffb05 100644
--- a/lumina-desktop/panel-plugins/taskmanager/LTaskButton.h
+++ b/lumina-desktop/panel-plugins/taskmanager/LTaskButton.h
@@ -21,7 +21,7 @@
 #include <LuminaX11.h>
 
 // Local includes
-#include "LWinInfo.h"
+#include "../../LWinInfo.h"
 #include "../LTBWidget.h"
 
 class LTaskButton : public LTBWidget{
diff --git a/lumina-desktop/panel-plugins/taskmanager/LWinInfo.h b/lumina-desktop/panel-plugins/taskmanager/LWinInfo.h
deleted file mode 100644
index 1084e6e3..00000000
--- a/lumina-desktop/panel-plugins/taskmanager/LWinInfo.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//===========================================
-//  Lumina-DE source code
-//  Copyright (c) 2014, Ken Moore
-//  Available under the 3-clause BSD license
-//  See the LICENSE file for full details
-//===========================================
-#ifndef _LUMINA_DESKTOP_WINDOW_INFO_H
-#define _LUMINA_DESKTOP_WINDOW_INFO_H
-
-// Qt includes
-#include <QString>
-#include <QPixmap>
-#include <QIcon>
-#include <QPainter>
-
-// libLumina includes
-#include <LuminaX11.h>
-#include <LuminaXDG.h>
-
-// Local includes
-#include "../../Globals.h" //For the STATES enumeration definition
-
-
-class LWinInfo{
-private:
-	WId window;
-
-public:
-	LWinInfo(WId id = 0){
-	  window = id;
-	}
-	~LWinInfo(){};
-	
-	//The current window ID
-	WId windowID(){
-	  return window;
-	}
-	
-	//Information Retrieval
-	 // Don't cache these results because they can change regularly
-	QString  text(){
-	  if(window==0){ return ""; }
-	  QString nm = LX11::WindowVisibleIconName(window);
-	  if(nm.isEmpty()){ nm = LX11::WindowIconName(window); }
-	  if(nm.isEmpty()){ nm = LX11::WindowVisibleName(window); }
-	  if(nm.isEmpty()){ nm = LX11::WindowName(window); }
-	  return nm;
-	}
-
-	QIcon icon(){
-	  if(window==0){ return QIcon(); }
-	  //qDebug() << "Check for Window Icon:" << window;
-	  QIcon ico = LX11::WindowIcon(window);
-	  //Check for a null icon, and supply one if necessary
-	  //if(ico.isNull()){ ico = LXDG::findIcon("preferences-system-windows",""); }
-	  return ico;
-	}
-	
-	QString Class(){
-	  return LX11::WindowClass(window);
-	}
-	
-	Lumina::STATES status(){
-	  if(window==0){ return Lumina::NOSHOW; }
-	  LX11::WINDOWSTATE ws = LX11::GetWindowState(window);
-	  Lumina::STATES state;
-	  switch(ws){
-	    case LX11::VISIBLE:
-		    state = Lumina::VISIBLE; break;
-	    case LX11::INVISIBLE:
-		    state = Lumina::INVISIBLE; break;
-	    case LX11::ACTIVE:
-		    state = Lumina::ACTIVE; break;
-	    case LX11::ATTENTION:
-		    state = Lumina::NOTIFICATION; break;
-	    default:
-		    state = Lumina::NOSHOW;
-	  }
-	  //qDebug() << "Window State:" << ws << state;
-	  return state;
-	}
-};
-
-#endif
\ No newline at end of file