5 files changed, 121 insertions, 4 deletions
diff --git a/data/engrampa.desktop.in.in b/data/engrampa.desktop.in.in
index c23c8ab..84d86cb 100644
--- a/data/engrampa.desktop.in.in
+++ b/data/engrampa.desktop.in.in
@@ -11,7 +11,7 @@ Type=Application
 Icon=engrampa
 # Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 Categories=GTK;Utility;Archiving;Compression;
-MimeType=application/epub+zip;application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-arc;application/x-arj;application/x-brotli;application/x-brotli-compressed-tar;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/vnd.debian.binary-package;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lzh-compressed;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-source-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;@ZSTD_MIME_TYPE@;application/x-zstd-compressed-tar;application/zip;application/x-archive;application/vnd.ms-cab-compressed;
+MimeType=application/epub+zip;application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-arc;application/x-arj;application/x-brotli;application/x-brotli-compressed-tar;application/x-bzip;application/x-bzip2;application/bzip2;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/vnd.debian.binary-package;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/gzip;application/x-gzpostscript;application/x-java-archive;application/java-archive;application/jar;application/jar-archive;application/x-lha;application/x-lzh-compressed;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-source-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;application/zstd;application/x-zstd;application/x-zstd-compressed-tar;application/zip;application/x-archive;application/vnd.ms-cab-compressed;
 # Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 Keywords=MATE;archive;manager;compression;
 X-MATE-DocPath=engrampa/engrampa.xml
diff --git a/data/icons/meson.build b/data/icons/meson.build
new file mode 100644
index 0000000..93c4a29
--- /dev/null
+++ b/data/icons/meson.build
@@ -0,0 +1,35 @@
+apps_icons = [
+  ['16x16', 'engrampa.png'],
+  ['22x22', 'engrampa.png'],
+  ['24x24', 'engrampa.png'],
+  ['32x32', 'engrampa.png'],
+]
+
+actions_icons = [
+  ['16x16', 'add-folder-to-archive.png', 'extract-archive.png', 'add-files-to-archive.png'],
+  ['24x24', 'add-folder-to-archive.png', 'extract-archive.png', 'add-files-to-archive.png'],
+]
+
+foreach icon: actions_icons
+  install_data(
+    join_paths(icon[0], 'actions', icon[1]),
+    install_dir: join_paths(get_option('prefix'), 'share/icons', 'hicolor', icon[0], 'actions')
+  )
+  install_data(
+    join_paths(icon[0], 'actions', icon[2]),
+    install_dir: join_paths(get_option('prefix'), 'share/icons', 'hicolor', icon[0], 'actions')
+  )
+  install_data(
+    join_paths(icon[0], 'actions', icon[3]),
+    install_dir: join_paths(get_option('prefix'), 'share/icons', 'hicolor', icon[0], 'actions')
+  )
+endforeach
+
+foreach icon: apps_icons
+  install_data(
+    join_paths(icon[0], 'apps', icon[1]),
+    install_dir: join_paths(get_option('prefix'), 'share/icons', 'hicolor', icon[0], 'apps')
+  )
+endforeach
+
+install_subdir('scalable', install_dir : join_paths(datadir, 'icons', 'hicolor'))
diff --git a/data/meson.build b/data/meson.build
new file mode 100644
index 0000000..bde2aed
--- /dev/null
+++ b/data/meson.build
@@ -0,0 +1,74 @@
+po_dir = join_paths(meson.source_root(), 'po')
+man1_dir = join_paths(engrampa_mandir, 'man1')
+
+schema_data = configuration_data()
+schema_data.set('GETTEXT_PACKAGE', meson.project_name())
+configure_file(
+  input : 'org.mate.engrampa.gschema.xml.in',
+  output : 'org.mate.engrampa.gschema.xml',
+  configuration : schema_data,
+  install : true,
+  install_dir : join_paths(datadir, 'glib-2.0', 'schemas')
+)
+
+install_data('packages.match',
+  install_dir : join_paths(datadir, meson.project_name())
+)
+
+install_data('engrampa.1',
+  install_dir : man1_dir
+)
+
+# .desktop file
+
+desktop_data = configuration_data()
+desktop_data.set('VERSION', meson.project_version())
+desktop_in_file = configure_file(
+  input : 'engrampa.desktop.in.in',
+  output : 'engrampa.desktop.in',
+  configuration : desktop_data
+)
+
+i18n.merge_file(
+  input : desktop_in_file,
+  output : 'engrampa.desktop',
+  type : 'desktop',
+  po_dir : po_dir,
+  install : true,
+  install_dir : join_paths(datadir, 'applications')
+)
+
+# .service files
+
+service_data = configuration_data()
+service_data.set('libexecdir', join_paths(prefix, get_option('libexecdir')))
+
+configure_file(
+  input : 'org.mate.Engrampa.service.in',
+  output : 'org.mate.Engrampa.service',
+  configuration : service_data,
+  install : true,
+  install_dir : join_paths(datadir, 'dbus-1/services')
+)
+
+# .appdata file
+
+appdata_data = configuration_data()
+appdata_data.set('PACKAGE_URL', 'https://mate-desktop.org')
+appdata_in_file = configure_file(
+  input : 'engrampa.appdata.xml.in.in',
+  output : 'engrampa.appdata.xml.in',
+  configuration : appdata_data
+)
+i18n.merge_file(
+  input : appdata_in_file,
+  output : 'engrampa.appdata.xml',
+  type : 'xml',
+  po_dir : po_dir,
+  install : true,
+  install_dir : join_paths(datadir, 'metainfo')
+)
+
+# Subdirectories
+
+subdir('icons')
diff --git a/data/org.mate.engrampa.gschema.xml.in b/data/org.mate.engrampa.gschema.xml.in
index c997fd9..5b62190 100644
--- a/data/org.mate.engrampa.gschema.xml.in
+++ b/data/org.mate.engrampa.gschema.xml.in
@@ -150,6 +150,14 @@
       <default>true</default>
       <summary>Recreate the folders stored in the archive</summary>
     </key>
+    <key name="close-dialog" type="b">
+      <default>false</default>
+      <summary>Close dialog after decompression</summary>
+    </key>
+    <key name="create-subdirectory" type="b">
+      <default>false</default>
+      <summary>Create a folder with the archive name and extract there</summary>
+    </key>
   </schema>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.engrampa.dialogs.add" path="/org/mate/engrampa/dialogs/add/">
     <key name="current-folder" type="s">
diff --git a/data/packages.match b/data/packages.match
index 49f5d23..6bfafbc 100644
--- a/data/packages.match
+++ b/data/packages.match
@@ -15,9 +15,9 @@ lzma=
 lzop=
 ncompress=
 nomarch=
-p7zip=
-p7zip-full=
-p7zip-rar=
+7zip=
+7zip-full=
+7zip-rar=
 rar=
 rpm=
 rzip=