From 2979715098badeeedca5709817d7944ca16d2d69 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Tue, 28 Jun 2016 12:50:54 -0400 Subject: Cleanup the build system for how the special OS-specific config file/wallpaper are added into the build. This now means that we can commit any generic *-${OS}.[jpg/conf] here to the defaults directory and it will automatically get pulled in at build time. --- .../core/lumina-desktop/defaults/defaultapps.conf | 1 - .../defaults/desktop-background-TrueOS.jpg | Bin 0 -> 4005674 bytes .../defaults/desktop-background-trueos.jpg | Bin 4005674 -> 0 bytes .../defaults/desktop-background.pcbsd.jpg | Bin 3237484 -> 0 bytes .../lumina-desktop/defaults/desktopsettings.conf | 1 - .../defaults/luminaDesktop-TrueOS.conf | 98 +++++++++++++++++++ .../lumina-desktop/defaults/luminaDesktop.conf | 2 +- .../defaults/luminaDesktop.pcbsd.conf | 105 --------------------- src-qt5/core/lumina-desktop/lumina-desktop.pro | 18 +++- 9 files changed, 113 insertions(+), 112 deletions(-) delete mode 100644 src-qt5/core/lumina-desktop/defaults/defaultapps.conf create mode 100644 src-qt5/core/lumina-desktop/defaults/desktop-background-TrueOS.jpg delete mode 100644 src-qt5/core/lumina-desktop/defaults/desktop-background-trueos.jpg delete mode 100644 src-qt5/core/lumina-desktop/defaults/desktop-background.pcbsd.jpg delete mode 100644 src-qt5/core/lumina-desktop/defaults/desktopsettings.conf create mode 100644 src-qt5/core/lumina-desktop/defaults/luminaDesktop-TrueOS.conf delete mode 100644 src-qt5/core/lumina-desktop/defaults/luminaDesktop.pcbsd.conf (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-desktop/defaults/defaultapps.conf b/src-qt5/core/lumina-desktop/defaults/defaultapps.conf deleted file mode 100644 index 8b137891..00000000 --- a/src-qt5/core/lumina-desktop/defaults/defaultapps.conf +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src-qt5/core/lumina-desktop/defaults/desktop-background-TrueOS.jpg b/src-qt5/core/lumina-desktop/defaults/desktop-background-TrueOS.jpg new file mode 100644 index 00000000..de11074e Binary files /dev/null and b/src-qt5/core/lumina-desktop/defaults/desktop-background-TrueOS.jpg differ diff --git a/src-qt5/core/lumina-desktop/defaults/desktop-background-trueos.jpg b/src-qt5/core/lumina-desktop/defaults/desktop-background-trueos.jpg deleted file mode 100644 index de11074e..00000000 Binary files a/src-qt5/core/lumina-desktop/defaults/desktop-background-trueos.jpg and /dev/null differ diff --git a/src-qt5/core/lumina-desktop/defaults/desktop-background.pcbsd.jpg b/src-qt5/core/lumina-desktop/defaults/desktop-background.pcbsd.jpg deleted file mode 100644 index 80c3cf02..00000000 Binary files a/src-qt5/core/lumina-desktop/defaults/desktop-background.pcbsd.jpg and /dev/null differ diff --git a/src-qt5/core/lumina-desktop/defaults/desktopsettings.conf b/src-qt5/core/lumina-desktop/defaults/desktopsettings.conf deleted file mode 100644 index 8b137891..00000000 --- a/src-qt5/core/lumina-desktop/defaults/desktopsettings.conf +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src-qt5/core/lumina-desktop/defaults/luminaDesktop-TrueOS.conf b/src-qt5/core/lumina-desktop/defaults/luminaDesktop-TrueOS.conf new file mode 100644 index 00000000..f3f4a7bc --- /dev/null +++ b/src-qt5/core/lumina-desktop/defaults/luminaDesktop-TrueOS.conf @@ -0,0 +1,98 @@ +#This is the configuration file that generates all the default settings files for the Lumina desktop +# For any setting that can take a list of values, each vale needs to be seperated by a comma and a space (", ") +# Example: some_setting=item1, item2, item3 + +#NOTE: To pre-setup default applications for particular mime-types, you need to create *.desktop entries on +# 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.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.9.1): +# terminal, filemanager, applications, line, settings, windowlist, app:: + +#GENERAL SESSION SETTINGS +session_enablenumlock=false #[true/false] Enable numlock on login using "numlockx" +session_playloginaudio=true #[true/false] Play the audio chimes on log in +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 +#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 + +#DEFAULT UTILITIES FOR INDIVIDUAL MIME TYPES +# Format: mime_default_[_ifexists]=<*.desktop file> +mime_default_text/*_ifexists=lumina-textedit.desktop +mime_default_audio/*_ifexists=vlc.desktop +mime_default_video/*_ifexists=vlc.desktop +mime_default_application/zip_ifexists=peazip.desktop +mime_default_application/x-compressed-tar_ifexists=peazip.desktop +mime_default_application/x-bzip-compressed-tar_ifexists=peazip.desktop +mime_default_application/x-lrzip-compressed-tar_ifexists=peazip.desktop +mime_default_application/x-lzma-compressed-tar_ifexists=peazip.desktop +mime_default_application/x-xz-compressed-tar_ifexists=peazip.desktop +mime_default_application/x-tar_ifexists=peazip.desktop +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=Grey-Dark #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_fontsize=10pt #Default size of the fonts to use on the desktop (can also use a percentage of the screen height (%) ) + +#DESKTOP SETTINGS (used for the primary screen in multi-screen setups) +desktop_visiblepanels=2 #[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=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. or panel2., depending on the number of panels you have visible by default) +panel1_location=bottom #[top/bottom/left/right] Screen edge the panel should be on +panel1_pixelsize=3.5%H #number of pixels wide/high the panel should be (or %[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, 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 + +#MENU SETTINGS (right-click menu) +menu_plugins=terminal, filemanager, applications, line, settings #list of menu plugins to show + +#FAVORITES CUSTOMIZATION +#favorites_add= #Create a favorites entry for this file/dir +#favorites_remove= #Remove a favorites entry for this file/dir +#favorites_add_ifexists= #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 +favorites_add_ifexists=~/Documents +favorites_add_ifexists=~/Downloads +favorites_add_ifexists=~/Pictures +favorites_add_ifexists=~/Videos + +#QUICKLAUNCH CUSTOMIZATION (requires the use of the "systemstart" panel plugin) +#quicklaunch_add= #Create a quicklaunch shortcut for this file/dir +#quicklaunch_add_ifexists= #Create a quicklaunch shortcut for this file/dir if the file/dir exists + +#Generic scripts/utilities to run for any additional setup procedures +# These are always run after all other settings are saved +#Format: usersetup_run= +usersetup_run=xdg-user-dirs-update diff --git a/src-qt5/core/lumina-desktop/defaults/luminaDesktop.conf b/src-qt5/core/lumina-desktop/defaults/luminaDesktop.conf index 68ea1f3c..7f8e363c 100644 --- a/src-qt5/core/lumina-desktop/defaults/luminaDesktop.conf +++ b/src-qt5/core/lumina-desktop/defaults/luminaDesktop.conf @@ -64,7 +64,7 @@ desktop_generate_icons=true #[true/false] Auto-generate launchers for ~/Desktop panel1_location=bottom #[top/bottom/left/right] Screen edge the panel should be on panel1_pixelsize=3.5%H #number of pixels wide/high the panel should be (or %[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_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 diff --git a/src-qt5/core/lumina-desktop/defaults/luminaDesktop.pcbsd.conf b/src-qt5/core/lumina-desktop/defaults/luminaDesktop.pcbsd.conf deleted file mode 100644 index 3d434501..00000000 --- a/src-qt5/core/lumina-desktop/defaults/luminaDesktop.pcbsd.conf +++ /dev/null @@ -1,105 +0,0 @@ -#This is the configuration file that generates all the default settings files for the Lumina desktop -# For any setting that can take a list of values, each vale needs to be seperated by a comma and a space (", ") -# Example: some_setting=item1, item2, item3 - -#NOTE: To pre-setup default applications for particular mime-types, you need to create *.desktop entries on -# 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.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.9.1): -# terminal, filemanager, applications, line, settings, windowlist, app:: - -#GENERAL SESSION SETTINGS -session_enablenumlock=false #[true/false] Enable numlock on login using "numlockx" -session_playloginaudio=true #[true/false] Play the audio chimes on log in -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 -#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 - -#DEFAULT UTILITIES FOR INDIVIDUAL MIME TYPES -# Format: mime_default_[_ifexists]=<*.desktop file> -mime_default_text/*_ifexists=lumina-textedit.desktop -mime_default_audio/*_ifexists=vlc.desktop -mime_default_video/*_ifexists=vlc.desktop -mime_default_application/zip_ifexists=peazip.desktop -mime_default_application/x-compressed-tar_ifexists=peazip.desktop -mime_default_application/x-bzip-compressed-tar_ifexists=peazip.desktop -mime_default_application/x-lrzip-compressed-tar_ifexists=peazip.desktop -mime_default_application/x-lzma-compressed-tar_ifexists=peazip.desktop -mime_default_application/x-xz-compressed-tar_ifexists=peazip.desktop -mime_default_application/x-tar_ifexists=peazip.desktop -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=Grey-Dark #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_fontsize=10pt #Default size of the fonts to use on the desktop (can also use a percentage of the screen height (%) ) - -#DESKTOP SETTINGS (used for the primary screen in multi-screen setups) -desktop_visiblepanels=2 #[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=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. or panel2., depending on the number of panels you have visible by default) -panel1_location=bottom #[top/bottom/left/right] Screen edge the panel should be on -panel1_pixelsize=3.5%H #number of pixels wide/high the panel should be (or %[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=99 #[1->100] percentage of the screen edge to use - -panel2_location=top -panel2_pixelsize=3%H -panel2_autohide=true -panel2_plugins=spacer, desktopbar, spacer -panel2_pinlocation=center -panel2_edgepercent=10 - -#MENU SETTINGS (right-click menu) -menu_plugins=terminal, filemanager, applications, line, settings #list of menu plugins to show - -#FAVORITES CUSTOMIZATION -#favorites_add= #Create a favorites entry for this file/dir -#favorites_remove= #Remove a favorites entry for this file/dir -#favorites_add_ifexists= #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 -favorites_add_ifexists=~/Documents -favorites_add_ifexists=~/Downloads -favorites_add_ifexists=~/Pictures -favorites_add_ifexists=~/Videos - -#QUICKLAUNCH CUSTOMIZATION (requires the use of the "systemstart" panel plugin) -#quicklaunch_add= #Create a quicklaunch shortcut for this file/dir -#quicklaunch_add_ifexists= #Create a quicklaunch shortcut for this file/dir if the file/dir exists - -#Generic scripts/utilities to run for any additional setup procedures -# These are always run after all other settings are saved -#Format: usersetup_run= -usersetup_run=xdg-user-dirs-update diff --git a/src-qt5/core/lumina-desktop/lumina-desktop.pro b/src-qt5/core/lumina-desktop/lumina-desktop.pro index 33c20502..4bf38a08 100644 --- a/src-qt5/core/lumina-desktop/lumina-desktop.pro +++ b/src-qt5/core/lumina-desktop/lumina-desktop.pro @@ -87,12 +87,22 @@ defaults.path = $${L_SHAREDIR}/lumina-desktop/ conf.path = $${L_ETCDIR} -#Now do any TrueOS defaults (if set) -PCBSD{ - conf.extra = cp defaults/luminaDesktop.pcbsd.conf $(INSTALL_ROOT)$${L_ETCDIR}/luminaDesktop.conf.dist - defaults.extra = cp defaults/desktop-background.pcbsd.jpg $(INSTALL_ROOT)$${L_SHAREDIR}/lumina-desktop/desktop-background.jpg +#Now do any OS-specific defaults (if available) +#First see if there is a known OS override first +TRUEOS{ + message("Installing defaults for OS: TrueOS") + OS=TrueOS +} +exists("defaults/luminaDesktop-$${OS}.conf"){ + message(" -- Found OS-specific system config file: $${OS}"); + conf.extra = cp defaults/luminaDesktop-$${OS}.conf $(INSTALL_ROOT)$${L_ETCDIR}/luminaDesktop.conf.dist }else{ conf.extra = cp defaults/luminaDesktop.conf $(INSTALL_ROOT)$${L_ETCDIR}/luminaDesktop.conf.dist +} +exists("defaults/desktop-background-$${OS}.jpg"){ + message(" -- Found OS-specific background image: $${OS}"); + defaults.extra = cp defaults/desktop-background-$${OS}.jpg $(INSTALL_ROOT)$${L_SHAREDIR}/lumina-desktop/desktop-background.jpg +}else{ defaults.extra = cp defaults/desktop-background.jpg $(INSTALL_ROOT)$${L_SHAREDIR}/lumina-desktop/desktop-background.jpg } -- cgit