Merge pull request #797 from lumina-desktop/1.6.2

1.6.2

port-files/Fedora/lbuild.sh

@@ -1 +1 @@
-/usr/lib64/qt5/bin/qmake 'QMAKE_CFLAGS_DEBUG=-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1  -m64  -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection ' 'QMAKE_CFLAGS_RELEASE=-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1  -m64  -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection ' 'QMAKE_CXXFLAGS_DEBUG=-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1  -m64  -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection ' 'QMAKE_CXXFLAGS_RELEASE=-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1  -m64  -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection ' 'QMAKE_LFLAGS_DEBUG=-Wl,-z,relro -Wl,--as-needed  -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld ' 'QMAKE_LFLAGS_RELEASE=-Wl,-z,relro -Wl,--as-needed  -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld ' QMAKE_STRIP= lumina.pro CONFIG+=configure LIBPREFIX=/usr/lib64 L_BINDIR=/usr/bin L_LIBDIR=/usr/lib64 L_SHAREDIR=/usr/share L_ETCDIR=/etc L_INCLUDEDIR=/usr/include L_MANDIR=/usr/share/man QT5LIBDIR=/usr QMAKE_LFLAGS+=-Wl,--as-needed
+/usr/lib64/qt5/bin/qmake 'QMAKE_CFLAGS_DEBUG=-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1  -m64  -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection ' 'QMAKE_CFLAGS_RELEASE=-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1  -m64  -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection ' 'QMAKE_CXXFLAGS_DEBUG=-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1  -m64  -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection ' 'QMAKE_CXXFLAGS_RELEASE=-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1  -m64  -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection ' 'QMAKE_LFLAGS_DEBUG=-Wl,-z,relro -Wl,--as-needed  -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld ' 'QMAKE_LFLAGS_RELEASE=-Wl,-z,relro -Wl,--as-needed  -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld ' QMAKE_STRIP= lumina.pro CONFIG+=configure LIBPREFIX=/usr/lib64 L_BINDIR=/usr/bin L_LIBDIR=/usr/lib64 L_SHAREDIR=/usr/share L_ETCDIR=/etc L_INCLUDEDIR=/usr/include L_MANDIR=/usr/share/man QT5LIBDIR=/usr QMAKE_LFLAGS+=-Wl,--as-needed CONFIG+=force_debug_info

port-files/gentoo/Manifest

@@ -0,0 +1,6 @@
+AUX 1.2.0-desktop-files.patch 1001 BLAKE2B eee93a9f1d3466dcdb4d9d411b9e5b5b5a882dba2d4ccadb8ad90d82b66ee3a2d02fb02dbdd6b156fb9768c6d8d8b772b075ffc2b12e630e204e55632e99f931 SHA512 419fdd6c26f05daa4dacee5d0f21a51ffc465d443ba47e374c431c722dab98b8686453c692b0d8e579c5a5f43b18d92c0f7345845901e1d86ad36c70e1546b4d
+AUX lumina-session 2011 BLAKE2B bec6e1161c89ef0ae5f6506d57b6deff09f907b2c16b0d3404eb61369f1c3fa6f19400557f18dc3081e19652badae541d9f84be8717851b5a583392caaef303f SHA512 79e06e1761b079c96984c84f225e23a545d012ad94148080c3659c85f75b322dd050fc4b1908f72de1cdd22bab6b62e0d1de4f8c77f29073e88488671b0836db
+DIST lumina-1.6.0.tar.gz 20662000 BLAKE2B c016f07fb86333e792d6a0a0ddaa9ea09f322d6de69d099abf9340d7db6cb9e23624b62882579ba6c13eec71fcf663f1688424fd940cd7e09e625f6fcc4b281f SHA512 e923961568ab9cc32206386066daef8cd1fd2db2d5c3e260e5c1da1dcda39a516576418f607cefbe5a1c47d8684591d0e595fb344e7d6aa2859fc3b326e73e30
+EBUILD lumina-1.6.0.ebuild 2393 BLAKE2B 81ec58a7db69858efba8551c036f11190af573b21ae85c18c97ae6759ab35e169b63d5cc6d6c93146ba9af12823e70007a740eb2fe3d0c42fc2452d9cc94fd0e SHA512 fdd5aca5842e6b7cbe3e815c0ba65d869d8a5f934ad06421cc83b7e16b6f840c5668e14bd7c449db799d9d2a7e246e784f8de8979a0508e9122b399f9684a05f
+EBUILD lumina-9999.ebuild 1366 BLAKE2B 0da2fd0940f6ebdb0dcbe0424b81458f90b20fe66cfb3c65f3bc1164c45deb5293981eb30886bdcc40d56e1ffe0ffc79660c91c62531fb038c56b5fa584d45be SHA512 758c5ac50e8673155abf452dbe28ba54d5f59ff5f1b91f59dcb061d5ed1c979aab7c8101dab4b928e24ca79491c9bf5b8c27a83a7277ba9d10b7f016c8674d13
+MISC metadata.xml 1982 BLAKE2B f2ea25f4e1118e58d78802ba7a047ec2cf1a963127d650625d2e18d2dd4378fdd255d513dcfbd7c24dacd7635839f3edde09cf778846ac7c98f302000e79b14a SHA512 54ffea2bd7d41a773888fe09dd4c70ef2db0898347249806cde19476f8a8a5b925ba5c953c4718786dd763a1664e5e247151cde69328525615cf9b0412dce909

