aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Default/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml (renamed from Free/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml)0
-rw-r--r--Flash/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml41
-rw-r--r--Makefile4
-rw-r--r--One/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml41
-rw-r--r--Powerpack/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml41
-rw-r--r--README.update.urpmi8
-rw-r--r--common/autostart/xfce4-firstrun.desktop4
-rw-r--r--common/xfce4/panel/xfce4-menu-5.rc4
-rw-r--r--common/xfce4/theme/gtkrc6
-rw-r--r--common/xfce4/theme/mandriva-xfce-panel.pngbin887 -> 0 bytes
-rw-r--r--common/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml6
-rw-r--r--tools/xfce4-firstrun26
13 files changed, 21 insertions, 163 deletions
diff --git a/ChangeLog b/ChangeLog
index cd8c244..db6f9ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2011-02-17 21:52 Ahmad Samir <ahmadsamir3891 at gmail.com>
+ * adapt to Mageia
+
2010-06-04 12:49 Tomasz Paweł Gajc <tpg at mandriva.org>
* common/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml:
diff --git a/Free/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/Default/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
index a1c0813..a1c0813 100644
--- a/Free/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
+++ b/Default/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
diff --git a/Flash/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/Flash/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
deleted file mode 100644
index c264000..0000000
--- a/Flash/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xsettings" version="1.0">
- <property name="Net" type="empty">
- <property name="DoubleClickTime" type="int" value="250"/>
- <property name="DoubleClickDistance" type="int" value="5"/>
- <property name="DndDragThreshold" type="int" value="8"/>
- <property name="CursorBlink" type="bool" value="true"/>
- <property name="CursorBlinkTime" type="int" value="1200"/>
- <property name="ThemeName" type="string" value="Ia Ora Smooth"/>
- <property name="IconThemeName" type="string" value="Tango"/>
- <property name="SoundThemeName" type="string" value="default"/>
- <property name="EnableEventSounds" type="bool" value="true"/>
- <property name="EnableInputFeedbackSounds" type="bool" value="true"/>
- </property>
- <property name="Xft" type="empty">
- <property name="Antialias" type="int" value="1"/>
- <property name="Hinting" type="int" value="-1"/>
- <property name="HintStyle" type="string" value="hintslight"/>
- <property name="RGBA" type="string" value="none"/>
- <property name="DPI" type="int" value="96"/>
- </property>
- <property name="Gtk" type="empty">
- <property name="CanChangeAccels" type="bool" value="false"/>
- <property name="ColorPalette" type="string" value="black:white:gray50:red:purple:blue:light blue:green:yellow:orange:lavender:brown:goldenrod4:dodger blue:pink:light green:gray10:gray30:gray75:gray90"/>
- <property name="FontName" type="string" value="Sans 10"/>
- <property name="IconSizes" type="string" value=""/>
- <property name="KeyThemeName" type="string" value=""/>
- <property name="ToolbarStyle" type="string" value="both"/>
- <property name="ToolbarIconSize" type="int" value="3"/>
- <property name="IMPreeditStyle" type="string" value=""/>
- <property name="IMStatusStyle" type="string" value=""/>
- <property name="MenuImages" type="bool" value="true"/>
- <property name="ButtonImages" type="bool" value="true"/>
- <property name="MenuBarAccel" type="string" value="F10"/>
- <property name="CursorThemeName" type="string" value="wonderland"/>
- <property name="CursorThemeSize" type="int" value="0"/>
- </property>
- <property name="Initialized" type="uint" value="1"/>
- <property name="NetCursorBlinkTime" type="int" value="1000"/>
-</channel>
diff --git a/Makefile b/Makefile
index fba8266..f6c203d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
# tpg@mandriva.org
-PACKAGE = mandriva-xfce-config
+PACKAGE = mageia-xfce-config
VERSION = `date +%Y%m%d`
PREFIX=$(prefix)
xfceconfdir=$(sysconfdir)
-xfceprofdir=$(localstatedir)/mandriva/xfce-profiles
+xfceprofdir=$(localstatedir)/mageia/xfce-profiles
install:
-install -d $(DESTDIR)$(xfceconfdir)
diff --git a/One/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/One/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
deleted file mode 100644
index c264000..0000000
--- a/One/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xsettings" version="1.0">
- <property name="Net" type="empty">
- <property name="DoubleClickTime" type="int" value="250"/>
- <property name="DoubleClickDistance" type="int" value="5"/>
- <property name="DndDragThreshold" type="int" value="8"/>
- <property name="CursorBlink" type="bool" value="true"/>
- <property name="CursorBlinkTime" type="int" value="1200"/>
- <property name="ThemeName" type="string" value="Ia Ora Smooth"/>
- <property name="IconThemeName" type="string" value="Tango"/>
- <property name="SoundThemeName" type="string" value="default"/>
- <property name="EnableEventSounds" type="bool" value="true"/>
- <property name="EnableInputFeedbackSounds" type="bool" value="true"/>
- </property>
- <property name="Xft" type="empty">
- <property name="Antialias" type="int" value="1"/>
- <property name="Hinting" type="int" value="-1"/>
- <property name="HintStyle" type="string" value="hintslight"/>
- <property name="RGBA" type="string" value="none"/>
- <property name="DPI" type="int" value="96"/>
- </property>
- <property name="Gtk" type="empty">
- <property name="CanChangeAccels" type="bool" value="false"/>
- <property name="ColorPalette" type="string" value="black:white:gray50:red:purple:blue:light blue:green:yellow:orange:lavender:brown:goldenrod4:dodger blue:pink:light green:gray10:gray30:gray75:gray90"/>
- <property name="FontName" type="string" value="Sans 10"/>
- <property name="IconSizes" type="string" value=""/>
- <property name="KeyThemeName" type="string" value=""/>
- <property name="ToolbarStyle" type="string" value="both"/>
- <property name="ToolbarIconSize" type="int" value="3"/>
- <property name="IMPreeditStyle" type="string" value=""/>
- <property name="IMStatusStyle" type="string" value=""/>
- <property name="MenuImages" type="bool" value="true"/>
- <property name="ButtonImages" type="bool" value="true"/>
- <property name="MenuBarAccel" type="string" value="F10"/>
- <property name="CursorThemeName" type="string" value="wonderland"/>
- <property name="CursorThemeSize" type="int" value="0"/>
- </property>
- <property name="Initialized" type="uint" value="1"/>
- <property name="NetCursorBlinkTime" type="int" value="1000"/>
-</channel>
diff --git a/Powerpack/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/Powerpack/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
deleted file mode 100644
index c264000..0000000
--- a/Powerpack/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xsettings" version="1.0">
- <property name="Net" type="empty">
- <property name="DoubleClickTime" type="int" value="250"/>
- <property name="DoubleClickDistance" type="int" value="5"/>
- <property name="DndDragThreshold" type="int" value="8"/>
- <property name="CursorBlink" type="bool" value="true"/>
- <property name="CursorBlinkTime" type="int" value="1200"/>
- <property name="ThemeName" type="string" value="Ia Ora Smooth"/>
- <property name="IconThemeName" type="string" value="Tango"/>
- <property name="SoundThemeName" type="string" value="default"/>
- <property name="EnableEventSounds" type="bool" value="true"/>
- <property name="EnableInputFeedbackSounds" type="bool" value="true"/>
- </property>
- <property name="Xft" type="empty">
- <property name="Antialias" type="int" value="1"/>
- <property name="Hinting" type="int" value="-1"/>
- <property name="HintStyle" type="string" value="hintslight"/>
- <property name="RGBA" type="string" value="none"/>
- <property name="DPI" type="int" value="96"/>
- </property>
- <property name="Gtk" type="empty">
- <property name="CanChangeAccels" type="bool" value="false"/>
- <property name="ColorPalette" type="string" value="black:white:gray50:red:purple:blue:light blue:green:yellow:orange:lavender:brown:goldenrod4:dodger blue:pink:light green:gray10:gray30:gray75:gray90"/>
- <property name="FontName" type="string" value="Sans 10"/>
- <property name="IconSizes" type="string" value=""/>
- <property name="KeyThemeName" type="string" value=""/>
- <property name="ToolbarStyle" type="string" value="both"/>
- <property name="ToolbarIconSize" type="int" value="3"/>
- <property name="IMPreeditStyle" type="string" value=""/>
- <property name="IMStatusStyle" type="string" value=""/>
- <property name="MenuImages" type="bool" value="true"/>
- <property name="ButtonImages" type="bool" value="true"/>
- <property name="MenuBarAccel" type="string" value="F10"/>
- <property name="CursorThemeName" type="string" value="wonderland"/>
- <property name="CursorThemeSize" type="int" value="0"/>
- </property>
- <property name="Initialized" type="uint" value="1"/>
- <property name="NetCursorBlinkTime" type="int" value="1000"/>
-</channel>
diff --git a/README.update.urpmi b/README.update.urpmi
index 1ee66ff..48ce777 100644
--- a/README.update.urpmi
+++ b/README.update.urpmi
@@ -1,10 +1,10 @@
-Xfce doesn't update its configuration files into users home by itself.
+Xfce doesn't update its configuration files in user's home dir by itself.
-Please remove these directories manually in your home, after update
-of mandriva-xfce-config and then restart your X session.
+Please remove these directories manually in your home, after updating
+mageia-xfce-config and then restart your X session.
~/.config/xfce4
~/.config/Terminal
~/.config/Thunar
-Do NOT to forget about doing backup of these directories.
+Do NOT to forget about first backing up those directories.
diff --git a/common/autostart/xfce4-firstrun.desktop b/common/autostart/xfce4-firstrun.desktop
index 56b5340..29790f5 100644
--- a/common/autostart/xfce4-firstrun.desktop
+++ b/common/autostart/xfce4-firstrun.desktop
@@ -1,9 +1,9 @@
[Desktop Entry]
Version=1.0
Type=Application
-Name=Mandriva xfce4 update tool
+Name=Mageia xfce4 update tool
Comment=Update config and icons for Xfce
-Icon=mandriva
+Icon=mageia
Exec=xfce4-firstrun
StartupNotify=false
Terminal=false
diff --git a/common/xfce4/panel/xfce4-menu-5.rc b/common/xfce4/panel/xfce4-menu-5.rc
index 4ca3c70..06aa933 100644
--- a/common/xfce4/panel/xfce4-menu-5.rc
+++ b/common/xfce4/panel/xfce4-menu-5.rc
@@ -1,7 +1,7 @@
use_default_menu=true
show_button_title=true
menu_file=/etc/xdg/menus/xfce-applications.menu
-icon_file=/usr/share/icons/Tango/scalable/apps/mandriva.svg
+icon_file=/usr/share/icons/Tango/scalable/apps/mageia.svg
show_menu_icons=true
-button_title=Mandriva
+button_title=Mageia
diff --git a/common/xfce4/theme/gtkrc b/common/xfce4/theme/gtkrc
index 7f1cf9f..d2b8827 100644
--- a/common/xfce4/theme/gtkrc
+++ b/common/xfce4/theme/gtkrc
@@ -3,9 +3,9 @@
style "xfce-panel"
{
- # mandriva-xfce-panel.png is same as main panel height, which is 32 px
- bg_pixmap[NORMAL] = "mandriva-xfce-panel.png"
- bg_pixmap[SELECTED] = "mandriva-xfce-panel.png"
+ # mageia-xfce-panel.png is same as main panel height, which is 32 px
+ bg_pixmap[NORMAL] = "mageia-xfce-panel.png"
+ bg_pixmap[SELECTED] = "mageia-xfce-panel.png"
}
# make desktop's icons label transparent
diff --git a/common/xfce4/theme/mandriva-xfce-panel.png b/common/xfce4/theme/mandriva-xfce-panel.png
deleted file mode 100644
index 99a8d11..0000000
--- a/common/xfce4/theme/mandriva-xfce-panel.png
+++ /dev/null
Binary files differ
diff --git a/common/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/common/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
index 8f9ce92..c467456 100644
--- a/common/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
+++ b/common/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
@@ -4,9 +4,9 @@
<property name="backdrop" type="empty">
<property name="screen0" type="empty">
<property name="monitor0" type="empty">
- <property name="image-path" type="string" value="/usr/share/mdk/backgrounds/default.jpg"/>
- <property name="last-image" type="string" value="/usr/share/mdk/backgrounds/default.jpg"/>
- <property name="last-single-image" type="string" value="/usr/share/mdk/backgrounds/default.jpg"/>
+ <property name="image-path" type="string" value="/usr/share/mga/backgrounds/default.jpg"/>
+ <property name="last-image" type="string" value="/usr/share/mga/backgrounds/default.jpg"/>
+ <property name="last-single-image" type="string" value="/usr/share/mga/backgrounds/default.jpg"/>
<property name="image-show" type="empty"/>
<property name="brightness" type="int" value="0"/>
<property name="saturation" type="double" value="1.000000"/>
diff --git a/tools/xfce4-firstrun b/tools/xfce4-firstrun
index 7fa83da..d6be828 100644
--- a/tools/xfce4-firstrun
+++ b/tools/xfce4-firstrun
@@ -3,7 +3,6 @@
# Author: tpg@mandriva.org
# Licensed under GPL terms
-MDV_FLAVOUR=`echo $META_CLASS`
USER_DESKTOP=`xdg-user-dir DESKTOP`
DESKTOP_FILE=$HOME/.config/autostart/xfce4-firstrun.desktop
@@ -23,35 +22,14 @@ Hidden=true
EOF
#
- if [ $MDV_FLAVOUR = "download" -o $MDV_FLAVOUR = "desktop" ]; then
- if [ ! -e $USER_DESKTOP/register.desktop ]; then
- cp -f /usr/share/mdk/desktop/free/register.desktop $USER_DESKTOP 2> /dev/null
- fi
-
- if [ ! -e $USER_DESKTOP/upgrade.desktop ]; then
- cp -f /usr/share/mdk/desktop/one/upgrade.desktop $USER_DESKTOP 2> /dev/null
- fi
-
- if [ ! -e $USER_DESKTOP/mandriva-draklive-install.desktop ]; then
- cp -f /usr/share/applications/mandriva-draklive-install.desktop $USER_DESKTOP 2> /dev/null
+ if [ ! -e $USER_DESKTOP/mageia-draklive-install.desktop ]; then
+ cp -f /usr/share/applications/mageia-draklive-install.desktop $USER_DESKTOP 2> /dev/null
fi
if [ "$(pidof xfdesktop)" ]; then
xfdesktop --reload 1> /dev/null; echo "xfce4-firstrun: xfdesktop reloaded.";
fi
exit || 0
- else
- if [ ! -e $USER_DESKTOP/register.desktop ]; then
- cp -f /usr/share/mdk/desktop/powerpack/register.desktop $USER_DESKTOP 2> /dev/null
- fi
-
- if [ ! -e $USER_DESKTOP/mandriva-draklive-install.desktop ]; then
- cp -f /usr/share/applications/mandriva-draklive-install.desktop $USER_DESKTOP 2> /dev/null
- fi
- if [ "$(pidof xfdesktop)" ]; then
- xfdesktop --reload 1> /dev/null; echo "xfce4-firstrun: xfdesktop reloaded.";
- fi
- exit || 0
fi
else echo "xfce4-firstrun: make sure you have installed xdg-user-dirs-gtk and xdg-user-dir packages."
fi