[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sysui/desktop
sysui/desktop/menus/base.desktop|1 + sysui/desktop/menus/calc.desktop|1 + sysui/desktop/menus/draw.desktop|1 + sysui/desktop/menus/impress.desktop |1 + sysui/desktop/menus/math.desktop|1 + sysui/desktop/menus/writer.desktop |1 + 6 files changed, 6 insertions(+) New commits: commit 90524e0f8c6c7a8e6e5e8c0bc48afc2025336e63 Author: Marco Biscaro marcobiscaro2...@gmail.com Date: Sun Aug 26 21:32:41 2012 -0300 fdo#47157 adding Keywords to .desktop files Adding Keywords to .desktop files, following the suggestions in https://bugs.freedesktop.org/show_bug.cgi?id=47157#c0 Change-Id: Ic2a1428aaa12bc31b0af8488d166f78d5a970a1d Reviewed-on: https://gerrit.libreoffice.org/490 Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com Tested-by: Björn Michaelsen bjoern.michael...@canonical.com (cherry picked from commit 9d844ce3f8e411bfb4237372b1a6d4aec21a0a65) Signed-off-by: David Tardon dtar...@redhat.com diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop index 72cf467..578e5c7 100755 --- a/sysui/desktop/menus/base.desktop +++ b/sysui/desktop/menus/base.desktop @@ -9,6 +9,7 @@ MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.bas Name=%PRODUCTNAME Base GenericName=Database Development Comment=Manage databases, create queries and reports to track and manage your information by using Base. +Keywords=Data;SQL; InitialPreference=5 X-Ayatana-Desktop-Shortcuts=X-New [X-New Shortcut Group] diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop index e9f3250..638b9e2 100755 --- a/sysui/desktop/menus/calc.desktop +++ b/sysui/desktop/menus/calc.desktop @@ -9,6 +9,7 @@ MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.op Name=%PRODUCTNAME Calc GenericName=Spreadsheet Comment=Perform calculations, analyze information and manage lists in spreadsheets by using Calc. +Keywords=Accounting;Stats;Chart;ods;xls;xlsx; InitialPreference=5 X-Ayatana-Desktop-Shortcuts=X-New [X-New Shortcut Group] diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop index 9511fd5..6d92845 100755 --- a/sysui/desktop/menus/draw.desktop +++ b/sysui/desktop/menus/draw.desktop @@ -9,6 +9,7 @@ MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opend Name=%PRODUCTNAME Draw GenericName=Drawing Program Comment=Create and edit drawings, flow charts, and logos by using Draw. +Keywords=Vector;Schema;Diagram;odg; InitialPreference=5 X-Ayatana-Desktop-Shortcuts=X-New [X-New Shortcut Group] diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop index 2fb8650..d8ca703 100755 --- a/sysui/desktop/menus/impress.desktop +++ b/sysui/desktop/menus/impress.desktop @@ -9,6 +9,7 @@ MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.o Name=%PRODUCTNAME Impress GenericName=Presentation Comment=Create and edit presentations for slideshows, meeting and Web pages by using Impress. +Keywords=Slideshow;odp;ppt;pptx; InitialPreference=5 X-Ayatana-Desktop-Shortcuts=X-New [X-New Shortcut Group] diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop index 867711d..4381a49 100755 --- a/sysui/desktop/menus/math.desktop +++ b/sysui/desktop/menus/math.desktop @@ -10,6 +10,7 @@ MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math Name=%PRODUCTNAME Math GenericName=Formula Editor Comment=Create and edit scientific formulas and equations by using Math. +Keywords=Equation; InitialPreference=5 X-Ayatana-Desktop-Shortcuts=X-New [X-New Shortcut Group] diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop index 888b382..f76ac4e 100755 --- a/sysui/desktop/menus/writer.desktop +++ b/sysui/desktop/menus/writer.desktop @@ -9,6 +9,7 @@ MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocum Name=%PRODUCTNAME Writer GenericName=Word Processor Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer. +Keywords=Text;Letter;CV;odt;doc;docx; InitialPreference=5 X-Ayatana-Desktop-Shortcuts=X-New [X-New Shortcut Group] ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sysui/desktop
sysui/desktop/share/translate.pl | 125 +++
1 file changed, 62 insertions(+), 63 deletions(-)
New commits:
commit 462be03401d5cf17f75d6c60132069fef842fc22
Author: David Tardon dtar...@redhat.com
Date: Sun Jul 1 18:38:07 2012 +0200
rewrite a horrible perl script to saner form
The old form duplicated the last line of the processed file if the key
was not present. This was not a problem before we added Unity-specific
keys to the desktop files, because all keys were always present...
Change-Id: Ifef6a90250fd303b913807944c7a23e04a5aafb1
diff --git a/sysui/desktop/share/translate.pl b/sysui/desktop/share/translate.pl
index 89c9da0..c55ee25 100755
--- a/sysui/desktop/share/translate.pl
+++ b/sysui/desktop/share/translate.pl
@@ -29,15 +29,9 @@ eval 'exec perl -wS $0 ${1+$@}'
#
#*
-
-#*
-#
-# main
-#
-
my ($prefix, $ext, $key);
-$productname = LibreOffice;
-$workdir = .;
+my $productname = LibreOffice;
+my $workdir = .;
while ($_ = $ARGV[0], /^-/) {
shift;
@@ -65,63 +59,36 @@ while ($_ = $ARGV[0], /^-/) {
}
# hack for unity section
-$outkey = $key;
+my $outkey = $key;
if ( $outkey eq UnityQuicklist ) {
$outkey = Name;
}
+my %templates;
+
# open input file
unless (open(SOURCE, $ARGV[0])) {
print STDERR Can't open $ARGV[0] file: $!\n;
return;
}
+# currently read template
+my $template;
-# For every section in the specified ulf file there should exist
-# a template file in $workdir ..
+# read ulf file
while (SOURCE) {
-$line = $_;
+my $line = $_;
if ( [ eq substr($line, 0, 1) ) {
-# Pass the tail of the template to the output file
-while (TEMPLATE) {
-print OUTFILE;
-}
-
-close(TEMPLATE);
-
-if (close(OUTFILE)) {
-system mv -f $outfile.tmp $outfile\n;
-}
-
-$_ = substr($line, 1, index($line,])-1);
-$outfile = $workdir/$prefix$_.$ext;
-
-# open the template file - ignore sections for which no
-# templates exist
-unless(open(TEMPLATE, $outfile)) {
-print STDERR Warning: No template found for item $_: $outfile:
$!\n;
-next;
-}
-
-# open output file
-unless (open(OUTFILE, $outfile.tmp)) {
-print STDERR Can't create output file $outfile.tmp: $!\n;
-exit -1;
-}
-
-# Pass the head of the template to the output file
-KEY:while (TEMPLATE) {
-$keyline = $_;
-last KEY if (/$key/);
-print OUTFILE;
-}
-$keyline=~s/^$key/$outkey/;
-print OUTFILE $keyline;
-
+$template = substr($line, 1, index($line,])-1);
+my %entry;
+# For every section in the specified ulf file there should exist
+# a template file in $workdir ..
+$entry{'outfile'} = $workdir/$prefix$template.$ext;
+$templates{$template} = \%entry;
} else {
# split locale = value into 2 strings
-($locale, $value) = split(' = ', $line);
+my ($locale, $value) = split(' = ', $line);
if ( $locale ne $line ) {
# replace en-US with en
@@ -135,23 +102,55 @@ KEY:while (TEMPLATE) {
$locale=~s/-/_/;
-if (not $value eq '') {
-if ($ext eq desktop) {
-print OUTFILE $outkey\[$locale\]=$value\n;
-} else {
-print OUTFILE \t\[$locale\]$outkey=$value\n;
-}
-}
+$templates{$template}-{'locale'} = $locale;
+$templates{$template}-{'value'} = $value;
}
}
}
-while (TEMPLATE) {
-print OUTFILE;
-}
+close(SOURCE);
-if (close(OUTFILE)) {
-system mv -f $outfile.tmp $outfile\n;
-}
+# process templates
+foreach $template (keys %templates) {
+my $outfile = $templates{$template}-{'outfile'};
+print processing template $template in $outfile\n;
+
+# open the template file - ignore sections for which no
+# templates exist
+unless(open(TEMPLATE, $outfile)) {
+print STDERR Warning: No template found for item $_: $outfile: $!\n;
+next;
+}
+
+# open output file
+unless (open(OUTFILE, $outfile.tmp)) {
+print STDERR Can't create output file $outfile.tmp: $!\n;
+exit -1;
+}
-close(TEMPLATE);
+# emit the template to the output file
+while (TEMPLATE) {
+my $keyline = $_;
+$keyline =~ s/^$key/$outkey/;
+print OUTFILE $keyline;
+if (/$key/) {
+my $locale = $templates{$template}-{'locale'};
+my $value = $templates{$template}-{'value'};
+print locale is $locale\n;
+print value is $value\n;
+if ($value) {
+if ($ext eq desktop) {
+print
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sysui/desktop
sysui/desktop/menus/base.desktop|4 ++-- sysui/desktop/menus/calc.desktop|4 ++-- sysui/desktop/menus/draw.desktop|4 ++-- sysui/desktop/menus/impress.desktop |4 ++-- sysui/desktop/menus/math.desktop|4 ++-- sysui/desktop/menus/writer.desktop |4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) New commits: commit 3589f3dab091eaa9654b8466a7ca2d32d5110da2 Author: David Tardon dtar...@redhat.com Date: Mon Jun 25 15:14:43 2012 +0200 fix invalid .desktop files desktop-file-validate issued the following error: error: file contains group New Shortcut Group, but groups extending the format should start with X- Change-Id: I45c0039ab788546a37780927284c8827a19fd52c diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop index 8cc8e7c..72cf467 100755 --- a/sysui/desktop/menus/base.desktop +++ b/sysui/desktop/menus/base.desktop @@ -10,8 +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] +X-Ayatana-Desktop-Shortcuts=X-New +[X-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 b1bde07..e9f3250 100755 --- a/sysui/desktop/menus/calc.desktop +++ b/sysui/desktop/menus/calc.desktop @@ -10,8 +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] +X-Ayatana-Desktop-Shortcuts=X-New +[X-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 0bec2b0..5c741a9 100755 --- a/sysui/desktop/menus/draw.desktop +++ b/sysui/desktop/menus/draw.desktop @@ -10,8 +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] +X-Ayatana-Desktop-Shortcuts=X-New +[X-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 0df250c..2fb8650 100755 --- a/sysui/desktop/menus/impress.desktop +++ b/sysui/desktop/menus/impress.desktop @@ -10,8 +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] +X-Ayatana-Desktop-Shortcuts=X-New +[X-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 67f9ea6..122e01f 100755 --- a/sysui/desktop/menus/math.desktop +++ b/sysui/desktop/menus/math.desktop @@ -11,8 +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] +X-Ayatana-Desktop-Shortcuts=X-New +[X-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 6d2274e..888b382 100755 --- a/sysui/desktop/menus/writer.desktop +++ b/sysui/desktop/menus/writer.desktop @@ -10,8 +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] +X-Ayatana-Desktop-Shortcuts=X-New +[X-New Shortcut Group] UnityQuicklist=New Document Exec=libreoffice --writer %U TargetEnvironment=Unity ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
