summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kdm/kfrontend/genkdmconf.c2
-rw-r--r--kdm/kfrontend/themes/o2_enterprise/Dialog.pngbin6474 -> 5099 bytes
-rw-r--r--kdm/kfrontend/themes/o2_enterprise/background.jpgbin765343 -> 965444 bytes
-rw-r--r--kdm/kfrontend/themes/o2_enterprise/enterprise.xml14
-rw-r--r--kpersonalizer/keyecandypage.cpp2
-rw-r--r--pics/wallpapers/Makefile.am2
-rw-r--r--pics/wallpapers/green_curtain.jpgbin0 -> 765343 bytes
-rw-r--r--pics/wallpapers/green_curtain.jpg.desktop7
-rw-r--r--pics/wallpapers/stripes.jpg.desktop4
-rw-r--r--startkde2
10 files changed, 21 insertions, 12 deletions
diff --git a/kdm/kfrontend/genkdmconf.c b/kdm/kfrontend/genkdmconf.c
index 1dc85a3b..78e2d1c7 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 2c7cc2db..47d4db8a 100644
--- a/kdm/kfrontend/themes/o2_enterprise/Dialog.png
+++ b/kdm/kfrontend/themes/o2_enterprise/Dialog.png
Binary files differ
diff --git a/kdm/kfrontend/themes/o2_enterprise/background.jpg b/kdm/kfrontend/themes/o2_enterprise/background.jpg
index 723cfe90..7a3f643f 100644
--- a/kdm/kfrontend/themes/o2_enterprise/background.jpg
+++ b/kdm/kfrontend/themes/o2_enterprise/background.jpg
Binary files differ
diff --git a/kdm/kfrontend/themes/o2_enterprise/enterprise.xml b/kdm/kfrontend/themes/o2_enterprise/enterprise.xml
index c05acfae..11849cc6 100644
--- a/kdm/kfrontend/themes/o2_enterprise/enterprise.xml
+++ b/kdm/kfrontend/themes/o2_enterprise/enterprise.xml
@@ -10,11 +10,11 @@
<pos width="640" x="50%" y="50%" anchor="c" height="400" />
<item type="label" id="clock" >
<normal color="#000000" font="Sans 10" />
- <pos x="435" y="170" anchor="n" />
+ <pos x="435" y="120" anchor="n" />
<text>%c</text>
</item>
<item type="rect">
- <pos anchor="nw" x="30" y="130" height="243" width="200"/>
+ <pos anchor="nw" x="30" y="80" height="243" width="200"/>
<fixed>
<item type="rect" id="userlist">
<pos anchor="c" x="50%" y="50%" height="100%" width="100%"/>
@@ -24,7 +24,7 @@
</item>
<item button="true" type="rect" id="system_button" >
<normal alpha="0.0" color="#00ff00" />
- <pos width="box" x="605" y="365" anchor="c" height="box" />
+ <pos width="box" x="605" y="315" anchor="c" height="box" />
<box xpadding="0" spacing="0" orientation="horizontal" >
<item type="pixmap">
<pos x="50%" y="50%" anchor="c" />
@@ -36,7 +36,7 @@
</item>
<item button="true" type="rect" id="login_button" >
<normal alpha="0.0" color="#00ff00" />
- <pos width="box" x="540" y="238" anchor="c" height="box" />
+ <pos width="box" x="540" y="188" anchor="c" height="box" />
<box xpadding="0" spacing="0" orientation="horizontal" >
<item type="pixmap">
<pos x="90%" y="50%" anchor="c" />
@@ -48,7 +48,7 @@
</item>
<box xpadding="20" spacing="10" ypadding="20" orientation="vertical" min-width="340" >
<item type="rect" id="talker" >
- <pos width="box" x="375" y="190" anchor="n" height="box" />
+ <pos width="box" x="375" y="140" anchor="n" height="box" />
<box xpadding="0" spacing="0" ypadding="0" orientation="horizontal" >
<item type="rect" >
<normal alpha="0.0" color="#000000" />
@@ -83,7 +83,7 @@
</box>
<fixed>
<item type="label" id="pam-error" >
- <pos x="435" y="343" anchor="s" />
+ <pos x="435" y="293" anchor="s" />
<normal color="#CD0000" font="Sans 10" />
<text/>
</item>
@@ -91,7 +91,7 @@
<fixed>
<item type="label" id="caps-lock-warning" >
<normal color="#CD0000" font="Sans 10" />
- <pos x="435" y="373" anchor="s" />
+ <pos x="435" y="323" anchor="s" />
<stock type="caps-lock-warning" />
</item>
</fixed>
diff --git a/kpersonalizer/keyecandypage.cpp b/kpersonalizer/keyecandypage.cpp
index d719a350..ea1099cb 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 09cdb7e7..4c27637f 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 00000000..723cfe90
--- /dev/null
+++ b/pics/wallpapers/green_curtain.jpg
Binary files differ
diff --git a/pics/wallpapers/green_curtain.jpg.desktop b/pics/wallpapers/green_curtain.jpg.desktop
new file mode 100644
index 00000000..5cbd077b
--- /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 d969f0bc..42b26463 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 b5df0b58..3dec135c 100644
--- a/startkde
+++ b/startkde
@@ -94,7 +94,7 @@ fi
if [ ! -e $kdehome/share/config/kdesktoprc ]; then
cat >$kdehome/share/config/kdesktoprc <<EOF
[Desktop0]
-Wallpaper=stripes.jpg
+Wallpaper=green_curtain.jpg
WallpaperMode=Scaled
EOF
fi