Rename/move the new RSS reader plugin to "rssreader" in the backend/source tree, update luminaDesktop.conf to include this plugin as well as other quick out-of-box shortcuts.

8 files changed, 31 insertions, 19 deletions

diff --git a/src-qt5/core/lumina-desktop/defaults/luminaDesktop.conf b/src-qt5/core/lumina-desktop/defaults/luminaDesktop.conf
index 2c973adb..41672ab6 100644
--- a/src-qt5/core/lumina-desktop/defaults/luminaDesktop.conf
+++ b/src-qt5/core/lumina-desktop/defaults/luminaDesktop.conf
@@ -6,12 +6,12 @@
 #  system corresponding to the XDG mime-type specifications for default applications
 #  See Here for specifications: http://www.freedesktop.org/wiki/Specifications/mime-apps-spec/
 
-# Possible Desktop Plugins (Lumina version 0.8.7): 
-#   calendar, applauncher[::absolute path to *.desktop file], desktopview, notepad, audioplayer
-# Possible Panel Plugins (Lumina version 0.8.7):
+# Possible Desktop Plugins (Lumina version 0.9.1): 
+#   calendar, applauncher[::absolute path to *.desktop file], desktopview, notepad, audioplayer, rssreader
+# Possible Panel Plugins (Lumina version 0.9.1):
 #   userbutton, desktopbar, spacer, desktopswitcher, battery, clock, systemdashboard, systemstart
 #   taskmanager[-nogroups], systemtray, homebutton, appmenu, applauncher[::absolute path to *.desktop file]
-# Possible Menu Plugins (Lumina version 0.8.7):
+# Possible Menu Plugins (Lumina version 0.9.1):
 #   terminal, filemanager, applications, line, settings, windowlist, app::<absolute path to *.desktop file>
 
 #GENERAL SESSION SETTINGS 
@@ -22,10 +22,14 @@ session_playlogoutaudio=true #[true/false] Play the audio chimes on log out
 # DEFAULT UTILITIES
 # Provide the full path to *.desktop file, or a binary name which exists on PATH
 # *.desktop files provide better support for input formats, and are recommended
-#session_default_terminal=xterm 
-#session_default_filemanager=lumina-fm 
-#session_default_webbrowser=/usr/local/share/applications/firefox.desktop
-#session_default_email=/usr/local/share/applications/thunderbird.desktop
+#Note: the last "ifexists" entry has the highest priority for each session utility
+session_default_terminal_ifexists=xterm.desktop
+session_default_terminal_ifexists=lumina-terminal.desktop
+session_default_filemanager=lumina-fm.desktop
+session_default_webbrowser_ifexists=chromium-browser.desktop
+session_default_webbrowser_ifexists=firefox.desktop
+session_default_webbrowser_ifexists=qupzilla.desktop
+session_default_email_ifexists=trojita.desktop
 
 #THEME SETTINGS
 #theme.themefile=<file path> #Absolute path to the theme template file to use (disable for Lumina-Default)
@@ -35,19 +39,19 @@ theme_font=Arial #Name of the font family to use
 theme_fontsize=10pt #Default size of the fonts to use on the desktop (can also use a percentage of the screen height (<number>%) )
 
 #DESKTOP SETTINGS (used for the primary screen in multi-screen setups)
-desktop_visiblepanels=1 #[0/1/2] The number of panels visible by default
+desktop_visiblepanels=1 #[0 - 12] The number of panels visible by default
 #desktop.backgroundfiles= #list of absolute file paths for image files (disable for Lumina default)
 desktop_backgroundrotateminutes=5 #[positive integer] number of minutes between background rotations (if multiple files)
-desktop_plugins= #list of plugins to be shown on the desktop by default
+desktop_plugins=rssreader #list of plugins to be shown on the desktop by default
 desktop_generate_icons=true #[true/false] Auto-generate launchers for ~/Desktop items
 
 #PANEL SETTINGS (preface with panel1.<setting> or panel2.<setting>, depending on the number of panels you have visible by default)
