diff options
| -rw-r--r-- | src/dlg-add-folder.c | 4 | ||||
| -rw-r--r-- | src/ui/add-options.ui | 53 | ||||
| -rw-r--r-- | src/ui/batch-add-files.ui | 39 | ||||
| -rw-r--r-- | src/ui/batch-password.ui | 32 | ||||
| -rw-r--r-- | src/ui/delete.ui | 30 | ||||
| -rw-r--r-- | src/ui/password.ui | 32 | ||||
| -rw-r--r-- | src/ui/properties.ui | 30 | ||||
| -rw-r--r-- | src/ui/update.ui | 155 | 
8 files changed, 205 insertions, 170 deletions
| diff --git a/src/dlg-add-folder.c b/src/dlg-add-folder.c index 2f62986..ab613ed 100644 --- a/src/dlg-add-folder.c +++ b/src/dlg-add-folder.c @@ -674,8 +674,8 @@ load_options_cb (GtkWidget  *w,  	gtk_builder_add_callback_symbols (builder,  	                                  "on_add_options_dialog_destroy",	G_CALLBACK (aod_destroy_cb),  	                                  "on_aod_treeview_row_activated",	G_CALLBACK (aod_activated_cb), -	                                  "on_aod_okbutton_clicked",		G_CALLBACK (aod_apply_cb), -	                                  "on_aod_cancelbutton_clicked",	G_CALLBACK (aod_remove_cb), +	                                  "on_aod_ok_button_clicked",		G_CALLBACK (aod_apply_cb), +	                                  "on_aod_cancel_button_clicked",	G_CALLBACK (aod_remove_cb),  	                                  NULL);  	gtk_builder_connect_signals (builder, aod_data); diff --git a/src/ui/add-options.ui b/src/ui/add-options.ui index 6ffee4d..5bb9458 100644 --- a/src/ui/add-options.ui +++ b/src/ui/add-options.ui @@ -1,7 +1,22 @@  <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.2 --> +<!-- Generated with glade 3.36.0 -->  <interface>    <requires lib="gtk+" version="3.22"/> +  <object class="GtkImage" id="aod_apply_button"> +    <property name="visible">True</property> +    <property name="can_focus">False</property> +    <property name="icon_name">gtk-apply</property> +  </object> +  <object class="GtkImage" id="aod_cancel_image"> +    <property name="visible">True</property> +    <property name="can_focus">False</property> +    <property name="icon_name">window-close</property> +  </object> +  <object class="GtkImage" id="aod_remove_image"> +    <property name="visible">True</property> +    <property name="can_focus">False</property> +    <property name="icon_name">list-remove</property> +  </object>    <object class="GtkDialog" id="add_options_dialog">      <property name="can_focus">False</property>      <property name="border_width">5</property> @@ -9,9 +24,6 @@      <property name="window_position">center-on-parent</property>      <property name="type_hint">dialog</property>      <signal name="destroy" handler="on_add_options_dialog_destroy" swapped="no"/> -    <child type="titlebar"> -      <placeholder/> -    </child>      <child internal-child="vbox">        <object class="GtkBox" id="dialog-vbox19">          <property name="visible">True</property> @@ -24,14 +36,16 @@              <property name="can_focus">False</property>              <property name="layout_style">end</property>              <child> -              <object class="GtkButton" id="aod_cancelbutton"> -                <property name="label">gtk-close</property> +              <object class="GtkButton" id="aod_cancel_button"> +                <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> -                <signal name="clicked" handler="on_aod_cancelbutton_clicked" swapped="no"/> +                <property name="image">aod_cancel_image</property> +                <property name="use_underline">True</property> +                <property name="always_show_image">True</property> +                <signal name="clicked" handler="on_aod_cancel_button_clicked" swapped="no"/>                </object>                <packing>                  <property name="expand">False</property> @@ -40,14 +54,16 @@                </packing>              </child>              <child> -              <object class="GtkButton" id="aod_okbutton"> -                <property name="label">gtk-apply</property> +              <object class="GtkButton" id="aod_ok_button"> +                <property name="label" translatable="yes">_Apply</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> -                <signal name="clicked" handler="on_aod_okbutton_clicked" swapped="no"/> +                <property name="image">aod_apply_button</property> +                <property name="use_underline">True</property> +                <property name="always_show_image">True</property> +                <signal name="clicked" handler="on_aod_ok_button_clicked" swapped="no"/>                </object>                <packing>                  <property name="expand">False</property> @@ -78,11 +94,13 @@                  <property name="spacing">6</property>                  <child>                    <object class="GtkButton" id="aod_remove_button"> -                    <property name="label">gtk-remove</property> +                    <property name="label" translatable="yes">_Remove</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="image">aod_remove_image</property> +                    <property name="use_underline">True</property> +                    <property name="always_show_image">True</property>                    </object>                    <packing>                      <property name="expand">False</property> @@ -136,8 +154,11 @@        </object>      </child>      <action-widgets> -      <action-widget response="-7">aod_cancelbutton</action-widget> -      <action-widget response="-10">aod_okbutton</action-widget> +      <action-widget response="-7">aod_cancel_button</action-widget> +      <action-widget response="-10">aod_ok_button</action-widget>      </action-widgets> +    <child type="titlebar"> +      <placeholder/> +    </child>    </object>  </interface> diff --git a/src/ui/batch-add-files.ui b/src/ui/batch-add-files.ui index 82bb457..6a4ee5b 100644 --- a/src/ui/batch-add-files.ui +++ b/src/ui/batch-add-files.ui @@ -1,17 +1,25 @@  <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.2 --> +<!-- Generated with glade 3.36.0 -->  <interface>    <requires lib="gtk+" version="3.22"/> -  <object class="GtkImage" id="image1"> +  <object class="GtkImage" id="a_add_image">      <property name="visible">True</property>      <property name="can_focus">False</property>      <property name="icon_name">add-files-to-archive</property>    </object> +  <object class="GtkImage" id="a_cancel_image"> +    <property name="visible">True</property> +    <property name="can_focus">False</property> +    <property name="icon_name">process-stop</property> +  </object> +  <object class="GtkImage" id="a_help_image"> +    <property name="visible">True</property> +    <property name="can_focus">False</property> +    <property name="icon_name">help-browser</property> +  </object>    <object class="GtkAdjustment" id="volume_adjustment"> -    <property name="lower">0.10000000000000001</property>      <property name="upper">9999999999</property>      <property name="value">10</property> -    <property name="step_increment">0.10000000000000001</property>      <property name="page_increment">10</property>    </object>    <object class="GtkDialog" id="dialog"> @@ -22,9 +30,6 @@      <property name="window_position">center</property>      <property name="type_hint">normal</property>      <signal name="destroy" handler="on_dialog_destroy" swapped="no"/> -    <child type="titlebar"> -      <placeholder/> -    </child>      <child internal-child="vbox">        <object class="GtkBox" id="dialog-vbox11">          <property name="visible">True</property> @@ -38,11 +43,13 @@              <property name="layout_style">end</property>              <child>                <object class="GtkButton" id="a_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="image">a_cancel_image</property> +                <property name="use_underline">True</property> +                <property name="always_show_image">True</property>                </object>                <packing>                  <property name="expand">False</property> @@ -59,12 +66,9 @@                  <property name="can_default">True</property>                  <property name="has_default">True</property>                  <property name="receives_default">False</property> -                <property name="image">image1</property> +                <property name="image">a_add_image</property>                  <property name="use_underline">True</property>                  <signal name="clicked" handler="on_a_add_button_clicked" swapped="no"/> -                <child> -                  <placeholder/> -                </child>                </object>                <packing>                  <property name="expand">False</property> @@ -74,12 +78,14 @@              </child>              <child>                <object class="GtkButton" id="a_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="image">a_help_image</property> +                <property name="use_underline">True</property> +                <property name="always_show_image">True</property>                </object>                <packing>                  <property name="expand">False</property> @@ -388,6 +394,9 @@        <action-widget response="0">a_add_button</action-widget>        <action-widget response="-11">a_help_button</action-widget>      </action-widgets> +    <child type="titlebar"> +      <placeholder/> +    </child>    </object>    <object class="GtkSizeGroup">      <widgets> diff --git a/src/ui/batch-password.ui b/src/ui/batch-password.ui index ee677ab..812bc01 100644 --- a/src/ui/batch-password.ui +++ b/src/ui/batch-password.ui @@ -1,7 +1,17 @@  <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.2 --> +<!-- Generated with glade 3.36.0 -->  <interface>    <requires lib="gtk+" version="3.22"/> +  <object class="GtkImage" id="pw_cancel_image"> +    <property name="visible">True</property> +    <property name="can_focus">False</property> +    <property name="icon_name">process-stop</property> +  </object> +  <object class="GtkImage" id="pw_ok_image"> +    <property name="visible">True</property> +    <property name="can_focus">False</property> +    <property name="icon_name">gtk-ok</property> +  </object>    <object class="GtkDialog" id="password_dialog">      <property name="can_focus">False</property>      <property name="border_width">5</property> @@ -10,9 +20,6 @@      <property name="type_hint">dialog</property>      <signal name="destroy" handler="on_password_dialog_destroy" swapped="no"/>      <signal name="response" handler="on_password_dialog_response" swapped="no"/> -    <child type="titlebar"> -      <placeholder/> -    </child>      <child internal-child="vbox">        <object class="GtkBox" id="dialog-vbox15">          <property name="visible">True</property> @@ -26,12 +33,14 @@              <property name="layout_style">end</property>              <child>                <object class="GtkButton" id="pw_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="can_default">True</property>                  <property name="receives_default">False</property> -                <property name="use_stock">True</property> +                <property name="image">pw_cancel_image</property> +                <property name="use_underline">True</property> +                <property name="always_show_image">True</property>                </object>                <packing>                  <property name="expand">False</property> @@ -41,14 +50,16 @@              </child>              <child>                <object class="GtkButton" id="pw_ok_button"> -                <property name="label">gtk-ok</property> +                <property name="label" translatable="yes">_OK</property>                  <property name="visible">True</property>                  <property name="can_focus">True</property>                  <property name="has_focus">True</property>                  <property name="can_default">True</property>                  <property name="has_default">True</property>                  <property name="receives_default">False</property> -                <property name="use_stock">True</property> +                <property name="image">pw_ok_image</property> +                <property name="use_underline">True</property> +                <property name="always_show_image">True</property>                </object>                <packing>                  <property name="expand">False</property> @@ -82,7 +93,7 @@                      <property name="can_focus">False</property>                      <property name="halign">start</property>                      <property name="valign">start</property> -                    <property name="stock">gtk-dialog-authentication</property> +                    <property name="icon_name">dialog-password</property>                      <property name="icon_size">6</property>                    </object>                    <packing> @@ -191,5 +202,8 @@        <action-widget response="-6">pw_cancel_button</action-widget>        <action-widget response="-5">pw_ok_button</action-widget>      </action-widgets> +    <child type="titlebar"> +      <placeholder/> +    </child>    </object>  </interface> diff --git a/src/ui/delete.ui b/src/ui/delete.ui index 21de895..89f759a 100644 --- a/src/ui/delete.ui +++ b/src/ui/delete.ui @@ -1,7 +1,17 @@  <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.2 --> +<!-- Generated with glade 3.36.0 -->  <interface>    <requires lib="gtk+" version="3.22"/> +  <object class="GtkImage" id="d_cancel_image"> +    <property name="visible">True</property> +    <property name="can_focus">False</property> +    <property name="icon_name">process-stop</property> +  </object> +  <object class="GtkImage" id="d_ok_image"> +    <property name="visible">True</property> +    <property name="can_focus">False</property> +    <property name="icon_name">edit-delete</property> +  </object>    <object class="GtkDialog" id="delete_dialog">      <property name="can_focus">False</property>      <property name="border_width">5</property> @@ -10,9 +20,6 @@      <property name="window_position">center-on-parent</property>      <property name="type_hint">dialog</property>      <signal name="destroy" handler="on_delete_dialog_destroy" swapped="no"/> -    <child type="titlebar"> -      <placeholder/> -    </child>      <child internal-child="vbox">        <object class="GtkBox" id="dialog-vbox14">          <property name="visible">True</property> @@ -26,11 +33,13 @@              <property name="layout_style">end</property>              <child>                <object class="GtkButton" id="d_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="image">d_cancel_image</property> +                <property name="use_underline">True</property> +                <property name="always_show_image">True</property>                </object>                <packing>                  <property name="expand">False</property> @@ -40,13 +49,15 @@              </child>              <child>                <object class="GtkButton" id="d_ok_button"> -                <property name="label">gtk-delete</property> +                <property name="label" translatable="yes">_Delete</property>                  <property name="visible">True</property>                  <property name="can_focus">True</property>                  <property name="can_default">True</property>                  <property name="has_default">True</property>                  <property name="receives_default">False</property> -                <property name="use_stock">True</property> +                <property name="image">d_ok_image</property> +                <property name="use_underline">True</property> +                <property name="always_show_image">True</property>                  <signal name="clicked" handler="on_d_ok_button_clicked" swapped="no"/>                </object>                <packing> @@ -145,5 +156,8 @@        <action-widget response="0">d_cancel_button</action-widget>        <action-widget response="0">d_ok_button</action-widget>      </action-widgets> +    <child type="titlebar"> +      <placeholder/> +    </child>    </object>  </interface> diff --git a/src/ui/password.ui b/src/ui/password.ui index dc57d23..7986d0e 100644 --- a/src/ui/password.ui +++ b/src/ui/password.ui @@ -1,7 +1,17 @@  <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.2 --> +<!-- Generated with glade 3.36.0 -->  <interface>    <requires lib="gtk+" version="3.22"/> +  <object class="GtkImage" id="pw_cancel_image"> +    <property name="visible">True</property> +    <property name="can_focus">False</property> +    <property name="icon_name">process-stop</property> +  </object> +  <object class="GtkImage" id="pw_ok_image"> +    <property name="visible">True</property> +    <property name="can_focus">False</property> +    <property name="icon_name">gtk-ok</property> +  </object>    <object class="GtkDialog" id="password_dialog">      <property name="can_focus">False</property>      <property name="border_width">5</property> @@ -11,9 +21,6 @@      <property name="type_hint">dialog</property>      <signal name="destroy" handler="on_password_dialog_destroy" swapped="no"/>      <signal name="response" handler="on_password_dialog_response" swapped="no"/> -    <child type="titlebar"> -      <placeholder/> -    </child>      <child internal-child="vbox">        <object class="GtkBox" id="dialog-vbox15">          <property name="visible">True</property> @@ -27,12 +34,14 @@              <property name="layout_style">end</property>              <child>                <object class="GtkButton" id="pw_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="can_default">True</property>                  <property name="receives_default">False</property> -                <property name="use_stock">True</property> +                <property name="image">pw_cancel_image</property> +                <property name="use_underline">True</property> +                <property name="always_show_image">True</property>                </object>                <packing>                  <property name="expand">False</property> @@ -42,14 +51,16 @@              </child>              <child>                <object class="GtkButton" id="pw_ok_button"> -                <property name="label">gtk-ok</property> +                <property name="label" translatable="yes">_OK</property>                  <property name="visible">True</property>                  <property name="can_focus">True</property>                  <property name="has_focus">True</property>                  <property name="can_default">True</property>                  <property name="has_default">True</property>                  <property name="receives_default">False</property> -                <property name="use_stock">True</property> +                <property name="image">pw_ok_image</property> +                <property name="use_underline">True</property> +                <property name="always_show_image">True</property>                </object>                <packing>                  <property name="expand">False</property> @@ -140,7 +151,7 @@                    <object class="GtkImage" id="image2">                      <property name="visible">True</property>                      <property name="can_focus">False</property> -                    <property name="stock">gtk-dialog-info</property> +                    <property name="icon_name">dialog-information</property>                      <property name="icon_size">6</property>                    </object>                    <packing> @@ -184,5 +195,8 @@        <action-widget response="-6">pw_cancel_button</action-widget>        <action-widget response="-5">pw_ok_button</action-widget>      </action-widgets> +    <child type="titlebar"> +      <placeholder/> +    </child>    </object>  </interface> diff --git a/src/ui/properties.ui b/src/ui/properties.ui index a943061..75850c5 100644 --- a/src/ui/properties.ui +++ b/src/ui/properties.ui @@ -1,16 +1,23 @@  <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.2 --> +<!-- Generated with glade 3.36.0 -->  <interface>    <requires lib="gtk+" version="3.22"/> +  <object class="GtkImage" id="p_help_image"> +    <property name="visible">True</property> +    <property name="can_focus">False</property> +    <property name="icon_name">help-browser</property> +  </object> +  <object class="GtkImage" id="p_ok_image"> +    <property name="visible">True</property> +    <property name="can_focus">False</property> +    <property name="icon_name">window-close</property> +  </object>    <object class="GtkDialog" id="prop_dialog">      <property name="can_focus">False</property>      <property name="border_width">5</property>      <property name="window_position">center-on-parent</property>      <property name="type_hint">dialog</property>      <signal name="destroy" handler="on_prop_dialog_destroy" swapped="no"/> -    <child type="titlebar"> -      <placeholder/> -    </child>      <child internal-child="vbox">        <object class="GtkBox" id="dialog-vbox12">          <property name="visible">True</property> @@ -24,12 +31,14 @@              <property name="layout_style">end</property>              <child>                <object class="GtkButton" id="p_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="image">p_help_image</property> +                <property name="use_underline">True</property> +                <property name="always_show_image">True</property>                </object>                <packing>                  <property name="expand">False</property> @@ -40,14 +49,16 @@              </child>              <child>                <object class="GtkButton" id="p_ok_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="has_focus">True</property>                  <property name="can_default">True</property>                  <property name="has_default">True</property>                  <property name="receives_default">False</property> -                <property name="use_stock">True</property> +                <property name="image">p_ok_image</property> +                <property name="use_underline">True</property> +                <property name="always_show_image">True</property>                </object>                <packing>                  <property name="expand">False</property> @@ -308,5 +319,8 @@        <action-widget response="-11">p_help_button</action-widget>        <action-widget response="-7">p_ok_button</action-widget>      </action-widgets> +    <child type="titlebar"> +      <placeholder/> +    </child>    </object>  </interface> diff --git a/src/ui/update.ui b/src/ui/update.ui index 5deb4e9..def416d 100644 --- a/src/ui/update.ui +++ b/src/ui/update.ui @@ -1,15 +1,22 @@  <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.2 --> +<!-- Generated with glade 3.36.0 -->  <interface>    <requires lib="gtk+" version="3.22"/> +  <object class="GtkImage" id="update_file_cancel_image"> +    <property name="visible">True</property> +    <property name="can_focus">False</property> +    <property name="icon_name">process-stop</property> +  </object> +  <object class="GtkImage" id="update_file_ok_image"> +    <property name="visible">True</property> +    <property name="can_focus">False</property> +    <property name="icon_name">document-save</property> +  </object>    <object class="GtkDialog" id="update_file_dialog">      <property name="can_focus">False</property>      <property name="border_width">5</property>      <property name="type_hint">dialog</property>      <signal name="destroy" handler="on_update_file_dialog_destroy" swapped="no"/> -    <child type="titlebar"> -      <placeholder/> -    </child>      <child internal-child="vbox">        <object class="GtkBox" id="dialog-vbox1">          <property name="visible">True</property> @@ -23,12 +30,14 @@              <property name="layout_style">end</property>              <child>                <object class="GtkButton" id="update_file_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="can_default">True</property>                  <property name="receives_default">False</property> -                <property name="use_stock">True</property> +                <property name="image">update_file_cancel_image</property> +                <property name="use_underline">True</property> +                <property name="always_show_image">True</property>                </object>                <packing>                  <property name="expand">False</property> @@ -38,55 +47,17 @@              </child>              <child>                <object class="GtkButton" id="update_file_ok_button"> +                <property name="label" translatable="yes">_Update</property>                  <property name="visible">True</property>                  <property name="can_focus">True</property> -                <property name="can_default">True</property> -                <property name="receives_default">False</property> -                <signal name="clicked" handler="on_update_file_ok_button_clicked" swapped="no"/> -                <child> -                  <object class="GtkAlignment" id="alignment1"> -                    <property name="visible">True</property> -                    <property name="can_focus">False</property> -                    <property name="xscale">0</property> -                    <property name="yscale">0</property> -                    <child> -                      <object class="GtkBox" id="hbox1"> -                        <property name="visible">True</property> -                        <property name="can_focus">False</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-save</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="label1"> -                            <property name="visible">True</property> -                            <property name="can_focus">False</property> -                            <property name="label" translatable="yes">_Update</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> +                <property name="receives_default">True</property> +                <property name="image">update_file_ok_image</property> +                <property name="use_underline">True</property> +                <property name="always_show_image">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> @@ -113,7 +84,7 @@                    <object class="GtkImage" id="image2">                      <property name="visible">True</property>                      <property name="can_focus">False</property> -                    <property name="stock">gtk-dialog-warning</property> +                    <property name="icon_name">dialog-warning</property>                      <property name="icon_size">6</property>                    </object>                    <packing> @@ -172,7 +143,7 @@              </child>            </object>            <packing> -            <property name="expand">False</property> +            <property name="expand">True</property>              <property name="fill">True</property>              <property name="position">1</property>            </packing> @@ -183,15 +154,25 @@        <action-widget response="-6">update_file_cancel_button</action-widget>        <action-widget response="-5">update_file_ok_button</action-widget>      </action-widgets> +    <child type="titlebar"> +      <placeholder/> +    </child> +  </object> +  <object class="GtkImage" id="update_files_cancel_image"> +    <property name="visible">True</property> +    <property name="can_focus">False</property> +    <property name="icon_name">process-stop</property> +  </object> +  <object class="GtkImage" id="update_files_ok_image"> +    <property name="visible">True</property> +    <property name="can_focus">False</property> +    <property name="icon_name">document-save</property>    </object>    <object class="GtkDialog" id="update_files_dialog">      <property name="can_focus">False</property>      <property name="border_width">5</property>      <property name="type_hint">dialog</property>      <signal name="destroy" handler="on_update_files_dialog_destroy" swapped="no"/> -    <child type="titlebar"> -      <placeholder/> -    </child>      <child internal-child="vbox">        <object class="GtkBox" id="vbox5">          <property name="visible">True</property> @@ -205,12 +186,14 @@              <property name="layout_style">end</property>              <child>                <object class="GtkButton" id="update_files_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="can_default">True</property>                  <property name="receives_default">False</property> -                <property name="use_stock">True</property> +                <property name="image">update_files_cancel_image</property> +                <property name="use_underline">True</property> +                <property name="always_show_image">True</property>                </object>                <packing>                  <property name="expand">False</property> @@ -220,55 +203,18 @@              </child>              <child>                <object class="GtkButton" id="update_files_ok_button"> +                <property name="label" translatable="yes">_Update</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="receives_default">True</property> +                <property name="image">update_files_ok_image</property> +                <property name="use_underline">True</property> +                <property name="always_show_image">True</property>                  <signal name="clicked" handler="on_update_files_ok_button_clicked" swapped="no"/> -                <child> -                  <object class="GtkAlignment" id="alignment2"> -                    <property name="visible">True</property> -                    <property name="can_focus">False</property> -                    <property name="xscale">0</property> -                    <property name="yscale">0</property> -                    <child> -                      <object class="GtkBox" id="hbox3"> -                        <property name="visible">True</property> -                        <property name="can_focus">False</property> -                        <property name="spacing">2</property> -                        <child> -                          <object class="GtkImage" id="image3"> -                            <property name="visible">True</property> -                            <property name="can_focus">False</property> -                            <property name="stock">gtk-save</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="label6"> -                            <property name="visible">True</property> -                            <property name="can_focus">False</property> -                            <property name="label" translatable="yes">_Update</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="expand">True</property> +                <property name="fill">True</property>                  <property name="position">1</property>                </packing>              </child> @@ -295,7 +241,7 @@                    <object class="GtkImage" id="image4">                      <property name="visible">True</property>                      <property name="can_focus">False</property> -                    <property name="stock">gtk-dialog-warning</property> +                    <property name="icon_name">dialog-warning</property>                      <property name="icon_size">6</property>                    </object>                    <packing> @@ -417,5 +363,8 @@        <action-widget response="-6">update_files_cancel_button</action-widget>        <action-widget response="-5">update_files_ok_button</action-widget>      </action-widgets> +    <child type="titlebar"> +      <placeholder/> +    </child>    </object>  </interface> | 
