|
 |
b05e2a8 |
From 9441e2a015d38968592508782c4041dab5af1bda Mon Sep 17 00:00:00 2001
|
|
|
b05e2a8 |
From: David Tardon <dtardon@redhat.com>
|
|
|
b05e2a8 |
Date: Tue, 31 Jan 2012 09:40:57 +0100
|
|
|
b05e2a8 |
Subject: [PATCH] move binfilter mime types into extra .desktop file
|
|
|
b05e2a8 |
|
|
|
b05e2a8 |
---
|
|
|
b05e2a8 |
scp2/source/ooo/common_brand.scp | 9 +++++++++
|
|
|
b05e2a8 |
sysui/desktop/freedesktop/freedesktop-menus.spec | 1 +
|
|
|
b05e2a8 |
sysui/desktop/menus/binfilter.desktop | 9 +++++++++
|
|
|
b05e2a8 |
sysui/desktop/menus/calc.desktop | 2 +-
|
|
|
b05e2a8 |
sysui/desktop/menus/draw.desktop | 2 +-
|
|
|
b05e2a8 |
sysui/desktop/menus/impress.desktop | 2 +-
|
|
|
b05e2a8 |
sysui/desktop/menus/math.desktop | 2 +-
|
|
|
b05e2a8 |
sysui/desktop/menus/writer.desktop | 2 +-
|
|
|
b05e2a8 |
sysui/desktop/share/launcher_genericname.ulf | 3 +++
|
|
|
b05e2a8 |
sysui/desktop/share/makefile.mk | 7 ++++---
|
|
|
b05e2a8 |
sysui/desktop/suse/suse-menus.spec | 1 +
|
|
|
b05e2a8 |
11 files changed, 32 insertions(+), 8 deletions(-)
|
|
|
b05e2a8 |
create mode 100644 sysui/desktop/menus/binfilter.desktop
|
|
|
b05e2a8 |
|
|
|
b05e2a8 |
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
|
|
|
b05e2a8 |
index 6c6fb66..9893a60 100644
|
|
|
b05e2a8 |
--- a/scp2/source/ooo/common_brand.scp
|
|
|
b05e2a8 |
+++ b/scp2/source/ooo/common_brand.scp
|
|
|
b05e2a8 |
@@ -87,6 +87,7 @@ Module gid_Module_Root_Brand
|
|
|
b05e2a8 |
gid_Brand_File_Share_Registry_O5oo_Xcd,
|
|
|
b05e2a8 |
gid_Brand_File_Script_Unopkg,
|
|
|
b05e2a8 |
gid_Brand_File_Share_Xdg_Base,
|
|
|
b05e2a8 |
+ gid_Brand_File_Share_Xdg_BinFilter,
|
|
|
b05e2a8 |
gid_Brand_File_Share_Xdg_Calc,
|
|
|
b05e2a8 |
gid_Brand_File_Share_Xdg_Draw,
|
|
|
b05e2a8 |
gid_Brand_File_Share_Xdg_Extension,
|
|
|
b05e2a8 |
@@ -781,6 +782,14 @@ File gid_Brand_File_Share_Xdg_JavaFilter
|
|
|
b05e2a8 |
End
|
|
|
b05e2a8 |
#endif
|
|
|
b05e2a8 |
|
|
|
b05e2a8 |
+#if defined UNX && ! defined MACOSX
|
|
|
b05e2a8 |
+File gid_Brand_File_Share_Xdg_BinFilter
|
|
|
b05e2a8 |
+ TXT_FILE_BODY;
|
|
|
b05e2a8 |
+ Dir = gid_Brand_Dir_Share_Xdg;
|
|
|
b05e2a8 |
+ Name = "binfilter.desktop";
|
|
|
b05e2a8 |
+ Styles = (PACKED,SCPZIP_REPLACE);
|
|
|
b05e2a8 |
+End
|
|
|
b05e2a8 |
+#endif
|
|
|
b05e2a8 |
|
|
|
b05e2a8 |
// Profiles
|
|
|
b05e2a8 |
|
|
|
b05e2a8 |
diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec
|
|
|
b05e2a8 |
index d4efca5..78a33ae 100755
|
|
|
b05e2a8 |
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
|
|
|
b05e2a8 |
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
|
|
|
b05e2a8 |
@@ -386,6 +386,7 @@ done
|
|
|
b05e2a8 |
/usr/share/applications/%unixfilename-writer.desktop
|
|
|
b05e2a8 |
/usr/share/applications/%unixfilename-startcenter.desktop
|
|
|
b05e2a8 |
/usr/share/applications/%unixfilename-javafilter.desktop
|
|
|
b05e2a8 |
+/usr/share/applications/%unixfilename-binfilter.desktop
|
|
|
b05e2a8 |
/usr/share/icons/gnome/*/apps/*png
|
|
|
b05e2a8 |
/usr/share/icons/gnome/*/mimetypes/*png
|
|
|
b05e2a8 |
/usr/share/icons/hicolor/*/apps/*png
|
|
|
b05e2a8 |
diff --git a/sysui/desktop/menus/binfilter.desktop b/sysui/desktop/menus/binfilter.desktop
|
|
|
b05e2a8 |
new file mode 100644
|
|
|
b05e2a8 |
index 0000000..bfad37f
|
|
|
b05e2a8 |
--- /dev/null
|
|
|
b05e2a8 |
+++ b/sysui/desktop/menus/binfilter.desktop
|
|
|
b05e2a8 |
@@ -0,0 +1,9 @@
|
|
|
b05e2a8 |
+[Desktop Entry]
|
|
|
b05e2a8 |
+Version=1.0
|
|
|
b05e2a8 |
+Terminal=false
|
|
|
b05e2a8 |
+Type=Application
|
|
|
b05e2a8 |
+Exec=${UNIXBASISROOTNAME} %U
|
|
|
b05e2a8 |
+MimeType=application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/vnd.stardivision.draw;application/vnd.stardivision.impress;application/vnd.stardivision.math;application/vnd.stardivision.writer;
|
|
|
b05e2a8 |
+Name=%PRODUCTNAME Legacy StarOffice 5 Binary Format Importer
|
|
|
b05e2a8 |
+GenericName=Legacy StarOffice 5 Binary Format Importer
|
|
|
b05e2a8 |
+NoDisplay=true
|
|
|
b05e2a8 |
diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop
|
|
|
b05e2a8 |
index 696385a..c8899cd 100755
|
|
|
b05e2a8 |
--- a/sysui/desktop/menus/calc.desktop
|
|
|
b05e2a8 |
+++ b/sysui/desktop/menus/calc.desktop
|
|
|
b05e2a8 |
@@ -5,7 +5,7 @@ Icon=calc
|
|
|
b05e2a8 |
Type=Application
|
|
|
b05e2a8 |
Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Spreadsheets;
|
|
|
b05e2a8 |
Exec=${UNIXBASISROOTNAME} --calc %U
|
|
|
b05e2a8 |
-MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-flat-xml;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;application/x-dbf;text/spreadsheet;
|
|
|
b05e2a8 |
+MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-flat-xml;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;application/x-dbf;text/spreadsheet;
|
|
|
b05e2a8 |
Name=%PRODUCTNAME Calc
|
|
|
b05e2a8 |
GenericName=Spreadsheet
|
|
|
b05e2a8 |
Comment=Perform calculations, analyze information and manage lists in spreadsheets by using Calc.
|
|
|
b05e2a8 |
diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop
|
|
|
b05e2a8 |
index 96234c6..67ad422 100755
|
|
|
b05e2a8 |
--- a/sysui/desktop/menus/draw.desktop
|
|
|
b05e2a8 |
+++ b/sysui/desktop/menus/draw.desktop
|
|
|
b05e2a8 |
@@ -5,7 +5,7 @@ Icon=draw
|
|
|
b05e2a8 |
Type=Application
|
|
|
b05e2a8 |
Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Drawing;
|
|
|
b05e2a8 |
Exec=${UNIXBASISROOTNAME} --draw %U
|
|
|
b05e2a8 |
-MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-flat-xml;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.stardivision.draw;
|
|
|
b05e2a8 |
+MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-flat-xml;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;
|
|
|
b05e2a8 |
Name=%PRODUCTNAME Draw
|
|
|
b05e2a8 |
GenericName=Drawing Program
|
|
|
b05e2a8 |
Comment=Create and edit drawings, flow charts, and logos by using Draw.
|
|
|
b05e2a8 |
diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop
|
|
|
b05e2a8 |
index 92060e3..91c937a 100755
|
|
|
b05e2a8 |
--- a/sysui/desktop/menus/impress.desktop
|
|
|
b05e2a8 |
+++ b/sysui/desktop/menus/impress.desktop
|
|
|
b05e2a8 |
@@ -5,7 +5,7 @@ Icon=impress
|
|
|
b05e2a8 |
Type=Application
|
|
|
b05e2a8 |
Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Presentations;
|
|
|
b05e2a8 |
Exec=${UNIXBASISROOTNAME} --impress %U
|
|
|
b05e2a8 |
-MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-flat-xml;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.stardivision.impress;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;
|
|
|
b05e2a8 |
+MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-flat-xml;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;
|
|
|
b05e2a8 |
Name=%PRODUCTNAME Impress
|
|
|
b05e2a8 |
GenericName=Presentation
|
|
|
b05e2a8 |
Comment=Create and edit presentations for slideshows, meeting and Web pages by using Impress.
|
|
|
b05e2a8 |
diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop
|
|
|
b05e2a8 |
index 61bade6..23e2d87 100755
|
|
|
b05e2a8 |
--- a/sysui/desktop/menus/math.desktop
|
|
|
b05e2a8 |
+++ b/sysui/desktop/menus/math.desktop
|
|
|
b05e2a8 |
@@ -6,7 +6,7 @@ Icon=math
|
|
|
b05e2a8 |
Type=Application
|
|
|
b05e2a8 |
Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other;
|
|
|
b05e2a8 |
Exec=${UNIXBASISROOTNAME} --math %U
|
|
|
b05e2a8 |
-MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.stardivision.math;
|
|
|
b05e2a8 |
+MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;
|
|
|
b05e2a8 |
Name=%PRODUCTNAME Math
|
|
|
b05e2a8 |
GenericName=Formula Editor
|
|
|
b05e2a8 |
Comment=Create and edit scientific formulas and equations by using Math.
|
|
|
b05e2a8 |
diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop
|
|
|
b05e2a8 |
index 625df59..0db0d05 100755
|
|
|
b05e2a8 |
--- a/sysui/desktop/menus/writer.desktop
|
|
|
b05e2a8 |
+++ b/sysui/desktop/menus/writer.desktop
|
|
|
b05e2a8 |
@@ -5,7 +5,7 @@ Icon=writer
|
|
|
b05e2a8 |
Type=Application
|
|
|
b05e2a8 |
Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Wordprocessors;
|
|
|
b05e2a8 |
Exec=${UNIXBASISROOTNAME} --writer %U
|
|
|
b05e2a8 |
-MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-flat-xml;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;application/x-hwp;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.lotus-wordpro;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;
|
|
|
b05e2a8 |
+MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-flat-xml;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/msword;application/vnd.ms-word;application/x-doc;application/x-hwp;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.lotus-wordpro;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;
|
|
|
b05e2a8 |
Name=%PRODUCTNAME Writer
|
|
|
b05e2a8 |
GenericName=Word Processor
|
|
|
b05e2a8 |
Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer.
|
|
|
b05e2a8 |
diff --git a/sysui/desktop/share/launcher_genericname.ulf b/sysui/desktop/share/launcher_genericname.ulf
|
|
|
b05e2a8 |
index ff8041a..6130e0b 100755
|
|
|
b05e2a8 |
--- a/sysui/desktop/share/launcher_genericname.ulf
|
|
|
b05e2a8 |
+++ b/sysui/desktop/share/launcher_genericname.ulf
|
|
|
b05e2a8 |
@@ -21,3 +21,6 @@ en-US = "Office"
|
|
|
b05e2a8 |
|
|
|
b05e2a8 |
[javafilter]
|
|
|
b05e2a8 |
en-US = "Small Device Format Importer"
|
|
|
b05e2a8 |
+
|
|
|
b05e2a8 |
+[binfilter]
|
|
|
b05e2a8 |
+en-US = "Legacy StarOffice 5 Binary Format Importer"
|
|
|
b05e2a8 |
diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk
|
|
|
b05e2a8 |
index f6a34b1..f6b4dfa 100755
|
|
|
b05e2a8 |
--- a/sysui/desktop/share/makefile.mk
|
|
|
b05e2a8 |
+++ b/sysui/desktop/share/makefile.mk
|
|
|
b05e2a8 |
@@ -52,7 +52,8 @@ ULFFILES= \
|
|
|
b05e2a8 |
launcher_genericname.ulf \
|
|
|
b05e2a8 |
launcher_name.ulf
|
|
|
b05e2a8 |
|
|
|
b05e2a8 |
-LAUNCHERLIST = writer calc draw impress math base printeradmin qstart startcenter javafilter
|
|
|
b05e2a8 |
+LAUNCHERLIST_APPS = writer calc draw impress math base printeradmin startcenter
|
|
|
b05e2a8 |
+LAUNCHERLIST = $(LAUNCHERLIST_APPS) qstart javafilter binfilter
|
|
|
b05e2a8 |
LAUNCHERDEPN = ../menus/{$(LAUNCHERLIST)}.desktop
|
|
|
b05e2a8 |
|
|
|
b05e2a8 |
LAUNCHERFLAGFILE = $(COMMONMISC)/$(TARGET)/xdg.flag
|
|
|
b05e2a8 |
@@ -126,9 +127,9 @@ MIMEICONLIST = \
|
|
|
b05e2a8 |
extension
|
|
|
b05e2a8 |
|
|
|
b05e2a8 |
ICONDEPN = \
|
|
|
b05e2a8 |
- ../icons/hicolor/{16x16 32x32 48x48}/apps/{$(LAUNCHERLIST:s/qstart//:s/javafilter//)}.png \
|
|
|
b05e2a8 |
+ ../icons/hicolor/{16x16 32x32 48x48}/apps/{$(LAUNCHERLIST_APPS)}.png \
|
|
|
b05e2a8 |
../icons/hicolor/{16x16 32x32 48x48}/mimetypes/{$(MIMEICONLIST)}.png \
|
|
|
b05e2a8 |
- ../icons/locolor/{16x16 32x32}/apps/{$(LAUNCHERLIST:s/qstart//:s/javafilter//)}.png \
|
|
|
b05e2a8 |
+ ../icons/locolor/{16x16 32x32}/apps/{$(LAUNCHERLIST_APPS)}.png \
|
|
|
b05e2a8 |
../icons/locolor/{16x16 32x32}/mimetypes/{$(MIMEICONLIST)}.png
|
|
|
b05e2a8 |
|
|
|
b05e2a8 |
# --- Targets ------------------------------------------------------
|
|
|
b05e2a8 |
diff --git a/sysui/desktop/suse/suse-menus.spec b/sysui/desktop/suse/suse-menus.spec
|
|
|
b05e2a8 |
index ea5ae31..74b67e6 100755
|
|
|
b05e2a8 |
--- a/sysui/desktop/suse/suse-menus.spec
|
|
|
b05e2a8 |
+++ b/sysui/desktop/suse/suse-menus.spec
|
|
|
b05e2a8 |
@@ -357,6 +357,7 @@ done
|
|
|
b05e2a8 |
/usr/share/applications/%unixfilename-printeradmin.desktop
|
|
|
b05e2a8 |
/usr/share/applications/%unixfilename-startcenter.desktop
|
|
|
b05e2a8 |
/usr/share/applications/%unixfilename-javafilter.desktop
|
|
|
b05e2a8 |
+/usr/share/applications/%unixfilename-binfilter.desktop
|
|
|
b05e2a8 |
/opt/gnome/share/mime-info/*.keys
|
|
|
b05e2a8 |
/opt/gnome/share/mime-info/*.mime
|
|
|
b05e2a8 |
/opt/kde3/share/mimelnk/application/*.desktop
|
|
|
b05e2a8 |
--
|
|
|
b05e2a8 |
1.7.7.5
|
|
|
b05e2a8 |
|