-panel1_location=top #[top/bottom/left/right] Screen edge the panel should be on
+panel1_location=bottom #[top/bottom/left/right] Screen edge the panel should be on
 panel1_pixelsize=4%H #number of pixels wide/high the panel should be (or <number>%[W/H] for a percentage of the screen width/height)
 panel1_autohide=false #[true/false] Have the panel become visible on mouse-over
 panel1_plugins=systemstart, taskmanager-nogroups, spacer, systemtray, clock #list of plugins for the panel
 panel1_pinlocation=center #[left/center/right] Note:[left/right] corresponds to [top/bottom] for vertical panels
-panel1_edgepercent=90 #[1->100] percentage of the screen edge to use
+panel1_edgepercent=99 #[1->100] percentage of the screen edge to use
 
 #MENU SETTINGS (right-click menu)
 menu_plugins=terminal, filemanager, applications, line, settings #list of menu plugins to show
@@ -56,3 +60,11 @@ menu_plugins=terminal, filemanager, applications, line, settings #list of menu p
 #favorites_add=<file/dir path> #Create a favorites entry for this file/dir
 #favorites_remove=<file/dir path> #Remove a favorites entry for this file/dir
 #favorites_add_ifexists=<file/dir path> #Create a favorites entry for this file/dir if the file/dir exists
+favorites_add_ifexists=firefox.desktop
+favorites_add_ifexists=chromium-browser.desktop
+favorites_add_ifexists=qupzilla.desktop
+favorites_add_ifexists=thunderbird.desktop
+favorites_add_ifexists=trojita.desktop
+favorites_add_ifexists=smplayer.desktop
+favorites_add_ifexists=vlc.desktop
+favorites_add_ifexists=pithos.desktop
diff --git a/src-qt5/core/lumina-desktop/desktop-plugins/NewDP.h b/src-qt5/core/lumina-desktop/desktop-plugins/NewDP.h
index bbb0539b..e28b8c61 100644
--- a/src-qt5/core/lumina-desktop/desktop-plugins/NewDP.h
+++ b/src-qt5/core/lumina-desktop/desktop-plugins/NewDP.h
@@ -22,7 +22,7 @@
 #include "systemmonitor/MonitorWidget.h"
 //#include "quickcontainer/QuickDPlugin.h"
 //#include "messagecenter/MessageCenter.h"