port-files/gentoo/lumina-9999.ebuild

@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit git-r3 qmake-utils
+
+DESCRIPTION="Lumina desktop environment"
+HOMEPAGE="https://lumina-desktop.org/"
+EGIT_REPO_URI="https://github.com/trueos/lumina"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE="desktop-utils"
+
+DEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5[widgets]
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libxcb:0
+	x11-libs/xcb-util
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-wm"
+
+RDEPEND="${DEPEND}
+	app-admin/sysstat
+	media-sound/alsa-utils
+	sys-fs/inotify-tools
+	sys-power/acpi
+	|| (
+		x11-apps/xbacklight
+		sys-power/acpilight
+	)
+	x11-misc/numlockx
+	x11-wm/fluxbox"
+
+BDEPEND="
+	dev-qt/linguist-tools:5"
+
+S="${WORKDIR}/${P/_/-}"
+
+PATCHES=(
+	"${FILESDIR}/1.2.0-desktop-files.patch"
+)
+
+src_prepare() {
+	default
+
+	if ! use desktop-utils ; then
+		rm -rf src-qt5/desktop-utils || die
+		sed -e "/desktop-utils/d" -i src-qt5/src-qt5.pro || die
+	fi
+}
+
+src_configure() {
+	eqmake5 PREFIX="${EPREFIX}/usr" LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" \
+		DESTDIR="${D}" CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM=
+}
+
+src_install() {
+	default
+	mv "${ED}"/etc/luminaDesktop.conf{.dist,} || die
+	rm "${ED}"/${PN}-* "${ED}"/start-${PN}-desktop || die
+}

port-files/slackware/README

@@ -0,0 +1,12 @@
+The Lumina Desktop Environment (Lumina for short) is a lightweight,
+XDG-compliant, BSD-licensed desktop environment that focuses
+specifically on streamlining the ability to get work done while
+minimizing system overhead.
+
+It is specifically designed for PC-BSD(r) and FreeBSD, but has also
+been ported to many other BSD and Linux operating systems. It is based
+on the Qt graphical toolkit and the Fluxbox window manager, and uses
+a small number of X utilities for various tasks, such as numlockx and
+xscreensaver.
+
+"acpi" is an optional dependency for the battery monitor.

port-files/slackware/lumina.SlackBuild

@@ -0,0 +1,105 @@
+#!/bin/sh
+
+# Slackware build script for lumina
+
+# 2019, 2020, updated by Chris Abela, Malta, <[email protected]>
+# Sasongko Bawono <[email protected]>
+
+# Thanks to :
+# Willy Sudiarto Raharjo <[email protected]>
+# Ryan P.C. McQuen <[email protected]>
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version, with the following exception:
+# the text of the GPL license may be omitted.
+
+# This program is distributed in the hope that it will be useful, but
+# without any warranty; without even the implied warranty of
+# merchantability or fitness for a particular purpose. Compiling,
+# interpreting, executing or merely reading the text of the program
+# may result in lapses of consciousness and/or very being, up to and
+# including the end of all existence and the Universe as we know it.
+# See the GNU General Public License for more details.
+
+# You may have received a copy of the GNU General Public License
+# along with this program (most likely, a file named COPYING). If
+# not, see <https://www.gnu.org/licenses/>.
+
+PRGNAM=lumina
+VERSION=${VERSION:-1.6.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -eu
+
+rm -rf $PKG
+mkdir -pv $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+sed -i "s|/media|/run/media/\$USER|" src-qt5/core/lumina-desktop/LDesktop.cpp
+qmake-qt5 \
+  PREFIX=/usr \
+  LIBPREFIX=/usr/lib${LIBDIRSUFFIX} \
+  QMAKE_CFLAGS_ISYSTEM= \
+  QMAKE_CFLAGS="$SLKCFLAGS" \
+  QMAKE_CXXFLAGS="$SLKCFLAGS" \
+  QT5LIBDIR=/usr/lib${LIBDIRSUFFIX}/qt5 \
+  CONFIG+=WITH_I18N \
+  L_ETCDIR=/etc
+
+make
+make install INSTALL_ROOT=$PKG DESTDIR=$PKG
+
+mkdir -p $PKG/etc/X11/xinit
+install -m 0755 $CWD/xinitrc.lumina $PKG/etc/X11/xinit/xinitrc.lumina
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}

