diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 38 | ||||
| -rw-r--r-- | data/eom-image-properties-dialog.ui | 357 | ||||
| -rw-r--r-- | data/eom-multiple-save-as-dialog.ui | 223 | ||||
| -rw-r--r-- | data/eom-preferences-dialog.ui | 259 | ||||
| -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 |
8 files changed, 543 insertions, 430 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 fb26d85..ab42ec1 100644 --- a/data/eom-image-properties-dialog.ui +++ b/data/eom-image-properties-dialog.ui @@ -1,129 +1,78 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.1 --> +<!-- Generated with glade 3.38.2 --> <interface> <requires lib="gtk+" version="3.22"/> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">go-next</property> + </object> + <object class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">go-previous</property> + </object> + <object class="GtkImage" id="image3"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">window-close</property> + </object> <template class="EomPropertiesDialog" parent="GtkDialog"> - <property name="can_focus">False</property> - <property name="border_width">5</property> + <property name="can-focus">False</property> + <property name="border-width">5</property> <property name="title" translatable="yes">Image Properties</property> - <property name="icon_name">gtk-properties</property> - <property name="type_hint">dialog</property> - <child> - <placeholder/> - </child> + <property name="icon-name">gtk-properties</property> + <property name="type-hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="image-properties-dialog-vbox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">2</property> <child internal-child="action_area"> <object class="GtkButtonBox" id="dialog-action_area1"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="layout_style">end</property> + <property name="can-focus">False</property> + <property name="layout-style">end</property> <child> <object class="GtkButton" id="previous_button"> + <property name="label" translatable="yes">_Previous</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <child> - <object class="GtkBox" id="hbox21"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="spacing">2</property> - <child> - <object class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-go-back</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label43"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Previous</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="image">image2</property> + <property name="use-underline">True</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkButton" id="next_button"> + <property name="label" translatable="yes">_Next</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <child> - <object class="GtkBox" id="hbox20"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="spacing">2</property> - <child> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-go-forward</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label42"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Next</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="image">image1</property> + <property name="use-underline">True</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkButton" id="close_button"> - <property name="label">gtk-close</property> + <property name="label" translatable="yes">_Close</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> + <property name="can-focus">True</property> + <property name="can-default">True</property> + <property name="receives-default">False</property> + <property name="image">image3</property> + <property name="use-underline">True</property> </object> <packing> <property name="expand">False</property> @@ -135,33 +84,33 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="pack_type">end</property> + <property name="pack-type">end</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkNotebook" id="notebook"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="border_width">5</property> + <property name="can-focus">True</property> + <property name="border-width">5</property> <signal name="switch-page" handler="eom_properties_dialog_page_switch" object="EomPropertiesDialog" swapped="no"/> <child> <object class="GtkBox" id="general_box"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkBox" id="vbox27"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">10</property> + <property name="can-focus">False</property> + <property name="border-width">10</property> <property name="orientation">vertical</property> <child> <object class="GtkImage" id="thumbnail_image"> - <property name="width_request">100</property> - <property name="height_request">100</property> + <property name="width-request">100</property> + <property name="height-request">100</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-missing-image</property> + <property name="can-focus">False</property> + <property name="icon-name">image-missing</property> </object> <packing> <property name="expand">False</property> @@ -179,23 +128,24 @@ <child> <object class="GtkBox" id="hbox19"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">10</property> + <property name="can-focus">False</property> + <property name="border-width">10</property> <property name="spacing">7</property> <child> <object class="GtkBox" id="vbox29"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">5</property> <child> <object class="GtkLabel" id="label36"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="margin_top">8</property> - <property name="margin_bottom">8</property> + <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"/> @@ -210,11 +160,12 @@ <child> <object class="GtkLabel" id="label37"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="margin_top">8</property> - <property name="margin_bottom">8</property> + <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> @@ -228,11 +179,12 @@ <child> <object class="GtkLabel" id="label38"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="margin_top">8</property> - <property name="margin_bottom">8</property> + <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> @@ -246,11 +198,12 @@ <child> <object class="GtkLabel" id="label39"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="margin_top">8</property> - <property name="margin_bottom">8</property> + <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> @@ -264,11 +217,12 @@ <child> <object class="GtkLabel" id="label40"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="margin_top">8</property> - <property name="margin_bottom">8</property> + <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> @@ -282,11 +236,12 @@ <child> <object class="GtkLabel" id="label73"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="margin_top">8</property> - <property name="margin_bottom">8</property> + <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> @@ -307,16 +262,16 @@ <child> <object class="GtkBox" id="vbox30"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">5</property> <child> <object class="GtkLabel" id="name_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="margin_top">9</property> - <property name="margin_bottom">7</property> + <property name="margin-top">9</property> + <property name="margin-bottom">7</property> <property name="selectable">True</property> </object> <packing> @@ -328,10 +283,10 @@ <child> <object class="GtkLabel" id="width_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="margin_top">9</property> - <property name="margin_bottom">7</property> + <property name="margin-top">9</property> + <property name="margin-bottom">7</property> <property name="selectable">True</property> </object> <packing> @@ -343,10 +298,10 @@ <child> <object class="GtkLabel" id="height_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="margin_top">9</property> - <property name="margin_bottom">7</property> + <property name="margin-top">9</property> + <property name="margin-bottom">7</property> <property name="selectable">True</property> </object> <packing> @@ -358,10 +313,10 @@ <child> <object class="GtkLabel" id="type_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="margin_top">9</property> - <property name="margin_bottom">7</property> + <property name="margin-top">9</property> + <property name="margin-bottom">7</property> <property name="selectable">True</property> </object> <packing> @@ -373,10 +328,10 @@ <child> <object class="GtkLabel" id="bytes_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="margin_top">9</property> - <property name="margin_bottom">7</property> + <property name="margin-top">9</property> + <property name="margin-bottom">7</property> <property name="selectable">True</property> </object> <packing> @@ -389,8 +344,8 @@ <object class="GtkButton" id="folder_button"> <property name="label">button</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <signal name="clicked" handler="pd_folder_button_clicked_cb" object="EomPropertiesDialog" swapped="no"/> </object> <packing> @@ -418,39 +373,39 @@ <child type="tab"> <object class="GtkLabel" id="label4"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">General</property> </object> <packing> - <property name="tab_fill">False</property> + <property name="tab-fill">False</property> </packing> </child> <child> <object class="GtkBox" id="metadata_box"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkBox" id="hbox22"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">10</property> + <property name="can-focus">False</property> + <property name="border-width">10</property> <property name="spacing">7</property> <child> <object class="GtkBox" id="vbox38"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkBox" id="vbox31"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">5</property> <child> <object class="GtkLabel" id="label88"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Aperture Value:</property> <attributes> @@ -466,7 +421,7 @@ <child> <object class="GtkLabel" id="label83"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Exposure Time:</property> <attributes> @@ -482,7 +437,7 @@ <child> <object class="GtkLabel" id="label96"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Focal Length:</property> <attributes> @@ -498,7 +453,7 @@ <child> <object class="GtkLabel" id="label95"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Flash:</property> <attributes> @@ -514,7 +469,7 @@ <child> <object class="GtkLabel" id="label94"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">ISO Speed Rating:</property> <attributes> @@ -530,7 +485,7 @@ <child> <object class="GtkLabel" id="label93"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Metering Mode:</property> <attributes> @@ -546,7 +501,7 @@ <child> <object class="GtkLabel" id="label92"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Camera Model:</property> <property name="justify">right</property> @@ -563,7 +518,7 @@ <child> <object class="GtkLabel" id="label91"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Date/Time:</property> <attributes> @@ -587,13 +542,13 @@ <child> <object class="GtkBox" id="xmp_box"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">5</property> <child> <object class="GtkLabel" id="label111"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Description:</property> <attributes> @@ -609,7 +564,7 @@ <child> <object class="GtkLabel" id="label110"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Location:</property> <attributes> @@ -625,7 +580,7 @@ <child> <object class="GtkLabel" id="label112"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Keywords:</property> <attributes> @@ -641,7 +596,7 @@ <child> <object class="GtkLabel" id="label113"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Author:</property> <attributes> @@ -657,7 +612,7 @@ <child> <object class="GtkLabel" id="label114"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Copyright:</property> <attributes> @@ -687,20 +642,20 @@ <child> <object class="GtkBox" id="vbox40"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkBox" id="vbox32"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">5</property> <child> <object class="GtkLabel" id="exif_aperture_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="use_markup">True</property> + <property name="use-markup">True</property> <property name="justify">right</property> <property name="selectable">True</property> <property name="ellipsize">end</property> @@ -714,9 +669,9 @@ <child> <object class="GtkLabel" id="exif_exposure_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="use_markup">True</property> + <property name="use-markup">True</property> <property name="selectable">True</property> <property name="ellipsize">end</property> </object> @@ -729,9 +684,9 @@ <child> <object class="GtkLabel" id="exif_focal_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="use_markup">True</property> + <property name="use-markup">True</property> <property name="selectable">True</property> <property name="ellipsize">end</property> </object> @@ -744,9 +699,9 @@ <child> <object class="GtkLabel" id="exif_flash_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="use_markup">True</property> + <property name="use-markup">True</property> <property name="selectable">True</property> <property name="ellipsize">end</property> </object> @@ -759,9 +714,9 @@ <child> <object class="GtkLabel" id="exif_iso_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="use_markup">True</property> + <property name="use-markup">True</property> <property name="selectable">True</property> <property name="ellipsize">end</property> </object> @@ -774,9 +729,9 @@ <child> <object class="GtkLabel" id="exif_metering_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="use_markup">True</property> + <property name="use-markup">True</property> <property name="selectable">True</property> <property name="ellipsize">end</property> </object> @@ -789,9 +744,9 @@ <child> <object class="GtkLabel" id="exif_model_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="use_markup">True</property> + <property name="use-markup">True</property> <property name="selectable">True</property> <property name="ellipsize">end</property> </object> @@ -804,9 +759,9 @@ <child> <object class="GtkLabel" id="exif_date_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="use_markup">True</property> + <property name="use-markup">True</property> <property name="selectable">True</property> <property name="ellipsize">end</property> </object> @@ -827,15 +782,15 @@ <child> <object class="GtkBox" id="xmp_box_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">5</property> <child> <object class="GtkLabel" id="xmp_description_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="use_markup">True</property> + <property name="use-markup">True</property> <property name="justify">right</property> <property name="selectable">True</property> <property name="ellipsize">end</property> @@ -849,9 +804,9 @@ <child> <object class="GtkLabel" id="xmp_location_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="use_markup">True</property> + <property name="use-markup">True</property> <property name="selectable">True</property> <property name="ellipsize">end</property> </object> @@ -864,9 +819,9 @@ <child> <object class="GtkLabel" id="xmp_keywords_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="use_markup">True</property> + <property name="use-markup">True</property> <property name="selectable">True</property> <property name="ellipsize">end</property> </object> @@ -879,9 +834,9 @@ <child> <object class="GtkLabel" id="xmp_creator_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="use_markup">True</property> + <property name="use-markup">True</property> <property name="selectable">True</property> <property name="ellipsize">end</property> </object> @@ -894,9 +849,9 @@ <child> <object class="GtkLabel" id="xmp_rights_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="use_markup">True</property> + <property name="use-markup">True</property> <property name="selectable">True</property> <property name="ellipsize">end</property> </object> @@ -930,14 +885,14 @@ <child> <object class="GtkExpander" id="metadata_details_expander"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <child> <placeholder/> </child> <child type="label"> <object class="GtkLabel" id="details_expander"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Details</property> <attributes> <attribute name="weight" value="bold"/> @@ -950,7 +905,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">3</property> - <property name="pack_type">end</property> + <property name="pack-type">end</property> <property name="position">1</property> </packing> </child> @@ -962,18 +917,18 @@ <child type="tab"> <object class="GtkLabel" id="label44"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Metadata</property> </object> <packing> <property name="position">1</property> - <property name="tab_fill">False</property> + <property name="tab-fill">False</property> </packing> </child> <child> <object class="GtkBox" id="metadata_details_box"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <placeholder/> @@ -986,12 +941,12 @@ <child type="tab"> <object class="GtkLabel" id="md_details_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Details</property> </object> <packing> <property name="position">2</property> - <property name="tab_fill">False</property> + <property name="tab-fill">False</property> </packing> </child> </object> diff --git a/data/eom-multiple-save-as-dialog.ui b/data/eom-multiple-save-as-dialog.ui index dcea40a..f41efa0 100644 --- a/data/eom-multiple-save-as-dialog.ui +++ b/data/eom-multiple-save-as-dialog.ui @@ -1,39 +1,50 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.20.0 --> +<!-- Generated with glade 3.38.2 --> <!--*- mode: xml -*--> <interface> - <requires lib="gtk+" version="3.14"/> + <requires lib="gtk+" version="3.22"/> <object class="GtkAdjustment" id="adjustment1"> <property name="upper">10000000</property> <property name="value">1</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> + <property name="step-increment">1</property> + <property name="page-increment">10</property> + </object> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">document-save-as</property> + </object> + <object class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">process-stop</property> </object> <object class="GtkDialog" id="eom_multiple_save_as_dialog"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="border_width">5</property> + <property name="border-width">5</property> <property name="title" translatable="yes">Save As</property> - <property name="window_position">center-on-parent</property> - <property name="type_hint">dialog</property> + <property name="window-position">center-on-parent</property> + <property name="type-hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox4"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">2</property> <child internal-child="action_area"> <object class="GtkButtonBox" id="dialog-action_area4"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="layout_style">end</property> + <property name="can-focus">False</property> + <property name="layout-style">end</property> <child> <object class="GtkButton" id="cancel_button"> - <property name="label">gtk-cancel</property> + <property name="label" translatable="yes">_Cancel</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="image">image2</property> + <property name="use-underline">True</property> </object> <packing> <property name="expand">True</property> @@ -43,11 +54,12 @@ </child> <child> <object class="GtkButton" id="save_as_button"> - <property name="label">gtk-save-as</property> + <property name="label" translatable="yes">Save _As</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="image">image1</property> + <property name="use-underline">True</property> </object> <packing> <property name="expand">True</property> @@ -59,47 +71,48 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack_type">end</property> + <property name="pack-type">end</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkBox" id="vbox1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkFrame" id="frame2"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="can-focus">False</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> <child> <object class="GtkAlignment" id="alignment3"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="bottom_padding">6</property> - <property name="left_padding">12</property> + <property name="can-focus">False</property> + <property name="top-padding">6</property> + <property name="bottom-padding">6</property> + <property name="left-padding">12</property> <child> + <!-- n-columns=3 n-rows=3 --> <object class="GtkGrid" id="table3"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">6</property> + <property name="can-focus">False</property> + <property name="row-spacing">6</property> + <property name="column-spacing">6</property> <child> <object class="GtkBox" id="vbox2"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkLabel" id="label12"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes"><b>%f:</b> original filename</property> - <property name="use_markup">True</property> + <property name="use-markup">True</property> <attributes> <attribute name="style" value="italic"/> <attribute name="scale" value="0.80000000000000004"/> @@ -114,10 +127,10 @@ <child> <object class="GtkLabel" id="label17"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes"><b>%n:</b> counter</property> - <property name="use_markup">True</property> + <property name="use-markup">True</property> <attributes> <attribute name="style" value="italic"/> <attribute name="scale" value="0.80000000000000004"/> @@ -131,71 +144,71 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> + <property name="left-attach">1</property> + <property name="top-attach">2</property> <property name="width">2</property> </packing> </child> <child> <object class="GtkComboBox" id="format_combobox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> + <property name="left-attach">2</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkEntry" id="token_entry"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="hexpand">True</property> - <property name="invisible_char">*</property> + <property name="invisible-char">*</property> <property name="text">%f</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="left-attach">1</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkFileChooserButton" id="dir_chooser"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="action">select-folder</property> - <property name="local_only">False</property> + <property name="local-only">False</property> <property name="title" translatable="yes">Choose a folder</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="left-attach">1</property> + <property name="top-attach">0</property> <property name="width">2</property> </packing> </child> <child> <object class="GtkLabel" id="label10"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Destination folder:</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkLabel" id="label11"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Filename format:</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> <child> @@ -208,7 +221,7 @@ <child type="label"> <object class="GtkLabel" id="label1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">File Path Specifications</property> <attributes> <attribute name="weight" value="bold"/> @@ -225,31 +238,31 @@ <child> <object class="GtkFrame" id="frame3"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="can-focus">False</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> <child> <object class="GtkAlignment" id="alignment4"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="bottom_padding">6</property> - <property name="left_padding">12</property> + <property name="can-focus">False</property> + <property name="top-padding">6</property> + <property name="bottom-padding">6</property> + <property name="left-padding">12</property> <child> <object class="GtkBox" id="vbox33"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">2</property> <child> <object class="GtkBox" id="hbox23"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label23"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Start counter at:</property> </object> <packing> @@ -261,10 +274,10 @@ <child> <object class="GtkSpinButton" id="counter_spin"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="adjustment">adjustment1</property> - <property name="climb_rate">1</property> + <property name="climb-rate">1</property> <property name="numeric">True</property> </object> <packing> @@ -284,10 +297,10 @@ <object class="GtkCheckButton" id="replace_spaces_check"> <property name="label" translatable="yes">Replace spaces with underscores</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> </object> <packing> <property name="expand">False</property> @@ -303,7 +316,7 @@ <child type="label"> <object class="GtkLabel" id="label2"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Options</property> <attributes> <attribute name="weight" value="bold"/> @@ -320,71 +333,87 @@ <child> <object class="GtkFrame" id="frame4"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="can-focus">False</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> <child> <object class="GtkAlignment" id="alignment5"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="bottom_padding">6</property> - <property name="left_padding">12</property> + <property name="can-focus">False</property> + <property name="top-padding">6</property> + <property name="bottom-padding">6</property> + <property name="left-padding">12</property> <child> + <!-- n-columns=3 n-rows=3 --> <object class="GtkGrid" id="table5"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">6</property> - <property name="column_homogeneous">True</property> + <property name="can-focus">False</property> + <property name="row-spacing">6</property> + <property name="column-spacing">6</property> + <property name="column-homogeneous">True</property> <child> <object class="GtkLabel" id="preview_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label">label</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="left-attach">1</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkLabel" id="preview_label_from"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label">label</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="left-attach">1</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkLabel" id="label116"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Rename from:</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkLabel" id="label115"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">To:</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> </child> </object> @@ -392,7 +421,7 @@ <child type="label"> <object class="GtkLabel" id="label3"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">File Name Preview</property> <attributes> <attribute name="weight" value="bold"/> diff --git a/data/eom-preferences-dialog.ui b/data/eom-preferences-dialog.ui index 7e2d676..c32e5b2 100644 --- a/data/eom-preferences-dialog.ui +++ b/data/eom-preferences-dialog.ui @@ -1,37 +1,48 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.20.0 --> +<!-- Generated with glade 3.38.2 --> <interface> - <requires lib="gtk+" version="3.14"/> + <requires lib="gtk+" version="3.22"/> <requires lib="libpeas-gtk" version="1.0"/> <object class="GtkAdjustment" id="adjustment1"> <property name="lower">1</property> <property name="upper">100</property> <property name="value">5</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> + <property name="step-increment">1</property> + <property name="page-increment">10</property> + </object> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">window-close</property> + </object> + <object class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">help-browser</property> </object> <template class="EomPreferencesDialog" parent="GtkDialog"> - <property name="can_focus">False</property> - <property name="border_width">5</property> + <property name="can-focus">False</property> + <property name="border-width">5</property> <property name="title" translatable="yes">Eye of MATE Preferences</property> - <property name="type_hint">dialog</property> + <property name="type-hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">2</property> <child internal-child="action_area"> <object class="GtkButtonBox" id="dialog-action_area1"> - <property name="can_focus">False</property> - <property name="layout_style">end</property> + <property name="can-focus">False</property> + <property name="layout-style">end</property> <child> <object class="GtkButton" id="help_button"> - <property name="label">gtk-help</property> + <property name="label" translatable="yes">_Help</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> + <property name="can-focus">True</property> + <property name="can-default">True</property> + <property name="receives-default">False</property> + <property name="image">image2</property> + <property name="use-underline">True</property> </object> <packing> <property name="expand">False</property> @@ -41,12 +52,13 @@ </child> <child> <object class="GtkButton" id="close_button"> - <property name="label">gtk-close</property> + <property name="label" translatable="yes">_Close</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> + <property name="can-focus">True</property> + <property name="can-default">True</property> + <property name="receives-default">False</property> + <property name="image">image1</property> + <property name="use-underline">True</property> </object> <packing> <property name="expand">False</property> @@ -58,32 +70,32 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="pack_type">end</property> + <property name="pack-type">end</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkNotebook" id="notebook"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="border_width">5</property> + <property name="can-focus">True</property> + <property name="border-width">5</property> <child> <object class="GtkBox" id="vbox5"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="can-focus">False</property> + <property name="border-width">12</property> <property name="orientation">vertical</property> <property name="spacing">18</property> <child> <object class="GtkBox" id="vbox6"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label6"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Image Enhancements</property> <attributes> @@ -99,11 +111,11 @@ <child> <object class="GtkBox" id="hbox_interpolate"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkLabel" id="label_interpolate"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label"> </property> </object> <packing> @@ -116,10 +128,10 @@ <object class="GtkCheckButton" id="interpolate_check"> <property name="label" translatable="yes">Smooth images when zoomed-_out</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> </object> <packing> <property name="expand">False</property> @@ -137,11 +149,11 @@ <child> <object class="GtkBox" id="hbox_extrapolate"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkLabel" id="label_extrapolate"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label"> </property> </object> <packing> @@ -154,10 +166,10 @@ <object class="GtkCheckButton" id="extrapolate_check"> <property name="label" translatable="yes">Smooth images when zoomed-_in</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> </object> <packing> <property name="expand">False</property> @@ -175,11 +187,11 @@ <child> <object class="GtkBox" id="hboxautorotate"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkLabel" id="labelautopad"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label"> </property> </object> <packing> @@ -192,10 +204,10 @@ <object class="GtkCheckButton" id="autorotate_check"> <property name="label" translatable="yes">_Automatic orientation</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> </object> <packing> <property name="expand">False</property> @@ -220,13 +232,13 @@ <child> <object class="GtkBox" id="vbox1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Background</property> <attributes> @@ -242,16 +254,16 @@ <child> <object class="GtkBox" id="hbox1"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">16</property> + <property name="can-focus">False</property> + <property name="margin-start">16</property> <property name="spacing">12</property> <child> <object class="GtkCheckButton" id="bg_color_check"> <property name="label" translatable="yes">As custom color:</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="draw_indicator">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="draw-indicator">True</property> </object> <packing> <property name="expand">False</property> @@ -262,9 +274,14 @@ <child> <object class="GtkColorButton" id="bg_color_button"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <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> @@ -289,13 +306,13 @@ <child> <object class="GtkBox" id="vbox7"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label8"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Transparent Parts</property> <attributes> @@ -311,11 +328,11 @@ <child> <object class="GtkBox" id="hbox4"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkLabel" id="label9"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label"> </property> </object> <packing> @@ -327,18 +344,18 @@ <child> <object class="GtkBox" id="vbox8"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkRadioButton" id="checkpattern_radio"> <property name="label" translatable="yes">As check _pattern</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> <property name="halign">start</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> </object> <packing> <property name="expand">False</property> @@ -349,16 +366,16 @@ <child> <object class="GtkBox" id="hbox5"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="spacing">6</property> <child> <object class="GtkRadioButton" id="color_radio"> <property name="label" translatable="yes">As custom c_olor:</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> <property name="group">checkpattern_radio</property> </object> <packing> @@ -370,12 +387,17 @@ <child> <object class="GtkColorButton" id="transp_color_button"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="margin_left">6</property> - <property name="use_alpha">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="margin-start">6</property> + <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> @@ -394,11 +416,11 @@ <object class="GtkRadioButton" id="background_radio"> <property name="label" translatable="yes">As _background</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> <property name="halign">start</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> <property name="group">checkpattern_radio</property> </object> <packing> @@ -433,30 +455,30 @@ <child type="tab"> <object class="GtkLabel" id="label4"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Image View</property> </object> <packing> - <property name="tab_fill">False</property> + <property name="tab-fill">False</property> </packing> </child> <child> <object class="GtkBox" id="vbox11"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="can-focus">False</property> + <property name="border-width">12</property> <property name="orientation">vertical</property> <property name="spacing">18</property> <child> <object class="GtkBox" id="vbox12"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label13"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Image Zoom</property> <attributes> @@ -472,11 +494,11 @@ <child> <object class="GtkBox" id="hbox7"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkLabel" id="label14"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label"> </property> </object> <packing> @@ -488,17 +510,17 @@ <child> <object class="GtkBox" id="vbox13"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="upscale_check"> <property name="label" translatable="yes">E_xpand images to fit screen</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> </object> <packing> <property name="expand">False</property> @@ -530,13 +552,13 @@ <child> <object class="GtkBox" id="vbox14"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label15"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Sequence</property> <attributes> @@ -552,11 +574,11 @@ <child> <object class="GtkBox" id="hbox8"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkLabel" id="label16"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label"> </property> </object> <packing> @@ -568,21 +590,21 @@ <child> <object class="GtkBox" id="vbox15"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkBox" id="seconds_hbox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label36"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">_Switch image after:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">seconds_spin</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">seconds_spin</property> </object> <packing> <property name="expand">False</property> @@ -593,10 +615,15 @@ <child> <object class="GtkSpinButton" id="seconds_spin"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="adjustment">adjustment1</property> - <property name="climb_rate">1</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> @@ -607,7 +634,7 @@ <child> <object class="GtkLabel" id="label18"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">seconds</property> </object> <packing> @@ -627,11 +654,11 @@ <object class="GtkCheckButton" id="random_check"> <property name="label" translatable="yes">_Random sequence</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> <property name="halign">start</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> </object> <packing> <property name="expand">False</property> @@ -643,11 +670,11 @@ <object class="GtkCheckButton" id="loop_check"> <property name="label" translatable="yes">_Loop sequence</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> <property name="halign">start</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> </object> <packing> <property name="expand">False</property> @@ -684,24 +711,24 @@ <child type="tab"> <object class="GtkLabel" id="label5"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Slideshow</property> </object> <packing> <property name="position">1</property> - <property name="tab_fill">False</property> + <property name="tab-fill">False</property> </packing> </child> <child> <object class="GtkBox" id="plugin_manager_container"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="can-focus">False</property> + <property name="border-width">12</property> <property name="orientation">vertical</property> <child> <object class="PeasGtkPluginManager" id="plugin_manager"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> </object> <packing> @@ -718,12 +745,12 @@ <child type="tab"> <object class="GtkLabel" id="label97"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Plugins</property> </object> <packing> <property name="position">2</property> - <property name="tab_fill">False</property> + <property name="tab-fill">False</property> </packing> </child> </object> 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) |