Changed default wallpaper (bugfix; the green curtain was so ugly it would drive users away...)

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1175921 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 14 years ago
parent 70e0afa6f0
commit a81880a78a

@ -694,7 +694,7 @@ static const char def_background[] =
"Program=\n" "Program=\n"
"ReverseBlending=false\n" "ReverseBlending=false\n"
"UseSHM=false\n" "UseSHM=false\n"
"Wallpaper=green_curtain.jpg\n" "Wallpaper=isadora.png\n"
"WallpaperList=\n" "WallpaperList=\n"
"WallpaperMode=Scaled\n"; "WallpaperMode=Scaled\n";
@ -1513,7 +1513,7 @@ edit_startup( File *file )
"test -f $PIDFILE && kill `cat $PIDFILE`\n" ))) "test -f $PIDFILE && kill `cat $PIDFILE`\n" )))
chg1 = 1; chg1 = 1;
if (oldver < 0x0203) { if (oldver < 0x0203) {
chg2 = chg2 =
#ifdef _AIX #ifdef _AIX
delstr( file, "\n" delstr( file, "\n"
"# We create a pseudodevice for finger. (host:0 becomes [kx]dm/host_0)\n" ); "# We create a pseudodevice for finger. (host:0 becomes [kx]dm/host_0)\n" );

@ -45,7 +45,7 @@
#include "ksysinfo.h" #include "ksysinfo.h"
#include "keyecandypage.h" #include "keyecandypage.h"
#define DEFAULT_WALLPAPER "green_curtain.jpg" #define DEFAULT_WALLPAPER "isadora.png"
KEyeCandyPage::KEyeCandyPage(TQWidget *parent, const char *name ) : KEyeCandyPageDlg(parent,name) { KEyeCandyPage::KEyeCandyPage(TQWidget *parent, const char *name ) : KEyeCandyPageDlg(parent,name) {

@ -25,7 +25,7 @@ fi
# we have to unset this for Darwin since it will screw up KDE's dynamic-loading # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
unset DYLD_FORCE_FLAT_NAMESPACE unset DYLD_FORCE_FLAT_NAMESPACE
# Check if prelinking is enabled. If so, exporting KDE_IS_PRELINKED improves # Check if prelinking is enabled. If so, exporting KDE_IS_PRELINKED improves
# loading KDE. # loading KDE.
if test -f /etc/default/prelink; then if test -f /etc/default/prelink; then
. /etc/default/prelink . /etc/default/prelink
@ -94,7 +94,7 @@ fi
if [ ! -e $kdehome/share/config/kdesktoprc ]; then if [ ! -e $kdehome/share/config/kdesktoprc ]; then
cat >$kdehome/share/config/kdesktoprc <<EOF cat >$kdehome/share/config/kdesktoprc <<EOF
[Desktop0] [Desktop0]
Wallpaper=green_curtain.jpg Wallpaper=isadora.png
WallpaperMode=Scaled WallpaperMode=Scaled
EOF EOF
fi fi
@ -164,9 +164,9 @@ unset DESKTOP_LOCKED # Don't want it in the environment
# with cold caches). Makes the splash appear sooner. # with cold caches). Makes the splash appear sooner.
# If kpersonalizer needs to be run splash will be started only later. # If kpersonalizer needs to be run splash will be started only later.
if test -z "$dl" && test "$kpersonalizerrc_general_firstlogin" != "true"; then if test -z "$dl" && test "$kpersonalizerrc_general_firstlogin" != "true"; then
case "$ksplashrc_ksplash_theme" in case "$ksplashrc_ksplash_theme" in
Simple) Simple)
ksplashsimple ksplashsimple
;; ;;
*) *)
;; ;;
@ -378,12 +378,12 @@ fi
if test -z "$dl"; then if test -z "$dl"; then
# the splashscreen and progress indicator # the splashscreen and progress indicator
case "$ksplashrc_ksplash_theme" in case "$ksplashrc_ksplash_theme" in
None) None)
;; # nothing ;; # nothing
Simple) Simple)
if test "$kpersonalizerrc_general_firstlogin" = "true"; then if test "$kpersonalizerrc_general_firstlogin" = "true"; then
ksplashsimple ksplashsimple
fi # otherwise started earlier fi # otherwise started earlier
;; ;;
*) *)
@ -441,11 +441,11 @@ fi
# if KDEWM is not set, ksmserver will ensure kwin is started. # if KDEWM is not set, ksmserver will ensure kwin is started.
# kwrapper is used to reduce startup time and memory usage # kwrapper is used to reduce startup time and memory usage
# kwrapper does not return usefull error codes such as the exit code of ksmserver. # kwrapper does not return usefull error codes such as the exit code of ksmserver.
# We only check for 255 which means that the ksmserver process could not be # We only check for 255 which means that the ksmserver process could not be
# started, any problems thereafter, e.g. ksmserver failing to initialize, # started, any problems thereafter, e.g. ksmserver failing to initialize,
# will remain undetected. # will remain undetected.
test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM" test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM"
kwrapper ksmserver $KDEWM kwrapper ksmserver $KDEWM
if test $? -eq 255; then if test $? -eq 255; then
# Startup error # Startup error
echo 'startkde: Could not start ksmserver. Check your installation.' 1>&2 echo 'startkde: Could not start ksmserver. Check your installation.' 1>&2

Loading…
Cancel
Save