diff options
| -rw-r--r-- | desktop-common-data.spec | 6 | ||||
| -rw-r--r-- | dm/mdk-gdm.xml | 22 | ||||
| -rw-r--r-- | dm/mdk-kde.xml | 10 | ||||
| -rwxr-xr-x | xinit.d/desktop-directories | 11 |
4 files changed, 26 insertions, 23 deletions
diff --git a/desktop-common-data.spec b/desktop-common-data.spec index ac8f11c..b92a79b 100644 --- a/desktop-common-data.spec +++ b/desktop-common-data.spec @@ -3,7 +3,7 @@ Summary: Desktop common files Name: desktop-common-data Version: 2007 -Release: %mkrel 10 +Release: %mkrel 11 License: GPL URL: http://www.mandrivalinux.com/ Group: System/Configuration/Other @@ -193,6 +193,10 @@ rm -fr %buildroot %changelog +* Mon Sep 04 2006 Frederic Crozat <fcrozat@mandriva.com> 2007-11mdv2007.0 +- Improve gdm/kdm theme with new backgrounds +- Don't create default desktop directories for root (Mdv bug #19711) + * Thu Aug 31 2006 Laurent MONTEL <lmontel@mandriva.com> 2007-10mdv2007.0 - Fix upgrade from 2006 - Fix discovery menu (merge kmenuedit.menu when it created by kmenuedit, fix diff --git a/dm/mdk-gdm.xml b/dm/mdk-gdm.xml index f416e52..14d7d16 100644 --- a/dm/mdk-gdm.xml +++ b/dm/mdk-gdm.xml @@ -117,11 +117,11 @@ </item> <item type="rect" id="caps-lock-warning"> - <normal color="#ffffff" alpha="0.6"/> - <pos anchor="c" x="50%" y="75%" width="box" height="box"/> + <normal color="#ffffff" alpha="0"/> + <pos anchor="c" x="50%" y="50%" width="box" height="box"/> <box orientation="vertical" min-width="400" xpadding="10" ypadding="5" spacing="0"> <item type="label"> - <normal color="#000000" font="Sans 14"/> + <normal color="#FFFFFF" font="Sans 14"/> <pos x="50%" anchor="n"/> <!-- Stock label for: You've got capslock on! --> <stock type="caps-lock-warning"/> @@ -131,11 +131,11 @@ <item type="rect"> <show type="timed"/> - <normal color="#ffffff" alpha="0.6"/> + <normal color="#ffffff" alpha="0"/> <pos anchor="c" x="50%" y="70%" width="box" height="box"/> <box orientation="vertical" min-width="400" xpadding="10" ypadding="5" spacing="0"> <item type="label" id="timed-label"> - <normal color="#000000" font="Sans 14"/> + <normal color="#FFFFFF" font="Sans 14"/> <pos x="50%" anchor="n"/> <!-- Stock label for: User %s will login in %d seconds --> <stock type="timed-label"/> @@ -144,23 +144,23 @@ </item> <item type="rect"> - <normal color="#ffffff" alpha="0.6"/> + <normal color="#ffffff" alpha="0"/> <pos anchor="c" x="50%" y="40%" width="box" height="box"/> <box orientation="vertical" min-width="350" xpadding="30" ypadding="30" spacing="10"> <item type="label"> <pos anchor="n" x="50%"/> - <normal color="#000000" font="Sans 18"/> + <normal color="#FFFFFF" font="Sans 18"/> <!-- Stock label for: Welcome to %h --> <stock type="welcome-label"/> </item> <item type="label" id="pam-prompt"> - <pos anchor="nw" x="10%"/> - <normal color="#000000" font="Sans 16"/> + <pos anchor="nw" x="10%" /> + <normal color="#FFFFFF" font="Sans 14"/> <!-- Stock label for: Username: --> <stock type="username-label"/> </item> <item type="rect"> - <normal color="#000000"/> + <normal color="#FFFFFF"/> <pos anchor="n" x="50%" height="24" width="80%"/> <fixed> <item type="entry" id="user-pw-entry"> @@ -170,7 +170,7 @@ </item> <item type="label" id="pam-message"> <pos anchor="n" x="50%"/> - <normal color="#000000" font="Sans 16"/> + <normal color="#FFFFFF" font="Sans 12"/> <text></text> </item> </box> diff --git a/dm/mdk-kde.xml b/dm/mdk-kde.xml index eb58e38..2af1ebc 100644 --- a/dm/mdk-kde.xml +++ b/dm/mdk-kde.xml @@ -118,7 +118,7 @@ <item type="rect" id="caps-lock-warning"> <normal color="#ffffff" alpha="0.0"/> - <pos anchor="c" x="50%" y="75%" width="box" height="box"/> + <pos anchor="c" x="50%" y="50%" width="box" height="box"/> <box orientation="vertical" min-width="400" xpadding="10" ypadding="5" spacing="0"> <item type="label"> <normal color="#FFFFFF" font="Sans 14"/> @@ -131,7 +131,7 @@ <item type="rect"> <show type="timed"/> - <normal color="#ffffff" alpha="0.6"/> + <normal color="#ffffff" alpha="0"/> <pos anchor="c" x="50%" y="70%" width="box" height="box"/> <box orientation="vertical" min-width="400" xpadding="10" ypadding="5" spacing="0"> <item type="label" id="timed-label"> @@ -164,13 +164,13 @@ <box orientation="vertical" xpadding="0" ypadding="0" spacing="14"> <item type="label"> <pos anchor="ne" x="100%"/> - <normal color="#FFFFFF" font="Sans 16"/> + <normal color="#FFFFFF" font="Sans 14"/> <!-- Stock label for: Username: --> <stock type="username-label"/> </item> <item type="label"> <pos anchor="ne" x="100%"/> - <normal color="#FFFFFF" font="Sans 16"/> + <normal color="#FFFFFF" font="Sans 14"/> <!-- Stock label for: Password: --> <stock type="password-label"/> </item> @@ -194,7 +194,7 @@ <fixed> <item type="label" id="pam-error"> <pos anchor="n" x="50%" y="110%"/> - <normal color="#ffffff" font="Sans 16"/> + <normal color="#ffffff" font="Sans 12"/> <text></text> </item> </fixed> diff --git a/xinit.d/desktop-directories b/xinit.d/desktop-directories index 9627973..ffe7512 100755 --- a/xinit.d/desktop-directories +++ b/xinit.d/desktop-directories @@ -1,8 +1,8 @@ #!/bin/sh -USER_STAMP=$HOME/.mdk-folders +MDK_FOLDERS="$HOME/.mdk-folders" -if [ ! -e $USER_STAMP ]; then +if [ "$UID" != "0" -a ! -e $MDK_FOLDERS ]; then . /etc/profile.d/10lang.sh locale=C if [ ! -z "$LC_ALL" ]; then @@ -14,7 +14,7 @@ if [ ! -e $USER_STAMP ]; then fi CHARSET=`locale charmap` - [ -d $HOME/.mdk-folders ] || mkdir -p $HOME/.mdk-folders + [ -d $MDK_FOLDERS ] || mkdir -p "$MDK_FOLDERS" for file in /usr/share/mdk/menu/*-mdk.desktop.template ; do TARGET_DIR=`grep -m1 -F Name[$locale]= $file | sed -e 's|.*=||g'` @@ -36,8 +36,8 @@ if [ ! -e $USER_STAMP ]; then [ -d "$DIRECTORY_PATH" ] || mkdir -p "$DIRECTORY_PATH" echo -e [Desktop Entry]\\nHidden=true\\n`grep Icon= $file` > "$DIRECTORY_PATH/.directory" - FILE_PATH=$HOME/.mdk-folders/`basename $file .template` - SYMLINK=$HOME/.mdk-folders/`basename $file -mdk.desktop.template` + FILE_PATH=$MDK_FOLDERS/`basename $file .template` + SYMLINK=$MDK_FOLDERS/`basename $file -mdk.desktop.template` ln -f -s "$DIRECTORY_PATH" $SYMLINK @@ -47,6 +47,5 @@ if [ ! -e $USER_STAMP ]; then [ -f $FILE_PATH ] || cat $file | sed -e "s|\$HOME.*|$DIRECTORY_PATH|g" > $FILE_PATH echo "file://$FILE_PATH" >> $HOME/.gtk-bookmarks done - touch $USER_STAMP fi |