diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-04-18 12:00:30 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-04-18 12:00:30 +0200 |
commit | b7423ceee1a6b1c5595fbbef6f0ca4417feeddf6 (patch) | |
tree | 7268dee54f7d2c3d4ef0a0da09a0586c0beccdb2 /sysui | |
parent | 38c7eeeb94b780343af1aae6e29cb9e5b906015c (diff) |
lp#720716: add unity quicklist support
Diffstat (limited to 'sysui')
-rwxr-xr-x | sysui/desktop/menus/base.desktop | 5 | ||||
-rwxr-xr-x | sysui/desktop/menus/calc.desktop | 5 | ||||
-rwxr-xr-x | sysui/desktop/menus/draw.desktop | 5 | ||||
-rwxr-xr-x | sysui/desktop/menus/impress.desktop | 5 | ||||
-rwxr-xr-x | sysui/desktop/menus/math.desktop | 5 | ||||
-rwxr-xr-x | sysui/desktop/menus/writer.desktop | 5 | ||||
-rw-r--r-- | sysui/desktop/share/makefile.mk | 4 | ||||
-rwxr-xr-x | sysui/desktop/share/translate.pl | 18 |
8 files changed, 48 insertions, 4 deletions
diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop index 56a25a21f91f..8cc8e7c7f48f 100755 --- a/sysui/desktop/menus/base.desktop +++ b/sysui/desktop/menus/base.desktop @@ -10,3 +10,8 @@ Name=%PRODUCTNAME Base GenericName=Database Development Comment=Manage databases, create queries and reports to track and manage your information by using Base. InitialPreference=5 +X-Ayatana-Desktop-Shortcuts=New +[New Shortcut Group] +UnityQuicklist=New Database +Exec=libreoffice --base %U +TargetEnvironment=Unity diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop index f58a164e7f88..d1a414732ff2 100755 --- a/sysui/desktop/menus/calc.desktop +++ b/sysui/desktop/menus/calc.desktop @@ -10,3 +10,8 @@ Name=%PRODUCTNAME Calc GenericName=Spreadsheet Comment=Perform calculations, analyze information and manage lists in spreadsheets by using Calc. InitialPreference=5 +X-Ayatana-Desktop-Shortcuts=New +[New Shortcut Group] +UnityQuicklist=New Spreadsheet +Exec=libreoffice --calc %U +TargetEnvironment=Unity diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop index 7819d8123754..e55833095b27 100755 --- a/sysui/desktop/menus/draw.desktop +++ b/sysui/desktop/menus/draw.desktop @@ -10,3 +10,8 @@ Name=%PRODUCTNAME Draw GenericName=Drawing Program Comment=Create and edit drawings, flow charts, and logos by using Draw. InitialPreference=5 +X-Ayatana-Desktop-Shortcuts=New +[New Shortcut Group] +UnityQuicklist=New Drawing +Exec=libreoffice --draw %U +TargetEnvironment=Unity diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop index 84f16a9d91ad..1ea00aa0bcf0 100755 --- a/sysui/desktop/menus/impress.desktop +++ b/sysui/desktop/menus/impress.desktop @@ -10,3 +10,8 @@ Name=%PRODUCTNAME Impress GenericName=Presentation Comment=Create and edit presentations for slideshows, meeting and Web pages by using Impress. InitialPreference=5 +X-Ayatana-Desktop-Shortcuts=New +[New Shortcut Group] +UnityQuicklist=New Presentation +Exec=libreoffice --impress %U +TargetEnvironment=Unity diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop index 9b87ef09c3df..70b56955da04 100755 --- a/sysui/desktop/menus/math.desktop +++ b/sysui/desktop/menus/math.desktop @@ -11,3 +11,8 @@ Name=%PRODUCTNAME Math GenericName=Formula Editor Comment=Create and edit scientific formulas and equations by using Math. InitialPreference=5 +X-Ayatana-Desktop-Shortcuts=New +[New Shortcut Group] +UnityQuicklist=New Formula +Exec=libreoffice --math %U +TargetEnvironment=Unity diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop index 0b6f116f50ee..8698e9745d9a 100755 --- a/sysui/desktop/menus/writer.desktop +++ b/sysui/desktop/menus/writer.desktop @@ -10,3 +10,8 @@ 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 +X-Ayatana-Desktop-Shortcuts=New +[New Shortcut Group] +UnityQuicklist=New Document +Exec=libreoffice --writer %U +TargetEnvironment=Unity diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk index 1d99c84d7e6d..0a7c549b35db 100644 --- a/sysui/desktop/share/makefile.mk +++ b/sysui/desktop/share/makefile.mk @@ -50,6 +50,7 @@ ULFFILES= \ documents.ulf \ launcher_comment.ulf \ launcher_genericname.ulf \ + launcher_unityquicklist.ulf \ launcher_name.ulf LAUNCHERLIST_APPS = writer calc draw impress math base printeradmin startcenter @@ -146,7 +147,7 @@ ALLTAR : $(LAUNCHERFLAGFILE) $(SPECFILES) $(COMMONMISC)$/{$(PRODUCTLIST)}$/build # merge-in the translations. # -$(LAUNCHERFLAGFILE) : ../productversion.mk brand.pl translate.pl $(ULFDIR)$/launcher_name.ulf $(ULFDIR)$/launcher_comment.ulf $(ULFDIR)/launcher_genericname.ulf +$(LAUNCHERFLAGFILE) : ../productversion.mk brand.pl translate.pl $(ULFDIR)$/launcher_name.ulf $(ULFDIR)$/launcher_comment.ulf $(ULFDIR)/launcher_genericname.ulf $(ULFDIR)/launcher_unityquicklist.ulf $(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN) @@-$(MKDIRHIER) $(@:db).$(INPATH).$(@:f) @echo Creating desktop entries for $(@:f) .. @@ -155,6 +156,7 @@ $(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 + @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "UnityQuicklist" $(ULFDIR)$/launcher_unityquicklist.ulf .IF "$(WITH_LIBSN)"=="YES" @noop x$(foreach,i,$(LAUNCHERLIST) $(shell @echo "StartupNotify=true" >> $(@:db).$(INPATH).$(@:f)/$i.desktop))x .ENDIF diff --git a/sysui/desktop/share/translate.pl b/sysui/desktop/share/translate.pl index 197c333e6f37..89c9da0db5ff 100755 --- a/sysui/desktop/share/translate.pl +++ b/sysui/desktop/share/translate.pl @@ -64,6 +64,12 @@ while ($_ = $ARGV[0], /^-/) { } } +# hack for unity section +$outkey = $key; +if ( $outkey eq "UnityQuicklist" ) { + $outkey = "Name"; +} + # open input file unless (open(SOURCE, $ARGV[0])) { print STDERR "Can't open $ARGV[0] file: $!\n"; @@ -106,9 +112,12 @@ while (<SOURCE>) { # Pass the head of the template to the output file KEY: while (<TEMPLATE>) { - print OUTFILE; + $keyline = $_; last KEY if (/$key/); + print OUTFILE; } + $keyline=~s/^$key/$outkey/; + print OUTFILE $keyline; } else { # split locale = "value" into 2 strings @@ -125,10 +134,13 @@ KEY: while (<TEMPLATE>) { $value=~s/%PRODUCTNAME/$productname/g; $locale=~s/-/_/; + + if (not $value eq '') { if ($ext eq "desktop") { - print OUTFILE "$key\[$locale\]=$value\n"; + print OUTFILE "$outkey\[$locale\]=$value\n"; } else { - print OUTFILE "\t\[$locale\]$key=$value\n"; + print OUTFILE "\t\[$locale\]$outkey=$value\n"; + } } } } |