5 files changed, 9 insertions, 46 deletions
diff --git a/lumina-desktop/LDesktop.cpp b/lumina-desktop/LDesktop.cpp
index 556b4560..d51e423a 100644
--- a/lumina-desktop/LDesktop.cpp
+++ b/lumina-desktop/LDesktop.cpp
@@ -16,54 +16,17 @@ LDesktop::LDesktop(int deskNum) : QObject(){
   DPREFIX = "desktop-"+QString::number(deskNum)+"/";
   desktopnumber = deskNum;
   desktop = QApplication::desktop();
-    //connect(desktop, SIGNAL(resized(int)), this, SLOT(UpdateGeometry(int)));
   defaultdesktop = (desktop->screenGeometry(desktopnumber).x()==0);
   desktoplocked = true;
   issyncing = bgupdating = deskupdating = false;
-  /*qDebug() << "Desktop #"<<deskNum<<" -> "<< desktop->screenGeometry(desktopnumber).x() << desktop->screenGeometry(desktopnumber).y() << desktop->screenGeometry(desktopnumber).width() << desktop->screenGeometry(desktopnumber).height();
-  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","") );*/
   usewinmenu=false;
-  //connect(winMenu, SIGNAL(triggered(QAction*)), this, SLOT(winClicked(QAction*)) );
-  //appmenu = new AppMenu(0);
-  /*workspacelabel = new QLabel(0);
-    workspacelabel->setAlignment(Qt::AlignCenter);
-  wkspaceact = new QWidgetAction(0);
-    wkspaceact->setDefaultWidget(workspacelabel);*/
+
   //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;
-  
-  /*bgtimer = new QTimer(this);
-    bgtimer->setSingleShot(true);
-    connect(bgtimer, SIGNAL(timeout()), this, SLOT(UpdateBackground()) );
-  watcher = new QFileSystemWatcher(this);
-    //connect(LSession::instance(), SIGNAL(DesktopConfigChanged()), this, SLOT(SettingsChanged()) );
-    watcher->addPath(settings->fileName());
-    connect(watcher, SIGNAL(fileChanged(QString)), this, SLOT(SettingsChanged()) );
-  
-  bgWindow = new QWidget(0);
-	bgWindow->setObjectName("bgWindow");
-	bgWindow->setContextMenuPolicy(Qt::CustomContextMenu);
-	LX11::SetAsDesktop(bgWindow->winId());
-	bgWindow->setGeometry(desktop->screenGeometry(desktopnumber));
-	connect(bgWindow, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(ShowMenu()) );
-  bgDesktop = new QMdiArea(bgWindow);
-	//Make sure the desktop area is transparent to show the background
-        bgDesktop->setBackground( QBrush(Qt::NoBrush) );
-	bgDesktop->setStyleSheet( "QMdiArea{ border: none; background: transparent;}" );
-  
-  //Start the update processes
-  QTimer::singleShot(1,this, SLOT(UpdateMenu()) );
-  QTimer::singleShot(1,this, SLOT(UpdateBackground()) );
-  QTimer::singleShot(1,this, SLOT(UpdateDesktop()) );
-  QTimer::singleShot(10,this, SLOT(UpdatePanels()) );*/
   QTimer::singleShot(1,this, SLOT(InitDesktop()) );
 
 }
