[Libreoffice-commits] .: sysui/desktop
sysui/desktop/menus/calc.desktop|2 +-
sysui/desktop/menus/draw.desktop|4 ++--
sysui/desktop/menus/impress.desktop |2 +-
sysui/desktop/menus/math.desktop|2 +-
sysui/desktop/menus/writer.desktop |2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit d8b07e5ba238d529a7610dd302269ee05c5e8fbc
Author: Samuel Mehrbrodt s.mehrbr...@gmail.com
Date: Wed Oct 31 21:49:30 2012 +0100
fdo#47157 Add more keywords to .desktop files
Change-Id: I34d0bf75d7cf8c5ec764a1bfa0ad0e4c5ab8ae4e
Reviewed-on: https://gerrit.libreoffice.org/953
Reviewed-by: Radek DoulÃk r...@novell.com
Tested-by: Radek DoulÃk r...@novell.com
diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop
index 638b9e2..6a0225a 100755
--- a/sysui/desktop/menus/calc.desktop
+++ b/sysui/desktop/menus/calc.desktop
@@ -9,7 +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;
+Keywords=Accounting;Stats;OpenDocument Spreadsheet;Chart;Microsoft
Excel;Microsoft Works;OpenOffice Calc;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 6d92845..10dee6e 100755
--- a/sysui/desktop/menus/draw.desktop
+++ b/sysui/desktop/menus/draw.desktop
@@ -8,8 +8,8 @@ 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;application/vnd.visio;application/x-wpg;
Name=%PRODUCTNAME Draw
GenericName=Drawing Program
-Comment=Create and edit drawings, flow charts, and logos by using Draw.
-Keywords=Vector;Schema;Diagram;odg;
+Comment=Create and edit drawings, flow charts and logos by using Draw.
+Keywords=Vector;Schema;Diagram;Layout;OpenDocument Graphics;Microsoft
Publisher;Corel Draw;cdr;odg;svg;
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 d8ca703..dc821c1 100755
--- a/sysui/desktop/menus/impress.desktop
+++ b/sysui/desktop/menus/impress.desktop
@@ -9,7 +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;
+Keywords=Slideshow;Slides;OpenDocument Presentation;Microsoft
PowerPoint;Microsoft Works;OpenOffice Impress;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 4381a49..7768c2b 100755
--- a/sysui/desktop/menus/math.desktop
+++ b/sysui/desktop/menus/math.desktop
@@ -10,7 +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;
+Keywords=Equation;OpenDocument Formula;Formula;odf;
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 f76ac4e..605a897 100755
--- a/sysui/desktop/menus/writer.desktop
+++ b/sysui/desktop/menus/writer.desktop
@@ -9,7 +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;
+Keywords=Text;Letter;Fax;Document;OpenDocument Text;Microsoft Word;Microsoft
Works;Lotus WordPro;OpenOffice Writer;CV;odt;doc;docx;rtf;
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] .: sysui/desktop
sysui/desktop/tg_rpm.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 9b0b15ee092d70fcaf0bfe4c2da35371d9c6b142 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Sun Sep 16 03:18:27 2012 +0200 checksize.pl chokes on empty files created by __debug_install_post⦠â¦that is /usr/lib/rpm/mageia/find-debuginfo.sh on Mageia for example. As the desktop-integration packages don't have any binaries whose debuginfo could be extracted and put into a -debug package, there is no impact on the packages themselves. Change-Id: I99756f6a1a3de707a94f7559b9f1b5169d2e7ee1 Reviewed-on: https://gerrit.libreoffice.org/630 Reviewed-by: Miklos Vajna vmik...@suse.cz Tested-by: Miklos Vajna vmik...@suse.cz diff --git a/sysui/desktop/tg_rpm.mk b/sysui/desktop/tg_rpm.mk index 0ff9af4..2e8c07d 100644 --- a/sysui/desktop/tg_rpm.mk +++ b/sysui/desktop/tg_rpm.mk @@ -42,5 +42,6 @@ $(RPMFLAGFILES) : $(SPECFILE) --define iconprefix $(ICONPREFIX.$(@:b:s/-/ /:1)) \ --define version $(PKGVERSION.$(@:b:s/-/ /:1)) \ --define release $(PKGREV) \ +--define __debug_install_post %nil \ --define _unpackaged_files_terminate_build 0 $(TOUCH) $@ .ENDIF ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sysui/desktop
sysui/desktop/icons/hicolor/1024x1024/apps/main.png |binary sysui/desktop/icons/hicolor/512x512/apps/main.png |binary sysui/desktop/icons/main.icns |binary 3 files changed New commits: commit 00ec76a49d8caa2e367151683a77eefcc1ee75df Author: Nicholas Shanks nicksha...@nickshanks.com Date: Mon Sep 17 15:35:02 2012 +0100 Resolves: fdo#54820 128x128px and 256x256px icons too small on MacOSX Change-Id: I9d1d21737da21724f98c2a7d06734693bb4ebedb diff --git a/sysui/desktop/icons/hicolor/1024x1024/apps/main.png b/sysui/desktop/icons/hicolor/1024x1024/apps/main.png index a19d7ed..747145a 100644 Binary files a/sysui/desktop/icons/hicolor/1024x1024/apps/main.png and b/sysui/desktop/icons/hicolor/1024x1024/apps/main.png differ diff --git a/sysui/desktop/icons/hicolor/512x512/apps/main.png b/sysui/desktop/icons/hicolor/512x512/apps/main.png index b5bebff..3d5396a 100644 Binary files a/sysui/desktop/icons/hicolor/512x512/apps/main.png and b/sysui/desktop/icons/hicolor/512x512/apps/main.png differ diff --git a/sysui/desktop/icons/main.icns b/sysui/desktop/icons/main.icns index 6c51c44..c3e1bf6 100644 Binary files a/sysui/desktop/icons/main.icns and b/sysui/desktop/icons/main.icns differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sysui/desktop
sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-database.png |binary sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-drawing-template.png |binary sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-drawing.png |binary sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-formula.png |binary sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-master-document.png |binary sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-presentation-template.png |binary sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-presentation.png |binary sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-spreadsheet-template.png |binary sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-spreadsheet.png |binary sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-text-template.png |binary sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-text.png |binary sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-web-template.png |binary sysui/desktop/icons/hicolor/512x512/mimetypes/oasis-database.png |binary sysui/desktop/icons/hicolor/512x512/mimetypes/oasis-drawing-template.png |binary sysui/desktop/icons/hicolor/512x512/mimetypes/oasis-drawing.png |binary sysui/desktop/icons/hicolor/512x512/mimetypes/oasis-formula.png |binary sysui/desktop/icons/hicolor/512x512/mimetypes/oasis-master-document.png |binary sysui/desktop/icons/hicolor/512x512/mimetypes/oasis-presentation-template.png |binary sysui/desktop/icons/hicolor/512x512/mimetypes/oasis-presentation.png |binary sysui/desktop/icons/hicolor/512x512/mimetypes/oasis-spreadsheet-template.png |binary sysui/desktop/icons/hicolor/512x512/mimetypes/oasis-spreadsheet.png |binary sysui/desktop/icons/hicolor/512x512/mimetypes/oasis-text-template.png |binary sysui/desktop/icons/hicolor/512x512/mimetypes/oasis-text.png |binary sysui/desktop/icons/hicolor/512x512/mimetypes/oasis-web-template.png |binary sysui/desktop/icons/oasis-database.icns |binary sysui/desktop/icons/oasis-drawing-template.icns |binary sysui/desktop/icons/oasis-drawing.icns |binary sysui/desktop/icons/oasis-formula.icns |binary sysui/desktop/icons/oasis-master-document.icns |binary sysui/desktop/icons/oasis-presentation-template.icns |binary sysui/desktop/icons/oasis-presentation.icns |binary sysui/desktop/icons/oasis-spreadsheet-template.icns |binary sysui/desktop/icons/oasis-spreadsheet.icns |binary sysui/desktop/icons/oasis-text-template.icns |binary sysui/desktop/icons/oasis-text.icns |binary sysui/desktop/icons/oasis-web-template.icns |binary 36 files changed New commits: commit 6e78fd18c9ca2d70af93cad321f55f3d72172742 Author: Nicholas Shanks nicksha...@nickshanks.com Date: Mon Sep 17 15:57:48 2012 +0100 revised MacOSX mimetype icons Change-Id: I68a1f132d0c4c379a3bcbf5e1a0f9a37604a8948 diff --git a/sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-database.png b/sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-database.png index a3b1878..f362c5b 100644 Binary files a/sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-database.png and b/sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-database.png differ diff --git a/sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-drawing-template.png b/sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-drawing-template.png index 2b09705..25a45c9 100644 Binary files a/sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-drawing-template.png and b/sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-drawing-template.png differ diff --git a/sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-drawing.png b/sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-drawing.png index 99c209a..ad53aad 100644 Binary files a/sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-drawing.png and b/sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-drawing.png differ diff --git a/sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-formula.png b/sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-formula.png index 188534e..7a60992 100644 Binary files a/sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-formula.png and b/sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-formula.png differ diff --git a/sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-master-document.png
[Libreoffice-commits] .: sysui/desktop
sysui/desktop/icons/hicolor/1024x1024/apps/main.png |binary sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-database.png |binary sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-drawing-template.png |binary sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-drawing.png |binary sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-formula.png |binary sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-master-document.png |binary sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-presentation-template.png |binary sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-presentation.png |binary sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-spreadsheet-template.png |binary sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-spreadsheet.png |binary sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-text-template.png |binary sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-text.png |binary sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-web-template.png |binary sysui/desktop/icons/hicolor/512x512/apps/main.png |binary sysui/desktop/icons/hicolor/512x512/mimetypes/oasis-database.png |binary sysui/desktop/icons/hicolor/512x512/mimetypes/oasis-drawing-template.png |binary sysui/desktop/icons/hicolor/512x512/mimetypes/oasis-drawing.png |binary sysui/desktop/icons/hicolor/512x512/mimetypes/oasis-formula.png |binary sysui/desktop/icons/hicolor/512x512/mimetypes/oasis-master-document.png |binary sysui/desktop/icons/hicolor/512x512/mimetypes/oasis-presentation-template.png |binary sysui/desktop/icons/hicolor/512x512/mimetypes/oasis-presentation.png |binary sysui/desktop/icons/hicolor/512x512/mimetypes/oasis-spreadsheet-template.png |binary sysui/desktop/icons/hicolor/512x512/mimetypes/oasis-spreadsheet.png |binary sysui/desktop/icons/hicolor/512x512/mimetypes/oasis-text-template.png |binary sysui/desktop/icons/hicolor/512x512/mimetypes/oasis-text.png |binary sysui/desktop/icons/hicolor/512x512/mimetypes/oasis-web-template.png |binary sysui/desktop/icons/main.icns |binary sysui/desktop/icons/oasis-database.icns |binary sysui/desktop/icons/oasis-drawing-template.icns |binary sysui/desktop/icons/oasis-drawing.icns |binary sysui/desktop/icons/oasis-formula.icns |binary sysui/desktop/icons/oasis-master-document.icns |binary sysui/desktop/icons/oasis-presentation-template.icns |binary sysui/desktop/icons/oasis-presentation.icns |binary sysui/desktop/icons/oasis-spreadsheet-template.icns |binary sysui/desktop/icons/oasis-spreadsheet.icns |binary sysui/desktop/icons/oasis-text-template.icns |binary sysui/desktop/icons/oasis-text.icns |binary 38 files changed New commits: commit 0cb1b9685877f6aeaddf1088ae5008e38bade6f9 Author: Nicholas Shanks nicksha...@nickshanks.com Date: Fri Sep 7 14:14:29 2012 +0100 higher-resolution OpenDocument icons for MacOSX Change-Id: I5bd4e5a8f80520f9cdf3f5a223dfe5cebadc4c6a diff --git a/sysui/desktop/icons/hicolor/1024x1024/apps/main.png b/sysui/desktop/icons/hicolor/1024x1024/apps/main.png new file mode 100644 index 000..a19d7ed Binary files /dev/null and b/sysui/desktop/icons/hicolor/1024x1024/apps/main.png differ diff --git a/sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-database.png b/sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-database.png new file mode 100644 index 000..a3b1878 Binary files /dev/null and b/sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-database.png differ diff --git a/sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-drawing-template.png b/sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-drawing-template.png new file mode 100644 index 000..2b09705 Binary files /dev/null and b/sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-drawing-template.png differ diff --git a/sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-drawing.png b/sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-drawing.png new file mode 100644 index 000..99c209a Binary files /dev/null and b/sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-drawing.png differ diff --git a/sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-formula.png
[Libreoffice-commits] .: sysui/desktop
dev/null |binary 1 file changed New commits: commit 3cac48044846522e095b84e3d98d7173cc849f58 Author: Nicholas Shanks nicksha...@nickshanks.com Date: Tue Sep 4 08:50:51 2012 +0300 Remove unused OS X ooo icons From e-mail: I have verified that none of these icons are shipped in the current TDF distribution, nor are they referred to by the Info.plist file (which is how Mac OS X specifies relationships between file types and icons, I don't know if this file is distribution.specific), therefore they are just dead files in the repository. Change-Id: I1134642ffa651f3972a81fac2ae992835f6479db diff --git a/sysui/desktop/icons/base.icns b/sysui/desktop/icons/base.icns deleted file mode 100644 index e1ed62c..000 Binary files a/sysui/desktop/icons/base.icns and /dev/null differ diff --git a/sysui/desktop/icons/calc.icns b/sysui/desktop/icons/calc.icns deleted file mode 100644 index a3d4edc..000 Binary files a/sysui/desktop/icons/calc.icns and /dev/null differ diff --git a/sysui/desktop/icons/configuration.icns b/sysui/desktop/icons/configuration.icns deleted file mode 100644 index fe0f094..000 Binary files a/sysui/desktop/icons/configuration.icns and /dev/null differ diff --git a/sysui/desktop/icons/draw.icns b/sysui/desktop/icons/draw.icns deleted file mode 100644 index da511e3..000 Binary files a/sysui/desktop/icons/draw.icns and /dev/null differ diff --git a/sysui/desktop/icons/impress.icns b/sysui/desktop/icons/impress.icns deleted file mode 100644 index 22a9475..000 Binary files a/sysui/desktop/icons/impress.icns and /dev/null differ diff --git a/sysui/desktop/icons/macro.icns b/sysui/desktop/icons/macro.icns deleted file mode 100644 index 00c3978..000 Binary files a/sysui/desktop/icons/macro.icns and /dev/null differ diff --git a/sysui/desktop/icons/math.icns b/sysui/desktop/icons/math.icns deleted file mode 100644 index 283c176..000 Binary files a/sysui/desktop/icons/math.icns and /dev/null differ diff --git a/sysui/desktop/icons/oasis-chart.icns b/sysui/desktop/icons/oasis-chart.icns deleted file mode 100644 index acdb970..000 Binary files a/sysui/desktop/icons/oasis-chart.icns and /dev/null differ diff --git a/sysui/desktop/icons/open.icns b/sysui/desktop/icons/open.icns deleted file mode 100644 index 620f8e1..000 Binary files a/sysui/desktop/icons/open.icns and /dev/null differ diff --git a/sysui/desktop/icons/printer.icns b/sysui/desktop/icons/printer.icns deleted file mode 100644 index a1eb599..000 Binary files a/sysui/desktop/icons/printer.icns and /dev/null differ diff --git a/sysui/desktop/icons/writer.icns b/sysui/desktop/icons/writer.icns deleted file mode 100644 index d0f4481..000 Binary files a/sysui/desktop/icons/writer.icns and /dev/null differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 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 9d844ce3f8e411bfb4237372b1a6d4aec21a0a65 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 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] .: sysui/desktop
sysui/desktop/macosx/Info.plist |2 ++ 1 file changed, 2 insertions(+) New commits: commit 4908c8d79745057ebece07c7834e318a7366d6d0 Author: Dave davefilms...@gmail.com Date: Thu Aug 23 19:43:57 2012 +0200 Fix for fdo#46858 Have us show up in Productivity category in Finder Change-Id: I19416bdef0e046102b78953d4663feaffa153722 diff --git a/sysui/desktop/macosx/Info.plist b/sysui/desktop/macosx/Info.plist index 8100df2..c673a79 100755 --- a/sysui/desktop/macosx/Info.plist +++ b/sysui/desktop/macosx/Info.plist @@ -1403,6 +1403,8 @@ string1/string keyNSPrincipalClass/key stringVCL_NSApplication/string +keyLSApplicationCategoryType/key +stringpublic.app-category.productivity/string /dict /plist ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sysui/desktop
sysui/desktop/share/makefile.mk |4
sysui/desktop/share/translate.pl |2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 947b3986d1f45c3e5432d57a48d8052db197f012
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jul 26 10:05:50 2012 +0100
fix No template found for item warning and make it an error
Change-Id: I75985c3f8821b3506e46eaf572c54828db97c964
diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk
index 0a7c549..84bf995 100644
--- a/sysui/desktop/share/makefile.mk
+++ b/sysui/desktop/share/makefile.mk
@@ -72,12 +72,16 @@ MIMELIST = \
master-document \
oasis-text \
oasis-text-template \
+oasis-text-flat-xml \
oasis-spreadsheet \
oasis-spreadsheet-template \
+oasis-spreadsheet-flat-xml \
oasis-drawing \
oasis-drawing-template \
+oasis-drawing-flat-xml \
oasis-presentation \
oasis-presentation-template \
+oasis-presentation-flat-xml \
oasis-formula \
oasis-master-document \
oasis-database \
diff --git a/sysui/desktop/share/translate.pl b/sysui/desktop/share/translate.pl
index c55ee25..d32f996 100755
--- a/sysui/desktop/share/translate.pl
+++ b/sysui/desktop/share/translate.pl
@@ -119,7 +119,7 @@ foreach $template (keys %templates) {
# templates exist
unless(open(TEMPLATE, $outfile)) {
print STDERR Warning: No template found for item $_: $outfile: $!\n;
-next;
+exit -1;
}
# open output file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sysui/desktop
sysui/desktop/share/translate.pl | 125 +++
1 file changed, 62 insertions(+), 63 deletions(-)
New commits:
commit b9c376111b7ed3137d7ff72286888e7373487142
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] .: 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 2b2e7aa7dfb3b41a2f0068a058bf7567465b87d2 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
[Libreoffice-commits] .: sysui/desktop
sysui/desktop/share/create_mime_xml.pl | 21 ++---
1 file changed, 18 insertions(+), 3 deletions(-)
New commits:
commit 515f26384510701be0b3ef21ddd445d1022198cc
Author: Petr Mladek pmla...@suse.cz
Date: Mon Sep 5 18:57:34 2011 +0200
better detect OASIS MIME types (bnc#711977)
check more elements; also set sub-class-of application/xml for Flat XML
diff --git a/sysui/desktop/share/create_mime_xml.pl
b/sysui/desktop/share/create_mime_xml.pl
index e1fc890..5141dff 100755
--- a/sysui/desktop/share/create_mime_xml.pl
+++ b/sysui/desktop/share/create_mime_xml.pl
@@ -45,9 +45,24 @@ foreach $component (sort(keys %mimehash)) {
print (sort({customsort($a) cmp customsort($b)} @{$mimehash{$component}}));
print 'glob pattern='.$glob.'/';
if ( $component =~ /oasis/ ) {
-print 'magic'.( $mimetype =~ /-/ ? ' priority=60' : '').'';
-print 'match type=string offset=38
value='.$mimetype.'/';
-print '/magic';
+if ( $component =~ /flat-xml/ ) {
+print 'sub-class-of type=application/xml/';
+print 'magic'.( $mimetype =~ /-/ ? ' priority=60' :
'').'';
+print 'match value=lt;?xml type=string offset=0';
+print 'match value=office:document type=string
offset=4:100';
+print 'match value=office:mimetype=quot;' .
$mimetype . 'quot; type=string offset=100:4000/';
+print '/match';
+print '/match';
+print '/magic';
+} else {
+print 'magic'.( $mimetype =~ /-/ ? ' priority=60' :
'').'';
+print 'match value=PK\003\004 type=string
offset=0';
+print 'match value=mimetype type=string
offset=30';
+print 'match value=' . $mimetype . '
type=string offset=38/';
+print '/match';
+print '/match';
+print '/magic';
+}
}
print ' /mime-type';
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sysui/desktop
sysui/desktop/menus/impress.desktop |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b77858bf67f177d6f90969df456a533203996025
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Thu Apr 26 02:10:36 2012 +0200
lp#904212: add missing mimetypes to impress.desktop
* application/vnd.openxmlformats-officedocument.presentationml.slide
* application/vnd.openxmlformats-officedocument.presentationml.slideshow
diff --git a/sysui/desktop/menus/impress.desktop
b/sysui/desktop/menus/impress.desktop
index 1ea00aa..c3250e9 100755
--- a/sysui/desktop/menus/impress.desktop
+++ b/sysui/desktop/menus/impress.desktop
@@ -5,7 +5,7 @@ Icon=impress
Type=Application
Categories=Office;Presentation;X-Red-Hat-Base;X-MandrivaLinux-Office-Presentations;
Exec=${UNIXBASISROOTNAME} --impress %U
-MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;
+MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.slide;application/vnd.openxmlformats-officedocument.presentationml.slideshow;
Name=%PRODUCTNAME Impress
GenericName=Presentation
Comment=Create and edit presentations for slideshows, meeting and Web pages by
using Impress.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sysui/desktop
sysui/desktop/productversion.mk |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 4045e770193ae632aca7075105dda89686c597d6 Author: Petr Mladek pmla...@suse.cz Date: Tue Apr 10 16:25:19 2012 +0200 use x.y.z version also for desktop integration packages (fdo#47840) This version scheme is used for other packages as well. It is important for the desktop integration packages now because we started reseting buildid for each bugfix release (fdo#47840). This value is used also for the release number of Linux packages. diff --git a/sysui/desktop/productversion.mk b/sysui/desktop/productversion.mk index 398241d..5a186bc 100755 --- a/sysui/desktop/productversion.mk +++ b/sysui/desktop/productversion.mk @@ -45,7 +45,8 @@ PKGDIR=$(BIN) .INCLUDE : productversion.mk -PKGVERSION = $(PRODUCTVERSION) +PKGVERSION = $(VERSIONMAJOR).$(VERSIONMINOR).$(VERSIONMICRO) + # gnome-vfs treats everything behind the last '.' as an icon extension, # even though the icon_filename in '.keys' is specified as filename # without extension. Since it also does not know how to handle 2-writer ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sysui/desktop
sysui/desktop/icons/base_app.ico|binary sysui/desktop/icons/calc_app.ico|binary sysui/desktop/icons/database.ico|binary sysui/desktop/icons/draw_app.ico|binary sysui/desktop/icons/drawing-template.ico|binary sysui/desktop/icons/drawing.ico |binary sysui/desktop/icons/empty-document.ico |binary sysui/desktop/icons/empty-template.ico |binary sysui/desktop/icons/formula.ico |binary sysui/desktop/icons/hicolor/256x256/apps/calc.png |binary sysui/desktop/icons/hicolor/256x256/apps/writer.png |binary sysui/desktop/icons/impress_app.ico |binary sysui/desktop/icons/main_app.ico|binary sysui/desktop/icons/master-document.ico |binary sysui/desktop/icons/math_app.ico|binary sysui/desktop/icons/oasis-database.ico |binary sysui/desktop/icons/oasis-drawing-template.ico |binary sysui/desktop/icons/oasis-drawing.ico |binary sysui/desktop/icons/oasis-empty-document.ico|binary sysui/desktop/icons/oasis-empty-template.ico|binary sysui/desktop/icons/oasis-formula.ico |binary sysui/desktop/icons/oasis-master-document.ico |binary sysui/desktop/icons/oasis-presentation-template.ico |binary sysui/desktop/icons/oasis-presentation.ico |binary sysui/desktop/icons/oasis-spreadsheet-template.ico |binary sysui/desktop/icons/oasis-spreadsheet.ico |binary sysui/desktop/icons/oasis-text-template.ico |binary sysui/desktop/icons/oasis-text.ico |binary sysui/desktop/icons/oasis-web-template.ico |binary sysui/desktop/icons/open.ico|binary sysui/desktop/icons/presentation-template.ico |binary sysui/desktop/icons/presentation.ico|binary sysui/desktop/icons/spreadsheet-template.ico|binary sysui/desktop/icons/spreadsheet.ico |binary sysui/desktop/icons/text-template.ico |binary sysui/desktop/icons/text.ico|binary sysui/desktop/icons/writer_app.ico |binary 37 files changed New commits: commit bc4ff4382964da57b8c36c115b0517d884127df3 Author: Andras Timar ati...@suse.com Date: Thu Jan 12 13:32:38 2012 +0100 256x256 Windows icons fdo#39555 diff --git a/sysui/desktop/icons/base_app.ico b/sysui/desktop/icons/base_app.ico index 02cf7a4..97b6110 100644 Binary files a/sysui/desktop/icons/base_app.ico and b/sysui/desktop/icons/base_app.ico differ diff --git a/sysui/desktop/icons/calc_app.ico b/sysui/desktop/icons/calc_app.ico index a9dd646..388ac6d 100644 Binary files a/sysui/desktop/icons/calc_app.ico and b/sysui/desktop/icons/calc_app.ico differ diff --git a/sysui/desktop/icons/database.ico b/sysui/desktop/icons/database.ico index 02cf7a4..97b6110 100644 Binary files a/sysui/desktop/icons/database.ico and b/sysui/desktop/icons/database.ico differ diff --git a/sysui/desktop/icons/draw_app.ico b/sysui/desktop/icons/draw_app.ico index 5297dae..48749da 100644 Binary files a/sysui/desktop/icons/draw_app.ico and b/sysui/desktop/icons/draw_app.ico differ diff --git a/sysui/desktop/icons/drawing-template.ico b/sysui/desktop/icons/drawing-template.ico index af2e9ff..9991270 100644 Binary files a/sysui/desktop/icons/drawing-template.ico and b/sysui/desktop/icons/drawing-template.ico differ diff --git a/sysui/desktop/icons/drawing.ico b/sysui/desktop/icons/drawing.ico index 5297dae..48749da 100644 Binary files a/sysui/desktop/icons/drawing.ico and b/sysui/desktop/icons/drawing.ico differ diff --git a/sysui/desktop/icons/empty-document.ico b/sysui/desktop/icons/empty-document.ico index 20e665f..ec11e8f 100644 Binary files a/sysui/desktop/icons/empty-document.ico and b/sysui/desktop/icons/empty-document.ico differ diff --git a/sysui/desktop/icons/empty-template.ico b/sysui/desktop/icons/empty-template.ico index 20e665f..ec11e8f 100644 Binary files a/sysui/desktop/icons/empty-template.ico and b/sysui/desktop/icons/empty-template.ico differ diff --git a/sysui/desktop/icons/formula.ico b/sysui/desktop/icons/formula.ico index fb2f651..07b3e8e 100644 Binary files a/sysui/desktop/icons/formula.ico and b/sysui/desktop/icons/formula.ico differ diff --git a/sysui/desktop/icons/hicolor/256x256/apps/calc.png b/sysui/desktop/icons/hicolor/256x256/apps/calc.png index 3ce322a..a3f5fd4 100644 Binary files a/sysui/desktop/icons/hicolor/256x256/apps/calc.png and b/sysui/desktop/icons/hicolor/256x256/apps/calc.png differ diff --git a/sysui/desktop/icons/hicolor/256x256/apps/writer.png b/sysui/desktop/icons/hicolor/256x256/apps/writer.png index 80af4bd..2f4abcb 100644 Binary files a/sysui/desktop/icons/hicolor/256x256/apps/writer.png and b/sysui/desktop/icons/hicolor/256x256/apps/writer.png differ diff --git a/sysui/desktop/icons/impress_app.ico
[Libreoffice-commits] .: sysui/desktop
sysui/desktop/icons/hicolor/256x256/apps/base.png |binary sysui/desktop/icons/hicolor/256x256/apps/calc.png |binary sysui/desktop/icons/hicolor/256x256/apps/draw.png |binary sysui/desktop/icons/hicolor/256x256/apps/impress.png |binary sysui/desktop/icons/hicolor/256x256/apps/main.png |binary sysui/desktop/icons/hicolor/256x256/apps/math.png |binary sysui/desktop/icons/hicolor/256x256/apps/startcenter.png |binary sysui/desktop/icons/hicolor/256x256/apps/writer.png |binary sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-database.png |binary sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-drawing-template.png |binary sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-drawing.png |binary sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-formula.png |binary sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-master-document.png |binary sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-presentation-template.png |binary sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-presentation.png |binary sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-spreadsheet-template.png |binary sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-spreadsheet.png |binary sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-text-template.png |binary sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-text.png |binary sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-web-template.png |binary 20 files changed New commits: commit 25e0d64a6fccbc62d4cca4d8d7d312ea84f45c3a Author: Petr Mladek pmla...@suse.cz Date: Wed Jan 11 11:14:55 2012 +0100 Add 256x256 desktop and MIME type icons (fdo#39555, bnc#722644) diff --git a/sysui/desktop/icons/hicolor/256x256/apps/base.png b/sysui/desktop/icons/hicolor/256x256/apps/base.png new file mode 100644 index 000..729dbcd Binary files /dev/null and b/sysui/desktop/icons/hicolor/256x256/apps/base.png differ diff --git a/sysui/desktop/icons/hicolor/256x256/apps/calc.png b/sysui/desktop/icons/hicolor/256x256/apps/calc.png new file mode 100644 index 000..3ce322a Binary files /dev/null and b/sysui/desktop/icons/hicolor/256x256/apps/calc.png differ diff --git a/sysui/desktop/icons/hicolor/256x256/apps/draw.png b/sysui/desktop/icons/hicolor/256x256/apps/draw.png new file mode 100644 index 000..b3ee114 Binary files /dev/null and b/sysui/desktop/icons/hicolor/256x256/apps/draw.png differ diff --git a/sysui/desktop/icons/hicolor/256x256/apps/impress.png b/sysui/desktop/icons/hicolor/256x256/apps/impress.png new file mode 100644 index 000..5909f05 Binary files /dev/null and b/sysui/desktop/icons/hicolor/256x256/apps/impress.png differ diff --git a/sysui/desktop/icons/hicolor/256x256/apps/main.png b/sysui/desktop/icons/hicolor/256x256/apps/main.png new file mode 100644 index 000..7e8e2a0 Binary files /dev/null and b/sysui/desktop/icons/hicolor/256x256/apps/main.png differ diff --git a/sysui/desktop/icons/hicolor/256x256/apps/math.png b/sysui/desktop/icons/hicolor/256x256/apps/math.png new file mode 100644 index 000..50b8dc8 Binary files /dev/null and b/sysui/desktop/icons/hicolor/256x256/apps/math.png differ diff --git a/sysui/desktop/icons/hicolor/256x256/apps/startcenter.png b/sysui/desktop/icons/hicolor/256x256/apps/startcenter.png new file mode 100644 index 000..7e8e2a0 Binary files /dev/null and b/sysui/desktop/icons/hicolor/256x256/apps/startcenter.png differ diff --git a/sysui/desktop/icons/hicolor/256x256/apps/writer.png b/sysui/desktop/icons/hicolor/256x256/apps/writer.png new file mode 100644 index 000..80af4bd Binary files /dev/null and b/sysui/desktop/icons/hicolor/256x256/apps/writer.png differ diff --git a/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-database.png b/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-database.png new file mode 100644 index 000..729dbcd Binary files /dev/null and b/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-database.png differ diff --git a/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-drawing-template.png b/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-drawing-template.png new file mode 100644 index 000..4cda813 Binary files /dev/null and b/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-drawing-template.png differ diff --git a/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-drawing.png b/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-drawing.png new file mode 100644 index 000..b3ee114 Binary files /dev/null and b/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-drawing.png differ diff --git a/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-formula.png
[Libreoffice-commits] .: sysui/desktop
sysui/desktop/share/launcher_comment.ulf | 169 --- sysui/desktop/share/launcher_genericname.ulf | 167 -- 2 files changed, 336 deletions(-) New commits: commit 4d9293660776b6d97289cf7a1bf8f6be7ad05649 Author: David Tardon dtar...@redhat.com Date: Thu Dec 15 12:49:36 2011 +0100 these translations do already exist in translations repo diff --git a/sysui/desktop/share/launcher_comment.ulf b/sysui/desktop/share/launcher_comment.ulf index c9cd594..71c82e2 100755 --- a/sysui/desktop/share/launcher_comment.ulf +++ b/sysui/desktop/share/launcher_comment.ulf @@ -1,190 +1,21 @@ [writer] en-US = Create and edit text and graphics in letters, reports, documents and Web pages by using Writer. -ast = Escribi y edita testos y gráficos en cartes, informes, documentos y páxines web. -ca = Creeu i editeu text i grà fics a cartes, informes, documents i pà gines web. -da = Opret og redigér tekst og grafik i breve, rapporter, dokumenter og hjemmesider. -de = Texte und Grafiken in Briefen, Berichten, Dokumenten und Webseiten erstellen und bearbeiten. -es = Cree y edite textos y gráficos en cartas, informes, documentos y páginas web. -fi = Luo ja muokkaa tekstejä ja grafiikkaa kirjeisiin, raportteihin, asiakirjoihin ja WWW-sivuille. -fr = Créer et modifier des textes et graphiques pour lettres, rapports, documents ou pages Web. -gl = Cree e modifique textos e gráficos en cartas, informes, documentos e páxinas web. -he = ×צ××¨× ×ער××× ×©× ××§×¡× ××רפ××§× ×××ת×××, ××××ת, ×ס×××× ×××ª×¨× ××× ××¨× ×. -hr = Stvorite i uredite tekstualna i grafiÄka pisma, izvjeÅ¡taje, dokumente i web stranice. -hu = Levelek, jelentések, dokumentumok és weboldalak szövegének és grafikájának létrehozása és szerkesztése -it = Crea e modifica testo e grafica in lettere, rapporti, documenti e pagine Web. -is = Búa til og sýsla með texta og myndefni à bréfum, skýrslum, ýmsum textaskjölum og vefsÃðum. -ja = æç´ãã¬ãã¼ããææ¸ãWebãã¼ã¸åãã®æç« ãç»åãä½æã»ç·¨éãã¾ãã -ku = Nivîs û grafîkên di name, rapor, belge û rûpelên torê de çêbike û sererast bike. -nl = Tekst en afbeeldingen bewerken in brieven, rapporten, documenten en webpagina's. -pt_BR = Crie e edite seus textos e gráficos em cartas, relatórios, documentos ou páginas da web. -ro = CreaÈi Èi editaÈi documente text Èi grafice sub formÄ de scrisori, rapoarte, articole sau pagini web. -ru = Создание и ÑедакÑиÑование ÑекÑÑов и изобÑажений в пиÑÑÐ¼Ð°Ñ , оÑÑÑÑÐ°Ñ , докÑменÑÐ°Ñ Ð¸ на веб-ÑÑÑаниÑÐ°Ñ . -sl = Ustvarjajte in urejajte besedilo in grafiko v pismih, poroÄilih, dokumentih in spletnih straneh. -te = పతà±à°°à°¾à°²à±, నివà±à°¦à°¿à°à°²à± మరియౠవà±à°¬à± à°ªà±à°à±à°²à°²à± పాఠà±à°¯à° మరియౠà°à±à°°à°¾à°«à°¿à°à±à°¸à± à°¸à±à°·à±à°à°¿ మరియౠసవరణ -vi = Tạo và soạn vÄn bản và hình trong thÆ°, báo cáo, tà i liá»u và trang web. -zh_CN = å建ç¼è¾ææ¡£ãæ¥åã信件åç½é¡µä¸çææ¬åå¾å½¢ã -zh_TW = 建ç«è編輯æ¸ä¿¡ãå ±åãæ件è網é ä¸çæåååå½¢ã [impress] en-US = Create and edit presentations for slideshows, meeting and Web pages by using Impress. -ast = Fai y edita presentaciones pa pases de diapositives, reuniones y páxines web. -ca = Creeu i editeu presentacions per a diapositives, conferències i pà gines web. -da = Opret og rediger præsentationer til diasshows, møder og hjemmesider. -de = Präsentationen für Vorführungen, Besprechungen und Web-Auftritte erstellen und bearbeiten. -el = ÎÎ·Î¼Î¹Î¿Ï Ïγία και εÏεξεÏγαÏία ÏαÏÎ¿Ï ÏιάÏεÏν για ÏÏοβολÎÏ Î´Î¹Î±ÏανειÏν, ÏÏ ÏκÎÏÎµÎ¹Ï ÎºÎ±Î¹ ιÏÏοÏÎµÎ»Î¯Î´ÎµÏ -es = Cree y edite presentaciones para pases de diapositivas, reuniones y páginas web. -fi = Luo ja muokkaa esityksiä esitelmiin, tapaamisiin ja WWW-sivuille. -fr = Créer et modifier des présentations pour des diaporamas, des conférences et pour le Web. -gl = Cree e modifique presentacións para diaporamas, conferencias e páxinas web. -he = ×צ××¨× ×ער××× ×©× ×צ××ת ×¢××ר שק×פ××ת, פ××ש×ת ×××ª×¨× ××× ××¨× ×. -hr = Stvorite i uredite prezentacije za sastanke i web stranice. -hu = Bemutatók készÃtése és szerkesztése diavetÃtésekhez vagy a webre -it = Crea e modifica presentazioni per proiezioni, meeting e pagine Web. -is = Búa til og breyta kynningum fyrir ráðstefnur, fyrirlestra og fyrir birtingu á vef. -ja = ã¹ã©ã¤ãã·ã§ã¼ãä¼è°ãWebãã¼ã¸åãã®ãã¬ã¼ã³ãã¼ã·ã§ã³ãä½æã»ç·¨éãã¾ãã -nl = Presentaties maken voor diavoorstellingen, vergaderingen en webpagina's. -pt_BR = Crie e edite apresentações para reuniões ou páginas da
[Libreoffice-commits] .: sysui/desktop
dev/null|binary sysui/desktop/icons/base_app.ico|binary sysui/desktop/icons/calc_app.ico|binary sysui/desktop/icons/draw_app.ico|binary sysui/desktop/icons/impress_app.ico |binary sysui/desktop/icons/main_app.ico|binary sysui/desktop/icons/math_app.ico|binary sysui/desktop/icons/open.ico|binary sysui/desktop/icons/writer_app.ico |binary 9 files changed New commits: commit c5ca69b5d61f1d28f6069346c426c2fd3402a5f0 Author: Andras Timar ati...@suse.com Date: Fri Dec 2 14:03:09 2011 +0100 remove ooo3_ from Windows icon names diff --git a/sysui/desktop/icons/base_app.ico b/sysui/desktop/icons/base_app.ico new file mode 100644 index 000..02cf7a4 Binary files /dev/null and b/sysui/desktop/icons/base_app.ico differ diff --git a/sysui/desktop/icons/calc_app.ico b/sysui/desktop/icons/calc_app.ico new file mode 100644 index 000..a9dd646 Binary files /dev/null and b/sysui/desktop/icons/calc_app.ico differ diff --git a/sysui/desktop/icons/draw_app.ico b/sysui/desktop/icons/draw_app.ico new file mode 100644 index 000..5297dae Binary files /dev/null and b/sysui/desktop/icons/draw_app.ico differ diff --git a/sysui/desktop/icons/impress_app.ico b/sysui/desktop/icons/impress_app.ico new file mode 100644 index 000..9e96c3e Binary files /dev/null and b/sysui/desktop/icons/impress_app.ico differ diff --git a/sysui/desktop/icons/main_app.ico b/sysui/desktop/icons/main_app.ico new file mode 100644 index 000..20e665f Binary files /dev/null and b/sysui/desktop/icons/main_app.ico differ diff --git a/sysui/desktop/icons/math_app.ico b/sysui/desktop/icons/math_app.ico new file mode 100644 index 000..fb2f651 Binary files /dev/null and b/sysui/desktop/icons/math_app.ico differ diff --git a/sysui/desktop/icons/ooo3_base_app.ico b/sysui/desktop/icons/ooo3_base_app.ico deleted file mode 100644 index 02cf7a4..000 Binary files a/sysui/desktop/icons/ooo3_base_app.ico and /dev/null differ diff --git a/sysui/desktop/icons/ooo3_calc_app.ico b/sysui/desktop/icons/ooo3_calc_app.ico deleted file mode 100644 index a9dd646..000 Binary files a/sysui/desktop/icons/ooo3_calc_app.ico and /dev/null differ diff --git a/sysui/desktop/icons/ooo3_draw_app.ico b/sysui/desktop/icons/ooo3_draw_app.ico deleted file mode 100644 index 5297dae..000 Binary files a/sysui/desktop/icons/ooo3_draw_app.ico and /dev/null differ diff --git a/sysui/desktop/icons/ooo3_impress_app.ico b/sysui/desktop/icons/ooo3_impress_app.ico deleted file mode 100644 index 9e96c3e..000 Binary files a/sysui/desktop/icons/ooo3_impress_app.ico and /dev/null differ diff --git a/sysui/desktop/icons/ooo3_main_app.ico b/sysui/desktop/icons/ooo3_main_app.ico deleted file mode 100644 index 20e665f..000 Binary files a/sysui/desktop/icons/ooo3_main_app.ico and /dev/null differ diff --git a/sysui/desktop/icons/ooo3_math_app.ico b/sysui/desktop/icons/ooo3_math_app.ico deleted file mode 100644 index fb2f651..000 Binary files a/sysui/desktop/icons/ooo3_math_app.ico and /dev/null differ diff --git a/sysui/desktop/icons/ooo3_open.ico b/sysui/desktop/icons/ooo3_open.ico deleted file mode 100644 index 20e665f..000 Binary files a/sysui/desktop/icons/ooo3_open.ico and /dev/null differ diff --git a/sysui/desktop/icons/ooo3_writer_app.ico b/sysui/desktop/icons/ooo3_writer_app.ico deleted file mode 100644 index cb08cc5..000 Binary files a/sysui/desktop/icons/ooo3_writer_app.ico and /dev/null differ diff --git a/sysui/desktop/icons/open.ico b/sysui/desktop/icons/open.ico new file mode 100644 index 000..20e665f Binary files /dev/null and b/sysui/desktop/icons/open.ico differ diff --git a/sysui/desktop/icons/writer_app.ico b/sysui/desktop/icons/writer_app.ico new file mode 100644 index 000..cb08cc5 Binary files /dev/null and b/sysui/desktop/icons/writer_app.ico differ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sysui/desktop
dev/null |binary 1 file changed New commits: commit 10f977981d2cfb6ba0ccd0185ccb12e212010bc2 Author: Andras Timar ati...@suse.com Date: Fri Dec 2 15:17:24 2011 +0100 remove unused Windows icon diff --git a/sysui/desktop/icons/main.ico b/sysui/desktop/icons/main.ico deleted file mode 100644 index 20e665f..000 Binary files a/sysui/desktop/icons/main.ico and /dev/null differ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sysui/desktop
sysui/desktop/menus/math.desktop |1 + 1 file changed, 1 insertion(+) New commits: commit 369f22ceb8b3440d8caf1d60d7f45abc1d5ac258 Author: Petr Mladek pmla...@suse.cz Date: Wed Oct 19 19:58:15 2011 +0200 do not show LibreOffice Math in the desktop menu (fdo#41681) It is just a helper application. The desktop file still makes sense to keep the MIME type association. diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop index 7b2e980..61bade6 100755 --- a/sysui/desktop/menus/math.desktop +++ b/sysui/desktop/menus/math.desktop @@ -1,6 +1,7 @@ [Desktop Entry] Version=1.0 Terminal=false +NoDisplay=true Icon=math Type=Application Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
