sysui/desktop/menus/base.desktop | 5 +++++
sysui/desktop/menus/calc.desktop | 5 +++++
sysui/desktop/menus/draw.desktop | 7 ++++++-
sysui/desktop/menus/impress.desktop | 5 +++++
sysui/desktop/menus/math.desktop | 5 +++++
sysui/desktop/menus/writer.desktop | 5 +++++
sysui/desktop/share/makefile.mk | 4 +++-
sysui/desktop/share/translate.pl | 18 +++++++++++++++---
8 files changed, 49 insertions(+), 5 deletions(-)
New commits:
commit b7423ceee1a6b1c5595fbbef6f0ca4417feeddf6
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Wed Apr 18 12:00:30 2012 +0200
lp#720716: add unity quicklist support
diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop
index 56a25a2..8cc8e7c 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 f58a164..d1a4147 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 7819d81..e558330 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 84f16a9..1ea00aa 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 9b87ef0..70b5695 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 0b6f116..8698e97 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 1d99c84..0a7c549 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 197c333..89c9da0 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";
+ }
}
}
}
commit 38c7eeeb94b780343af1aae6e29cb9e5b906015c
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Wed Apr 18 11:54:14 2012 +0200
lp#926940: Make LibreOffice Draw handle Visio files
diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop
index 805ef2d..7819d81 100755
--- a/sysui/desktop/menus/draw.desktop
+++ b/sysui/desktop/menus/draw.desktop
@@ -5,7 +5,7 @@ Icon=draw
Type=Application
Categories=Office;FlowChart;VectorGraphics;X-Red-Hat-Base;X-MandrivaLinux-Office-Drawing;
Exec=${UNIXBASISROOTNAME} --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;
+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.visio;
Name=%PRODUCTNAME Draw
GenericName=Drawing Program
Comment=Create and edit drawings, flow charts, and logos by using Draw.
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
