GitHub-Mirror/build
2
0
Fork 0
mirror of https://github.com/Fishwaldo/build.git synced 2025-07-23 05:18:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Desktop rework. Shortcuts to armbian-config, support and donate were moved to menu, default icon theme - installing with workaround - was changed to lighter one (Numix), fixed login greeter theme, changed default wallpaper

Browse source
This commit is contained in:
Igor Pecovnik 2017-11-08 18:45:59 +01:00
parent cac4155f81
commit 8b4d703f41
14 changed files with 51 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/desktop.sh
View file

@ -18,7 +18,7 @@ install_desktop ()
# install optimized firefox configuration
# cp $SRC/packages/blobs/desktop/firefox.conf $SDCARD/etc/firefox/syspref.js
# install optimized chromium configuration
cp $SRC/config/chromium.conf $SDCARD/etc/chromium-browser/default
cp $SRC/packages/blobs/desktop/chromium.conf $SDCARD/etc/chromium-browser/default
fi
# install default desktop settings
@ -34,7 +34,14 @@ install_desktop ()
cp $SRC/packages/blobs/desktop/wallpapers/armbian*.jpg $SDCARD/usr/share/backgrounds/xfce/
# Install custom icons and theme
install_deb_chroot "$SRC/packages/blobs/desktop/vibrancy-colors_2.7~xenial~Noobslab.com_all.deb"
cp $SRC/packages/blobs/desktop/numix-icon-theme_0.3+922~201711061547~ubuntu16.04.1_all.deb $SDCARD/root/
chroot $SDCARD /bin/bash -c "dpkg -x /root/numix-icon-theme_0.3+922~201711061547~ubuntu16.04.1_all.deb /" >> $DEST/debug/install.log 2>&1
chroot $SDCARD /bin/bash -c "gtk-update-icon-cache /usr/share/icons/Numix" >> $DEST/debug/install.log 2>&1
chroot $SDCARD /bin/bash -c "gtk-update-icon-cache /usr/share/icons/Numix-Light" >> $DEST/debug/install.log 2>&1
# Adjust menu
sed -i '0,/xfce4-about.desktop/s//armbian-donate.desktop/' $SDCARD/etc/xdg/menus/xfce-applications.menu
sed -i '/armbian-donate.desktop/a \\t<Filename>armbian-support.desktop</Filename>/' $SDCARD/etc/xdg/menus/xfce-applications.menu
# Enable network manager
if [[ -f $SDCARD/etc/NetworkManager/NetworkManager.conf ]]; then

BIN
packages/blobs/desktop/icons/armbian.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before After
Before After

BIN
packages/blobs/desktop/numix-icon-theme_0.3+922~201711061547~ubuntu16.04.1_all.deb Normal file
View file

Binary file not shown.

16
packages/blobs/desktop/skel/.config/xfce4/desktop/icons.screen0-1904x1033.rc
View file

@ -1,16 +0,0 @@
[Donate]
row=3
col=0
[Support]
row=2
col=0
[File System]
row=1
col=0
[Home]
row=0
col=0

8
packages/blobs/desktop/skel/.config/xfce4/desktop/icons.screen0-1904x1064.rc
View file

@ -1,8 +0,0 @@
[File System]
row=1
col=0
[Home]
row=0
col=0

15
packages/blobs/desktop/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
View file

@ -9,20 +9,25 @@
<property name="workspace0" type="empty">
<property name="color-style" type="int" value="0"/>
<property name="image-style" type="int" value="5"/>
<property name="image-path" type="string" value="/usr/share/backgrounds/xfce/armbian06-1430-very-dark-3840x2160.jpg"/>
<property name="last-image" type="string" value="/usr/share/backgrounds/xfce/armbian06-1430-very-dark-3840x2160.jpg"/>
<property name="image-path" type="string" value="/usr/share/backgrounds/xfce/armbian03-Dre0x-Minum-dark-3840x2160.jpg"/>
<property name="last-image" type="string" value="/usr/share/backgrounds/xfce/armbian03-Dre0x-Minum-dark-3840x2160.jpg"/>
</property>
<property name="workspace1" type="empty">
<property name="color-style" type="int" value="0"/>
<property name="image-style" type="int" value="5"/>
<property name="image-path" type="string" value="/usr/share/backgrounds/xfce/armbian03-Dre0x-Minum-dark-3840x2160.jpg"/>
<property name="last-image" type="string" value="/usr/share/backgrounds/xfce/armbian03-Dre0x-Minum-dark-3840x2160.jpg"/>
<property name="image-path" type="string" value="/usr/share/backgrounds/xfce/armbian06-1430-very-dark-3840x2160.jpg"/>
<property name="last-image" type="string" value="/usr/share/backgrounds/xfce/armbian06-1430-very-dark-3840x2160.jpg"/>
</property>
</property>
</property>
<property name="single-workspace-mode" type="bool" value="false"/>
</property>
<property name="desktop-icons" type="empty">
<property name="desktop-icons" type="empty">
<property name="icon-size" type="uint" value="32"/>
<property name="file-icons" type="empty">
<property name="show-home" type="bool" value="false"/>
<property name="show-filesystem" type="bool" value="false"/>
<property name="show-trash" type="bool" value="false"/>
</property>
</property>
</channel>

