diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-09-08 15:31:14 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-09-11 09:38:21 +0000 |
commit | ed00d0ddd663085a5fd180301cdc82af80bc8077 (patch) | |
tree | e9949eddf99b907a06ab99f248e81831a1505699 /sysui | |
parent | 4b758c52955e1931850938bf70764ee6376616a0 (diff) |
create a master document template type
of application/vnd.oasis.opendocument.text-master-template with
suffic otm
https://lists.oasis-open.org/archives/office-comment/201002/msg00042.html
desktop/icons/oasis-master-document-template.icns is just a copy
of
desktop/icons/oasis-master-document.icns
because I can't draw
Change-Id: I0d18c79c4c893e97505052884ee8be97d0f117a1
Reviewed-on: https://gerrit.libreoffice.org/11350
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sysui')
-rw-r--r-- | sysui/CustomTarget_share.mk | 2 | ||||
-rw-r--r-- | sysui/Package_osxicons.mk | 1 | ||||
-rwxr-xr-x | sysui/desktop/debian/postinst | 2 | ||||
-rwxr-xr-x | sysui/desktop/freedesktop/freedesktop-menus.spec | 1 | ||||
-rw-r--r-- | sysui/desktop/icons/oasis-master-document-template.icns | bin | 0 -> 118979 bytes | |||
-rwxr-xr-x | sysui/desktop/macosx/Info.plist.in | 43 | ||||
-rw-r--r-- | sysui/desktop/menus/writer.desktop | 2 | ||||
-rw-r--r-- | sysui/desktop/mimetypes/oasis-master-document-template.desktop | 26 | ||||
-rw-r--r-- | sysui/desktop/mimetypes/oasis-master-document-template.keys | 9 | ||||
-rwxr-xr-x | sysui/desktop/mimetypes/openoffice.applications | 2 | ||||
-rw-r--r-- | sysui/desktop/share/documents.ulf | 3 | ||||
-rwxr-xr-x | sysui/desktop/solaris/mailcap | 1 | ||||
-rwxr-xr-x | sysui/desktop/solaris/mime.types | 1 |
13 files changed, 91 insertions, 2 deletions
diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk index 862e57f51f0a..e4dde6fbaaaf 100644 --- a/sysui/CustomTarget_share.mk +++ b/sysui/CustomTarget_share.mk @@ -58,6 +58,7 @@ MIMELIST := \ oasis-presentation-flat-xml \ oasis-formula \ oasis-master-document \ + oasis-master-document-template \ oasis-database \ oasis-web-template \ ms-excel-sheet-12 \ @@ -90,6 +91,7 @@ MIMEICONLIST := \ oasis-presentation-template \ oasis-formula \ oasis-master-document \ + oasis-master-document-template \ oasis-database \ oasis-web-template \ text \ diff --git a/sysui/Package_osxicons.mk b/sysui/Package_osxicons.mk index cd8343a6e893..24a699881b68 100644 --- a/sysui/Package_osxicons.mk +++ b/sysui/Package_osxicons.mk @@ -20,6 +20,7 @@ $(eval $(call gb_Package_add_files_with_dir,sysui_osxicons,Resources,\ oasis-drawing.icns \ master-document.icns \ oasis-master-document.icns \ + oasis-master-document-template.icns \ formula.icns \ oasis-formula.icns \ text-template.icns \ diff --git a/sysui/desktop/debian/postinst b/sysui/desktop/debian/postinst index 67072de427b9..b9b6f24426f1 100755 --- a/sysui/desktop/debian/postinst +++ b/sysui/desktop/debian/postinst @@ -60,6 +60,7 @@ application/vnd.oasis.opendocument.text-flat-xml fodt application/vnd.oasis.opendocument.text-template ott application/vnd.oasis.opendocument.text-web oth application/vnd.oasis.opendocument.text-master odm +application/vnd.oasis.opendocument.text-master-template otm application/vnd.oasis.opendocument.graphics odg application/vnd.oasis.opendocument.graphics-flat-xml fodg application/vnd.oasis.opendocument.graphics-template otg @@ -123,6 +124,7 @@ application/vnd.oasis.opendocument.text-flat-xml; %PREFIX -view %s application/vnd.oasis.opendocument.text-template; %PREFIX -view %s application/vnd.oasis.opendocument.text-web; %PREFIX -view %s application/vnd.oasis.opendocument.text-master; %PREFIX -view %s +application/vnd.oasis.opendocument.text-master-template; %PREFIX -view %s application/vnd.sun.xml.writer; %PREFIX -view %s application/vnd.sun.xml.writer.template; %PREFIX -view %s application/vnd.sun.xml.writer.global; %PREFIX -view %s diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec index 09aeaf525162..9c952a50ff01 100755 --- a/sysui/desktop/freedesktop/freedesktop-menus.spec +++ b/sysui/desktop/freedesktop/freedesktop-menus.spec @@ -150,6 +150,7 @@ do icon=${link_target_dir}%iconprefix-oasis-drawing-template.png; test -f ${link_dir}/$icon && ln -sf ${icon} ${link_dir}/gnome-mime-application-vnd.oasis.opendocument.graphics-template.png icon=${link_target_dir}%iconprefix-oasis-formula.png; test -f ${link_dir}/$icon && ln -sf ${icon} ${link_dir}/gnome-mime-application-vnd.oasis.opendocument.formula.png icon=${link_target_dir}%iconprefix-oasis-master-document.png; test -f ${link_dir}/$icon && ln -sf ${icon} ${link_dir}/gnome-mime-application-vnd.oasis.opendocument.text-master.png + icon=${link_target_dir}%iconprefix-oasis-master-document-template.png; test -f ${link_dir}/$icon && ln -sf ${icon} ${link_dir}/gnome-mime-application-vnd.oasis.opendocument.text-master-template.png icon=${link_target_dir}%iconprefix-oasis-presentation.png; test -f ${link_dir}/$icon && ln -sf ${icon} ${link_dir}/gnome-mime-application-vnd.oasis.opendocument.presentation.png icon=${link_target_dir}%iconprefix-oasis-presentation-template.png; test -f ${link_dir}/$icon && ln -sf ${icon} ${link_dir}/gnome-mime-application-vnd.oasis.opendocument.presentation-template.png icon=${link_target_dir}%iconprefix-oasis-spreadsheet.png; test -f ${link_dir}/$icon && ln -sf ${icon} ${link_dir}/gnome-mime-application-vnd.oasis.opendocument.spreadsheet.png diff --git a/sysui/desktop/icons/oasis-master-document-template.icns b/sysui/desktop/icons/oasis-master-document-template.icns Binary files differnew file mode 100644 index 000000000000..9115dfc4b443 --- /dev/null +++ b/sysui/desktop/icons/oasis-master-document-template.icns diff --git a/sysui/desktop/macosx/Info.plist.in b/sysui/desktop/macosx/Info.plist.in index f6d1dc83e66d..3dde39444504 100755 --- a/sysui/desktop/macosx/Info.plist.in +++ b/sysui/desktop/macosx/Info.plist.in @@ -358,6 +358,30 @@ </dict> </dict> + <!-- Writer master document templates --> + <dict> + <key>UTTypeIdentifier</key> + <string>org.oasis-open.opendocument.text-master-template</string> + <key>UTTypeDescription</key> + <string>OpenDocument Text Master Template</string> + <key>UTTypeConformsTo</key> + <array> + <string>public.data</string> + <string>public.content</string> + </array> + <key>UTTypeTagSpecification</key> + <dict> + <key>public.filename-extension</key> + <array> + <string>otm</string> + </array> + <key>public.mime-type</key> + <array> + <string>application/vnd.oasis.opendocument.text-master-template</string> + </array> + </dict> + </dict> + <!-- Spreadsheet template documents --> <dict> <key>UTTypeIdentifier</key> @@ -1118,6 +1142,24 @@ <dict> <key>CFBundleTypeExtensions</key> <array> + <string>otm</string> + </array> + <key>CFBundleTypeMIMETypes</key> + <array> + <string>application/vnd.oasis.opendocument.text-master-template</string> + </array> + <key>CFBundleTypeIconFile</key> + <string>oasis-master-template.icns</string> + <key>CFBundleTypeName</key> + <string>OpenDocument Master Template</string> + <key>CFBundleTypeRole</key> + <string>Editor</string> + <key>LSIsAppleDefaultForType</key> + <true/> + </dict> + <dict> + <key>CFBundleTypeExtensions</key> + <array> <string>stc</string> </array> <key>CFBundleTypeMIMETypes</key> @@ -1343,6 +1385,7 @@ <string>org.oasis-open.opendocument.formula</string> <string>org.openoffice.text-template</string> <string>org.oasis-open.opendocument.text-template</string> + <string>org.oasis-open.opendocument.text-master-template</string> <string>org.openoffice.spreadsheet-template</string> <string>org.oasis-open.opendocument.spreadsheet-template</string> <string>org.openoffice.presentation-template</string> diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop index c4cea1280e14..e22a7b465fe5 100644 --- a/sysui/desktop/menus/writer.desktop +++ b/sysui/desktop/menus/writer.desktop @@ -22,7 +22,7 @@ Icon=writer Type=Application Categories=Office;WordProcessor;X-Red-Hat-Base;X-MandrivaLinux-Office-Wordprocessors; Exec=${UNIXBASISROOTNAME} --writer %%FILE%% -MimeType=application/vnd.oasis.opendocument.text;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;application/vnd.ms-works;application/vnd.stardivision.writer-global;application/x-extension-txt;application/x-t602;text/plain;application/vnd.oasis.opendocument.text-flat-xml;application/x-fictionbook+xml;application/macwriteii;application/x-aportisdoc;application/prs.plucker;application/vnd.palm;application/clarisworks; +MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.oasis.opendocument.text-master-template;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;application/vnd.ms-works;application/vnd.stardivision.writer-global;application/x-extension-txt;application/x-t602;text/plain;application/vnd.oasis.opendocument.text-flat-xml;application/x-fictionbook+xml;application/macwriteii;application/x-aportisdoc;application/prs.plucker;application/vnd.palm;application/clarisworks; Name=%PRODUCTNAME Writer GenericName=Word Processor Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer. diff --git a/sysui/desktop/mimetypes/oasis-master-document-template.desktop b/sysui/desktop/mimetypes/oasis-master-document-template.desktop new file mode 100644 index 000000000000..a47588c392da --- /dev/null +++ b/sysui/desktop/mimetypes/oasis-master-document-template.desktop @@ -0,0 +1,26 @@ +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# This file incorporates work covered by the following license notice: +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . +# +[Desktop Entry] +Version=1.0 +Encoding=UTF-8 +Hidden=false +Icon=oasis-master-document-template +Type=MimeType +Patterns=*.otm +MimeType=application/vnd.oasis.opendocument.text-master-template +Comment=OpenDocument Master Document Template diff --git a/sysui/desktop/mimetypes/oasis-master-document-template.keys b/sysui/desktop/mimetypes/oasis-master-document-template.keys new file mode 100644 index 000000000000..3cd4d5efdd00 --- /dev/null +++ b/sysui/desktop/mimetypes/oasis-master-document-template.keys @@ -0,0 +1,9 @@ +application/vnd.oasis.opendocument.text-master-template + description=OpenDocument Master Document Template + default_action_type=application + short_list_application_ids_for_novice_user_level= + short_list_application_ids_for_intermediate_user_level= + short_list_application_ids_for_advanced_user_level= + category=Documents/Word Processor + use_category_default=yes + icon_filename=oasis-master-document-template diff --git a/sysui/desktop/mimetypes/openoffice.applications b/sysui/desktop/mimetypes/openoffice.applications index 26a34947b09c..8af25f65bf07 100755 --- a/sysui/desktop/mimetypes/openoffice.applications +++ b/sysui/desktop/mimetypes/openoffice.applications @@ -5,5 +5,5 @@ OFFICENAME expects_uris=true requires_terminal=false uses_gnomevfs=true - mime_types=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.oasis.opendocument.graphics,application/vnd.oasis.opendocument.graphics-flat-xml,application/vnd.oasis.opendocument.graphics-template,application/vnd.oasis.opendocument.presentation,application/vnd.oasis.opendocument.presentation-flat-xml,application/vnd.oasis.opendocument.presentation-template,application/vnd.oasis.opendocument.spreadsheet,application/vnd.oasis.opendocument.spreadsheet-flat-xml,application/vnd.oasis.opendocument.spreadsheet-template,application/vnd.oasis.opendocument.formula,application/vnd.oasis.opendocument.database,application/vnd.ms-excel,application/rtf,application/msword,application/vnd.ms-powerpoint,application/vnd.stardivision.calc,application/vnd.stardivision.chart,application/vnd.stardivision.draw,application/vnd.stardivision.impress,application/vnd.stardivision.mail,application/vnd.stardivision.math,application/vnd.stardivision.writer,application/vnd.sun.xml.calc,application/vnd.sun.xml.calc.template,application/vnd.sun.xml.draw,application/vnd.sun.xml.draw.template,application/vnd.sun.xml.impress,application/vnd.sun.xml.impress.template,application/vnd.sun.xml.math,application/vnd.sun.xml.writer,application/vnd.sun.xml.writer.global,application/vnd.sun.xml.writer.template,application/vnd.sun.xml.base,image/x-emf,image/x-pcx,image/x-photo-cd,image/x-pict;application/vnd.wordperfect;application/vnd.lotus-wordpro;application/vnd.openofficeorg.extension;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;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.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.ms-excel.sheet.binary.macroenabled.12;application/x-hwp;text/spreadsheet; + mime_types=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.oasis.opendocument.text-master-master,application/vnd.oasis.opendocument.graphics,application/vnd.oasis.opendocument.graphics-flat-xml,application/vnd.oasis.opendocument.graphics-template,application/vnd.oasis.opendocument.presentation,application/vnd.oasis.opendocument.presentation-flat-xml,application/vnd.oasis.opendocument.presentation-template,application/vnd.oasis.opendocument.spreadsheet,application/vnd.oasis.opendocument.spreadsheet-flat-xml,application/vnd.oasis.opendocument.spreadsheet-template,application/vnd.oasis.opendocument.formula,application/vnd.oasis.opendocument.database,application/vnd.ms-excel,application/rtf,application/msword,application/vnd.ms-powerpoint,application/vnd.stardivision.calc,application/vnd.stardivision.chart,application/vnd.stardivision.draw,application/vnd.stardivision.impress,application/vnd.stardivision.mail,application/vnd.stardivision.math,application/vnd.stardivision.writer,application/vnd.sun.xml.calc,application/vnd.sun.xml.calc.template,application/vnd.sun.xml.draw,application/vnd.sun.xml.draw.template,application/vnd.sun.xml.impress,application/vnd.sun.xml.impress.template,application/vnd.sun.xml.math,application/vnd.sun.xml.writer,application/vnd.sun.xml.writer.global,application/vnd.sun.xml.writer.template,application/vnd.sun.xml.base,image/x-emf,image/x-pcx,image/x-photo-cd,image/x-pict;application/vnd.wordperfect;application/vnd.lotus-wordpro;application/vnd.openofficeorg.extension;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;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.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.ms-excel.sheet.binary.macroenabled.12;application/x-hwp;text/spreadsheet; diff --git a/sysui/desktop/share/documents.ulf b/sysui/desktop/share/documents.ulf index cff942286f99..2073c17c3647 100644 --- a/sysui/desktop/share/documents.ulf +++ b/sysui/desktop/share/documents.ulf @@ -40,6 +40,9 @@ en-US = "OpenDocument Text Template" [oasis-master-document] en-US = "OpenDocument Master Document" +[oasis-master-document-template] +en-US = "OpenDocument Master Document Template" + [oasis-formula] en-US = "OpenDocument Formula" diff --git a/sysui/desktop/solaris/mailcap b/sysui/desktop/solaris/mailcap index 43c020761704..910fcbeb89cd 100755 --- a/sysui/desktop/solaris/mailcap +++ b/sysui/desktop/solaris/mailcap @@ -40,6 +40,7 @@ cat << END application/vnd.oasis.opendocument.text; %PREFIX -view %s application/vnd.oasis.opendocument.text-flat-xml; %PREFIX -view %s application/vnd.oasis.opendocument.text-template; %PREFIX -view %s +application/vnd.oasis.opendocument.text-master-template; %PREFIX -view %s application/vnd.oasis.opendocument.text-web; %PREFIX -view %s application/vnd.oasis.opendocument.text-master; %PREFIX -view %s application/vnd.sun.xml.writer; %PREFIX -view %s diff --git a/sysui/desktop/solaris/mime.types b/sysui/desktop/solaris/mime.types index 4758d47c1f2f..a5ee6838a9a9 100755 --- a/sysui/desktop/solaris/mime.types +++ b/sysui/desktop/solaris/mime.types @@ -32,6 +32,7 @@ application/vnd.oasis.opendocument.text-flat-xml fodt application/vnd.oasis.opendocument.text-template ott application/vnd.oasis.opendocument.text-web oth application/vnd.oasis.opendocument.text-master odm +application/vnd.oasis.opendocument.text-master-template otm application/vnd.oasis.opendocument.graphics odg application/vnd.oasis.opendocument.graphics-flat-xml fodg application/vnd.oasis.opendocument.graphics-template otg |