port-files/slackware/lumina.info

@@ -0,0 +1,10 @@
+PRGNAM="lumina"
+VERSION="1.6.0"
+HOMEPAGE="https://lumina-desktop.org/"
+DOWNLOAD="https://github.com/trueos/lumina/archive/v1.6.0/lumina-1.6.0.tar.gz"
+MD5SUM="5f27df60bc402c919ddff0f50cba2f0c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="qt5-webkit"
+MAINTAINER="Chris Abela"
+EMAIL="[email protected]"

port-files/slackware/slack-desc

@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+lumina: lumina (Desktop Environment for BSD)
+lumina:
+lumina:
+lumina: The Lumina Desktop Environment (Lumina for short) is a lightweight,
+lumina: XDG-compliant, BSD-licensed desktop environment that focuses
+lumina: specifically on streamlining the ability to get work done while
+lumina: minimizing system overhead.
+lumina:
+lumina:
+lumina: https://lumina-desktop.org/
+lumina:

port-files/slackware/xinitrc.lumina

@@ -0,0 +1,29 @@
+#!/bin/sh
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+# merge in defaults and keymaps
+
+if [ -f $sysresources ]; then
+  xrdb -merge $sysresources
+fi
+if [ -f $sysmodmap ]; then
+  xmodmap $sysmodmap
+fi
+if [ -f $userresources ]; then
+  xrdb -merge $userresources
+fi
+if [ -f $usermodmap ]; then
+  xmodmap $usermodmap
+fi
+
+# Start the window manager:
+if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
+  exec dbus-launch --exit-with-session ck-launch-session start-lumina-desktop
+else
+  exec dbus-launch --exit-with-session start-lumina-desktop
+fi
+

src-qt5/core-utils/lumina-config/mainWindow.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>550</width>
-    <height>400</height>
+    <width>600</width>
+    <height>800</height>
    </rect>
   </property>
   <widget class="QWidget" name="centralwidget"/>

src-qt5/core-utils/lumina-config/pages/page_fluxbox_settings.cpp

