From: David-John Willis Date: Mon, 30 Nov 2009 10:42:57 +0000 (+0000) Subject: pandora-xfce-defaults: Commit 1st cut at defaults (WIP) X-Git-Tag: Release-2010-05/1~152 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3ea872495fe5bef519601b3567c7c89b398cabb;p=openpandora.oe.git pandora-xfce-defaults: Commit 1st cut at defaults (WIP) --- diff --git a/recipes/branding/pandora-xfce-defaults.bb b/recipes/branding/pandora-xfce-defaults.bb new file mode 100644 index 0000000..63d4427 --- /dev/null +++ b/recipes/branding/pandora-xfce-defaults.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "Default OpenPandora settings for Xfce4" +HOMEPAGE = "http://www.openpandora.org" +SECTION = "x11/xfce" + +PR = "r3" + +SRC_URI = " \ + file://pixmaps/* \ + \ + file://xfce4/* \ + \ + file://xfce4-panel/* \ + \ + file://xfconf-xfce-perchannel-xml/* \ +" + +do_install() { + install -d ${D}${datadir}/pixmaps/ + install -m 0644 ${WORKDIR}/pixmaps/* ${D}${datadir}/pixmaps/ + + install -d ${D}${sysconfdir}/xdg/op/xfce4/ + install -m 0644 ${WORKDIR}/xfce4/* ${D}${sysconfdir}/xdg/op/xfce4/ + + install -d ${D}${sysconfdir}/xdg/op/xfce4/panel/ + install -m 0644 ${WORKDIR}/xfce4-panel/* ${D}${sysconfdir}/xdg/op/xfce4/panel/ + + install -d ${D}${sysconfdir}/xdg/op/xfconf/xfce-perchannel-xml/ + install -m 0644 ${WORKDIR}/xfconf-xfce-perchannel-xml/* ${D}${sysconfdir}/xdg/op/xfconf/xfce-perchannel-xml/ +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +FILES_${PN} += "${datadir} ${sysconfdir}" diff --git a/recipes/branding/pandora-xfce-defaults/pixmaps/op-session.png b/recipes/branding/pandora-xfce-defaults/pixmaps/op-session.png new file mode 100644 index 0000000..46c8b38 Binary files /dev/null and b/recipes/branding/pandora-xfce-defaults/pixmaps/op-session.png differ diff --git a/recipes/branding/pandora-xfce-defaults/pixmaps/op-start.png b/recipes/branding/pandora-xfce-defaults/pixmaps/op-start.png new file mode 100644 index 0000000..916c7ca Binary files /dev/null and b/recipes/branding/pandora-xfce-defaults/pixmaps/op-start.png differ diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/actions-12.rc b/recipes/branding/pandora-xfce-defaults/xfce4-panel/actions-12.rc new file mode 100644 index 0000000..cef4af6 --- /dev/null +++ b/recipes/branding/pandora-xfce-defaults/xfce4-panel/actions-12.rc @@ -0,0 +1,3 @@ +type=0 +orientation=0 + diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/clock-14.rc b/recipes/branding/pandora-xfce-defaults/xfce4-panel/clock-14.rc new file mode 100644 index 0000000..687a9ad --- /dev/null +++ b/recipes/branding/pandora-xfce-defaults/xfce4-panel/clock-14.rc @@ -0,0 +1,10 @@ +DigitalFormat=%R +TooltipFormat=%A %d %B %Y +ClockType=2 +ShowFrame=false +ShowSeconds=true +ShowMilitary=true +ShowMeridiem=false +TrueBinary=false +FlashSeparators=false + diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-10.rc b/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-10.rc new file mode 100644 index 0000000..f04815c --- /dev/null +++ b/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-10.rc @@ -0,0 +1,12 @@ +[Global] +MoveFirst=false +ArrowPosition=0 + +[Entry 0] +Name=Web Browser +Comment=Surf the internet +Icon=internet-web-browser +Exec=exo-open --launch WebBrowser +Terminal=false +StartupNotify=false + diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-10.rc.bak b/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-10.rc.bak new file mode 100644 index 0000000..e3dd358 --- /dev/null +++ b/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-10.rc.bak @@ -0,0 +1,12 @@ +[Entry 0] +Name=Web Browser +Comment=Surf the internet +Icon=internet-web-browser +Exec=exo-open --launch WebBrowser +Terminal=false +StartupNotify=false + +[Global] +MoveFirst=false +ArrowPosition=0 + diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-12589452264.rc b/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-12589452264.rc new file mode 100644 index 0000000..1e59efe --- /dev/null +++ b/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-12589452264.rc @@ -0,0 +1,11 @@ +[Global] +MoveFirst=false +ArrowPosition=0 + +[Entry 0] +Name=eMail +Icon=internet-mail +Exec=exo-open --launch MailReader +Terminal=false +StartupNotify=false + diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-12589456725.rc b/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-12589456725.rc new file mode 100644 index 0000000..73982b1 --- /dev/null +++ b/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-12589456725.rc @@ -0,0 +1,11 @@ +[Global] +MoveFirst=false +ArrowPosition=0 + +[Entry 0] +Name=Messenger +Icon=internet-group-chat +Exec='/usr/bin/pidgin' +Terminal=false +StartupNotify=false + diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-12589456725.rc.bak b/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-12589456725.rc.bak new file mode 100644 index 0000000..c8098e9 --- /dev/null +++ b/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-12589456725.rc.bak @@ -0,0 +1,11 @@ +[Entry 0] +Name=Messenger +Icon=internet-group-chat +Exec='/usr/bin/pidgin' +Terminal=false +StartupNotify=false + +[Global] +MoveFirst=false +ArrowPosition=0 + diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-8.rc b/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-8.rc new file mode 100644 index 0000000..87d44c0 --- /dev/null +++ b/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-8.rc @@ -0,0 +1,12 @@ +[Global] +MoveFirst=false +ArrowPosition=0 + +[Entry 0] +Name=Editor +Comment=Edit text files +Icon=accessories-text-editor +Exec=mousepad +Terminal=false +StartupNotify=true + diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-8.rc.bak b/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-8.rc.bak new file mode 100644 index 0000000..db35d4b --- /dev/null +++ b/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-8.rc.bak @@ -0,0 +1,12 @@ +[Entry 0] +Name=Editor +Comment=Edit text files +Icon=accessories-text-editor +Exec=mousepad +Terminal=false +StartupNotify=true + +[Global] +MoveFirst=false +ArrowPosition=0 + diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-9.rc b/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-9.rc new file mode 100644 index 0000000..cd21114 --- /dev/null +++ b/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-9.rc @@ -0,0 +1,12 @@ +[Global] +MoveFirst=false +ArrowPosition=0 + +[Entry 0] +Name=File Manager +Comment=Manage files and folders +Icon=xfce-filemanager +Exec=thunar +Terminal=false +StartupNotify=true + diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/pager-2.rc b/recipes/branding/pandora-xfce-defaults/xfce4-panel/pager-2.rc new file mode 100644 index 0000000..cb0d5e9 --- /dev/null +++ b/recipes/branding/pandora-xfce-defaults/xfce4-panel/pager-2.rc @@ -0,0 +1,4 @@ +rows=2 +scrolling=true +show-names=false + diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/panels.xml b/recipes/branding/pandora-xfce-defaults/xfce4-panel/panels.xml new file mode 100644 index 0000000..71b4d94 --- /dev/null +++ b/recipes/branding/pandora-xfce-defaults/xfce4-panel/panels.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/panels.xml.bak b/recipes/branding/pandora-xfce-defaults/xfce4-panel/panels.xml.bak new file mode 100644 index 0000000..f926eac --- /dev/null +++ b/recipes/branding/pandora-xfce-defaults/xfce4-panel/panels.xml.bak @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/separator-11.rc b/recipes/branding/pandora-xfce-defaults/xfce4-panel/separator-11.rc new file mode 100644 index 0000000..c46dd6a --- /dev/null +++ b/recipes/branding/pandora-xfce-defaults/xfce4-panel/separator-11.rc @@ -0,0 +1,2 @@ +separator-type=2 + diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/separator-13.rc b/recipes/branding/pandora-xfce-defaults/xfce4-panel/separator-13.rc new file mode 100644 index 0000000..ea80172 --- /dev/null +++ b/recipes/branding/pandora-xfce-defaults/xfce4-panel/separator-13.rc @@ -0,0 +1,2 @@ +separator-type=1 + diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/separator-6.rc b/recipes/branding/pandora-xfce-defaults/xfce4-panel/separator-6.rc new file mode 100644 index 0000000..c46dd6a --- /dev/null +++ b/recipes/branding/pandora-xfce-defaults/xfce4-panel/separator-6.rc @@ -0,0 +1,2 @@ +separator-type=2 + diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/systray-4.rc b/recipes/branding/pandora-xfce-defaults/xfce4-panel/systray-4.rc new file mode 100644 index 0000000..cf6433a --- /dev/null +++ b/recipes/branding/pandora-xfce-defaults/xfce4-panel/systray-4.rc @@ -0,0 +1,12 @@ +[Global] +ShowFrame=false +Rows=1 + +[Applications] +bluetooth applet=false +gigolo=false +gnome-mplayer=false +networkmanager applet=false +orage=false +pidgin=false + diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/systray-4.rc.bak b/recipes/branding/pandora-xfce-defaults/xfce4-panel/systray-4.rc.bak new file mode 100644 index 0000000..9c14a43 --- /dev/null +++ b/recipes/branding/pandora-xfce-defaults/xfce4-panel/systray-4.rc.bak @@ -0,0 +1,12 @@ +[Global] +ShowFrame=false +Rows=1 + +[Applications] +networkmanager applet=false +orage=false +gigolo=false +gnome-mplayer=false +bluetooth applet=false +pidgin=false + diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/windowlist-12589448981.rc b/recipes/branding/pandora-xfce-defaults/xfce4-panel/windowlist-12589448981.rc new file mode 100644 index 0000000..3dad081 --- /dev/null +++ b/recipes/branding/pandora-xfce-defaults/xfce4-panel/windowlist-12589448981.rc @@ -0,0 +1,6 @@ +button_layout=0 +urgency_notify=1 +show_all_workspaces=true +show_window_icons=false +show_workspace_actions=false + diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/xfce4-menu-5.rc b/recipes/branding/pandora-xfce-defaults/xfce4-panel/xfce4-menu-5.rc new file mode 100644 index 0000000..ccdd8fb --- /dev/null +++ b/recipes/branding/pandora-xfce-defaults/xfce4-panel/xfce4-menu-5.rc @@ -0,0 +1,7 @@ +use_default_menu=true +menu_file= +icon_file=/usr/share/pixmaps/op-start.png +show_menu_icons=true +button_title=OpenPandora Menu +show_button_title=false + diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/xfce4-menu-5.rc.bak b/recipes/branding/pandora-xfce-defaults/xfce4-panel/xfce4-menu-5.rc.bak new file mode 100644 index 0000000..c99de3c --- /dev/null +++ b/recipes/branding/pandora-xfce-defaults/xfce4-panel/xfce4-menu-5.rc.bak @@ -0,0 +1,6 @@ +use_default_menu=true +menu_file= +icon_file=/usr/share/pixmaps/op-start.png +show_menu_icons=true +button_title=OpenPandora Menu +show_button_title=false diff --git a/recipes/branding/pandora-xfce-defaults/xfce4/Xft.xrdb b/recipes/branding/pandora-xfce-defaults/xfce4/Xft.xrdb new file mode 100644 index 0000000..af45361 --- /dev/null +++ b/recipes/branding/pandora-xfce-defaults/xfce4/Xft.xrdb @@ -0,0 +1,7 @@ +# Those are fallback settings, use the ui plugin to change it +# or add your overrides to ~/.Xresources +# Xft.hintstyle: hintnone/hintslight/hintmedium/hintfull +# Xft hinting: 1/0 + +Xft.hinting: 1 +Xft.hintstyle: hintmedium diff --git a/recipes/branding/pandora-xfce-defaults/xfce4/helpers.rc b/recipes/branding/pandora-xfce-defaults/xfce4/helpers.rc new file mode 100644 index 0000000..c6fd4ed --- /dev/null +++ b/recipes/branding/pandora-xfce-defaults/xfce4/helpers.rc @@ -0,0 +1,3 @@ +WebBrowser=midori +MailReader=sylpheed-claws +TerminalEmulator=Terminal diff --git a/recipes/branding/pandora-xfce-defaults/xfce4/mount.rc b/recipes/branding/pandora-xfce-defaults/xfce4/mount.rc new file mode 100644 index 0000000..723b841 --- /dev/null +++ b/recipes/branding/pandora-xfce-defaults/xfce4/mount.rc @@ -0,0 +1,54 @@ +# +# ABOUT +# ===== +# This file contains the mount option configuration when exo-mount is used with the HAL +# back end (which is highly recommended). If mounting using exo is somehow not working +# for you, you can copy this file to your $XDG_CONFIG_HOME/xfce4 directory and modify it. +# +# The options for each filesystem are not used when they are not in the list of +# valid mount options provided by HAL. You can find those values using lshal and +# search for the volume.mount.valid_options property. +# +# +# EXAMPLE +# ======= +# For example your usb device contains the vfat file system and lshal shows the +# following valid mount options for the device: +# +# volume.mount.valid_options = {'ro', 'sync', 'dirsync', 'noatime', 'nodiratime', +# 'noexec', 'quiet', 'remount', 'exec', 'uid=', +# 'gid=', 'umask=', 'utf8'} (string list) +# +# All the values that end with a = character are options that contain a value, +# the other options are booleans that can be enabled by for example putting +# utf8=true in the group. +# +# +# SUBSTITUTIONS +# ============= +# Some options can be substituted by exo-mount when you set the value to : +# uid : The real user ID +# gid : The real group ID +# iocharset: To the EXO_MOUNT_IOCHARSET or LC_CTYPE environment variable. +# + +[vfat] +uid= +shortname=winnt +# FreeBSD specific option +longnames=true + +[iso9660] +uid= + +[udf] +uid= +iocharset= + +[ntfs] +uid= + +[ntfs-3g] +uid= +# Make sure the device does not get 0777 permissions +umask=0077 diff --git a/recipes/branding/pandora-xfce-defaults/xfce4/xinitrc b/recipes/branding/pandora-xfce-defaults/xfce4/xinitrc new file mode 100644 index 0000000..f46fbb2 --- /dev/null +++ b/recipes/branding/pandora-xfce-defaults/xfce4/xinitrc @@ -0,0 +1,229 @@ +#!/bin/sh + +# fix broken $UID on some system... +if test "x$UID" = "x"; then + if test -x /usr/xpg4/bin/id; then + UID=`/usr/xpg4/bin/id -u`; + else + UID=`id -u`; + fi +fi + +# $XDG_CONFIG_HOME defines the base directory relative to which user specific +# configuration files should be stored. If $XDG_CONFIG_HOME is either not set +# or empty, a default equal to $HOME/.config should be used. +if test "x$XDG_CONFIG_HOME" = "x" ; then + XDG_CONFIG_HOME=$HOME/.config +fi +[ -d "$XDG_CONFIG_HOME" ] || mkdir "$XDG_CONFIG_HOME" + +# $XDG_CACHE_HOME defines the base directory relative to which user specific +# non-essential data files should be stored. If $XDG_CACHE_HOME is either not +# set or empty, a default equal to $HOME/.cache should be used. +if test "x$XDG_CACHE_HOME" = "x" ; then + XDG_CACHE_HOME=$HOME/.cache +fi +[ -d "$XDG_CACHE_HOME" ] || mkdir "$XDG_CACHE_HOME" + + +# set up XDG user directores. see +# http://freedesktop.org/wiki/Software/xdg-user-dirs +if type xdg-user-dirs-update >/dev/null 2>&1; then + xdg-user-dirs-update +fi + +if test -f "$XDG_CONFIG_HOME/user-dirs.dirs"; then + . "$XDG_CONFIG_HOME/user-dirs.dirs" + # i'm deliberately not 'export'-ing the XDG_ vars, because you shouldn't + # rely on the env vars inside apps, since the file could be changed at + # any time by the user. this is solely here for migration purposes. + + # a bit of user dir migration... + if test -d "$HOME/Desktop" -a ! -L "$HOME/Desktop" \ + -a "$XDG_DESKTOP_DIR" \ + -a "$HOME/Desktop" != "$XDG_DESKTOP_DIR" + then + echo "Migrating $HOME/Desktop to $XDG_DESKTOP_DIR..." + test -d "$XDG_DESKTOP_DIR" && rmdir "$XDG_DESKTOP_DIR" + mv "$HOME/Desktop" "$XDG_DESKTOP_DIR" || echo "Desktop migration failed" >&2 + fi + + if test -d "$HOME/Templates" -a ! -L "$HOME/Templates" \ + -a "$XDG_TEMPLATES_DIR" \ + -a "$HOME/Templates" != "$XDG_TEMPLATES_DIR" + then + echo "Migrating $HOME/Templates to $XDG_TEMPLATES_DIR..." + test -d "$XDG_TEMPLATES_DIR" && rmdir "$XDG_TEMPLATES_DIR" + mv "$HOME/Templates" "$XDG_TEMPLATES_DIR" || echo "Templates migration failed" >&2 + fi +fi + + +# Modify libglade and glade environment variables so that +# it will find the files installed by Xfce +export LIBGLADE_MODULE_PATH="$LIBGLADE_MODULE_PATH:/usr/lib/libglade/2.0" +export GLADE_CATALOG_PATH="$GLADE_CATALOG_PATH:" +export GLADE_PIXMAP_PATH="$GLADE_PIXMAP_PATH:" +export GLADE_MODULE_PATH="$GLADE_MODULE_PATH:" + + +# Export GTK_PATH so that GTK+ can find the Xfce theme engine +export GTK_PATH="$GTK_PATH:/usr/lib/gtk-2.0" + + +# For now, start with an empty list +XRESOURCES="" + +# Has to go prior to merging Xft.xrdb, as its the "Defaults" file +test -r "/etc/xdg/xfce4/Xft.xrdb" && XRESOURCES="$XRESOURCES /etc/xdg/xfce4/Xft.xrdb" +test -r $HOME/.Xdefaults && XRESOURCES="$XRESOURCES $HOME/.Xdefaults" + +BASEDIR=$XDG_CONFIG_HOME/xfce4 +if test -r "$BASEDIR/Xft.xrdb"; then + XRESOURCES="$XRESOURCES $BASEDIR/Xft.xrdb" +elif test -r "$XFCE4HOME/Xft.xrdb"; then + mkdir -p "$BASEDIR" + cp "$XFCE4HOME/Xft.xrdb" "$BASEDIR"/ + XRESOURCES="$XRESOURCES $BASEDIR/Xft.xrdb" +fi + +# merge in X cursor settings +test -r "$BASEDIR/Xcursor.xrdb" && XRESOURCES="$XRESOURCES $BASEDIR/Xcursor.xrdb" + +# ~/.Xresources contains overrides to the above +test -r "$HOME/.Xresources" && XRESOURCES="$XRESOURCES $HOME/.Xresources" + +# load all X resources (adds /dev/null to avoid an empty list that would hang the process) +cat /dev/null $XRESOURCES | xrdb -nocpp -merge - + +# load local modmap +test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap + +# Launch xscreensaver (if available), but only as non-root user +if test $UID -gt 0 -a -z "$VNCSESSION"; then + if test x"`which xscreensaver 2>/dev/null`" != x""; then + xscreensaver -no-splash & + elif test x"`which gnome-screensaver 2>/dev/null`" != x""; then + gnome-screensaver & + fi +fi + +# Use ssh-agent if installed and not already running. Run it separately +# so it populates the environment here, so we can clean it up later. +sshagent=`which ssh-agent` +kill_sshagent=0 +if test -z "$SSH_AGENT_PID" -a "$sshagent" -a "x$sshagent" != "xno"; then + eval `$sshagent -s` + kill_sshagent=1 +fi + +# Use dbus-launch if installed. +if test x"$DBUS_SESSION_BUS_ADDRESS" = x""; then + dbuslaunch=`which dbus-launch` + if test x"$dbuslaunch" != x"" -a x"$dbuslaunch" != x"no"; then + eval `$dbuslaunch --sh-syntax --exit-with-session` + fi +fi + +# Run xfce4-session if installed +xfcesm=`which xfce4-session` +case "x$xfcesm" in + x|xno*) + ;; + *) + $xfcesm + + if test $kill_sshagent -eq 1; then + eval `$sshagent -k` + fi + exit 0 + ;; +esac + + +################## +# IMPORTANT NOTE # +################## + +# Everything below here ONLY gets executed if you are NOT using xfce4-session +# (Xfce's session manager). If you are using the session manager, everything +# below is handled by it, and the code below is not executed at all. If you're +# not sure if you're using the session manager, type 'ps -e|grep xfce4-session' +# in a terminal while Xfce is running. + +################## + + +# this is only necessary when running w/o xfce4-session +xsetroot -solid black -cursor_name watch + +# or use old-fashioned startup script otherwise + +xfsettingsd & +xfwm4 --daemon + +# start up stuff in $XDG_CONFIG_HOME/autostart/, as that looks to be +# the new standard. if that directory doesn't exist, try the old +# ~/Desktop/Autostart method. we're not going to do any migration here. +if test -d "$XDG_CONFIG_HOME/autostart"; then + for i in ${XDG_CONFIG_HOME}/autostart/*.desktop; do + grep -q -E "^Hidden=true" "$i" && continue + if grep -q -E "^OnlyShowIn=" "$i"; then + # need to test twice, as lack of the line entirely means we still run it + grep -E "^OnlyShowIn=" "$i" | grep -q 'XFCE;' || continue + fi + grep -E "^NotShowIn=" "$i" | grep -q 'XFCE;' && continue + + # check for TryExec + trycmd=`grep -E "^TryExec=" "$i" | cut -d'=' -f2` + if test "$trycmd"; then + type "$trycmd" >/dev/null 2>&1 || continue + fi + + cmd=`grep -E "^Exec=" "$i" | cut -d'=' -f2` + if test "$cmd" && type "$cmd" >/dev/null 2>&1; then + $cmd & + fi + done +elif test -d "$HOME/Desktop/Autostart"; then + for i in `ls -1 -L ${HOME}/Desktop/Autostart/ 2>/dev/null`; do + if test -x $HOME/Desktop/Autostart/$i; then + $HOME/Desktop/Autostart/$i & + fi + done +fi + +xfdesktop& +orage & + +panel=`which xfce4-panel` +case "x$panel" in + x|xno*) + ;; + *) + $panel + ret=$? + while test $ret -ne 0; do + xmessage -center -file - -timeout 20 -title Error <&2 < + + + + + + + + + + + + + + + + + + + + + + diff --git a/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml new file mode 100644 index 0000000..c9e743e --- /dev/null +++ b/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-mixer.xml b/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-mixer.xml new file mode 100644 index 0000000..54edd93 --- /dev/null +++ b/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-mixer.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-notifyd.xml b/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-notifyd.xml new file mode 100644 index 0000000..cee2f4d --- /dev/null +++ b/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-notifyd.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-session.xml b/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-session.xml new file mode 100644 index 0000000..938d232 --- /dev/null +++ b/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-session.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-settings-manager.xml b/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-settings-manager.xml new file mode 100644 index 0000000..691d3cd --- /dev/null +++ b/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-settings-manager.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfprint.xml b/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfprint.xml new file mode 100644 index 0000000..4dce890 --- /dev/null +++ b/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfprint.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfwm4.xml b/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfwm4.xml new file mode 100644 index 0000000..449e050 --- /dev/null +++ b/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfwm4.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xsettings.xml b/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xsettings.xml new file mode 100644 index 0000000..7f54904 --- /dev/null +++ b/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xsettings.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + +