diff --git a/icon-theme/icon-theme.pro b/icon-theme/icon-theme.pro index 8978488ce..99d24c384 100644 --- a/icon-theme/icon-theme.pro +++ b/icon-theme/icon-theme.pro @@ -1,5 +1,6 @@ TEMPLATE = subdirs CONFIG += recursive -SUBDIRS+= material-design-light \ +SUBDIRS+= lumina-icons \ + material-design-light \ material-design-dark diff --git a/icon-theme/lumina-icons/LICENSE b/icon-theme/lumina-icons/LICENSE new file mode 100644 index 000000000..1cea9596c --- /dev/null +++ b/icon-theme/lumina-icons/LICENSE @@ -0,0 +1,2 @@ +Lumina-Icons are under the CC-BY License. +For more information see: https://creativecommons.org/licenses/by/4.0/ \ No newline at end of file diff --git a/icon-theme/lumina-icons/actions/symbolic/application.svg b/icon-theme/lumina-icons/actions/symbolic/application.svg new file mode 100644 index 000000000..a8c93e3d1 --- /dev/null +++ b/icon-theme/lumina-icons/actions/symbolic/application.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/icon-theme/lumina-icons/actions/symbolic/apps.svg b/icon-theme/lumina-icons/actions/symbolic/apps.svg new file mode 100644 index 000000000..7c3493a4a --- /dev/null +++ b/icon-theme/lumina-icons/actions/symbolic/apps.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/icon-theme/lumina-icons/actions/symbolic/arrow-down-double.svg b/icon-theme/lumina-icons/actions/symbolic/arrow-down-double.svg new file mode 100644 index 000000000..990b0e159 --- /dev/null +++ b/icon-theme/lumina-icons/actions/symbolic/arrow-down-double.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/icon-theme/lumina-icons/actions/symbolic/arrow-down.svg b/icon-theme/lumina-icons/actions/symbolic/arrow-down.svg new file mode 100644 index 000000000..667b30e07 --- /dev/null +++ b/icon-theme/lumina-icons/actions/symbolic/arrow-down.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/icon-theme/lumina-icons/actions/symbolic/arrow-up.svg b/icon-theme/lumina-icons/actions/symbolic/arrow-up.svg new file mode 100644 index 000000000..e58262dfd --- /dev/null +++ b/icon-theme/lumina-icons/actions/symbolic/arrow-up.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/icon-theme/lumina-icons/actions/symbolic/audio-volume-high.svg b/icon-theme/lumina-icons/actions/symbolic/audio-volume-high.svg new file mode 100644 index 000000000..e6fd464af --- /dev/null +++ b/icon-theme/lumina-icons/actions/symbolic/audio-volume-high.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/icon-theme/lumina-icons/actions/symbolic/audio-volume-low.svg b/icon-theme/lumina-icons/actions/symbolic/audio-volume-low.svg new file mode 100644 index 000000000..1dd4454d1 --- /dev/null +++ b/icon-theme/lumina-icons/actions/symbolic/audio-volume-low.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/icon-theme/lumina-icons/actions/symbolic/audio-volume-medium.svg b/icon-theme/lumina-icons/actions/symbolic/audio-volume-medium.svg new file mode 100644 index 000000000..cdda5b598 --- /dev/null +++ b/icon-theme/lumina-icons/actions/symbolic/audio-volume-medium.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/icon-theme/lumina-icons/actions/symbolic/audio-volume-off.svg b/icon-theme/lumina-icons/actions/symbolic/audio-volume-off.svg new file mode 100644 index 000000000..5031ef91b --- /dev/null +++ b/icon-theme/lumina-icons/actions/symbolic/audio-volume-off.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/icon-theme/lumina-icons/actions/symbolic/audio-volume.svg b/icon-theme/lumina-icons/actions/symbolic/audio-volume.svg new file mode 100644 index 000000000..e6fd464af --- /dev/null +++ b/icon-theme/lumina-icons/actions/symbolic/audio-volume.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/icon-theme/lumina-icons/actions/symbolic/bookmark-new-list.svg b/icon-theme/lumina-icons/actions/symbolic/bookmark-new-list.svg new file mode 100644 index 000000000..dede0692f --- /dev/null +++ b/icon-theme/lumina-icons/actions/symbolic/bookmark-new-list.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/icon-theme/lumina-icons/actions/symbolic/bookmark-new.svg b/icon-theme/lumina-icons/actions/symbolic/bookmark-new.svg new file mode 100644 index 000000000..2ffdc364e --- /dev/null +++ b/icon-theme/lumina-icons/actions/symbolic/bookmark-new.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/icon-theme/lumina-icons/actions/symbolic/bookmark-remove-list.svg b/icon-theme/lumina-icons/actions/symbolic/bookmark-remove-list.svg new file mode 100644 index 000000000..5106618eb --- /dev/null +++ b/icon-theme/lumina-icons/actions/symbolic/bookmark-remove-list.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/icon-theme/lumina-icons/actions/symbolic/bookmark-remove.svg b/icon-theme/lumina-icons/actions/symbolic/bookmark-remove.svg new file mode 100644 index 000000000..fa6cd6f94 --- /dev/null +++ b/icon-theme/lumina-icons/actions/symbolic/bookmark-remove.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/icon-theme/lumina-icons/actions/symbolic/bookmark-toolbar.svg b/icon-theme/lumina-icons/actions/symbolic/bookmark-toolbar.svg new file mode 100644 index 000000000..02bc77857 --- /dev/null +++ b/icon-theme/lumina-icons/actions/symbolic/bookmark-toolbar.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/icon-theme/lumina-icons/actions/symbolic/camera-off.svg b/icon-theme/lumina-icons/actions/symbolic/camera-off.svg new file mode 100644 index 000000000..81b0d4669 --- /dev/null +++ b/icon-theme/lumina-icons/actions/symbolic/camera-off.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/icon-theme/lumina-icons/actions/symbolic/camera-photo.svg b/icon-theme/lumina-icons/actions/symbolic/camera-photo.svg new file mode 100644 index 000000000..733c3e06b --- /dev/null +++ b/icon-theme/lumina-icons/actions/symbolic/camera-photo.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/icon-theme/lumina-icons/actions/symbolic/camera-video-off.svg b/icon-theme/lumina-icons/actions/symbolic/camera-video-off.svg new file mode 100644 index 000000000..742057de4 --- /dev/null +++ b/icon-theme/lumina-icons/actions/symbolic/camera-video-off.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/icon-theme/lumina-icons/actions/symbolic/camera-video.svg b/icon-theme/lumina-icons/actions/symbolic/camera-video.svg new file mode 100644 index 000000000..6df21a707 --- /dev/null +++ b/icon-theme/lumina-icons/actions/symbolic/camera-video.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/icon-theme/lumina-icons/actions/symbolic/camera-web.svg b/icon-theme/lumina-icons/actions/symbolic/camera-web.svg new file mode 100644 index 000000000..36dd928df --- /dev/null +++ b/icon-theme/lumina-icons/actions/symbolic/camera-web.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/icon-theme/lumina-icons/actions/symbolic/clock.svg b/icon-theme/lumina-icons/actions/symbolic/clock.svg new file mode 100644 index 000000000..b6ba54804 --- /dev/null +++ b/icon-theme/lumina-icons/actions/symbolic/clock.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/icon-theme/lumina-icons/actions/symbolic/git-gui.svg b/icon-theme/lumina-icons/actions/symbolic/git-gui.svg new file mode 100644 index 000000000..37e5fda30 --- /dev/null +++ b/icon-theme/lumina-icons/actions/symbolic/git-gui.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icon-theme/lumina-icons/actions/symbolic/lock.svg b/icon-theme/lumina-icons/actions/symbolic/lock.svg new file mode 100644 index 000000000..20c1f0b9b --- /dev/null +++ b/icon-theme/lumina-icons/actions/symbolic/lock.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/icon-theme/lumina-icons/actions/symbolic/system-cancel.svg b/icon-theme/lumina-icons/actions/symbolic/system-cancel.svg new file mode 100644 index 000000000..e555dadfe --- /dev/null +++ b/icon-theme/lumina-icons/actions/symbolic/system-cancel.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/icon-theme/lumina-icons/actions/symbolic/system-error.svg b/icon-theme/lumina-icons/actions/symbolic/system-error.svg new file mode 100644 index 000000000..cd4311fa4 --- /dev/null +++ b/icon-theme/lumina-icons/actions/symbolic/system-error.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icon-theme/lumina-icons/actions/symbolic/system-help.svg b/icon-theme/lumina-icons/actions/symbolic/system-help.svg new file mode 100644 index 000000000..3229512ad --- /dev/null +++ b/icon-theme/lumina-icons/actions/symbolic/system-help.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icon-theme/lumina-icons/actions/symbolic/system-lock-screen.svg b/icon-theme/lumina-icons/actions/symbolic/system-lock-screen.svg new file mode 100644 index 000000000..2a7385689 --- /dev/null +++ b/icon-theme/lumina-icons/actions/symbolic/system-lock-screen.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/icon-theme/lumina-icons/actions/symbolic/system-log-out.svg b/icon-theme/lumina-icons/actions/symbolic/system-log-out.svg new file mode 100644 index 000000000..40c961e5a --- /dev/null +++ b/icon-theme/lumina-icons/actions/symbolic/system-log-out.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/icon-theme/lumina-icons/actions/symbolic/system-reboot.svg b/icon-theme/lumina-icons/actions/symbolic/system-reboot.svg new file mode 100644 index 000000000..64344ffa8 --- /dev/null +++ b/icon-theme/lumina-icons/actions/symbolic/system-reboot.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/icon-theme/lumina-icons/actions/symbolic/system-save-session.svg b/icon-theme/lumina-icons/actions/symbolic/system-save-session.svg new file mode 100644 index 000000000..76b315607 --- /dev/null +++ b/icon-theme/lumina-icons/actions/symbolic/system-save-session.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/icon-theme/lumina-icons/actions/symbolic/system-search.svg b/icon-theme/lumina-icons/actions/symbolic/system-search.svg new file mode 100644 index 000000000..568d04b0e --- /dev/null +++ b/icon-theme/lumina-icons/actions/symbolic/system-search.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icon-theme/lumina-icons/actions/symbolic/system-shutdown.svg b/icon-theme/lumina-icons/actions/symbolic/system-shutdown.svg new file mode 100644 index 000000000..6909490c5 --- /dev/null +++ b/icon-theme/lumina-icons/actions/symbolic/system-shutdown.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/icon-theme/lumina-icons/actions/symbolic/system-suspend-hibernate.svg b/icon-theme/lumina-icons/actions/symbolic/system-suspend-hibernate.svg new file mode 100644 index 000000000..f796450ed --- /dev/null +++ b/icon-theme/lumina-icons/actions/symbolic/system-suspend-hibernate.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/icon-theme/lumina-icons/actions/symbolic/system-suspend.svg b/icon-theme/lumina-icons/actions/symbolic/system-suspend.svg new file mode 100644 index 000000000..f796450ed --- /dev/null +++ b/icon-theme/lumina-icons/actions/symbolic/system-suspend.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/icon-theme/lumina-icons/actions/symbolic/system-switch-user.svg b/icon-theme/lumina-icons/actions/symbolic/system-switch-user.svg new file mode 100644 index 000000000..4c140215d --- /dev/null +++ b/icon-theme/lumina-icons/actions/symbolic/system-switch-user.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/icon-theme/lumina-icons/actions/symbolic/system-users.svg b/icon-theme/lumina-icons/actions/symbolic/system-users.svg new file mode 100644 index 000000000..4efcfc976 --- /dev/null +++ b/icon-theme/lumina-icons/actions/symbolic/system-users.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/icon-theme/lumina-icons/icon-list.md b/icon-theme/lumina-icons/icon-list.md new file mode 100644 index 000000000..daed2609e --- /dev/null +++ b/icon-theme/lumina-icons/icon-list.md @@ -0,0 +1,205 @@ +* == completed + +Insight-FileManager +Lumina-DE +accessories-text-editor +alarm +*app.icon +application-close +application-exit +application-x-desktop +application-x-executable +applications-internet +archive-extract +archive-insert +archive-insert-directory +archive-remove +*arrow-down +*arrow-down-double +*arrow-up +*audio-volume-high +*audio-volume-low +*audio-volume-medium +*audio-volume-muted +*audio-volume +audio-x-generic +battery +battery-charging +battery-charging-00 +battery-charging-20 +battery-charging-40 +battery-charging-60 +battery-charging-80 +battery-charging-caution +battery-charging-full +battery-charging-good +battery-charging-low +battery-missing +battery-unknown +batteryIcon +*bookmark-new +*bookmark-new-list +*bookmark-toolbar +*bookmarks-organize +* camera-web +* clock + color-picker + configure +desk.icon +dialog-cancel +dialog-close +dialog-information +dialog-ok +dialog-ok-apply +dialog-warning +document-close +document-decrypt +document-edit +document-edit-verify +document-find +document-import +document-multiple +document-new +document-open +document-preview +document-save +document-save-as +documentation +download +drive-removable-media +drive-removable-media-usb-pendrive +edit-clear +edit-clear-list +edit-copy +edit-cut +edit-delete +edit-find +edit-find-replace +edit-paste +edit-rename +edit-select-all +emblem-favorite +emblem-symbolic-link +favorites +favorites +file-new +file.icon +folder +folder-sound +format-text-color +format-text-italic +format-view-carousel +*git +go-down +go-down-search +go-first-view +go-home +go-last-view +go-next-view +go-previous +go-previous-view +go-up +go-up-search +*help-about +im-user +image-x-generic +info +info.icon +inode-directory +input-keyboard +insert-image +list-add +list-remove +list-spacing +loginIcon.png +lumina +media-play +media-playback-pause +media-playback-start +media-playback-stop +media-playlist-audio +media-playlist-repeat +media-playlist-shuffle +media-skip-backward +media-skip-forward +multimedia-audio-player +network +networkIcon +object-rotate-left +object-rotate-right +open-menu +pandora +preferences-desktop +preferences-desktop-bluetooth +preferences-desktop-brightness +preferences-desktop-color +preferences-desktop-default-applications +preferences-desktop-display +preferences-desktop-filetype-association +preferences-desktop-font +preferences-desktop-icons +preferences-desktop-keyboard +preferences-desktop-locale +preferences-desktop-mouse +preferences-desktop-screensaver +preferences-desktop-sound +preferences-desktop-theme +preferences-desktop-user +preferences-desktop-wallpaper +preferences-other +preferences-system +preferences-system-session-services +preferences-system-windows +printer +quickopen +quickopen-file +redshift +run-build +*system-cancel +*system-error +system-file-manager-root +*system-help +*system-lock-screen +*system-log-out +*system-reboot +system-run +system-run-with +*system-save-session +*system-search +*system-shutdown +*system-suspend +*system-suspend-hibernate +*systen-switch-user +*system-users +tab-close +tab-detach +tab-new +transform-crop +transform-scale +unknown +user-desktop +user-home +user-identity +user-trash +utilities-file-archiver +utilities-terminal +video-x-generic +view-choose +view-close +view-list +view-media-artist +view-media-playlist +view-more-vertical +view-preview +view-refresh +view-right-close +view-right-new +view-split-left-right +winIcon +window-close +window-maximize +window-minimize +window-new +x-office-document +zoom-in +zoom-out \ No newline at end of file diff --git a/icon-theme/lumina-icons/index.theme b/icon-theme/lumina-icons/index.theme new file mode 100644 index 000000000..1cd77e1e7 --- /dev/null +++ b/icon-theme/lumina-icons/index.theme @@ -0,0 +1,13 @@ +[Icon Theme] +Name=Lumina-Icons +Comment=Icons for the Lumina Desktop +Inherits=La-Capitaine + +Directories=actions/symbolic + +[actions/symbolic] +Size=32 +Context=Actions +Type=Scalable +MinSize=1 +MaxSize=256 diff --git a/icon-theme/lumina-icons/lumina-icons.pro b/icon-theme/lumina-icons/lumina-icons.pro new file mode 100644 index 000000000..8110c07f3 --- /dev/null +++ b/icon-theme/lumina-icons/lumina-icons.pro @@ -0,0 +1,47 @@ +#QMake project file for installing the lumina-icons theme. + +#Load all the OS-specific install paths +include(../../src-qt5/OS-detect.pri) + +#ensure QMake realizes that nothing is actually going to get compiled +TEMPLATE = aux + +BASE_DIR = $${L_SHAREDIR}/icons/lumina-icons + +#Now setup the base directory/files +base.path = $${BASE_DIR} +base.files = LICENSE index.theme + +icons.path = $${BASE_DIR}/actions/symbolic +icons.files = actions/symbolic/*.svg + +#applications.path = $${BASE_DIR}/scalable/applications +#applications.files = applications/*.svg + +#categories.path = $${BASE_DIR}/scalable/categories +#categories.files = categories/*.svg + +#devices.path = $${BASE_DIR}/scalable/devices +#devices.files = devices/*.svg + +#emblems.path = $${BASE_DIR}/scalable/emblems +#emblems.files = emblems/*.svg + +#emotes.path = $${BASE_DIR}/scalable/emotes +#emotes.files = emotes/*.svg + +#international.path = $${BASE_DIR}/scalable/international +#international.files = international/*.svg + +#mimetypes.path = $${BASE_DIR}/scalable/mimetypes +#mimetypes.files = mimetypes/*.svg + +#places.path = $${BASE_DIR}/scalable/places +#places.files = places/*.svg + +#status.path = $${BASE_DIR}/scalable/status +#status.files = status/*.svg + +INSTALLS = base icons + +#INSTALLS = base actions applications categories devices emblems emotes international mimetypes places status diff --git a/icon-theme/lumina-icons/system-cancel.svg b/icon-theme/lumina-icons/system-cancel.svg new file mode 100644 index 000000000..e555dadfe --- /dev/null +++ b/icon-theme/lumina-icons/system-cancel.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/icon-theme/lumina-icons/system-log-out.svg b/icon-theme/lumina-icons/system-log-out.svg new file mode 100644 index 000000000..2a0b3318a --- /dev/null +++ b/icon-theme/lumina-icons/system-log-out.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/icon-theme/lumina-icons/systemlock.svg b/icon-theme/lumina-icons/systemlock.svg new file mode 100644 index 000000000..41e332e61 --- /dev/null +++ b/icon-theme/lumina-icons/systemlock.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src-qt5/core/README.md b/src-qt5/core/README.md index e3b11a818..64347cc7a 100644 --- a/src-qt5/core/README.md +++ b/src-qt5/core/README.md @@ -47,6 +47,7 @@ Other Files that get installed if "core" is built directly: * `fluxbox`: Used for window management within the desktop session * `xscreensaver`: Screensaver/locker for the desktop session 2. Optional (but recommended) Utilities + * `la-capitaine` : This icon set should be available in most package repositories. https://github.com/keeferrourke/la-capitaine-icon-theme * `numlockx`: Used to toggle the numlock key on session start * `compton` *or* `xcompmgr`: Compositor to provide cross-application transparency effects and graphical smoothing * `xterm`, `qterminal` or some other graphical terminal: XDG standards require the availability of a graphical terminal to launch particular types of applications. diff --git a/src-qt5/core/core.pro b/src-qt5/core/core.pro index 452d2fb79..809984bdc 100644 --- a/src-qt5/core/core.pro +++ b/src-qt5/core/core.pro @@ -26,6 +26,10 @@ scripts.files = menu-scripts/* themes.path=$${L_SHAREDIR}/lumina-desktop/themes/ themes.files=themes/*.qss.template +#FluxBox Config +fcfg.path=$${L_SHAREDIR}/fluxbox/style/lumina-dark/theme.cfg +fcfg.files=extrafiles/theme.cfg + #QtQuick plugins #quickplugins.path=$${L_SHAREDIR}/lumina-desktop/quickplugins/ #quickplugins.files=quickplugins/* @@ -34,4 +38,4 @@ themes.files=themes/*.qss.template globs.path=$${L_SHAREDIR}/lumina-desktop globs.files=xtrafiles/globs2 -INSTALLS+=scripts themes globs +INSTALLS+=scripts themes globs fcfg diff --git a/src-qt5/core/lumina-desktop/BootSplash.cpp b/src-qt5/core/lumina-desktop/BootSplash.cpp index f3befeaf5..6ecdfee86 100644 --- a/src-qt5/core/lumina-desktop/BootSplash.cpp +++ b/src-qt5/core/lumina-desktop/BootSplash.cpp @@ -19,7 +19,7 @@ BootSplash::BootSplash() : QWidget(0, Qt::SplashScreen | Qt::X11BypassWindowMana void BootSplash::generateTipOfTheDay(){ QSettings sessionsettings("lumina-desktop","sessionsettings"); - bool disablequotes = false; + bool disablequotes = true; if(sessionsettings.contains("DisableQuotes")){ disablequotes = sessionsettings.value("DisableQuotes").toBool(); } 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 3fd8cc497..000000000 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.jpg b/src-qt5/core/lumina-desktop/defaults/desktop-background.jpg index ddee66ead..ed3a41121 100644 Binary files a/src-qt5/core/lumina-desktop/defaults/desktop-background.jpg and b/src-qt5/core/lumina-desktop/defaults/desktop-background.jpg differ diff --git a/src-qt5/core/lumina-desktop/defaults/luminaDesktop.conf b/src-qt5/core/lumina-desktop/defaults/luminaDesktop.conf index 0e6101c10..c223e1e58 100644 --- a/src-qt5/core/lumina-desktop/defaults/luminaDesktop.conf +++ b/src-qt5/core/lumina-desktop/defaults/luminaDesktop.conf @@ -6,16 +6,17 @@ # 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: +# Possible Desktop Plugins (Lumina version 0.9.1): # calendar, applauncher[::absolute path to *.desktop file], desktopview, notepad, audioplayer, rssreader -# Possible Panel Plugins: +# 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: +# 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_disablequotes=true +session_enablenumlock=true #[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 @@ -23,64 +24,66 @@ session_playlogoutaudio=true #[true/false] Play the audio chimes on log out # 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=qterminal.desktop session_default_terminal_ifexists=lumina-terminal.desktop +session_default_terminal_ifexists=xterm.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_webbrowser_ifexists=org.kde.falkon.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=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_image/*_ifexists=phototonic.desktop +mime_default_unknown/*=lumina-textedit.desktop +mime_default_application/x-shellscript=lumina-textedit.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 mime_default_application/x-lrzip-compressed-tar_ifexists=lumina-archiver.desktop mime_default_application/x-lzma-compressed-tar_ifexists=lumina-archiver.desktop mime_default_application/x-xz-compressed-tar_ifexists=lumina-archiver.desktop mime_default_application/x-tar_ifexists=lumina-archiver.desktop -mime_default_unknown/*=lumina-textedit.desktop -mime_default_application/x-shellscript=lumina-textedit.desktop #THEME SETTINGS -theme_themefile=DarkGlass #Name of the theme to use +theme_fluxbox=lumina-dark #Name of the WM theme to use +theme_themefile=DarkGlass #Name of the theme to use (disable for Lumina-Default) theme_styles=scrollbar-simple, tooltip-simple, sliders-simple, traynotification-simple -theme_colorfile=darker #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_colorfile=lumina-dark #Name of the color spec file to use for theming +theme_iconset=lumina-icons #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 (%) ) #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_backgroundfiles=/usr/share/wallpapers/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. 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_pixelsize=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_plugins=appmenu, taskmanager, 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=100 #[1->100] percentage of the screen edge to use panel2_location=top -panel2_pixelsize=3%H +panel2_pixelsize=4%H panel2_autohide=true panel2_plugins=spacer, desktopbar, spacer panel2_pinlocation=center -panel2_edgepercent=10 +panel2_edgepercent=24 #MENU SETTINGS (right-click menu) -menu_plugins=terminal, filemanager, applications, line, settings #list of menu plugins to show +menu_plugins=terminal, filemanager, applications, line, jsonmenu::::/usr/share/lumina-desktop/menu-scripts/ls.json.sh::::Home::::user-home, jsonmenu::::/usr/share/lumina-desktop/menu-scripts/ls.json.sh /::::Root::::folder-orange, line, settings, line, lockdesktop #FAVORITES CUSTOMIZATION #favorites_add= #Create a favorites entry for this file/dir @@ -88,12 +91,15 @@ menu_plugins=terminal, filemanager, applications, line, settings #list of menu p #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=org.kde.falkon.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=lumina-mediaplayer-pandora.desktop +favorites_add_ifexists=telegram-desktop.desktop +favorites_add_ifexists=virtualbox.desktop +favorites_add_ifexists=pavucontrol.desktop favorites_add_ifexists=~/Documents favorites_add_ifexists=~/Downloads favorites_add_ifexists=~/Pictures @@ -103,6 +109,19 @@ favorites_add_ifexists=~/Videos #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 +#Desktop Folder symlinks +#desktoplinks_add= +desktoplinks_add=firefox.desktop +desktoplinks_add=chromium-browser.desktop +desktoplinks_add=org.kde.falkon.desktop +desktoplinks_add=thunderbird.desktop +desktoplinks_add=trojita.desktop +desktoplinks_add=vlc.desktop +desktoplinks_add=lthemeengine.desktop +desktoplinks_add=lumina-config.desktop +desktoplinks_add=telegram-desktop.desktop +desktoplinks_add=virtualbox.desktop + #Generic scripts/utilities to run for any additional setup procedures # These are always run after all other settings are saved #Format: usersetup_run= diff --git a/src-qt5/core/lumina-desktop/fluxboxconf/fluxbox-keys b/src-qt5/core/lumina-desktop/fluxboxconf/fluxbox-keys index 92f58e719..142569caa 100644 --- a/src-qt5/core/lumina-desktop/fluxboxconf/fluxbox-keys +++ b/src-qt5/core/lumina-desktop/fluxboxconf/fluxbox-keys @@ -71,6 +71,9 @@ Mod1 F1 :Exec lumina-open -terminal # open a dialog to run programs Mod1 F2 :Exec lumina-search +# open a LTE +Mod1 F3 :Exec lte + # current window commands Mod1 F4 :If {Matches (Layer=Normal)} {Close} Mod1 F5 :If {Matches (Layer=Normal)} {Kill} diff --git a/src-qt5/core/lumina-desktop/fluxboxconf/theme.cfg b/src-qt5/core/lumina-desktop/fluxboxconf/theme.cfg new file mode 100644 index 000000000..c799a88f5 --- /dev/null +++ b/src-qt5/core/lumina-desktop/fluxboxconf/theme.cfg @@ -0,0 +1,192 @@ +############################################################ +# This work is licensed under the Creative Commons # +# Attribution-NonCommercial-ShareAlike 2.5 License. # +# To view a copy of this license, visit # +# http://creativecommons.org/licenses/by-sa/2.5/ # +# or send a letter to Creative Commons, # +# 559 Nathan Abbott Way, Stanford, California 94305, USA. # +############################################################ + + + +################################################################################ +# +# name: bias_allblack +# made: tenner +# date: 02-07-2005 +# http://www.tenr.de +# +############################################################## FONTS ########### + +menu.frame.font: sans-8 +menu.title.font: sans-10 +toolbar.clock.font: sans-12:bold +toolbar.workspace.font: tahoma-10:bold +toolbar.iconbar.focused.font: sans-8:bold +toolbar.iconbar.unfocused.font: sans-8 +window.font: sans-9 + +############################################################## MENU ############ + +menu.bevelWidth: 0 + +menu.height: 21 + +menu.borderColor: #000000 +menu.borderWidth: 0 + +menu.bullet.position: Right + +menu.frame: sunken +menu.frame.pixmap: +menu.frame.justify: left +menu.frame.color: #302f2e +menu.frame.colorTo: #302f2e +menu.frame.textColor: #ffffff + +menu.title: Raised Bevel1 +menu.title.pixmap: +menu.title.justify: right +menu.title.color: #302f2e +menu.title.colorTo: #302f2e +menu.title.textColor: #ffffff + +menu.hilite: Raised bevel2 +menu.hilite.pixmap: +menu.hilite.color: #302f2e +menu.hilite.colorTo: #302f2e +menu.hilite.textColor: #3390FF + +menu.bullet: diamond + +############################################################## TOOLBAR ######### + +toolbar.bevelWidth: 0 + +toolbar.borderWidth: 1 +toolbar.borderColor: #000000 + +toolbar.height: 21 + +toolbar.justify: center + +toolbar.clock: raised bevel1 gradient vertical +toolbar.clock.pixmap: +toolbar.clock.justify: right +toolbar.clock.textColor: #ffffff +toolbar.clock.color: #2B3139 +toolbar.clock.colorTo: #010103 + +toolbar.systray: raised bevel1 gradient vertical +toolbar.systray.pixmap: +toolbar.systray.justify: Center +toolbar.systray.textColor: # +toolbar.systray.color: #2B3139 +toolbar.systray.colorTo: #010103 + +toolbar.workspace: raised bevel1 gradient vertical +toolbar.workspace.pixmap: +toolbar.workspace.justify: Center +toolbar.workspace.textColor: #ffffff +toolbar.workspace.color: #2B3139 +toolbar.workspace.colorTo: #010103 + +toolbar.button: raised bevel1 gradient vertical +toolbar.button.pixmap: +toolbar.button.picColor: #ffffff +toolbar.button.color: #2B3139 +toolbar.button.colorTo: #010103 +toolbar.button.pressed.pixmap: +toolbar.button.pressed.picColor: #616161 +toolbar.button.pressed.color: #3B4247 +toolbar.button.pressed.colorTo: #010103 + +toolbar.iconbar.empty: raised bevel1 gradient vertical +toolbar.iconbar.empty.pixmap: +toolbar.iconbar.empty.color: #2B3139 +toolbar.iconbar.empty.colorTo: #010103 + +toolbar.iconbar.focused: raised bevel2 gradient vertical +toolbar.iconbar.focused.pixmap: +toolbar.iconbar.focused.textColor: #ffffff +toolbar.iconbar.focused.color: #3B4247 +toolbar.iconbar.focused.colorTo: #010103 +toolbar.iconbar.focused.justify: center + +toolbar.iconbar.unfocused: raised bevel1 gradient vertical +toolbar.iconbar.unfocused.pixmap: +toolbar.iconbar.unfocused.textColor: #616161 +toolbar.iconbar.unfocused.color: #2B3139 +toolbar.iconbar.unfocused.colorTo: #010103 +toolbar.iconbar.unfocused.justify: center + +############################################################## WINDOW ########## +window.roundCorners: TopRight TopLeft +window.bevelWidth: 3 +window.shade: false +window.borderWidth: 0 +window.borderColor: #000000 + +window.justify: Center + +window.title.height: 24 + +window.title.focus: raised bevel1 +window.title.focus.color: #302f2e +window.title.focus.colorTo: #302f2e +window.title.unfocus: raised bevel1 +window.title.unfocus.color: #302f2e +window.title.unfocus.colorTo: #302f2e + +window.label.focus: parentrelative +window.label.focus.pixmap: +window.label.focus.textColor: #ffffff +window.label.focus.color: #3a3636 +window.label.focus.colorTo: #3a3636 +window.label.unfocus: parentrelative +window.label.unfocus.pixmap: +window.label.unfocus.textColor: #3390FF +window.label.unfocus.color: #3a3636 +window.label.unfocus.colorTo: #3a3636 + +window.button.focus: parentrelative +window.button.focus.color: #2B3139 +window.button.focus.colorTo: #010103 +window.button.focus.picColor: #ffffff +window.button.unfocus: parentrelative +window.button.unfocus.Color: #3390FF +window.button.unfocus.ColorTo: #3390FF +window.button.unfocus.picColor: #3390FF +window.button.pressed: parentrelative +window.button.pressed.color: #0210ce +window.button.pressed.colorTo: #0210ce +window.button.pressed.picColor: #0210ce + +window.frame: parentrelative +window.frame.pixmap: +window.frame.focusColor: #3a3636 +window.frame.focusColorTo: #3a3636 +window.frame.unfocusColor: #3a3636 +window.frame.unfocusColorTo: #3a3636 + +window.handle.focus: flat +window.handle.focus.pixmap: +window.handle.focus.color: #2B3139 +window.handle.focus.colorTo: #010103 +window.handle.unfocus: flat +window.handle.unfocus.pixmap: +window.handle.unfocus.color: #2B3139 +window.handle.unfocus.colorTo: #010103 +window.handleWidth: 4 + +window.grip.focus: raised +window.grip.focus.pixmap: +window.grip.focus.color: #3390FF +window.grip.focus.colorTo: #3B4247 +window.grip.unfocus: raised +window.grip.unfocus.pixmap: +window.grip.unfocus.color: #0210ce +window.grip.unfocus.colorTo: #3B3139 + +################################################################################ +# EOF diff --git a/src-qt5/core/lumina-desktop/lumina-desktop.pro b/src-qt5/core/lumina-desktop/lumina-desktop.pro index 678a85260..667d175cd 100644 --- a/src-qt5/core/lumina-desktop/lumina-desktop.pro +++ b/src-qt5/core/lumina-desktop/lumina-desktop.pro @@ -87,6 +87,9 @@ fluxconf.files = fluxboxconf/fluxbox-init-rc \ fluxboxconf/fluxbox-keys fluxconf.path = $${L_SHAREDIR}/lumina-desktop/ +fluxtheme.files = fluxboxconf/theme.cfg +fluxtheme.path = $${L_SHAREDIR}/lumina-desktop/ + defaults.files = defaults/luminaDesktop.conf \ defaults/compton.conf \ audiofiles/Logout.ogg \ @@ -188,7 +191,7 @@ dotrans.extra=cd $$PWD/i18n && $${LRELEASE} -nounfinished *.ts && cp *.qm $(INST manpage.path=$${L_MANDIR}/man1/ manpage.extra="$${MAN_ZIP} $$PWD/lumina-desktop.1 > $(INSTALL_ROOT)$${L_MANDIR}/man1/lumina-desktop.1.gz" -INSTALLS += target desktop icons defaults conf fluxconf manpage extrafiles +INSTALLS += target desktop icons defaults conf fluxconf fluxtheme manpage extrafiles WITH_I18N{ INSTALLS += dotrans diff --git a/src-qt5/core/lumina-theme-engine/colors/trident-dark.conf b/src-qt5/core/lumina-theme-engine/colors/lumina-dark.conf similarity index 100% rename from src-qt5/core/lumina-theme-engine/colors/trident-dark.conf rename to src-qt5/core/lumina-theme-engine/colors/lumina-dark.conf diff --git a/src-qt5/core/xtrafiles/theme.cfg b/src-qt5/core/xtrafiles/theme.cfg new file mode 100644 index 000000000..c799a88f5 --- /dev/null +++ b/src-qt5/core/xtrafiles/theme.cfg @@ -0,0 +1,192 @@ +############################################################ +# This work is licensed under the Creative Commons # +# Attribution-NonCommercial-ShareAlike 2.5 License. # +# To view a copy of this license, visit # +# http://creativecommons.org/licenses/by-sa/2.5/ # +# or send a letter to Creative Commons, # +# 559 Nathan Abbott Way, Stanford, California 94305, USA. # +############################################################ + + + +################################################################################ +# +# name: bias_allblack +# made: tenner +# date: 02-07-2005 +# http://www.tenr.de +# +############################################################## FONTS ########### + +menu.frame.font: sans-8 +menu.title.font: sans-10 +toolbar.clock.font: sans-12:bold +toolbar.workspace.font: tahoma-10:bold +toolbar.iconbar.focused.font: sans-8:bold +toolbar.iconbar.unfocused.font: sans-8 +window.font: sans-9 + +############################################################## MENU ############ + +menu.bevelWidth: 0 + +menu.height: 21 + +menu.borderColor: #000000 +menu.borderWidth: 0 + +menu.bullet.position: Right + +menu.frame: sunken +menu.frame.pixmap: +menu.frame.justify: left +menu.frame.color: #302f2e +menu.frame.colorTo: #302f2e +menu.frame.textColor: #ffffff + +menu.title: Raised Bevel1 +menu.title.pixmap: +menu.title.justify: right +menu.title.color: #302f2e +menu.title.colorTo: #302f2e +menu.title.textColor: #ffffff + +menu.hilite: Raised bevel2 +menu.hilite.pixmap: +menu.hilite.color: #302f2e +menu.hilite.colorTo: #302f2e +menu.hilite.textColor: #3390FF + +menu.bullet: diamond + +############################################################## TOOLBAR ######### + +toolbar.bevelWidth: 0 + +toolbar.borderWidth: 1 +toolbar.borderColor: #000000 + +toolbar.height: 21 + +toolbar.justify: center + +toolbar.clock: raised bevel1 gradient vertical +toolbar.clock.pixmap: +toolbar.clock.justify: right +toolbar.clock.textColor: #ffffff +toolbar.clock.color: #2B3139 +toolbar.clock.colorTo: #010103 + +toolbar.systray: raised bevel1 gradient vertical +toolbar.systray.pixmap: +toolbar.systray.justify: Center +toolbar.systray.textColor: # +toolbar.systray.color: #2B3139 +toolbar.systray.colorTo: #010103 + +toolbar.workspace: raised bevel1 gradient vertical +toolbar.workspace.pixmap: +toolbar.workspace.justify: Center +toolbar.workspace.textColor: #ffffff +toolbar.workspace.color: #2B3139 +toolbar.workspace.colorTo: #010103 + +toolbar.button: raised bevel1 gradient vertical +toolbar.button.pixmap: +toolbar.button.picColor: #ffffff +toolbar.button.color: #2B3139 +toolbar.button.colorTo: #010103 +toolbar.button.pressed.pixmap: +toolbar.button.pressed.picColor: #616161 +toolbar.button.pressed.color: #3B4247 +toolbar.button.pressed.colorTo: #010103 + +toolbar.iconbar.empty: raised bevel1 gradient vertical +toolbar.iconbar.empty.pixmap: +toolbar.iconbar.empty.color: #2B3139 +toolbar.iconbar.empty.colorTo: #010103 + +toolbar.iconbar.focused: raised bevel2 gradient vertical +toolbar.iconbar.focused.pixmap: +toolbar.iconbar.focused.textColor: #ffffff +toolbar.iconbar.focused.color: #3B4247 +toolbar.iconbar.focused.colorTo: #010103 +toolbar.iconbar.focused.justify: center + +toolbar.iconbar.unfocused: raised bevel1 gradient vertical +toolbar.iconbar.unfocused.pixmap: +toolbar.iconbar.unfocused.textColor: #616161 +toolbar.iconbar.unfocused.color: #2B3139 +toolbar.iconbar.unfocused.colorTo: #010103 +toolbar.iconbar.unfocused.justify: center + +############################################################## WINDOW ########## +window.roundCorners: TopRight TopLeft +window.bevelWidth: 3 +window.shade: false +window.borderWidth: 0 +window.borderColor: #000000 + +window.justify: Center + +window.title.height: 24 + +window.title.focus: raised bevel1 +window.title.focus.color: #302f2e +window.title.focus.colorTo: #302f2e +window.title.unfocus: raised bevel1 +window.title.unfocus.color: #302f2e +window.title.unfocus.colorTo: #302f2e + +window.label.focus: parentrelative +window.label.focus.pixmap: +window.label.focus.textColor: #ffffff +window.label.focus.color: #3a3636 +window.label.focus.colorTo: #3a3636 +window.label.unfocus: parentrelative +window.label.unfocus.pixmap: +window.label.unfocus.textColor: #3390FF +window.label.unfocus.color: #3a3636 +window.label.unfocus.colorTo: #3a3636 + +window.button.focus: parentrelative +window.button.focus.color: #2B3139 +window.button.focus.colorTo: #010103 +window.button.focus.picColor: #ffffff +window.button.unfocus: parentrelative +window.button.unfocus.Color: #3390FF +window.button.unfocus.ColorTo: #3390FF +window.button.unfocus.picColor: #3390FF +window.button.pressed: parentrelative +window.button.pressed.color: #0210ce +window.button.pressed.colorTo: #0210ce +window.button.pressed.picColor: #0210ce + +window.frame: parentrelative +window.frame.pixmap: +window.frame.focusColor: #3a3636 +window.frame.focusColorTo: #3a3636 +window.frame.unfocusColor: #3a3636 +window.frame.unfocusColorTo: #3a3636 + +window.handle.focus: flat +window.handle.focus.pixmap: +window.handle.focus.color: #2B3139 +window.handle.focus.colorTo: #010103 +window.handle.unfocus: flat +window.handle.unfocus.pixmap: +window.handle.unfocus.color: #2B3139 +window.handle.unfocus.colorTo: #010103 +window.handleWidth: 4 + +window.grip.focus: raised +window.grip.focus.pixmap: +window.grip.focus.color: #3390FF +window.grip.focus.colorTo: #3B4247 +window.grip.unfocus: raised +window.grip.unfocus.pixmap: +window.grip.unfocus.color: #0210ce +window.grip.unfocus.colorTo: #3B3139 + +################################################################################ +# EOF