diff options
| author | raveit65 <[email protected]> | 2017-04-22 21:23:46 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2017-04-23 12:17:43 +0200 |
| commit | e87b765d2cfaa6cd9abaf952a3b795f086d403e0 (patch) | |
| tree | 32833deaf438145b3ab0864943fc81a7462fbffe | |
| parent | 031f26385824b4dc265a182260b0bc3045eaffc4 (diff) | |
| download | eom-e87b765d2cfaa6cd9abaf952a3b795f086d403e0.tar.bz2 eom-e87b765d2cfaa6cd9abaf952a3b795f086d403e0.tar.xz | |
UI: avoid using deprecaded widgets
| -rw-r--r-- | data/eom-image-properties-dialog.ui | 493 | ||||
| -rw-r--r-- | data/eom-preferences-dialog.ui | 279 |
2 files changed, 470 insertions, 302 deletions
diff --git a/data/eom-image-properties-dialog.ui b/data/eom-image-properties-dialog.ui index f1d83ca..d0711d6 100644 --- a/data/eom-image-properties-dialog.ui +++ b/data/eom-image-properties-dialog.ui @@ -1,33 +1,162 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.20.0 --> <interface> - <!-- interface-requires gtk+ 2.12 --> - <!-- interface-naming-policy toplevel-contextual --> + <requires lib="gtk+" version="3.14"/> <object class="GtkDialog" id="eom_image_properties_dialog"> + <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 internal-child="vbox"> - <object class="GtkVBox" id="image-properties-dialog-vbox"> + <object class="GtkBox" id="image-properties-dialog-vbox"> <property name="visible">True</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> + <child> + <object class="GtkButton" id="previous_button"> + <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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="next_button"> + <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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="close_button"> + <property name="label">gtk-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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</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> <child> - <object class="GtkHBox" id="general_box"> + <object class="GtkBox" id="general_box"> <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkVBox" id="vbox27"> + <object class="GtkBox" id="vbox27"> <property name="visible">True</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="visible">True</property> + <property name="can_focus">False</property> <property name="stock">gtk-missing-image</property> </object> <packing> @@ -39,26 +168,31 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox19"> + <object class="GtkBox" id="hbox19"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">10</property> <property name="spacing">7</property> <child> - <object class="GtkVBox" id="vbox29"> + <object class="GtkBox" id="vbox29"> <property name="visible">True</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="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">Name:</property> <property name="justify">right</property> <attributes> - <attribute name="weight" value="PANGO_WEIGHT_BOLD"/> + <attribute name="weight" value="bold"/> </attributes> </object> <packing> @@ -70,10 +204,11 @@ <child> <object class="GtkLabel" id="label37"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">Width:</property> <attributes> - <attribute name="weight" value="PANGO_WEIGHT_BOLD"/> + <attribute name="weight" value="bold"/> </attributes> </object> <packing> @@ -85,10 +220,11 @@ <child> <object class="GtkLabel" id="label38"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">Height:</property> <attributes> - <attribute name="weight" value="PANGO_WEIGHT_BOLD"/> + <attribute name="weight" value="bold"/> </attributes> </object> <packing> @@ -100,10 +236,11 @@ <child> <object class="GtkLabel" id="label39"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">Type:</property> <attributes> - <attribute name="weight" value="PANGO_WEIGHT_BOLD"/> + <attribute name="weight" value="bold"/> </attributes> </object> <packing> @@ -115,10 +252,11 @@ <child> <object class="GtkLabel" id="label40"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">Bytes:</property> <attributes> - <attribute name="weight" value="PANGO_WEIGHT_BOLD"/> + <attribute name="weight" value="bold"/> </attributes> </object> <packing> @@ -130,10 +268,11 @@ <child> <object class="GtkLabel" id="label73"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">Location:</property> <attributes> - <attribute name="weight" value="PANGO_WEIGHT_BOLD"/> + <attribute name="weight" value="bold"/> </attributes> </object> <packing> @@ -150,13 +289,16 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox30"> + <object class="GtkBox" id="vbox30"> <property name="visible">True</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="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="selectable">True</property> </object> <packing> @@ -168,7 +310,8 @@ <child> <object class="GtkLabel" id="width_label"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="selectable">True</property> </object> <packing> @@ -180,7 +323,8 @@ <child> <object class="GtkLabel" id="height_label"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="selectable">True</property> </object> <packing> @@ -192,7 +336,8 @@ <child> <object class="GtkLabel" id="type_label"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="selectable">True</property> </object> <packing> @@ -204,7 +349,8 @@ <child> <object class="GtkLabel" id="bytes_label"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="selectable">True</property> </object> <packing> @@ -216,8 +362,8 @@ <child> <object class="GtkLabel" id="location_label"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0.47999998927116394</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="selectable">True</property> <property name="ellipsize">end</property> </object> @@ -229,11 +375,15 @@ </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -242,6 +392,7 @@ <child type="tab"> <object class="GtkLabel" id="label4"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">General</property> </object> <packing> @@ -249,27 +400,35 @@ </packing> </child> <child> - <object class="GtkVBox" id="exif_box"> + <object class="GtkBox" id="exif_box"> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> <child> - <object class="GtkHBox" id="hbox22"> + <object class="GtkBox" id="hbox22"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">10</property> <property name="spacing">7</property> <child> - <object class="GtkVBox" id="vbox38"> + <object class="GtkBox" id="vbox38"> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> <child> - <object class="GtkVBox" id="vbox31"> + <object class="GtkBox" id="vbox31"> <property name="visible">True</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="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">Aperture Value:</property> <attributes> - <attribute name="weight" value="PANGO_WEIGHT_BOLD"/> + <attribute name="weight" value="bold"/> </attributes> </object> <packing> @@ -281,10 +440,11 @@ <child> <object class="GtkLabel" id="label83"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">Exposure Time:</property> <attributes> - <attribute name="weight" value="PANGO_WEIGHT_BOLD"/> + <attribute name="weight" value="bold"/> </attributes> </object> <packing> @@ -296,10 +456,11 @@ <child> <object class="GtkLabel" id="label96"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">Focal Length:</property> <attributes> - <attribute name="weight" value="PANGO_WEIGHT_BOLD"/> + <attribute name="weight" value="bold"/> </attributes> </object> <packing> @@ -311,10 +472,11 @@ <child> <object class="GtkLabel" id="label95"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">Flash:</property> <attributes> - <attribute name="weight" value="PANGO_WEIGHT_BOLD"/> + <attribute name="weight" value="bold"/> </attributes> </object> <packing> @@ -326,10 +488,11 @@ <child> <object class="GtkLabel" id="label94"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">ISO Speed Rating:</property> <attributes> - <attribute name="weight" value="PANGO_WEIGHT_BOLD"/> + <attribute name="weight" value="bold"/> </attributes> </object> <packing> @@ -341,10 +504,11 @@ <child> <object class="GtkLabel" id="label93"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">Metering Mode:</property> <attributes> - <attribute name="weight" value="PANGO_WEIGHT_BOLD"/> + <attribute name="weight" value="bold"/> </attributes> </object> <packing> @@ -356,11 +520,12 @@ <child> <object class="GtkLabel" id="label92"> <property name="visible">True</property> - <property name="xalign">0</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> <attributes> - <attribute name="weight" value="PANGO_WEIGHT_BOLD"/> + <attribute name="weight" value="bold"/> </attributes> </object> <packing> @@ -372,10 +537,11 @@ <child> <object class="GtkLabel" id="label91"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">Date/Time:</property> <attributes> - <attribute name="weight" value="PANGO_WEIGHT_BOLD"/> + <attribute name="weight" value="bold"/> </attributes> </object> <packing> @@ -386,21 +552,26 @@ </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="padding">5</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkVBox" id="xmp_box"> + <object class="GtkBox" id="xmp_box"> <property name="visible">True</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="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">Description:</property> <attributes> - <attribute name="weight" value="PANGO_WEIGHT_BOLD"/> + <attribute name="weight" value="bold"/> </attributes> </object> <packing> @@ -412,10 +583,11 @@ <child> <object class="GtkLabel" id="label110"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">Location:</property> <attributes> - <attribute name="weight" value="PANGO_WEIGHT_BOLD"/> + <attribute name="weight" value="bold"/> </attributes> </object> <packing> @@ -427,10 +599,11 @@ <child> <object class="GtkLabel" id="label112"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">Keywords:</property> <attributes> - <attribute name="weight" value="PANGO_WEIGHT_BOLD"/> + <attribute name="weight" value="bold"/> </attributes> </object> <packing> @@ -442,10 +615,11 @@ <child> <object class="GtkLabel" id="label113"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">Author:</property> <attributes> - <attribute name="weight" value="PANGO_WEIGHT_BOLD"/> + <attribute name="weight" value="bold"/> </attributes> </object> <packing> @@ -457,10 +631,11 @@ <child> <object class="GtkLabel" id="label114"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">Copyright:</property> <attributes> - <attribute name="weight" value="PANGO_WEIGHT_BOLD"/> + <attribute name="weight" value="bold"/> </attributes> </object> <packing> @@ -471,26 +646,34 @@ </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkVBox" id="vbox40"> + <object class="GtkBox" id="vbox40"> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> <child> - <object class="GtkVBox" id="vbox32"> + <object class="GtkBox" id="vbox32"> <property name="visible">True</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="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="use_markup">True</property> <property name="justify">right</property> <property name="selectable">True</property> @@ -505,7 +688,8 @@ <child> <object class="GtkLabel" id="exif_exposure_label"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="use_markup">True</property> <property name="selectable">True</property> <property name="ellipsize">end</property> @@ -519,7 +703,8 @@ <child> <object class="GtkLabel" id="exif_focal_label"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="use_markup">True</property> <property name="selectable">True</property> <property name="ellipsize">end</property> @@ -533,7 +718,8 @@ <child> <object class="GtkLabel" id="exif_flash_label"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="use_markup">True</property> <property name="selectable">True</property> <property name="ellipsize">end</property> @@ -547,7 +733,8 @@ <child> <object class="GtkLabel" id="exif_iso_label"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="use_markup">True</property> <property name="selectable">True</property> <property name="ellipsize">end</property> @@ -561,7 +748,8 @@ <child> <object class="GtkLabel" id="exif_metering_label"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="use_markup">True</property> <property name="selectable">True</property> <property name="ellipsize">end</property> @@ -575,7 +763,8 @@ <child> <object class="GtkLabel" id="exif_model_label"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="use_markup">True</property> <property name="selectable">True</property> <property name="ellipsize">end</property> @@ -589,7 +778,8 @@ <child> <object class="GtkLabel" id="exif_date_label"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="use_markup">True</property> <property name="selectable">True</property> <property name="ellipsize">end</property> @@ -602,18 +792,23 @@ </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="padding">5</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkVBox" id="xmp_box_label"> + <object class="GtkBox" id="xmp_box_label"> <property name="visible">True</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="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="use_markup">True</property> <property name="justify">right</property> <property name="selectable">True</property> @@ -628,7 +823,8 @@ <child> <object class="GtkLabel" id="xmp_location_label"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="use_markup">True</property> <property name="selectable">True</property> <property name="ellipsize">end</property> @@ -642,7 +838,8 @@ <child> <object class="GtkLabel" id="xmp_keywords_label"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="use_markup">True</property> <property name="selectable">True</property> <property name="ellipsize">end</property> @@ -656,7 +853,8 @@ <child> <object class="GtkLabel" id="xmp_creator_label"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="use_markup">True</property> <property name="selectable">True</property> <property name="ellipsize">end</property> @@ -670,7 +868,8 @@ <child> <object class="GtkLabel" id="xmp_rights_label"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="use_markup">True</property> <property name="selectable">True</property> <property name="ellipsize">end</property> @@ -683,17 +882,22 @@ </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -707,14 +911,17 @@ <child type="label"> <object class="GtkLabel" id="details_expander"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Details</property> <attributes> - <attribute name="weight" value="PANGO_WEIGHT_BOLD"/> + <attribute name="weight" value="bold"/> </attributes> </object> </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="padding">3</property> <property name="pack_type">end</property> <property name="position">1</property> @@ -728,6 +935,7 @@ <child type="tab"> <object class="GtkLabel" id="label44"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Metadata</property> </object> <packing> @@ -736,8 +944,9 @@ </packing> </child> <child> - <object class="GtkVBox" id="metadata_details_box"> + <object class="GtkBox" id="metadata_details_box"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> <placeholder/> @@ -750,6 +959,7 @@ <child type="tab"> <object class="GtkLabel" id="md_details_label"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Details</property> </object> <packing> @@ -759,131 +969,9 @@ </child> </object> <packing> - <property name="position">1</property> - </packing> - </child> - <child internal-child="action_area"> - <object class="GtkHButtonBox" id="dialog-action_area1"> - <property name="visible">True</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="previous_button"> - <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="GtkAlignment" id="alignment2"> - <property name="visible">True</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <child> - <object class="GtkHBox" id="hbox21"> - <property name="visible">True</property> - <property name="spacing">2</property> - <child> - <object class="GtkImage" id="image2"> - <property name="visible">True</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="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> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="next_button"> - <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="GtkAlignment" id="alignment1"> - <property name="visible">True</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <child> - <object class="GtkHBox" id="hbox20"> - <property name="visible">True</property> - <property name="spacing">2</property> - <child> - <object class="GtkImage" id="image1"> - <property name="visible">True</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="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> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="close_button"> - <property name="label">gtk-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> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - </object> - <packing> <property name="expand">False</property> - <property name="pack_type">end</property> - <property name="position">0</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> @@ -893,5 +981,8 @@ <action-widget response="0">next_button</action-widget> <action-widget response="-7">close_button</action-widget> </action-widgets> + <style> + <class name="eom-image-properties-dialog"/> + </style> </object> </interface> diff --git a/data/eom-preferences-dialog.ui b/data/eom-preferences-dialog.ui index 5f3785e..5b17d78 100644 --- a/data/eom-preferences-dialog.ui +++ b/data/eom-preferences-dialog.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.20.0 --> <interface> - <requires lib="gtk+" version="2.20"/> - <!-- interface-naming-policy toplevel-contextual --> + <requires lib="gtk+" version="3.14"/> <object class="GtkAdjustment" id="adjustment1"> <property name="lower">1</property> <property name="upper">100</property> @@ -10,31 +10,82 @@ <property name="page_increment">10</property> </object> <object class="GtkDialog" id="eom_preferences_dialog"> + <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> <child internal-child="vbox"> - <object class="GtkVBox" id="dialog-vbox1"> + <object class="GtkBox" id="dialog-vbox1"> <property name="visible">True</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> + <child> + <object class="GtkButton" id="help_button"> + <property name="label">gtk-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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="close_button"> + <property name="label">gtk-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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</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> <child> - <object class="GtkVBox" id="vbox5"> + <object class="GtkBox" id="vbox5"> <property name="visible">True</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="GtkVBox" id="vbox6"> + <object class="GtkBox" id="vbox6"> <property name="visible">True</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="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">Image Enhancements</property> <attributes> <attribute name="weight" value="bold"/> @@ -47,11 +98,13 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox_interpolate"> + <object class="GtkBox" id="hbox_interpolate"> <property name="visible">True</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="label"> </property> </object> <packing> @@ -77,15 +130,19 @@ </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox_extrapolate"> + <object class="GtkBox" id="hbox_extrapolate"> <property name="visible">True</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="label"> </property> </object> <packing> @@ -111,15 +168,19 @@ </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> <child> - <object class="GtkHBox" id="hboxautorotate"> + <object class="GtkBox" id="hboxautorotate"> <property name="visible">True</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="label"> </property> </object> <packing> @@ -158,13 +219,16 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox1"> + <object class="GtkBox" id="vbox1"> <property name="visible">True</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="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">Background</property> <attributes> <attribute name="weight" value="bold"/> @@ -177,46 +241,42 @@ </packing> </child> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkBox" id="hbox1"> <property name="visible">True</property> - <property name="left_padding">16</property> + <property name="can_focus">False</property> + <property name="margin_left">16</property> + <property name="spacing">12</property> <child> - <object class="GtkHBox" id="hbox1"> + <object class="GtkCheckButton" id="bg_color_check"> + <property name="label" translatable="yes">As custom color:</property> <property name="visible">True</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="use_action_appearance">False</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <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="title" translatable="yes">Background Color</property> - <property name="color">#000000000000</property> - </object> - <packing> - <property name="expand">False</property> - <property name="position">1</property> - </packing> - </child> + <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> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <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="title" translatable="yes">Background Color</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -228,13 +288,16 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox7"> + <object class="GtkBox" id="vbox7"> <property name="visible">True</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="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">Transparent Parts</property> <attributes> <attribute name="weight" value="bold"/> @@ -247,11 +310,13 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox4"> + <object class="GtkBox" id="hbox4"> <property name="visible">True</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="label"> </property> </object> <packing> @@ -261,8 +326,10 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox8"> + <object class="GtkBox" id="vbox8"> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkRadioButton" id="checkpattern_radio"> @@ -270,6 +337,7 @@ <property name="visible">True</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> </object> @@ -280,8 +348,9 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox5"> + <object class="GtkBox" id="hbox5"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkRadioButton" id="color_radio"> @@ -304,11 +373,14 @@ <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="title" translatable="yes">Color for Transparent Areas</property> <property name="rgba">rgb(0,0,0)</property> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -325,6 +397,7 @@ <property name="visible">True</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="group">checkpattern_radio</property> @@ -337,11 +410,15 @@ </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -357,6 +434,7 @@ <child type="tab"> <object class="GtkLabel" id="label4"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Image View</property> </object> <packing> @@ -364,18 +442,23 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox11"> + <object class="GtkBox" id="vbox11"> <property name="visible">True</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="GtkVBox" id="vbox12"> + <object class="GtkBox" id="vbox12"> <property name="visible">True</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="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">Image Zoom</property> <attributes> <attribute name="weight" value="bold"/> @@ -388,11 +471,13 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox7"> + <object class="GtkBox" id="hbox7"> <property name="visible">True</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="label"> </property> </object> <packing> @@ -402,8 +487,10 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox13"> + <object class="GtkBox" id="vbox13"> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="upscale_check"> @@ -422,11 +509,15 @@ </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -438,13 +529,16 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox14"> + <object class="GtkBox" id="vbox14"> <property name="visible">True</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="xalign">0</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">Sequence</property> <attributes> <attribute name="weight" value="bold"/> @@ -457,11 +551,13 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox8"> + <object class="GtkBox" id="hbox8"> <property name="visible">True</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="label"> </property> </object> <packing> @@ -471,16 +567,20 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox15"> + <object class="GtkBox" id="vbox15"> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkHBox" id="seconds_hbox"> + <object class="GtkBox" id="seconds_hbox"> <property name="visible">True</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="label" translatable="yes">_Switch image after:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">seconds_spin</property> @@ -508,6 +608,7 @@ <child> <object class="GtkLabel" id="label18"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">seconds</property> </object> <packing> @@ -529,6 +630,7 @@ <property name="visible">True</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> </object> @@ -544,6 +646,7 @@ <property name="visible">True</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> </object> @@ -555,16 +658,22 @@ </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -576,6 +685,7 @@ <child type="tab"> <object class="GtkLabel" id="label5"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Slideshow</property> </object> <packing> @@ -584,9 +694,11 @@ </packing> </child> <child> - <object class="GtkVBox" id="plugin_manager_container"> + <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="orientation">vertical</property> <child> <placeholder/> </child> @@ -598,6 +710,7 @@ <child type="tab"> <object class="GtkLabel" id="label97"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Plugins</property> </object> <packing> @@ -607,48 +720,9 @@ </child> </object> <packing> - <property name="position">1</property> - </packing> - </child> - <child internal-child="action_area"> - <object class="GtkHButtonBox" id="dialog-action_area1"> - <property name="visible">True</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="help_button"> - <property name="label">gtk-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> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="close_button"> - <property name="label">gtk-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> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> <property name="expand">False</property> - <property name="pack_type">end</property> - <property name="position">0</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> @@ -657,5 +731,8 @@ <action-widget response="-11">help_button</action-widget> <action-widget response="-7">close_button</action-widget> </action-widgets> + <style> + <class name="eom-preferences-dialog"/> + </style> </object> </interface> |