2
packages/blobs/desktop/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
View file

@ -3,7 +3,7 @@
<channel name="xsettings" version="1.0">
<property name="Net" type="empty">
<property name="ThemeName" type="string" value="Numix"/>
<property name="IconThemeName" type="string" value="Vibrancy-Colors-Full-Dark"/>
<property name="IconThemeName" type="string" value="Numix"/>
<property name="DoubleClickTime" type="empty"/>
<property name="DoubleClickDistance" type="empty"/>
<property name="DndDragThreshold" type="empty"/>

7
packages/blobs/desktop/skel/Desktop/Configuration.desktop → packages/blobs/desktop/skel/.local/share/applications/armbian-config.desktop Executable file → Normal file
View file

@ -1,10 +1,11 @@
[Desktop Entry]
Version=1.0
Type=Application
Name=Config
Name=Armbian config
Comment=Basic system settings
Exec=gksu "xfce4-terminal --hide-menubar --fullscreen -e armbian-config"
Icon=system-settings
Icon=preferences-system
Path=
Terminal=false
StartupNotify=false
StartupNotify=false
Categories=GTK;GNOME;Settings;HardwareSettings;

5
packages/blobs/desktop/skel/Desktop/paypal.desktop → packages/blobs/desktop/skel/.local/share/applications/armbian-donate.desktop Executable file → Normal file
View file

@ -2,7 +2,8 @@
Version=1.0
Type=Link
Name=Donate
Comment=
Icon=/usr/share/icons/Vibrancy-Colors/apps/64/web-paypal.png
Comment=Support making
Icon=application-community
URL=https://www.armbian.com/donate
GenericName=Support development
Categories=GTK;GNOME;X-Xfce-Toplevel;

10
packages/blobs/desktop/skel/.local/share/applications/armbian-support.desktop Normal file
View file

@ -0,0 +1,10 @@
[Desktop Entry]
Version=1.0
Type=Link
Name=Help
Comment=Community forums
URL=http://forum.armbian.com
Icon=help-about
StartupNotify=false
Terminal=false
Categories=GTK;GNOME;X-Xfce-Toplevel;

7
packages/blobs/desktop/skel/Desktop/Support.desktop
View file

@ -1,7 +0,0 @@
[Desktop Entry]
Version=1.0
Type=Link
Name=Support
Comment=
Icon=system-help
URL=http://forum.armbian.com

BIN
packages/blobs/desktop/vibrancy-colors_2.7~xenial~Noobslab.com_all.deb
View file

Binary file not shown.

7
packages/bsp/common/etc/init.d/firstrun
View file

@ -84,6 +84,13 @@ case "$1" in
# get rid of purple background color in newt apps whiptail, partimage, debconf ... Reverting to Debian look.
sed -e 's/magenta/blue/g' -i /etc/newt/palette
# desktop tweaks - enable show windows content on stronger boards
cpu_cores=$(grep -c '^processor' /proc/cpuinfo | sed 's/^0$/1/')
if [[ ${cpu_cores} -gt 2 && -f /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml ]]; then
sed -i 's/<property name="box_move" type="bool" value=".*/<property name="box_move" type="bool" value="false"\/>/g' \
/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
fi
# some hardware workarounds
case $LINUXFAMILY in
sun7i|sun8i)

11
packages/bsp/common/etc/lightdm/lightdm-gtk-greeter.conf
View file

@ -1,6 +1,9 @@
[greeter]
user-background=false
theme-name=Numix
icon-theme-name=Vibrancy-Colors-Full-Dark
background = #888a85
theme-name = Numix
icon-theme-name = Numix
default-user-image=/usr/share/pixmaps/armbian.png
indicators=~language;~power
indicators = ~language;~power
screensaver-timeout = 0
font-name = Sans 11
user-background = false