@@ -168,10 +131,10 @@ void LDesktop::InitDesktop(){
 	bgDesktop->setStyleSheet( "QMdiArea{ border: none; background: transparent;}" );
   qDebug() << " - Desktop Init Done:" << desktopnumber;
   //Start the update processes
-  QTimer::singleShot(1,this, SLOT(UpdateMenu()) );
-  QTimer::singleShot(1,this, SLOT(UpdateBackground()) );
+  QTimer::singleShot(10,this, SLOT(UpdateMenu()) );
+  QTimer::singleShot(0,this, SLOT(UpdateBackground()) );
   QTimer::singleShot(1,this, SLOT(UpdateDesktop()) );
-  QTimer::singleShot(10,this, SLOT(UpdatePanels()) );
+  QTimer::singleShot(2,this, SLOT(UpdatePanels()) );
 }
 
 void LDesktop::SettingsChanged(){
diff --git a/lumina-desktop/desktop-plugins/desktopview/DesktopViewPlugin.cpp b/lumina-desktop/desktop-plugins/desktopview/DesktopViewPlugin.cpp
index 98d132ac..54727a36 100644
--- a/lumina-desktop/desktop-plugins/desktopview/DesktopViewPlugin.cpp
+++ b/lumina-desktop/desktop-plugins/desktopview/DesktopViewPlugin.cpp
@@ -18,9 +18,8 @@ DesktopViewPlugin::DesktopViewPlugin(QWidget* parent, QString ID) : LDPlugin(par
     list->setSpacing(2);
     list->setSelectionBehavior(QAbstractItemView::SelectItems);
     list->setSelectionMode(QAbstractItemView::NoSelection);
-    list->setStyleSheet( "QListWidget{ background: transparent; }" );
+    list->setStyleSheet( "QListWidget{ background: rgba(255,255,255,100); border: none; border-radius: 3px;}" );
     list->setIconSize(QSize(64,64));
-    list->setGridSize(QSize(80,80));
   this->layout()->addWidget(list);
   this->setInitialSize(200,300);
   watcher = new QFileSystemWatcher(this);
@@ -41,6 +40,7 @@ void DesktopViewPlugin::runItem(QListWidgetItem *item){
 
 void DesktopViewPlugin::updateContents(){
   list->clear();
+  list->setGridSize(QSize(80,70+this->fontMetrics().height()));
   QDir dir(QDir::homePath()+"/Desktop");
   QFileInfoList files = dir.entryInfoList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name | QDir::Type | QDir::DirsFirst);
   for(int i=0; i<files.length(); i++){
diff --git a/lumina-desktop/desktop-plugins/notepad/NotepadPlugin.cpp b/lumina-desktop/desktop-plugins/notepad/NotepadPlugin.cpp
index bba1d863..01e7179e 100644
--- a/lumina-desktop/desktop-plugins/notepad/NotepadPlugin.cpp
+++ b/lumina-desktop/desktop-plugins/notepad/NotepadPlugin.cpp
@@ -10,7 +10,7 @@ NotePadPlugin::NotePadPlugin(QWidget* parent, QString ID) : LDPlugin(parent, ID)
     this->layout()->setContentsMargins(0,0,0,0);
     vlay->setContentsMargins(3,3,3,3);
     frame = new QFrame(this);
-      frame->setStyleSheet("QFrame{border-size: 1px; background: rgba(255,255,255,100);}");
+      frame->setStyleSheet("QFrame{border-size: 1px; background: rgba(255,255,255,100); color: black;}");
     this->layout()->addWidget(frame);
     frame->setLayout(vlay);
    
diff --git a/lumina-desktop/fluxboxconf/fluxbox-keys b/lumina-desktop/fluxboxconf/fluxbox-keys
index 958a48c7..4d78efcb 100644
--- a/lumina-desktop/fluxboxconf/fluxbox-keys
+++ b/lumina-desktop/fluxboxconf/fluxbox-keys
@@ -73,7 +73,7 @@ Mod4 9 :Tab 9
 Mod1 F1 :Exec xterm
 
 # open a dialog to run programs
-Mod1 F2 :Exec fbrun
+Mod1 F2 :Exec lumina-search
 
 # current window commands
 Mod1 F4 :Close
diff --git a/lumina-desktop/main.cpp b/lumina-desktop/main.cpp
index 8c99a902..884e9441 100644
--- a/lumina-desktop/main.cpp
+++ b/lumina-desktop/main.cpp
@@ -82,7 +82,7 @@ int main(int argc, char ** argv)
     if(DEBUG){ qDebug() << "Load Locale:" << timer->elapsed(); }
     a.LoadLocale(QLocale().name());
     //Start launching external applications
-    QTimer::singleShot(2000, &a, SLOT(launchStartupApps()) ); //wait a second first
+    QTimer::singleShot(2000, &a, SLOT(launchStartupApps()) ); //wait a couple seconds first
     if(DEBUG){ qDebug() << "Exec Time:" << timer->elapsed(); delete timer;}
     int retCode = a.exec();
     //qDebug() << "Stopping the window manager";