diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 38 | ||||
| -rw-r--r-- | data/eom-image-properties-dialog.ui | 6 | ||||
| -rw-r--r-- | data/eom-preferences-dialog.ui | 15 | ||||
| -rw-r--r-- | data/eom.appdata.xml.in.in (renamed from data/eom.appdata.xml.in) | 4 | ||||
| -rw-r--r-- | data/eom.desktop.in.in | 2 | ||||
| -rw-r--r-- | data/icons/meson.build | 33 | ||||
| -rw-r--r-- | data/meson.build | 57 |
7 files changed, 139 insertions, 16 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 4842527..67f1b1e 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,18 +1,28 @@ SUBDIRS = pixmaps icons -DESKTOP_IN_FILES= eom.desktop.in.in -DESKTOP_FILES= $(DESKTOP_IN_FILES:.desktop.in.in=.desktop) - desktopdir = $(datadir)/applications -desktop_DATA = $(DESKTOP_FILES) -$(desktop_DATA): $(DESKTOP_IN_FILES) +desktop_DATA = eom.desktop +desktop_in_files = $(desktop_DATA:.desktop=.desktop.in) +desktop_in_in_files = $(desktop_in_files:.desktop.in=.desktop.in.in) + +$(desktop_DATA): $(desktop_in_files) +if USE_NLS $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@ +else + $(AM_V_GEN) cp $< $@ +endif appdatadir = $(datadir)/metainfo -appdata_in_files = eom.appdata.xml.in -appdata_DATA = $(appdata_in_files:.xml.in=.xml) +appdata_DATA = eom.appdata.xml +appdata_in_files = $(appdata_DATA:.xml=.xml.in) +appdata_in_in_files = $(appdata_in_files:.xml.in=.xml.in.in) + $(appdata_DATA): $(appdata_in_files) +if USE_NLS $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@ +else + $(AM_V_GEN) cp $< $@ +endif gsettings_ENUM_NAMESPACE = org.mate.eom gsettings_ENUM_FILES = $(top_srcdir)/src/eom-scroll-view.h \ @@ -29,7 +39,7 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = eom.pc EXTRA_DIST = \ - $(ui_DATA) \ + $(ui_DATA) \ eom.css \ eom-image-properties-dialog.ui \ eom-multiple-save-as-dialog.ui \ @@ -37,14 +47,16 @@ EXTRA_DIST = \ eom-ui.xml \ metadata-sidebar.ui \ eom.about \ - $(DESKTOP_IN_FILES) \ - $(appdata_in_files) + $(appdata_in_in_files) \ + $(desktop_in_in_files) CLEANFILES = \ - $(appdata_DATA) + $(appdata_DATA) \ + $(desktop_DATA) DISTCLEANFILES = \ - $(DESKTOP_FILES) \ - $(gsettings_SCHEMAS) + $(appdata_in_files) \ + $(desktop_in_files) \ + $(gsettings_SCHEMAS) -include $(top_srcdir)/git.mk diff --git a/data/eom-image-properties-dialog.ui b/data/eom-image-properties-dialog.ui index fdff309..ab42ec1 100644 --- a/data/eom-image-properties-dialog.ui +++ b/data/eom-image-properties-dialog.ui @@ -145,6 +145,7 @@ <property name="margin-top">8</property> <property name="margin-bottom">8</property> <property name="label" translatable="yes">Name:</property> + <property name="mnemonic-widget">name_label</property> <property name="justify">right</property> <attributes> <attribute name="weight" value="bold"/> @@ -164,6 +165,7 @@ <property name="margin-top">8</property> <property name="margin-bottom">8</property> <property name="label" translatable="yes">Width:</property> + <property name="mnemonic-widget">width_label</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -182,6 +184,7 @@ <property name="margin-top">8</property> <property name="margin-bottom">8</property> <property name="label" translatable="yes">Height:</property> + <property name="mnemonic-widget">height_label</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -200,6 +203,7 @@ <property name="margin-top">8</property> <property name="margin-bottom">8</property> <property name="label" translatable="yes">Type:</property> + <property name="mnemonic-widget">type_label</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -218,6 +222,7 @@ <property name="margin-top">8</property> <property name="margin-bottom">8</property> <property name="label" translatable="yes">Bytes:</property> + <property name="mnemonic-widget">bytes_label</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -236,6 +241,7 @@ <property name="margin-top">8</property> <property name="margin-bottom">8</property> <property name="label" translatable="yes">Location:</property> + <property name="mnemonic-widget">folder_button</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/data/eom-preferences-dialog.ui b/data/eom-preferences-dialog.ui index 9974193..c32e5b2 100644 --- a/data/eom-preferences-dialog.ui +++ b/data/eom-preferences-dialog.ui @@ -277,6 +277,11 @@ <property name="can-focus">True</property> <property name="receives-default">True</property> <property name="title" translatable="yes">Background Color</property> + <child internal-child="accessible"> + <object class="AtkObject" id="bg_color_accessible"> + <property name="AtkObject::accessible-name" translatable="yes">Background Color</property> + </object> + </child> </object> <packing> <property name="expand">False</property> @@ -388,6 +393,11 @@ <property name="use-alpha">True</property> <property name="title" translatable="yes">Color for Transparent Areas</property> <property name="rgba">rgb(0,0,0)</property> + <child internal-child="accessible"> + <object class="AtkObject" id="transp_color_accessible"> + <property name="AtkObject::accessible-name" translatable="yes">Color for Transparent Areas</property> + </object> + </child> </object> <packing> <property name="expand">False</property> @@ -609,6 +619,11 @@ <property name="adjustment">adjustment1</property> <property name="climb-rate">1</property> <property name="numeric">True</property> + <child internal-child="accessible"> + <object class="AtkObject"> + <property name="AtkObject::accessible-name" translatable="yes">seconds</property> + </object> + </child> </object> <packing> <property name="expand">False</property> diff --git a/data/eom.appdata.xml.in b/data/eom.appdata.xml.in.in index b1a2635..3aa83a4 100644 --- a/data/eom.appdata.xml.in +++ b/data/eom.appdata.xml.in.in @@ -12,8 +12,8 @@ subsequent images in the directory the image was loaded from. </p> </description> - <url type="homepage">http://mate-desktop.org/</url> + <url type="homepage">@PACKAGE_URL@</url> <screenshots> - <screenshot type="default">http://mate-desktop.org/gallery/1.8/eom.png</screenshot> + <screenshot type="default">https://mate-desktop.org/gallery/1.8/eom.png</screenshot> </screenshots> </component> diff --git a/data/eom.desktop.in.in b/data/eom.desktop.in.in index 465546b..95e20eb 100644 --- a/data/eom.desktop.in.in +++ b/data/eom.desktop.in.in @@ -8,7 +8,7 @@ Icon=eom StartupNotify=true Terminal=false Type=Application -Categories=GTK;Graphics;RasterGraphics;Viewer; +Categories=GTK;Graphics;2DGraphics;RasterGraphics;Viewer; # Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! Keywords=image;viewer;JPEG;PNG;TIFF;SVG;MATE;photos;browse;thumbnails;rotate; X-MATE-Bugzilla-Bugzilla=MATE diff --git a/data/icons/meson.build b/data/icons/meson.build new file mode 100644 index 0000000..e7bfb26 --- /dev/null +++ b/data/icons/meson.build @@ -0,0 +1,33 @@ +actioniconsdir = pkgdatadir / 'icons' / 'hicolor' +appiconsdir = datadir / 'icons' / 'hicolor' + +foreach size : ['16x16', '22x22', '24x24', '32x32'] + install_data([ + size / 'actions/eom-image-collection.png', + size / 'actions/slideshow-play.png', + ], install_dir: actioniconsdir / size / 'actions') +endforeach + +foreach size : ['16x16', '22x22', '32x32'] + install_data([ + size / 'actions/eom-plugin.png', + ], install_dir: actioniconsdir / size / 'actions') +endforeach + +install_data('48x48/actions/slideshow-play.png', install_dir: actioniconsdir / '48x48' / 'actions') + +install_data([ + 'scalable/actions/eom-image-collection.svg', + 'scalable/actions/eom-plugin.svg', + 'scalable/actions/slideshow-play.svg', +], install_dir: actioniconsdir / 'scalable' / 'actions') + +foreach size : ['16x16', '22x22', '24x24', '32x32'] + install_data([ + size / 'apps/eom.png', + ], install_dir: appiconsdir / size / 'apps') +endforeach + +install_data(['scalable/apps/eom.svg'], install_dir: appiconsdir / 'scalable' / 'apps') + +gnome.post_install(gtk_update_icon_cache: true) diff --git a/data/meson.build b/data/meson.build new file mode 100644 index 0000000..06acf52 --- /dev/null +++ b/data/meson.build @@ -0,0 +1,57 @@ +subdir('icons') + +desktopdir = datadir / 'applications' +desktopfile = configure_file(input: 'eom.desktop.in.in', configuration: pkg_info, output: 'eom.desktop.in') + +if get_option('nls') + i18n.merge_file( + input: desktopfile, + output: 'eom.desktop', + install: true, + install_dir: desktopdir, + type: 'desktop', + po_dir: po_dir, + ) +else + install_data(desktopfile, install_dir: desktopdir, rename: ['eom.desktop']) +endif +gnome.post_install(update_desktop_database: true) + +appdatadir = join_paths(datadir, 'metainfo') +appdatafile = configure_file(input: 'eom.appdata.xml.in.in', configuration: pkg_info, output: 'eom.appdata.xml.in') + +if get_option('nls') + i18n.merge_file( + input: appdatafile, + output: 'eom.appdata.xml', + install: true, + install_dir: appdatadir, + type: 'xml', + po_dir: po_dir, + ) +else + install_data(appdatafile, install_dir: appdatadir, rename: ['eom.appdata.xml']) +endif + +gsettings_schema = configure_file(input: 'org.mate.eom.gschema.xml.in', configuration: pkg_info, output: 'org.mate.eom.gschema.xml') +install_data(gsettings_schema, install_dir: schemadir) +gnome.post_install(glib_compile_schemas: true) + +gnome.mkenums( + 'org.mate.eom.enums.xml', + comments: '<!-- @comment@ -->', + sources: enum_headers, + fhead: '<schemalist>', + vhead: ''' <@type@ id='org.mate.eom.@EnumName@'>''', + vprod: ''' <value nick='@valuenick@' value='@valuenum@'/>''', + vtail: ' </@type@>', + ftail: '</schemalist>', + install_header: true, + install_dir: schemadir +) + +eom_pc = configure_file(input: 'eom.pc.in', configuration: pkg_info, output: 'eom.pc') +install_data(eom_pc, install_dir: libdir / 'pkgconfig') + +uidir = pkgdatadir +install_data('eom-toolbar.xml', install_dir: uidir) |