diff options
| -rw-r--r-- | kcontrol/background/bgdefaults.h | 4 | ||||
| -rw-r--r-- | kpersonalizer/keyecandypage.cpp | 8 | ||||
| -rw-r--r-- | startkde | 26 |
3 files changed, 29 insertions, 9 deletions
diff --git a/kcontrol/background/bgdefaults.h b/kcontrol/background/bgdefaults.h index b7de45bda..8a0f2912e 100644 --- a/kcontrol/background/bgdefaults.h +++ b/kcontrol/background/bgdefaults.h @@ -24,12 +24,12 @@ #define _defMinOptimizationDepth 1 // Per desktop defaults -// Before you change this get in touch with me (torsten@kde.org) +// Before you change this get in touch with me (kb9vqf@pearsoncomputing.net) // Thanks!! #define _defColorA TQColor("#003082") #define _defColorB TQColor("#C0C0C0") #define _defBackgroundMode KBackgroundSettings::Flat -#define _defWallpaperMode KBackgroundSettings::NoWallpaper +#define _defWallpaperMode KBackgroundSettings::Scaled #define _defMultiMode KBackgroundSettings::NoMulti #define _defBlendMode KBackgroundSettings::NoBlending #define _defBlendBalance 100 diff --git a/kpersonalizer/keyecandypage.cpp b/kpersonalizer/keyecandypage.cpp index 3349ab4c3..d719a3501 100644 --- a/kpersonalizer/keyecandypage.cpp +++ b/kpersonalizer/keyecandypage.cpp @@ -45,6 +45,8 @@ #include "ksysinfo.h" #include "keyecandypage.h" +#define DEFAULT_WALLPAPER "stripes.jpg" + KEyeCandyPage::KEyeCandyPage(TQWidget *parent, const char *name ) : KEyeCandyPageDlg(parent,name) { kwinconf = new KConfig("kwinrc", false, true); @@ -240,14 +242,14 @@ void KEyeCandyPage::enableDesktopWallpaper(bool enable, bool user){ kdesktopconf->setGroup("Desktop0"); if( st_UserWallpaper.WallpaperMode == "NoWallpaper") - deskbgimage="KDE34.png"; + deskbgimage=DEFAULT_WALLPAPER; if(enable && !user){ // if the user has a different mode than the default of NoMulti, we don't change anyting on that. if( st_UserWallpaper.MultiWallpaperMode == "NoMulti" ) kdesktopconf->writeEntry("MultiWallpaperMode", "NoMulti"); // if the wallpaper is the new default one, set mode to scaled to leave user settings untouched - if( deskbgimage == "KDE34.png"){ + if( deskbgimage == DEFAULT_WALLPAPER){ kdesktopconf->writeEntry("WallpaperMode", "Scaled"); //here we change the kdesktop font color to white as it fits better // to the KDE34png.png gray background @@ -689,7 +691,7 @@ void KEyeCandyPage::getUserDefaults(){ st_UserWallpaper.MultiWallpaperMode = kdesktopconf->readEntry("MultiWallpaperMode", "NoMulti"); st_UserWallpaper.WallpaperMode = kdesktopconf->readEntry("WallpaperMode", "Scaled"); st_UserWallpaper.Wallpaper = kdesktopconf->readPathEntry("Wallpaper", "NoWallpaper"); - deskbgimage = kdesktopconf->readPathEntry("Wallpaper", "KDE34.png"); + deskbgimage = kdesktopconf->readPathEntry("Wallpaper", DEFAULT_WALLPAPER); // Wallpaper-User-Defaults (END) KGlobal::config()->setGroup("KDE"); @@ -90,6 +90,15 @@ if test $? -ne 0; then fi . $kdehome/share/config/startupconfig +# Make sure default wallpaper is set +if [ ! -e $kdehome/share/config/kdesktoprc ]; then +cat >$kdehome/share/config/kdesktoprc <<EOF +[Desktop0] +Wallpaper=stripes.jpg +WallpaperMode=Scaled +EOF +fi + # XCursor mouse theme needs to be applied here to work even for kded or ksmserver if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize" @@ -176,16 +185,25 @@ fi # configuration of the gtk_qt_engine if not already set -if [ ! -e $kdehome/env/gtk-qt-engine.rc.sh ] && [ -e /usr/share/kubuntu-default-settings/gtk-qt-engine.rc.sh ] +if test -n "$KDEDIRS"; then + kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'` + KGTK_RC_ENGINE=$kdedirs_first/share/kgtk/gtk-qt-engine.rc.sh + KGTK_RC_KDE=$kdedirs_first/share/kgtk/.gtkrc-2.0-kde +else + KGTK_RC_ENGINE=$KDEDIR/share/kgtk/gtk-qt-engine.rc.sh + KGTK_RC_KDE=$KDEDIR/share/kgtk/.gtkrc-2.0-kde +fi + +if [ ! -e $kdehome/env/gtk-qt-engine.rc.sh ] && [ -e $KGTK_RC_ENGINE ] then mkdir -p $kdehome/env - cp -f /usr/share/kubuntu-default-settings/gtk-qt-engine.rc.sh $kdehome/env + cp -f $KGTK_RC_ENGINE $kdehome/env chmod 755 $kdehome/env/gtk-qt-engine.rc.sh fi -if [ ! -e $HOME/.gtkrc-2.0-kde ] && [ -e /usr/share/kubuntu-default-settings/.gtkrc-2.0-kde ] +if [ ! -e $HOME/.gtkrc-2.0-kde ] && [ -e $KGTK_RC_KDE ] then - cp -f /usr/share/kubuntu-default-settings/.gtkrc-2.0-kde $HOME + cp -f $KGTK_RC_KDE $HOME fi # Source scripts found in <localprefix>/env/*.sh and <prefixes>/env/*.sh |