Merge branch 'master' of github.com:trueos/lumina

5 files changed, 12 insertions, 8 deletions

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 e9ef78cb..3be19faa 100644
--- a/src-qt5/core/lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.cpp
+++ b/src-qt5/core/lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.cpp
@@ -20,7 +20,8 @@ AppLauncherPlugin::AppLauncherPlugin(QWidget* parent, QString ID) : LDPlugin(par
 	connect(watcher, SIGNAL(fileChanged(QString)), this, SLOT( loadButton()) );
 
   connect(this, SIGNAL(PluginActivated()), this, SLOT(buttonClicked()) ); //in case they use the context menu to launch it.
-  QTimer::singleShot(200,this, SLOT(loadButton()) );
+  loadButton();
+  //QTimer::singleShot(0,this, SLOT(loadButton()) );
 }
 	
 void AppLauncherPlugin::Cleanup(){
@@ -40,7 +41,7 @@ void AppLauncherPlugin::loadButton(){
   QString txt;
   if(path.endsWith(".desktop") && ok){
     XDGDesktop file(path);
-    ok = file.isValid();
+    ok = !file.name.isEmpty();
     if(!ok){
       button->setWhatsThis("");
       button->setIcon( QIcon(LXDG::findIcon("quickopen-file","").pixmap(QSize(icosize,icosize)).scaledToHeight(icosize, Qt::SmoothTransformation) ) );
diff --git a/src-qt5/core/lumina-desktop/desktop-plugins/audioplayer/PlayerWidget.cpp b/src-qt5/core/lumina-desktop/desktop-plugins/audioplayer/PlayerWidget.cpp
index 4d293b39..722a5865 100644
--- a/src-qt5/core/lumina-desktop/desktop-plugins/audioplayer/PlayerWidget.cpp
+++ b/src-qt5/core/lumina-desktop/desktop-plugins/audioplayer/PlayerWidget.cpp
@@ -30,6 +30,8 @@ PlayerWidget::PlayerWidget(QWidget *parent) : QWidget(parent), ui(new Ui::Player
     ui->tool_add->setMenu(addMenu);
 	
   updatinglists = false; //start off as false
+
+  ui->combo_playlist->setContextMenuPolicy(Qt::NoContextMenu);
 	
   LoadIcons();
   playerStateChanged(); //update button visibility
@@ -266,4 +268,4 @@ AudioPlayerPlugin::AudioPlayerPlugin(QWidget *parent, QString ID) : LDPlugin(par
 
 AudioPlayerPlugin::~AudioPlayerPlugin(){
   //qDebug() << "Remove AudioPlayerPlugin";
-}
\ No newline at end of file
+}
diff --git a/src-qt5/core/lumina-desktop/desktop-plugins/notepad/NotepadPlugin.cpp b/src-qt5/core/lumina-desktop/desktop-plugins/notepad/NotepadPlugin.cpp
index 435a57c2..6d321305 100644
--- a/src-qt5/core/lumina-desktop/desktop-plugins/notepad/NotepadPlugin.cpp
+++ b/src-qt5/core/lumina-desktop/desktop-plugins/notepad/NotepadPlugin.cpp
@@ -2,7 +2,7 @@
 
 #include <LuminaXDG.h>
 #include "LSession.h"
-#include <LuminaUtils.h>
+#include <LUtils.h>
 #include <QDir>
 #include <QFileDialog>
 #include <QInputDialog>
@@ -60,12 +60,13 @@ NotePadPlugin::NotePadPlugin(QWidget* parent, QString ID) : LDPlugin(parent, ID)
     edit->setReadOnly(false);
     edit->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     vlay->addWidget(edit);
+    edit->setContextMenuPolicy(Qt::NoContextMenu);
 	
   //Now load the new file-based system for saving notes
   //qDebug() << "Saving a new setting";
   this->saveSetting("customFile",""); //always clear this when the plugin is initialized (only maintained per-session)
   //qDebug() << "Loading Notes Dir";
-  QTimer::singleShot(2000, this, SLOT(notesDirChanged()));
+  QTimer::singleShot(10, this, SLOT(notesDirChanged()));
   //qDebug() << "Set Sizing";
   
   //qDebug() << "Connect Signals/slots";
diff --git a/src-qt5/core/lumina-desktop/desktop-plugins/quickcontainer/QuickDPlugin.h b/src-qt5/core/lumina-desktop/desktop-plugins/quickcontainer/QuickDPlugin.h
index 4ba74133..d6039ac0 100644
--- a/src-qt5/core/lumina-desktop/desktop-plugins/quickcontainer/QuickDPlugin.h
+++ b/src-qt5/core/lumina-desktop/desktop-plugins/quickcontainer/QuickDPlugin.h
@@ -13,7 +13,7 @@
 #include <QVBoxLayout>
 #include "../LDPlugin.h"
 
-#include <LuminaUtils.h>
+#include <LUtils.h>
 
 class QuickDPlugin : public LDPlugin{
 	Q_OBJECT
diff --git a/src-qt5/core/lumina-desktop/desktop-plugins/rssreader/RSSFeedPlugin.cpp b/src-qt5/core/lumina-desktop/desktop-plugins/rssreader/RSSFeedPlugin.cpp
index 23c1ca01..c330d6c0 100644
--- a/src-qt5/core/lumina-desktop/desktop-plugins/rssreader/RSSFeedPlugin.cpp
+++ b/src-qt5/core/lumina-desktop/desktop-plugins/rssreader/RSSFeedPlugin.cpp
@@ -9,7 +9,7 @@
 
 #include <LuminaXDG.h>
 #include "LSession.h"
-#include <LuminaUtils.h>
+#include <LUtils.h>
 #include <QDir>
 #include <QFileDialog>
 #include <QInputDialog>
@@ -20,7 +20,7 @@ RSSFeedPlugin::RSSFeedPlugin(QWidget* parent, QString ID) : LDPlugin(parent, ID)
   //Load the global settings 
   setprefix = "rssreader/"; //this structure/prefix should be used for *all* plugins of this type
   RSS = new RSSReader(this, setprefix);
-
+  ui->text_feed->setContextMenuPolicy(Qt::NoContextMenu);
   //Create the options menu
   optionsMenu = new QMenu(this);
   ui->tool_options->setMenu(optionsMenu);