From 262e9ff5395e41abc567644530278123f357eee8 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Fri, 21 Oct 2016 14:29:15 -0400 Subject: For desktop icons, only check if there is a name to decide when to show it. Let the launcher find any problems with it and alert the user at that time. --- .../lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src-qt5/core/lumina-desktop/desktop-plugins') 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..708355cd 100644 --- a/src-qt5/core/lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.cpp +++ b/src-qt5/core/lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.cpp @@ -40,7 +40,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) ) ); -- cgit From 7ab900e41f5f15adccd573d459a80fe60cf6a044 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Mon, 7 Nov 2016 13:52:20 -0500 Subject: LARGE UPDATE: 1) Dismantle the Lumina library completely. 2) Setup lots of small subproject files (.pri) for the individual classes within the old library. 3) Move all the Lumina binaries to use the new subproject files 4) Split up the LuminaUtils class/files into LUtils and LDesktopUtils (generic utilities, and desktop-specific utilities) --- src-qt5/core/lumina-desktop/desktop-plugins/notepad/NotepadPlugin.cpp | 2 +- .../core/lumina-desktop/desktop-plugins/quickcontainer/QuickDPlugin.h | 2 +- src-qt5/core/lumina-desktop/desktop-plugins/rssreader/RSSFeedPlugin.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src-qt5/core/lumina-desktop/desktop-plugins') 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..a2549acf 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 #include "LSession.h" -#include +#include #include #include #include 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 #include "../LDPlugin.h" -#include +#include 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..8dc58e0a 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 #include "LSession.h" -#include +#include #include #include #include -- cgit From 634557bad1b1b6781fe693d37b480897cc55376e Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Thu, 10 Nov 2016 12:38:56 -0500 Subject: Add pass-through for context menu requests on many desktop plugins. This should allow the user to click almost anywhere on the plugin to actually see the menu for managing the plugin itself. --- .../core/lumina-desktop/desktop-plugins/audioplayer/PlayerWidget.cpp | 4 +++- src-qt5/core/lumina-desktop/desktop-plugins/notepad/NotepadPlugin.cpp | 1 + .../core/lumina-desktop/desktop-plugins/rssreader/RSSFeedPlugin.cpp | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src-qt5/core/lumina-desktop/desktop-plugins') 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 a2549acf..fe26941e 100644 --- a/src-qt5/core/lumina-desktop/desktop-plugins/notepad/NotepadPlugin.cpp +++ b/src-qt5/core/lumina-desktop/desktop-plugins/notepad/NotepadPlugin.cpp @@ -60,6 +60,7 @@ 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"; 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 8dc58e0a..c330d6c0 100644 --- a/src-qt5/core/lumina-desktop/desktop-plugins/rssreader/RSSFeedPlugin.cpp +++ b/src-qt5/core/lumina-desktop/desktop-plugins/rssreader/RSSFeedPlugin.cpp @@ -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); -- cgit From 3464e681e6eebe8022b75750405770e8dfe7db87 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Sat, 12 Nov 2016 09:19:29 -0500 Subject: Speed up the initial loading of the desktop at start, and delay the auto-started apps by 1/2 second. --- .../lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.cpp | 3 ++- src-qt5/core/lumina-desktop/desktop-plugins/notepad/NotepadPlugin.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src-qt5/core/lumina-desktop/desktop-plugins') 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 708355cd..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(){ 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 fe26941e..6d321305 100644 --- a/src-qt5/core/lumina-desktop/desktop-plugins/notepad/NotepadPlugin.cpp +++ b/src-qt5/core/lumina-desktop/desktop-plugins/notepad/NotepadPlugin.cpp @@ -66,7 +66,7 @@ NotePadPlugin::NotePadPlugin(QWidget* parent, QString ID) : LDPlugin(parent, ID) //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"; -- cgit