CWS-TOOLING: integrate CWS sysui36

2008-12-12 22:23:56 +0100 rene  r265443 : revert last change
2008-12-12 19:59:28 +0100 ihi  r265442 : ->Exec PRODUCTNAME
2008-12-12 19:44:27 +0100 ihi  r265441 : false icon but locolor
2008-12-12 19:43:50 +0100 ihi  r265440 : false icon but locolor
2008-12-12 16:12:35 +0100 ihi  r265430 : pre #i86704# work to have the translation prepared till UI freeze
2008-12-10 18:46:08 +0100 ihi  r265222 : #i96666# rpm build fix
2008-12-10 18:35:55 +0100 ihi  r265217 : #i93909# Missing GenericName

13 files changed, 27 insertions, 2 deletions

diff --git a/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png b/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png
new file mode 100644
index 0000000000..b009ee2b92
--- /dev/null
+++ b/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png b/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png
new file mode 100644
index 0000000000..c81fc95d47
--- /dev/null
+++ b/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png b/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png
new file mode 100644
index 0000000000..22bdd4a7fe
--- /dev/null
+++ b/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png b/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png
new file mode 100644
index 0000000000..f67dc97675
--- /dev/null
+++ b/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png
diff --git a/sysui/desktop/icons/locolor/16x16/apps/startcenter.png b/sysui/desktop/icons/locolor/16x16/apps/startcenter.png
new file mode 100644
index 0000000000..347d030bc7
--- /dev/null
+++ b/sysui/desktop/icons/locolor/16x16/apps/startcenter.png
diff --git a/sysui/desktop/icons/locolor/32x32/apps/startcenter.png b/sysui/desktop/icons/locolor/32x32/apps/startcenter.png
new file mode 100644
index 0000000000..cfaaaba07a
--- /dev/null
+++ b/sysui/desktop/icons/locolor/32x32/apps/startcenter.png
diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop
index ae274b32d1..438d603e06 100644
--- a/sysui/desktop/menus/draw.desktop
+++ b/sysui/desktop/menus/draw.desktop
@@ -7,4 +7,5 @@ Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Drawi
 Exec=openoffice -draw %U
 MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.stardivision.draw;
 Name=%PRODUCTNAME Draw
+GenericName=Drawing Program
 Comment=Create and edit drawings, flow charts, and logos by using Draw.
diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop
index 01750c1cf1..15a6d42efc 100644
--- a/sysui/desktop/menus/math.desktop
+++ b/sysui/desktop/menus/math.desktop
@@ -7,4 +7,5 @@ Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other
 Exec=openoffice -math %U
 MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.stardivision.math;
 Name=%PRODUCTNAME Math
+GenericName=Formula Editor
 Comment=Create and edit scientific formulas and equations by using Math.
diff --git a/sysui/desktop/menus/startcenter.desktop b/sysui/desktop/menus/startcenter.desktop
new file mode 100644
index 0000000000..1786557c6e
--- /dev/null
+++ b/sysui/desktop/menus/startcenter.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Terminal=false
+Icon=startcenter
+Type=Application
+Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-MoreApplications-Databases;
+Exec=openoffice %U
+MimeType=
+Name=%PRODUCTNAME 
+GenericName=Office 
+Comment=The office productivity suite compatible to the open and standardized ODF document format. Supported by Sun Microsystems.
diff --git a/sysui/desktop/share/launcher_comment.ulf b/sysui/desktop/share/launcher_comment.ulf
index 04c1f74200..e3abc7c7ea 100644
--- a/sysui/desktop/share/launcher_comment.ulf
+++ b/sysui/desktop/share/launcher_comment.ulf
@@ -15,3 +15,7 @@ en-US = "Create and edit scientific formulas and equations by using Math."
 
 [base]
 en-US = "Manage databases, create queries and reports to track and manage your information by using Base."
+
+[startcenter]
+en-US = "The office productivity suite compatible to the open and standardized ODF document format. Supported by Sun Microsystems."
+
diff --git a/sysui/desktop/share/launcher_genericname.ulf b/sysui/desktop/share/launcher_genericname.ulf
index b2b7333466..ea11da04e0 100644
--- a/sysui/desktop/share/launcher_genericname.ulf
+++ b/sysui/desktop/share/launcher_genericname.ulf
@@ -10,3 +10,11 @@ en-US = "Spreadsheet"
 [base]
 en-US = "Database Development"
 
+[math]
+en-US = "Formula Editor"
+
+[draw]
+en-US = "Drawing Program"
+
+[startcenter] 
+en-US = "Office"
diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk
index b054f9b162..a0ed77b179 100644
--- a/sysui/desktop/share/makefile.mk
+++ b/sysui/desktop/share/makefile.mk
@@ -56,7 +56,7 @@ ULFFILES= \
     launcher_genericname.ulf \
     launcher_name.ulf
 
-LAUNCHERLIST = writer calc draw impress math base printeradmin qstart
+LAUNCHERLIST = writer calc draw impress math base printeradmin qstart startcenter
 LAUNCHERDEPN = ../menus/{$(LAUNCHERLIST)}.desktop
 
 LAUNCHERFLAGFILE = $(COMMONMISC)/$(TARGET)/xdg.flag
diff --git a/sysui/desktop/tg_rpm.mk b/sysui/desktop/tg_rpm.mk
index e814d2fb90..06902b6986 100644
--- a/sysui/desktop/tg_rpm.mk
+++ b/sysui/desktop/tg_rpm.mk
@@ -38,7 +38,7 @@ $(RPMFILES) : $(SPECFILE)
     -$(RM) $(@:d)$(@:b:s/-/ /:1)-$(SPECFILE:b)-*
     $(RPM) -bb $< $(RPMMACROS) \
         --buildroot $(ABSLOCALOUT)$/misc$/$(@:b) \
-        --define "_builddir $(COMMONMISC)$/$(@:b:s/-/ /:1)" \
+        --define "_builddir $(shell @cd $(COMMONMISC)$/$(@:b:s/-/ /:1) && pwd)" \
         --define "productname $(PRODUCTNAME.$(@:b:s/-/ /:1))" \
         --define "pkgprefix $(@:b:s/-/ /:1)$(PRODUCTVERSION.$(@:b:s/-/ /:1))" \
         --define "unixfilename $(UNIXFILENAME.$(@:b:s/-/ /:1))" \