Rearrange the Lumina source tree quite a bit:

Now the utilites are arranged by category (core, core-utils, desktop-utils), so all the -utils may be excluded by a package system (or turned into separate packages) as needed.

1 files changed, 532 insertions, 0 deletions

diff --git a/src-qt5/core/lumina-desktop/LDesktop.cpp b/src-qt5/core/lumina-desktop/LDesktop.cpp
new file mode 100644
index 00000000..72b267b0
--- /dev/null
+++ b/src-qt5/core/lumina-desktop/LDesktop.cpp
@@ -0,0 +1,532 @@
+//===========================================
+//  Lumina-DE source code
+//  Copyright (c) 2012-2015, Ken Moore
+//  Available under the 3-clause BSD license
+//  See the LICENSE file for full details
+//===========================================
+#include "LDesktop.h"
+#include "LSession.h"
+
+#include <LuminaOS.h>
+#include <LuminaX11.h>
+#include "LWinInfo.h"
+
+#define DEBUG 0
+
+LDesktop::LDesktop(int deskNum, bool setdefault) : QObject(){
+
+  DPREFIX = "desktop-"+QString::number(deskNum)+"/";
+  desktopnumber = deskNum;
+  desktop = QApplication::desktop();
+  defaultdesktop = setdefault; //(desktop->screenGeometry(desktopnumber).x()==0);
+  desktoplocked = true;
+  issyncing = bgupdating = false;
+  usewinmenu=false;
+
+  //Setup the internal variables
+  settings = new QSettings(QSettings::UserScope, "LuminaDE","desktopsettings", this);
+  //qDebug() << " - Desktop Settings File:" << settings->fileName();
+  if(!QFile::exists(settings->fileName())){ settings->setValue(DPREFIX+"background/filelist",QStringList()<<"default"); settings->sync(); }
+  bgWindow = 0;
+  bgDesktop = 0;
+  QTimer::singleShot(1,this, SLOT(InitDesktop()) );
+
+}
+
+LDesktop::~LDesktop(){
+  delete deskMenu;
+  delete winMenu;
+  delete bgWindow;
+  delete workspacelabel;
+  delete wkspaceact;
+}
+
+int LDesktop::Screen(){
+  return desktopnumber;
+}
+
+void LDesktop::show(){
+  if(bgWindow!=0){ bgWindow->show(); }
+  if(bgDesktop!=0){ bgDesktop->show(); }
+  for(int i=0; i<PANELS.length(); i++){ PANELS[i]->show(); }
+}
+
+void LDesktop::hide(){
+  if(bgWindow!=0){ bgWindow->hide(); }
+  if(bgDesktop!=0){ bgDesktop->hide(); }
+  for(int i=0; i<PANELS.length(); i++){ PANELS[i]->hide(); }
+}
+
+void LDesktop::prepareToClose(){
+  //Get any panels ready to close
+  issyncing = true; //Stop handling any watcher events
+  for(int i=0; i<PANELS.length(); i++){ PANELS[i]->prepareToClose(); PANELS.takeAt(i)->deleteLater(); i--; }
+  //Now close down any desktop plugins
+  desktoplocked = true; //make sure that plugin settings are preserved during removal
+  //Remove all the current containers
+  bgDesktop->cleanup();
+}
+
+WId LDesktop::backgroundID(){
+  if(bgWindow!=0){ return bgWindow->winId(); }
+  else{ return QX11Info::appRootWindow(); }
+}
+
+QRect LDesktop::availableScreenGeom(){
+  //Return a QRect containing the (global) screen area that is available (not under any panels)
+  if(bgDesktop!=0){
+    return globalWorkRect; //saved from previous calculations
+  }else{
+    return LSession::handle()->screenGeom(desktopnumber);
+  }	  
+}
+
+void LDesktop::UpdateGeometry(){
+    //First make sure there is something different about the geometry
+    //if(desktop->screenGeometry(desktopnumber)==bgWindow->geometry()){ return; }
+    //Now update the screen
+    // NOTE: This functionality is highly event-driven based on X changes - so we need to keep things in order (no signals/slots)
+    qDebug() << "Changing Desktop Geom:" << desktopnumber;
+    bgWindow->setGeometry(desktop->screenGeometry(desktopnumber));
+    qDebug() << " - Update Desktop Plugin Area";
+    UpdateDesktopPluginArea();
+    /*qDebug() << " - Update Panel Geometry";
+    for(int i=0; PANELS.length(); i++){
+      PANELS[i]->UpdatePanel(true); //only update geometry
+    }*/
+    qDebug() << " - Done With Desktop Geom Updates";
+    QTimer::singleShot(0, this, SLOT(UpdatePanels()));
+}
+	
+void LDesktop::SystemLogout(){
+  LSession::handle()->systemWindow();
+}
+
+void LDesktop::SystemTerminal(){
+  LSession::handle()->sessionSettings()->sync(); //make sure it is up to date
+  QString term = LSession::handle()->sessionSettings()->value("default-terminal","xterm").toString();
+  if(term.endsWith(".desktop")){ term = "lumina-open \""+term+"\""; }
+  LSession::LaunchApplication(term);
+}
+
+void LDesktop::SystemFileManager(){
+  //Just open the home directory
+  QString fm =  "lumina-open \""+QDir::homePath()+"\"";
+  LSession::LaunchApplication(fm);
+}
+
+void LDesktop::SystemApplication(QAction* act){
+  if(!act->whatsThis().isEmpty() && act->parent()==deskMenu){
+    LSession::LaunchApplication("lumina-open \""+act->whatsThis()+"\"");
+  }
+}
+
+void LDesktop::checkResolution(){
+  //Compare the current screen resolution with the last one used/saved and adjust config values *only*
+  //NOTE: This is only run the first time this desktop is created (before loading all the interface) - not on each desktop change
+  int oldWidth = settings->value(DPREFIX+"screen/lastWidth",-1).toInt();
+  int oldHeight = settings->value(DPREFIX+"screen/lastHeight",-1).toInt();
+  QRect scrn = LSession::handle()->screenGeom(desktopnumber);
+  if(scrn.isNull()){ return; }
+  issyncing = true;
+  settings->setValue(DPREFIX+"screen/lastWidth",scrn.width());
+  settings->setValue(DPREFIX+"screen/lastHeight",scrn.height());
+
+  if(oldWidth<1 || oldHeight<1 || scrn.width()<1 || scrn.height()<1){
+    //nothing to do - something invalid
+  }else if(scrn.width()==oldWidth && scrn.height()==oldHeight){
+    //nothing to do - same as before
+  }else{
+    //Calculate the scale factor between the old/new sizes in each dimension 
+    //  and forward that on to all the interface elements
+    double xscale = scrn.width()/((double) oldWidth);
+    double yscale = scrn.height()/((double) oldHeight);
+    if(DEBUG){
+      qDebug() << "Screen Resolution Changed:" << desktopnumber;
+      qDebug() << " - Old:" << QString::number(oldWidth)+"x"+QString::number(oldHeight);
+      qDebug() << " - New:" << QString::number(scrn.width())+"x"+QString::number(scrn.height());
+      qDebug() << " - Scale Factors:" << xscale << yscale;
+    }
+    //Update any panels in the config file
+    for(int i=0; i<4; i++){
+      QString PPREFIX = "panel"+QString::number(desktopnumber)+"."+QString::number(i)+"/";
+      int ht = settings->value(PPREFIX+"height",-1).toInt();
+      if(ht<1){ continue; } //no panel height defined
+      QString loc = settings->value(PPREFIX+"location","top").toString().toLower();
+      if(loc=="top" || loc=="bottom"){
+        settings->setValue(PPREFIX+"height", (int) ht*yscale); //vertical dimension
+      }else{
+        settings->setValue(PPREFIX+"height", (int) ht*xscale); //horizontal dimension
+      }
+    }
+    //Update any desktop plugins
+    QStringList plugs = settings->value(DPREFIX+"pluginlist").toStringList();
+    QFileInfoList files = LSession::handle()->DesktopFiles();
+    for(int i=0; i<files.length(); i++){
+      plugs << "applauncher::"+files[i].absoluteFilePath()+"---"+DPREFIX;
+    }
+    //QString pspath = QDir::homePath()+"/.lumina/desktop-plugins/%1.conf";
+    QSettings *DP = LSession::handle()->DesktopPluginSettings();
+    QStringList keys = DP->allKeys();
+    for(int i=0; i<plugs.length(); i++){
+      QStringList filter = keys.filter(plugs[i]);
+      for(int j=0; j<filter.length(); j++){
+        //Has existing settings - need to adjust it
+	  if(filter[j].endsWith("location/height")){ DP->setValue( filter[j], qRound(DP->value(filter[j]).toInt()*yscale) ); }
+	  if(filter[j].endsWith("location/width")){ DP->setValue( filter[j], qRound(DP->value(filter[j]).toInt()*xscale) ); }
+	  if(filter[j].endsWith("location/x")){ DP->setValue( filter[j], qRound(DP->value(filter[j]).toInt()*xscale) ); }
+	  if(filter[j].endsWith("location/y")){ DP->setValue( filter[j], qRound(DP->value(filter[j]).toInt()*yscale) ); }
+	  if(filter[j].endsWith("IconSize")){ DP->setValue( filter[j], qRound(DP->value(filter[j]).toInt()*yscale) ); }
+	  if(filter[j].endsWith("iconsize")){ DP->setValue( filter[j], qRound(DP->value(filter[j]).toInt()*yscale) ); }
+      }
+    }
+    DP->sync(); //make sure it gets saved to disk right away
+    
+  }
+  issyncing = false;
+}
+
+// =====================
+//     PRIVATE SLOTS
+// =====================
+void LDesktop::InitDesktop(){
+  //This is called *once* during the main initialization routines
+  checkResolution(); //Adjust the desktop config file first (if necessary)
+  if(DEBUG){ qDebug() << "Init Desktop:" << desktopnumber; }
+    //connect(desktop, SIGNAL(resized(int)), this, SLOT(UpdateGeometry(int)));
+  if(DEBUG){ qDebug() << "Desktop #"<<desktopnumber<<" -> "<< desktop->screenGeometry(desktopnumber) << LSession::handle()->screenGeom(desktopnumber); }
+  deskMenu = new QMenu(0);
+    connect(deskMenu, SIGNAL(triggered(QAction*)), this, SLOT(SystemApplication(QAction*)) );
+  winMenu = new QMenu(0);
+    winMenu->setTitle(tr("Window List"));
+    winMenu->setIcon( LXDG::findIcon("preferences-system-windows","") );
+  connect(winMenu, SIGNAL(triggered(QAction*)), this, SLOT(winClicked(QAction*)) );
+  workspacelabel = new QLabel(0);
+    workspacelabel->setAlignment(Qt::AlignCenter);
+  wkspaceact = new QWidgetAction(0);
+    wkspaceact->setDefaultWidget(workspacelabel);
+  bgtimer = new QTimer(this);
+    bgtimer->setSingleShot(true);
+    connect(bgtimer, SIGNAL(timeout()), this, SLOT(UpdateBackground()) );
+
+    connect(QApplication::instance(), SIGNAL(DesktopConfigChanged()), this, SLOT(SettingsChanged()) );
+    connect(QApplication::instance(), SIGNAL(DesktopFilesChanged()), this, SLOT(UpdateDesktop()) );
+    connect(QApplication::instance(), SIGNAL(LocaleChanged()), this, SLOT(LocaleChanged()) );
+
+  if(DEBUG){ qDebug() << "Create bgWindow"; }
+  bgWindow = new QWidget();
+	bgWindow->setObjectName("bgWindow");
+	bgWindow->setContextMenuPolicy(Qt::CustomContextMenu);
+	bgWindow->setFocusPolicy(Qt::StrongFocus);
+  	bgWindow->setWindowFlags(Qt::WindowStaysOnBottomHint | Qt::CustomizeWindowHint | Qt::FramelessWindowHint);
+	LSession::handle()->XCB->SetAsDesktop(bgWindow->winId());
+	bgWindow->setGeometry(LSession::handle()->screenGeom(desktopnumber));
+	connect(bgWindow, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(ShowMenu()) );
+  if(DEBUG){ qDebug() << "Create bgDesktop"; }
+  bgDesktop = new LDesktopPluginSpace(bgWindow); //new QMdiArea(bgWindow);
+      int grid = settings->value(DPREFIX+"GridSize",-1).toInt();
+      if(grid<0 && bgWindow->height() > 2000){ grid = 200; }
+      else if(grid<0){ grid = 100; }
+      bgDesktop->SetIconSize( grid );
+      connect(bgDesktop, SIGNAL(PluginRemovedByUser(QString)), this, SLOT(RemoveDeskPlugin(QString)) );
+      connect(bgDesktop, SIGNAL(IncreaseIcons()), this, SLOT(IncreaseDesktopPluginIcons()) );
+      connect(bgDesktop, SIGNAL(DecreaseIcons()), this, SLOT(DecreaseDesktopPluginIcons()) );
+      connect(bgDesktop, SIGNAL(HideDesktopMenu()), deskMenu, SLOT(hide()));
+  if(DEBUG){ qDebug() << " - Desktop Init Done:" << desktopnumber; }
+  //Start the update processes
+  QTimer::singleShot(10,this, SLOT(UpdateMenu()) );
+  QTimer::singleShot(0,this, SLOT(UpdateBackground()) );
+  QTimer::singleShot(1,this, SLOT(UpdateDesktop()) );
+  QTimer::singleShot(2,this, SLOT(UpdatePanels()) );
+}
+
+void LDesktop::SettingsChanged(){
+  if(issyncing){ return; } //don't refresh for internal modifications to the 
+  issyncing = true;
+  qDebug() << "Found Settings Change:" << desktopnumber;
+  settings->sync(); //make sure to sync with external settings changes
+  UpdateBackground();
+  UpdateDesktop();
+  UpdatePanels();
+  UpdateMenu();
+  issyncing = false;
+  QTimer::singleShot(100, this, SLOT(UnlockSettings()) ); //give it a few moments to settle before performing another sync
+}
+
+void LDesktop::LocaleChanged(){
+  //Update any elements which require a re-translation
+  UpdateMenu(false); //do the full menu refresh
+}
+
+void LDesktop::UpdateMenu(bool fast){
+  if(DEBUG){ qDebug() << " - Update Menu:" << desktopnumber; }
+  //Put a label at the top
+  int num = LSession::handle()->XCB->CurrentWorkspace(); //LX11::GetCurrentDesktop();
+  if(DEBUG){ qDebug() << "Found workspace number:" << num; }
+  if(num < 0){ workspacelabel->setText( "<b>"+tr("Lumina Desktop")+"</b>"); }
+  else{ workspacelabel->setText( "<b>"+QString(tr("Workspace %1")).arg(QString::number(num+1))+"</b>"); }
+  if(fast && usewinmenu){ UpdateWinMenu(); }
+  if(fast){ return; } //already done
+  deskMenu->clear(); //clear it for refresh
+  deskMenu->addAction(wkspaceact);
+  deskMenu->addSeparator();
+  //Now load the user's menu setup and fill the menu
+  QStringList items = settings->value("menu/itemlist", QStringList()<< "terminal" << "filemanager" <<"applications" << "line" << "settings" ).toStringList();
+  usewinmenu=false;
+  for(int i=0; i<items.length(); i++){
+    if(items[i]=="terminal"){ deskMenu->addAction(LXDG::findIcon("utilities-terminal",""), tr("Terminal"), this, SLOT(SystemTerminal()) ); }
+    else if(items[i]=="filemanager"){ deskMenu->addAction( LXDG::findIcon("user-home",""), tr("Browse Files"), this, SLOT(SystemFileManager()) ); }
+    else if(items[i]=="applications"){ deskMenu->addMenu( LSession::handle()->applicationMenu() ); }
+    else if(items[i]=="line"){ deskMenu->addSeparator(); }
+    else if(items[i]=="settings"){ deskMenu->addMenu( LSession::handle()->settingsMenu() ); }
+    else if(items[i]=="windowlist"){ deskMenu->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();
+      bool ok = false;
+      XDGDesktop xdgf = LXDG::loadDesktopFile(file, ok);
+      if(ok){
+        deskMenu->addAction( LXDG::findIcon(xdgf.icon,""), xdgf.name)->setWhatsThis(file);
+	}else{
+	  qDebug() << "Could not load application file:" << file;
+	}
+    }
+  }
+  //Now add the system quit options
+  deskMenu->addSeparator();
+  deskMenu->addAction(LXDG::findIcon("system-log-out",""), tr("Leave"), this, SLOT(SystemLogout()) );
+}
+
+void LDesktop::UpdateWinMenu(){
+  winMenu->clear();
+  //Get the current list of windows
+  QList<WId> wins = LSession::handle()->XCB->WindowList();	
+  //Now add them to the menu
+  for(int i=0; i<wins.length(); i++){
+    LWinInfo info(wins[i]);
+    bool junk;
+    QAction *act = winMenu->addAction( info.icon(junk), info.text() );
+      act->setData( QString::number(wins[i]) );
+  }
+}
+
+void LDesktop::winClicked(QAction* act){
+  LSession::handle()->XCB->ActivateWindow( act->data().toString().toULong() );	
+}
+
+void LDesktop::UpdateDesktop(){
+  if(DEBUG){ qDebug() << " - Update Desktop Plugins for screen:" << desktopnumber; }
+  QStringList plugins = settings->value(DPREFIX+"pluginlist", QStringList()).toStringList();
+  if(defaultdesktop && plugins.isEmpty()){
+    //plugins << "sample" << "sample" << "sample";
+  }
+  bool changed=false; //in case the plugin list needs to be changed
+  //First make sure all the plugin names are unique
+  for(int i=0; i<plugins.length(); i++){
+	if(!plugins[i].contains("---") ){
+	  int num=1;
+	  while( plugins.contains(plugins[i]+"---"+QString::number(desktopnumber)+"."+QString::number(num)) ){
+	    num++;
+	  }
+	  plugins[i] = plugins[i]+"---"+QString::number(desktopnumber)+"."+QString::number(num);
+	  changed=true;
+	}
+  }
+  if(changed){
+    //save the modified plugin list to file (so per-plugin settings are preserved)
+    issyncing=true; //don't let the change cause a refresh
+    settings->setValue(DPREFIX+"pluginlist", plugins);
+    settings->sync();
+    QTimer::singleShot(200, this, SLOT(UnlockSettings()) );
+  }
+  //If generating desktop file launchers, add those in
+  QStringList filelist;
+  if(settings->value(DPREFIX+"generateDesktopIcons",false).toBool()){
+    QFileInfoList files = LSession::handle()->DesktopFiles();
+    for(int i=0; i<files.length(); i++){
+	filelist << files[i].absoluteFilePath();
+    }
+  }
+  UpdateDesktopPluginArea();
+  bgDesktop->LoadItems(plugins, filelist);
+}
+
+void LDesktop::RemoveDeskPlugin(QString ID){
+  //This is called after a plugin is manually removed by the user
+  //	just need to ensure that the plugin is also removed from the settings file
+  QStringList plugs = settings->value(DPREFIX+"pluginlist", QStringList()).toStringList();
+  if(plugs.contains(ID)){ 
+    plugs.removeAll(ID); 
+    issyncing=true; //don't let the change cause a refresh
+    settings->setValue(DPREFIX+"pluginlist", plugs);
+    settings->sync();
+    QTimer::singleShot(200, this, SLOT(UnlockSettings()) );
+  }
+}
+
+void LDesktop::IncreaseDesktopPluginIcons(){
+  int cur = settings->value(DPREFIX+"GridSize",-1).toInt();
+  if(cur<0 && bgWindow->height() > 2000){ cur = 200; }
+  else if(cur<0){  cur = 100; }
+  cur+=16;
+  issyncing=true; //don't let the change cause a refresh
+  settings->setValue(DPREFIX+"GridSize",cur);
+    settings->sync();
+    QTimer::singleShot(200, this, SLOT(UnlockSettings()) );
+  bgDesktop->SetIconSize(cur);
+}
+
+void LDesktop::DecreaseDesktopPluginIcons(){
+  int cur = settings->value(DPREFIX+"GridSize",-1).toInt();
+  if(cur<0 && bgWindow->height() > 2000){ cur = 200; }
+  else if(cur<0){ cur = 100; }
+  if(cur<32){ return; } //cannot get smaller than 16x16
+  cur-=16;
+  issyncing=true; //don't let the change cause a refresh
+  settings->setValue(DPREFIX+"GridSize",cur);
+    settings->sync();
+    QTimer::singleShot(200, this, SLOT(UnlockSettings()) );
+  bgDesktop->SetIconSize(cur);	
+}
+
+void LDesktop::UpdatePanels(){
+  if(DEBUG){ qDebug() << " - Update Panels For Screen:" << desktopnumber; }
+  int panels = settings->value(DPREFIX+"panels", -1).toInt();
+  //if(panels==-1 && defaultdesktop){ panels=1; } //need at least 1 panel on the primary desktop
+  //Remove all extra panels
+  for(int i=0; i<PANELS.length(); i++){
+    if(panels <= PANELS[i]->number()){
+      if(DEBUG){ qDebug() << " -- Remove Panel:" << PANELS[i]->number(); }
+      PANELS[i]->prepareToClose();
+      PANELS.takeAt(i)->deleteLater();
+      i--;
+    }
+  }
+  for(int i=0; i<panels; i++){
+    //Check for a panel with this number
+    bool found = false;
+    for(int p=0; p<PANELS.length() && !found; p++){
+      if(PANELS[p]->number() == i){
+        found = true;
+	if(DEBUG){ qDebug() << " -- Update panel "<< i; }
+        //panel already exists - just update it
+        QTimer::singleShot(0, PANELS[p], SLOT(UpdatePanel()) );
+      }
+    }
+    if(!found){
+      if(DEBUG){ qDebug() << " -- Create panel "<< i; }
+      //New panel
+      LPanel *pan = new LPanel(settings, desktopnumber, i, bgWindow);
+      PANELS << pan;
+      pan->show();
+    }
+  }
+  //Give it a 1/2 second before ensuring that the visible desktop area is correct
+  QTimer::singleShot(500, this, SLOT(UpdateDesktopPluginArea()) );
+}
+
+void LDesktop::UpdateDesktopPluginArea(){
+  QRegion visReg( bgWindow->geometry() ); //visible region (not hidden behind a panel)
+  QRect rawRect = visReg.boundingRect(); //initial value (screen size)
+  for(int i=0; i<PANELS.length(); i++){
+    QRegion shifted = visReg;
+    QString loc = settings->value(PANELS[i]->prefix()+"location","top").toString().toLower();
+    int vis = PANELS[i]->visibleWidth();
+    if(loc=="top"){ 
+      if(!shifted.contains(QRect(rawRect.x(), rawRect.y(), rawRect.width(), vis))){ continue; }
+      shifted.translate(0, (rawRect.top()+vis)-shifted.boundingRect().top() ); 
+    }else if(loc=="bottom"){
+      if(!shifted.contains(QRect(rawRect.x(), rawRect.bottom()-vis, rawRect.width(), vis))){ continue; }	    
+      shifted.translate(0, (rawRect.bottom()-vis)-shifted.boundingRect().bottom()); 
+    }else if(loc=="left"){ 
+      if( !shifted.contains(QRect(rawRect.x(), rawRect.y(), vis,rawRect.height())) ){ continue; }
+      shifted.translate((rawRect.left()+vis)-shifted.boundingRect().left() ,0); 
+    }else{  //right
+      if(!shifted.contains(QRect(rawRect.right()-vis, rawRect.y(), vis,rawRect.height())) ){ continue; }
+      shifted.translate((rawRect.right()-vis)-shifted.boundingRect().right(),0); 
+    }
+    visReg = visReg.intersected( shifted );
+  }
+  //Now make sure the desktop plugin area is only the visible area
+  QRect rec = visReg.boundingRect();
+  //LSession::handle()->XCB->SetScreenWorkArea((unsigned int) desktopnumber, rec);
+  //Now remove the X offset to place it on the current screen (needs widget-coords, not global)
+  globalWorkRect = rec; //save this for later
+  rec.moveTopLeft( QPoint( rec.x()-desktop->screenGeometry(desktopnumber).x() , rec.y() ) );
+  //qDebug() << "DPlug Area:" << rec << bgDesktop->geometry() << LSession::handle()->desktop()->availableGeometry(bgDesktop);
+  if(rec.size().isNull() || rec == bgDesktop->geometry()){return; } //nothing changed
+  bgDesktop->setGeometry( rec );
+  bgDesktop->UpdateGeom(); //just in case the plugin space itself needs to do anything
+  //Re-paint the panels (just in case a plugin was underneath it and the panel is transparent)
+  for(int i=0; i<PANELS.length(); i++){ PANELS[i]->update(); }
+  //Make sure to re-disable any WM control flags
+  LSession::handle()->XCB->SetDisableWMActions(bgWindow->winId());
+}
+
+void LDesktop::UpdateBackground(){
+  //Get the current Background
+  if(bgupdating || bgWindow==0){ return; } //prevent multiple calls to this at the same time
+  bgupdating = true;
+  if(DEBUG){ qDebug() << " - Update Desktop Background for screen:" << desktopnumber; }
+  //Get the list of background(s) to show
+  QStringList bgL = settings->value(DPREFIX+"background/filelist", QStringList()).toStringList();
+  //qDebug() << " - List:" << bgL << CBG;
+    //Remove any invalid files
+    for(int i=0; i<bgL.length(); i++){
+      if( (!QFile::exists(bgL[i]) && bgL[i]!="default" && !bgL[i].startsWith("rgb(") ) || bgL[i].isEmpty()){ bgL.removeAt(i); i--; }
+    }
+    if(bgL.isEmpty()){ bgL << "default"; } //always fall back on the default
+  //Determine if the background needs to be changed
+  //qDebug() << "BG List:" << bgL << oldBGL << CBG << bgtimer->isActive();
+  if(bgL==oldBGL && !CBG.isEmpty() && bgtimer->isActive()){
+    //No background change scheduled - just update the widget
+    bgWindow->update();
+    bgupdating=false;
+    return;
+  }
+  oldBGL = bgL; //save this for later
+  //Determine which background to use next
+  int index;
+  if(CBG.isEmpty()){ index = ( qrand() % bgL.length() ); } //random first wallpaper
+  else{ 
+    //Go to the next in the list
+    index = bgL.indexOf(CBG); 
+    if(index < 0 || index >= bgL.length()-1){ index = 0; } //if invalid or last item in the list - go to first
+    else{ index++; } //go to next
+  }
+  QString bgFile = bgL[index];
+  //Save this file as the current background
+  CBG = bgFile;
+  //qDebug() << " - Set Background to:" << CBG << index << bgL;
+  if( (bgFile.toLower()=="default")){ bgFile = LOS::LuminaShare()+"desktop-background.jpg"; }
+  //Now set this file as the current background
+  QString style;
+  QString format = settings->value(DPREFIX+"background/format","stretch").toString();
+  if(bgFile.startsWith("rgb(")){ style = "QWidget#bgWindow{ border-image: none; background-color: %1;}";
+  }else if( format == "center"){ style = "QWidget#bgWindow{ background: black url(%1); background-position: center; background-repeat: no-repeat; }";
+  }else if( format == "topleft"){ style = "QWidget#bgWindow{ background: black url(%1); background-position: top left; background-repeat: no-repeat; }";
+  }else if( format == "topright"){ style = "QWidget#bgWindow{ background: black url(%1); background-position: top right; background-repeat: no-repeat; }";
+  }else if( format == "bottomleft"){ style = "QWidget#bgWindow{ background: black url(%1); background-position: bottom left; background-repeat: no-repeat; }";
+  }else if( format == "bottomright"){ style = "QWidget#bgWindow{ background: black url(%1); background-position: bottom right; background-repeat: no-repeat; }";
+  }else if( format == "tile"){ style = "QWidget#bgWindow{ background-color: black; border-image:url(%1) repeat;}";
+  }else{ /* STRETCH*/ style = "QWidget#bgWindow{ background-color: black; border-image:url(%1) stretch;}"; }
+  style = style.arg(bgFile);
+  bgWindow->setStyleSheet(style);
+  bgWindow->show();
+  //Now reset the timer for the next change (if appropriate)
+  if(bgtimer->isActive()){ bgtimer->stop(); }
+  if(bgL.length() > 1){
+    //get the length of the timer (in minutes)
+    int min = settings->value(DPREFIX+"background/minutesToChange",5).toInt();
+    //restart the internal timer
+    if(min > 0){
+      bgtimer->start(min*60000); //convert from minutes to milliseconds
+    }
+  }
+  //Now update the panel backgrounds
+  for(int i=0; i<PANELS.length(); i++){
+    PANELS[i]->update();
+    PANELS[i]->show();
+  }
+  bgupdating=false;
+}