From 278fa07764f522e03510693f44471eea99a38fd5 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 9 Sep 2010 07:41:12 +0000 Subject: Added Green Curtain wallpaper (a modification of Stripes) and set as default This is both for artistic and legibility reasons, as well as to differentiate Trinity from KDE4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1173286 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kdm/kfrontend/genkdmconf.c | 2 +- kdm/kfrontend/themes/o2_enterprise/Dialog.png | Bin 6474 -> 5099 bytes kdm/kfrontend/themes/o2_enterprise/background.jpg | Bin 765343 -> 965444 bytes kdm/kfrontend/themes/o2_enterprise/enterprise.xml | 14 +++++++------- kpersonalizer/keyecandypage.cpp | 2 +- pics/wallpapers/Makefile.am | 2 ++ pics/wallpapers/green_curtain.jpg | Bin 0 -> 765343 bytes pics/wallpapers/green_curtain.jpg.desktop | 7 +++++++ pics/wallpapers/stripes.jpg.desktop | 4 ++-- startkde | 2 +- 10 files changed, 21 insertions(+), 12 deletions(-) create mode 100644 pics/wallpapers/green_curtain.jpg create mode 100644 pics/wallpapers/green_curtain.jpg.desktop diff --git a/kdm/kfrontend/genkdmconf.c b/kdm/kfrontend/genkdmconf.c index 1dc85a3bc..78e2d1c7f 100644 --- a/kdm/kfrontend/genkdmconf.c +++ b/kdm/kfrontend/genkdmconf.c @@ -694,7 +694,7 @@ static const char def_background[] = "Program=\n" "ReverseBlending=false\n" "UseSHM=false\n" -"Wallpaper=stripes.jpg\n" +"Wallpaper=green_curtain.jpg\n" "WallpaperList=\n" "WallpaperMode=Scaled\n"; diff --git a/kdm/kfrontend/themes/o2_enterprise/Dialog.png b/kdm/kfrontend/themes/o2_enterprise/Dialog.png index 2c7cc2db1..47d4db8af 100644 Binary files a/kdm/kfrontend/themes/o2_enterprise/Dialog.png and b/kdm/kfrontend/themes/o2_enterprise/Dialog.png differ diff --git a/kdm/kfrontend/themes/o2_enterprise/background.jpg b/kdm/kfrontend/themes/o2_enterprise/background.jpg index 723cfe905..7a3f643f8 100644 Binary files a/kdm/kfrontend/themes/o2_enterprise/background.jpg and b/kdm/kfrontend/themes/o2_enterprise/background.jpg differ diff --git a/kdm/kfrontend/themes/o2_enterprise/enterprise.xml b/kdm/kfrontend/themes/o2_enterprise/enterprise.xml index c05acfaef..11849cc62 100644 --- a/kdm/kfrontend/themes/o2_enterprise/enterprise.xml +++ b/kdm/kfrontend/themes/o2_enterprise/enterprise.xml @@ -10,11 +10,11 @@ - + %c - + @@ -24,7 +24,7 @@ - + @@ -36,7 +36,7 @@ - + @@ -48,7 +48,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -91,7 +91,7 @@ - + diff --git a/kpersonalizer/keyecandypage.cpp b/kpersonalizer/keyecandypage.cpp index d719a3501..ea1099cbd 100644 --- a/kpersonalizer/keyecandypage.cpp +++ b/kpersonalizer/keyecandypage.cpp @@ -45,7 +45,7 @@ #include "ksysinfo.h" #include "keyecandypage.h" -#define DEFAULT_WALLPAPER "stripes.jpg" +#define DEFAULT_WALLPAPER "green_curtain.jpg" KEyeCandyPage::KEyeCandyPage(TQWidget *parent, const char *name ) : KEyeCandyPageDlg(parent,name) { diff --git a/pics/wallpapers/Makefile.am b/pics/wallpapers/Makefile.am index 09cdb7e7b..4c27637f4 100644 --- a/pics/wallpapers/Makefile.am +++ b/pics/wallpapers/Makefile.am @@ -43,6 +43,8 @@ pics_wallpaper_data_DATA = \ celtic.svgz.desktop \ globe.svgz \ globe.svgz.desktop \ + green_curtain.jpg \ + green_curtain.jpg.desktop \ here-gear.svgz \ here-gear.svgz.desktop \ konqui.svgz \ diff --git a/pics/wallpapers/green_curtain.jpg b/pics/wallpapers/green_curtain.jpg new file mode 100644 index 000000000..723cfe905 Binary files /dev/null and b/pics/wallpapers/green_curtain.jpg differ diff --git a/pics/wallpapers/green_curtain.jpg.desktop b/pics/wallpapers/green_curtain.jpg.desktop new file mode 100644 index 000000000..5cbd077bc --- /dev/null +++ b/pics/wallpapers/green_curtain.jpg.desktop @@ -0,0 +1,7 @@ +[Wallpaper] +File=green_curtain.jpg +Name=Green Curtain +Name[de]=Grüner Vorhang +Name[en_GB]=Green Curtain +ImageType=pixmap +Author=Ivan Čukić and Timothy Pearson \ No newline at end of file diff --git a/pics/wallpapers/stripes.jpg.desktop b/pics/wallpapers/stripes.jpg.desktop index d969f0bc8..42b264632 100644 --- a/pics/wallpapers/stripes.jpg.desktop +++ b/pics/wallpapers/stripes.jpg.desktop @@ -1,7 +1,7 @@ [Wallpaper] File=stripes.jpg Name=Stripes -Name[de]=Stripes -Name[en_GB]=Streifen +Name[de]=Streifen +Name[en_GB]=Stripes ImageType=pixmap Author=Ivan Čukić \ No newline at end of file diff --git a/startkde b/startkde index b5df0b580..3dec135c7 100644 --- a/startkde +++ b/startkde @@ -94,7 +94,7 @@ fi if [ ! -e $kdehome/share/config/kdesktoprc ]; then cat >$kdehome/share/config/kdesktoprc <