svn commit: r1337786 - in /incubator/ooo/trunk/main/sysui/desktop: menus/ share/

[da...@apache.org]

Author: damjan
Date: Sun May 13 06:32:11 2012
New Revision: 1337786

URL: http://svn.apache.org/viewvc?rev=1337786&view=rev
Log:
Added StartupNotify=true to all relevant Freedesktop .desktop
shortcuts in AOO, so the user gets feedback that AOO is
being started. This is important because it can take a long
time to start.

Tests show the notifications come up correctly, and go
away when the splash screen comes up, even without LIBSN,
because the GUI toolkit(s?) we use (GTK?) do this
automatically.

See also:
http://developer.gnome.org/integration-guide/stable/startup-notification.html.en
https://bugs.launchpad.net/ubuntu/+source/openoffice.org/+bug/479973


Modified:
    incubator/ooo/trunk/main/sysui/desktop/menus/base.desktop
    incubator/ooo/trunk/main/sysui/desktop/menus/calc.desktop
    incubator/ooo/trunk/main/sysui/desktop/menus/draw.desktop
    incubator/ooo/trunk/main/sysui/desktop/menus/impress.desktop
    incubator/ooo/trunk/main/sysui/desktop/menus/math.desktop
    incubator/ooo/trunk/main/sysui/desktop/menus/printeradmin.desktop
    incubator/ooo/trunk/main/sysui/desktop/menus/startcenter.desktop
    incubator/ooo/trunk/main/sysui/desktop/menus/writer.desktop
    incubator/ooo/trunk/main/sysui/desktop/share/makefile.mk

Modified: incubator/ooo/trunk/main/sysui/desktop/menus/base.desktop
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sysui/desktop/menus/base.desktop?rev=1337786&r1=1337785&r2=1337786&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sysui/desktop/menus/base.desktop (original)
+++ incubator/ooo/trunk/main/sysui/desktop/menus/base.desktop Sun May 13 06:32:11 2012
@@ -30,3 +30,4 @@ Name=%PRODUCTNAME Base
 GenericName=Database Development
 Comment=Manage databases, create queries and reports to track and manage your information by using Base.
 InitialPreference=5
+StartupNotify=true

Modified: incubator/ooo/trunk/main/sysui/desktop/menus/calc.desktop
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sysui/desktop/menus/calc.desktop?rev=1337786&r1=1337785&r2=1337786&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sysui/desktop/menus/calc.desktop (original)
+++ incubator/ooo/trunk/main/sysui/desktop/menus/calc.desktop Sun May 13 06:32:11 2012
@@ -30,3 +30,4 @@ Name=%PRODUCTNAME Calc
 GenericName=Spreadsheet
 Comment=Perform calculation, analyze information and manage lists in spreadsheets by using Calc.
 InitialPreference=5
+StartupNotify=true

Modified: incubator/ooo/trunk/main/sysui/desktop/menus/draw.desktop
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sysui/desktop/menus/draw.desktop?rev=1337786&r1=1337785&r2=1337786&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sysui/desktop/menus/draw.desktop (original)
+++ incubator/ooo/trunk/main/sysui/desktop/menus/draw.desktop Sun May 13 06:32:11 2012
@@ -30,3 +30,4 @@ Name=%PRODUCTNAME Draw
 GenericName=Drawing Program
 Comment=Create and edit drawings, flow charts, and logos by using Draw.
 InitialPreference=5
+StartupNotify=true

Modified: incubator/ooo/trunk/main/sysui/desktop/menus/impress.desktop
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sysui/desktop/menus/impress.desktop?rev=1337786&r1=1337785&r2=1337786&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sysui/desktop/menus/impress.desktop (original)
+++ incubator/ooo/trunk/main/sysui/desktop/menus/impress.desktop Sun May 13 06:32:11 2012
@@ -30,3 +30,4 @@ Name=%PRODUCTNAME Impress
 GenericName=Presentation
 Comment=Create and edit presentations for slideshows, meeting and Web pages by using Impress.
 InitialPreference=5
+StartupNotify=true

Modified: incubator/ooo/trunk/main/sysui/desktop/menus/math.desktop
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sysui/desktop/menus/math.desktop?rev=1337786&r1=1337785&r2=1337786&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sysui/desktop/menus/math.desktop (original)
+++ incubator/ooo/trunk/main/sysui/desktop/menus/math.desktop Sun May 13 06:32:11 2012
@@ -30,3 +30,4 @@ Name=%PRODUCTNAME Math
 GenericName=Formula Editor
 Comment=Create and edit scientific formulas and equations by using Math.
 InitialPreference=5
+StartupNotify=true

Modified: incubator/ooo/trunk/main/sysui/desktop/menus/printeradmin.desktop
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sysui/desktop/menus/printeradmin.desktop?rev=1337786&r1=1337785&r2=1337786&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sysui/desktop/menus/printeradmin.desktop (original)
+++ incubator/ooo/trunk/main/sysui/desktop/menus/printeradmin.desktop Sun May 13 06:32:11 2012
@@ -26,3 +26,4 @@ Type=Application
 Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;
 Exec=openoffice-printeradmin
 Name=%PRODUCTNAME Printer Administration
+StartupNotify=true

Modified: incubator/ooo/trunk/main/sysui/desktop/menus/startcenter.desktop
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sysui/desktop/menus/startcenter.desktop?rev=1337786&r1=1337785&r2=1337786&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sysui/desktop/menus/startcenter.desktop (original)
+++ incubator/ooo/trunk/main/sysui/desktop/menus/startcenter.desktop Sun May 13 06:32:11 2012
@@ -29,3 +29,4 @@ MimeType=application/vnd.openofficeorg.e
 Name=%PRODUCTNAME 
 GenericName=Office 
 Comment=The office productivity suite compatible to the open and standardized ODF document format.
+StartupNotify=true

Modified: incubator/ooo/trunk/main/sysui/desktop/menus/writer.desktop
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sysui/desktop/menus/writer.desktop?rev=1337786&r1=1337785&r2=1337786&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sysui/desktop/menus/writer.desktop (original)
+++ incubator/ooo/trunk/main/sysui/desktop/menus/writer.desktop Sun May 13 06:32:11 2012
@@ -30,3 +30,4 @@ Name=%PRODUCTNAME Writer
 GenericName=Word Processor
 Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer.
 InitialPreference=5
+StartupNotify=true

Modified: incubator/ooo/trunk/main/sysui/desktop/share/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sysui/desktop/share/makefile.mk?rev=1337786&r1=1337785&r2=1337786&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sysui/desktop/share/makefile.mk (original)
+++ incubator/ooo/trunk/main/sysui/desktop/share/makefile.mk Sun May 13 06:32:11 2012
@@ -150,9 +150,6 @@ $(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN) 
 	@$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Name" $(ULFDIR)$/launcher_name.ulf
 	@$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Comment" $(ULFDIR)$/launcher_comment.ulf
 	@$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "GenericName" $(ULFDIR)$/launcher_genericname.ulf
-.IF "$(WITH_LIBSN)"=="YES"
-	@noop x$(foreach,i,$(LAUNCHERLIST) $(shell @echo "StartupNotify=true" >> $(@:db).$(INPATH).$(@:f)/$i.desktop))x
-.ENDIF
 	@$(MV) -f $(@:db).$(INPATH).$(@:f)/* $(@:d)
 	@rmdir $(@:db).$(INPATH).$(@:f)
 	@touch $@