Merge remote-tracking branch 'origin/master'

2 files changed, 28 insertions, 11 deletions

diff --git a/src-qt5/core/lumina-desktop/defaults/luminaDesktop-TrueOS.conf b/src-qt5/core/lumina-desktop/defaults/luminaDesktop-TrueOS.conf
index c1f3a194..e453c0b8 100644
--- a/src-qt5/core/lumina-desktop/defaults/luminaDesktop-TrueOS.conf
+++ b/src-qt5/core/lumina-desktop/defaults/luminaDesktop-TrueOS.conf
@@ -42,6 +42,7 @@ mime_default_unknown/*=lumina-textedit.desktop
 mime_default_application/x-shellscript=lumina-textedit.desktop
 mime_default_application/pdf_ifexists=pc-pdfviewer.desktop
 mime_default_application/pdf_ifexists=okular.desktop
+mime_default_application/pdf_ifexists=lumina-pdf.desktop
 mime_default_application/zip_ifexists=lumina-archiver.desktop
 mime_default_application/x-compressed-tar_ifexists=lumina-archiver.desktop
 mime_default_application/x-bzip-compressed-tar_ifexists=lumina-archiver.desktop
@@ -51,17 +52,17 @@ mime_default_application/x-xz-compressed-tar_ifexists=lumina-archiver.desktop
 mime_default_application/x-tar_ifexists=lumina-archiver.desktop
 
 #THEME SETTINGS
-theme_themefile=Glass #Name of the theme to use (disable for Lumina-Default)
-theme_colorfile=Lumina-Glass #Name of the color spec file to use for theming
-theme_iconset=oxygen #Name of the icon theme to use
-theme_font=Arial #Name of the font family to use
+theme_themefile=DarkGlass #Name of the theme to use (disable for Lumina-Default)
+theme_colorfile=Black #Name of the color spec file to use for theming
+theme_iconset=material-design-dark #Name of the icon theme to use
+theme_font=Noto Sans #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 - 12] The number of panels visible by default
-#desktop_backgroundfiles= #list of absolute file paths for image files (disable for Lumina default)
+desktop_backgroundfiles=/usr/local/share/wallpapers/TrueOS/trueos-1-4k.png #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=rssreader #list of plugins to be shown on the desktop by default
+#desktop_plugins= #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)
@@ -70,7 +71,7 @@ panel1_pixelsize=3.5%H #number of pixels wide/high the panel should be (or <numb
 panel1_autohide=false #[true/false] Have the panel become visible on mouse-over
 panel1_plugins=systemstart, taskmanager-nogroups, spacer, systemtray, clock, battery #list of plugins for the panel
 panel1_pinlocation=center #[left/center/right] Note:[left/right] corresponds to [top/bottom] for vertical panels
-panel1_edgepercent=99 #[1->100] percentage of the screen edge to use
+panel1_edgepercent=100 #[1->100] percentage of the screen edge to use
 
 #MENU SETTINGS (right-click menu)
 menu_plugins=terminal, filemanager, applications, line, settings, line, lockdesktop#list of menu plugins to show
@@ -96,6 +97,19 @@ favorites_add_ifexists=~/Videos
 #quicklaunch_add=<file/dir path> #Create a quicklaunch shortcut for this file/dir
 #quicklaunch_add_ifexists=<file/dir path> #Create a quicklaunch shortcut for this file/dir if the file/dir exists
 
+#Desktop Folder symlinks
+#desktoplinks_add=<file/dir path>
+desktoplinks_add=firefox.desktop
+desktoplinks_add=chromium-browser.desktop
+desktoplinks_add=qupzilla.desktop
+desktoplinks_add=thunderbird.desktop
+desktoplinks_add=trojita.desktop
+desktoplinks_add=vlc.desktop
+desktoplinks_add=pccontrol.desktop
+desktoplinks_add=lthemeengine.desktop
+desktoplinks_add=lumina-config.desktop
+desktoplinks_add=appcafe.desktop
+desktoplinks_add=handbook.desktop
 #Generic scripts/utilities to run for any additional setup procedures
 #  These are always run after all other settings are saved
 #Format: usersetup_run=<generic command to run>
diff --git a/src-qt5/core/lumina-desktop/defaults/luminaDesktop.conf b/src-qt5/core/lumina-desktop/defaults/luminaDesktop.conf
index 46d00053..1327f148 100644
--- a/src-qt5/core/lumina-desktop/defaults/luminaDesktop.conf
+++ b/src-qt5/core/lumina-desktop/defaults/luminaDesktop.conf
@@ -34,9 +34,12 @@ session_default_email_ifexists=trojita.desktop
 #DEFAULT UTILITIES FOR INDIVIDUAL MIME TYPES
 # Format: mime_default_<mimetype>[_ifexists]=<*.desktop file>
 mime_default_text/*_ifexists=lumina-textedit.desktop
+mime_default_audio/*_ifexists=lumina-mediaplayer.desktop
 mime_default_audio/*_ifexists=vlc.desktop
+mime_default_video/*_ifexists=lumina-mediaplayer.desktop
 mime_default_video/*_ifexists=vlc.desktop
 mime_default_application/zip_ifexists=lumina-archiver.desktop
+mime_default_application/pdf_ifexists=lumina-pdf.desktop
 mime_default_application/x-compressed-tar_ifexists=lumina-archiver.desktop
 mime_default_application/x-bzip-compressed-tar_ifexists=lumina-archiver.desktop
 mime_default_application/x-lrzip-compressed-tar_ifexists=lumina-archiver.desktop
@@ -47,9 +50,9 @@ mime_default_unknown/*=lumina-textedit.desktop
 mime_default_application/x-shellscript=lumina-textedit.desktop
 
 #THEME SETTINGS
-theme_themefile=Glass #Name of the theme to use (disable for Lumina-Default)
-theme_colorfile=Lumina-Glass #Name of the color spec file to use for theming
-theme_iconset=oxygen #Name of the icon theme to use
+theme_themefile=DarkGlass #Name of the theme to use (disable for Lumina-Default)
+theme_colorfile=Black #Name of the color spec file to use for theming
+theme_iconset=material-design-dark #Name of the icon theme to use
 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>%) )
 
@@ -66,7 +69,7 @@ panel1_pixelsize=3.5%H #number of pixels wide/high the panel should be (or <numb
 panel1_autohide=false #[true/false] Have the panel become visible on mouse-over
 panel1_plugins=systemstart, taskmanager-nogroups, spacer, systemtray, clock, battery #list of plugins for the panel
 panel1_pinlocation=center #[left/center/right] Note:[left/right] corresponds to [top/bottom] for vertical panels
-panel1_edgepercent=99 #[1->100] percentage of the screen edge to use
+panel1_edgepercent=100 #[1->100] percentage of the screen edge to use
 
 panel2_location=top
 panel2_pixelsize=3%H