-#include "rssfeeder/RSSFeedPlugin.h"
+#include "rssreader/RSSFeedPlugin.h"
 
 class NewDP{
 public:
@@ -49,7 +49,7 @@ public:
 	    //plug = new MessageCenterPlugin(parent, plugin);
 	  //}else if(plugin.section("---",0,0).startsWith("quick-") && LUtils::validQuickPlugin(plugin.section("---",0,0)) ){
 	    //plug = new QuickDPlugin(parent, plugin);
-	  }else if(plugin.section("---",0,0)=="rssfeeder"){
+	  }else if(plugin.section("---",0,0)=="rssreader"){
 	    plug = new RSSFeedPlugin(parent, plugin);
 	  }else{
 	    qWarning() << "Invalid Desktop Plugin:"<<plugin << " -- Ignored";
diff --git a/src-qt5/core/lumina-desktop/desktop-plugins/desktop-plugins.pri b/src-qt5/core/lumina-desktop/desktop-plugins/desktop-plugins.pri
index e39c594e..8376316a 100644
--- a/src-qt5/core/lumina-desktop/desktop-plugins/desktop-plugins.pri
+++ b/src-qt5/core/lumina-desktop/desktop-plugins/desktop-plugins.pri
@@ -3,8 +3,8 @@ SOURCES += $$PWD/applauncher/AppLauncherPlugin.cpp \
 	$$PWD/notepad/NotepadPlugin.cpp \
 	$$PWD/audioplayer/PlayerWidget.cpp \
 	$$PWD/systemmonitor/MonitorWidget.cpp \
-	$$PWD/rssfeeder/RSSFeedPlugin.cpp \
-	$$PWD/rssfeeder/RSSObjects.cpp
+	$$PWD/rssreader/RSSFeedPlugin.cpp \
+	$$PWD/rssreader/RSSObjects.cpp
 #	$$PWD/messagecenter/MessageCenter.cpp
 
 HEADERS += $$PWD/calendar/CalendarPlugin.h \
@@ -14,11 +14,11 @@ HEADERS += $$PWD/calendar/CalendarPlugin.h \
 	$$PWD/notepad/NotepadPlugin.h \
 	$$PWD/audioplayer/PlayerWidget.h \
 	$$PWD/systemmonitor/MonitorWidget.h \
-	$$PWD/rssfeeder/RSSFeedPlugin.h \
-	$$PWD/rssfeeder/RSSObjects.h
+	$$PWD/rssreader/RSSFeedPlugin.h \
+	$$PWD/rssreader/RSSObjects.h
 #	$$PWD/quickcontainer/QuickDPlugin.h
 #	$$PWD/messagecenter/MessageCenter.h
 
 FORMS += $$PWD/audioplayer/PlayerWidget.ui \
 	$$PWD/systemmonitor/MonitorWidget.ui \
-	$$PWD/rssfeeder/RSSFeedPlugin.ui
+	$$PWD/rssreader/RSSFeedPlugin.ui
diff --git a/src-qt5/core/lumina-desktop/desktop-plugins/rssfeeder/RSSFeedPlugin.cpp b/src-qt5/core/lumina-desktop/desktop-plugins/rssreader/RSSFeedPlugin.cpp
index 23c1ca01..23c1ca01 100644
--- a/src-qt5/core/lumina-desktop/desktop-plugins/rssfeeder/RSSFeedPlugin.cpp
+++ b/src-qt5/core/lumina-desktop/desktop-plugins/rssreader/RSSFeedPlugin.cpp
diff --git a/src-qt5/core/lumina-desktop/desktop-plugins/rssfeeder/RSSFeedPlugin.h b/src-qt5/core/lumina-desktop/desktop-plugins/rssreader/RSSFeedPlugin.h
index 68b36760..68b36760 100644
--- a/src-qt5/core/lumina-desktop/desktop-plugins/rssfeeder/RSSFeedPlugin.h
+++ b/src-qt5/core/lumina-desktop/desktop-plugins/rssreader/RSSFeedPlugin.h
diff --git a/src-qt5/core/lumina-desktop/desktop-plugins/rssfeeder/RSSFeedPlugin.ui b/src-qt5/core/lumina-desktop/desktop-plugins/rssreader/RSSFeedPlugin.ui
index 45dac405..45dac405 100644
--- a/src-qt5/core/lumina-desktop/desktop-plugins/rssfeeder/RSSFeedPlugin.ui
+++ b/src-qt5/core/lumina-desktop/desktop-plugins/rssreader/RSSFeedPlugin.ui
diff --git a/src-qt5/core/lumina-desktop/desktop-plugins/rssfeeder/RSSObjects.cpp b/src-qt5/core/lumina-desktop/desktop-plugins/rssreader/RSSObjects.cpp
index 654a005d..654a005d 100644
--- a/src-qt5/core/lumina-desktop/desktop-plugins/rssfeeder/RSSObjects.cpp
+++ b/src-qt5/core/lumina-desktop/desktop-plugins/rssreader/RSSObjects.cpp
diff --git a/src-qt5/core/lumina-desktop/desktop-plugins/rssfeeder/RSSObjects.h b/src-qt5/core/lumina-desktop/desktop-plugins/rssreader/RSSObjects.h
index c0e72e18..c0e72e18 100644
--- a/src-qt5/core/lumina-desktop/desktop-plugins/rssfeeder/RSSObjects.h
+++ b/src-qt5/core/lumina-desktop/desktop-plugins/rssreader/RSSObjects.h