@@ -33,6 +33,8 @@ page_fluxbox_settings::~page_fluxbox_settings(){
 //================
 void page_fluxbox_settings::SaveSettings(){
   QStringList FB;
+  QStringList FBNS;
+    FBNS = readFile(QString(getenv("XDG_CONFIG_HOME"))+"/lumina-desktop/fluxbox-init -no-slit");
   if(ui->radio_simple->isChecked()){
     FB = readFile(QString(getenv("XDG_CONFIG_HOME"))+"/lumina-desktop/fluxbox-init");
     // - window placement
@@ -46,6 +48,11 @@ void page_fluxbox_settings::SaveSettings(){
     if(index < 0){ FB << line; } //add line to the end of the file
     else{ FB[index] = line; } //replace the current setting with the new one
     // - window theme
+    index = FBNS.indexOf( FBNS.filter("session.styleFile:").join("") );
+    line = "session.styleFile:\t"+ui->combo_session_wtheme->itemData( ui->combo_session_wtheme->currentIndex() ).toString();
+    if(index < 0){ FBNS << line; } //add line to the end of the file
+    else{ FBNS[index] = line; } //replace the current setting with the new one
+    // - window theme lumina-config
     index = FB.indexOf( FB.filter("session.styleFile:").join("") );
     line = "session.styleFile:\t"+ui->combo_session_wtheme->itemData( ui->combo_session_wtheme->currentIndex() ).toString();
     if(index < 0){ FB << line; } //add line to the end of the file
@@ -61,6 +68,7 @@ void page_fluxbox_settings::SaveSettings(){
   }
   //Save the fluxbox settings
   bool ok = overwriteFile(QString(getenv("XDG_CONFIG_HOME"))+"/lumina-desktop/fluxbox-init", FB);
+  overwriteFile(QString(getenv("XDG_CONFIG_HOME"))+"/lumina-desktop/fluxbox-init -no-slit", FBNS);
   if(!ok){ qDebug() << "Warning: Could not save fluxbox-init"; }
   emit HasPendingChanges(false);
 }

src-qt5/core/core.pro

@@ -10,8 +10,8 @@ SUBDIRS+= lumina-desktop \
 	lumina-info \
 	lumina-pingcursor \
 	$${PWD}/../../icon-theme \
-	lumina-theme-engine \
-	lumina-checkpass
+	lumina-theme-engine 
+#	lumina-checkpass
 #	lumina-desktop-unified
 
 #Also install any special menu scripts

src-qt5/core/lumina-desktop/defaults/luminaDesktop.conf

@@ -52,7 +52,7 @@ mime_default_application/x-xz-compressed-tar_ifexists=lumina-archiver.desktop
 mime_default_application/x-tar_ifexists=lumina-archiver.desktop
 
 #THEME SETTINGS
-theme_fluxbox=lumina-dark #Name of the WM 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=lumina-dark #Name of the color spec file to use for theming

src-qt5/core/lumina-desktop/lumina-desktop.pro

@@ -81,7 +81,7 @@ RESOURCES+= Lumina-DE.qrc
 desktop.path = $${L_SESSDIR}
 desktop.files = Lumina-DE.desktop
 
-icons.files = Lumina-DE.png
+icons.files = Lumina-DE.svg
 
 fluxconf.files = fluxboxconf/fluxbox-init-rc \
 			fluxboxconf/fluxbox-keys

src-qt5/core/lumina-desktop/panel-plugins/appmenu/LAppMenuPlugin.cpp

@@ -37,7 +37,11 @@ void LAppMenuPlugin::updateButtonVisuals(){
     button->setToolTip( tr("Quickly launch applications or open files"));
     button->setText( tr("Applications") );
     //Use the TrueOS icon by default (or the Lumina icon for non-TrueOS systems)
-    button->setIcon( LXDG::findIcon("start-here-lumina","Lumina-DE") );
+    if( QFile::exists(QDir::homePath()+"/.loginIcon.png") ){
+      button->setIcon( QIcon(QDir::homePath()+"/.loginIcon.png") );
+    }else{
+      button->setIcon( LXDG::findIcon("user-identity", ":/images/default-user.png") ); //force icon refresh
+    }
 }
 
 // ========================

src-qt5/core/lumina-desktop/panel-plugins/systemstart/LStartButton.cpp

@@ -51,7 +51,11 @@ LStartButtonPlugin::~LStartButtonPlugin(){
 void LStartButtonPlugin::updateButtonVisuals(){
     button->setToolTip(tr(""));
     button->setText( SYSTEM::user() );
-    button->setIcon( LXDG::findIcon("start-here-lumina","Lumina-DE") ); //force icon refresh
+    if( QFile::exists(QDir::homePath()+"/.loginIcon.png") ){
+      button->setIcon( QIcon(QDir::homePath()+"/.loginIcon.png") );
+    }else{
+      button->setIcon( LXDG::findIcon("user-identity", ":/images/default-user.png") ); //force icon refresh
+    }
 }
 
 void LStartButtonPlugin::updateQuickLaunch(QStringList apps){

src-qt5/desktop-utils/desktop-utils.pro

@@ -10,4 +10,5 @@ SUBDIRS+= lumina-fm \
 	lumina-textedit \
 	lumina-archiver \
 	lumina-mediaplayer \
-	lumina-photo
+	lumina-photo \
+	lumina-sudo

src-qt5/desktop-utils/lumina-archiver/MainUI.cpp

@@ -25,7 +25,7 @@ MainUI::MainUI() : QMainWindow(), ui(new Ui::MainUI){
     delayClose->setSingleShot(true);
     connect(delayClose, SIGNAL(timeout()), this, SLOT(close()) );
 
-  QString title = tr("Archive Manager");
+  QString title = tr("Lumina Archiver");
   if( getuid()==0){ title.append(" ("+tr("Admin Mode")+")"); }
   this->setWindowTitle(title);
   BACKEND = new Backend(this);

src-qt5/desktop-utils/lumina-archiver/imgDialog.cpp

@@ -86,7 +86,7 @@ void imgDialog::start_process(){
   }
   //Generate the command
   QString prog; QStringList args;
-  //if( ::getuid()!=0){ prog = "qsudo";  args<<"dd"; }
+  //if( ::getuid()!=0){ prog = "lumina-sudo";  args<<"dd"; }
   //else{ 
     prog = "dd"; 
   //}
@@ -166,9 +166,9 @@ void imgDialog::procFinished(){
   ui->frame_setup->setVisible(true);
   if(ddProc->exitStatus()==QProcess::NormalExit){
     if(ddProc->exitCode() !=0 ){
-      if(lastmsg.contains("permission denied", Qt::CaseInsensitive) && LUtils::isValidBinary("qsudo") ){
+      if(lastmsg.contains("permission denied", Qt::CaseInsensitive) && LUtils::isValidBinary("lumina-sudo") ){
         if(QMessageBox::Yes == QMessageBox::question(this, tr("Administrator Permissions Needed"), tr("This operation requires administrator priviledges.")+"\n\n"+tr("Would you like to enable these priviledges?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes) ){
-          QProcess::startDetached("qsudo", QStringList() << "lumina-archiver" << "--burn-img" << ui->label_iso->whatsThis());
+          QProcess::startDetached("lumina-sudo", QStringList() << "lumina-archiver" << "--burn-img" << ui->label_iso->whatsThis());
           exit(0);
         }
       }else{