changeset a88e660b07dd in /home/hg/repos/gajim
author: Denis Fomin fominde@gmail.com branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=a88e660b07dd description: filetransfer and xml console dialogs. Do not "Show images on buttons". see #7186
diffstat:
data/gui/filetransfers.ui | 96 ++++++++--------------------------------- data/gui/xml_console_window.ui | 45 +++---------------- 2 файлов изменено, 27 вставок(+), 114 удалений(-)
различия (241 строк):
diff -r 70b89632bb4a -r a88e660b07dd data/gui/filetransfers.ui --- a/data/gui/filetransfers.ui Fri Sep 20 12:27:41 2013 +0400 +++ b/data/gui/filetransfers.ui Fri Sep 20 12:35:49 2013 +0400 @@ -41,11 +41,11 @@ </object> </child> <signal name="button_press_event" handler="on_transfers_list_button_press_event"/> + <signal name="row_activated" handler="on_transfers_list_row_activated"/> <signal name="button_release_event" handler="on_transfers_list_button_release_event"/> <signal name="key_press_event" handler="on_transfers_list_key_press_event"/> + <signal name="motion_notify_event" handler="on_transfers_list_motion_notify_event"/> <signal name="leave_notify_event" handler="on_transfers_list_leave_notify_event"/> - <signal name="motion_notify_event" handler="on_transfers_list_motion_notify_event"/> - <signal name="row_activated" handler="on_transfers_list_row_activated"/> </object> </child> </object> @@ -81,12 +81,15 @@ <property name="layout_style">end</property> <child> <object class="GtkButton" id="cleanup_button"> + <property name="label" translatable="yes">Clean _up</property> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">Removes completed, cancelled and failed file transfers from the list</property> + <property name="image">image1</property> + <property name="use_underline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="cleanup_button-atkobject"> <property name="AtkObject::accessible-name" translatable="yes">Remove file transfer from the list.</property> @@ -94,42 +97,6 @@ </object> </child> <signal name="clicked" handler="on_cleanup_button_clicked"/> - <child> - <object class="GtkAlignment" id="alignment91"> - <property name="visible">True</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <child> - <object class="GtkHBox" id="hbox2992"> - <property name="visible">True</property> - <property name="spacing">2</property> - <child> - <object class="GtkImage" id="image1143"> - <property name="visible">True</property> - <property name="stock">gtk-clear</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="label358"> - <property name="visible">True</property> - <property name="label" translatable="yes">Clean _up</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> @@ -139,48 +106,15 @@ </child> <child> <object class="GtkButton" id="pause_restore_button"> + <property name="label" translatable="yes">_Pause</property> <property name="visible">True</property> <property name="sensitive">False</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> <signal name="clicked" handler="on_pause_restore_button_clicked"/> - <child> - <object class="GtkAlignment" id="alignment92"> - <property name="visible">True</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <child> - <object class="GtkHBox" id="hbox2993"> - <property name="visible">True</property> - <property name="spacing">2</property> - <child> - <object class="GtkImage" id="image1147"> - <property name="visible">True</property> - <property name="stock">gtk-media-pause</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="label359"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Pause</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> @@ -252,7 +186,7 @@ </child> <child> <object class="GtkImageMenuItem" id="continue_menuitem"> - <property name="label" translatable="yes">_Continue</property> + <property name="label">_Continue</property> <property name="no_show_all">True</property> <property name="use_underline">True</property> <property name="use_stock">True</property> @@ -262,7 +196,7 @@ </child> <child> <object class="GtkImageMenuItem" id="pause_menuitem"> - <property name="label" translatable="yes">_Pause</property> + <property name="label">_Pause</property> <property name="use_underline">True</property> <property name="use_stock">True</property> <property name="accel_group">accelgroup1</property> @@ -285,7 +219,7 @@ </child> <child> <object class="GtkImageMenuItem" id="open_folder_menuitem"> - <property name="label" translatable="yes">_Open Containing Folder</property> + <property name="label">_Open Containing Folder</property> <property name="use_underline">True</property> <property name="use_stock">True</property> <property name="accel_group">accelgroup1</property> @@ -294,4 +228,12 @@ </child> </object> <object class="GtkAccelGroup" id="accelgroup1"/> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-clear</property> + </object> + <object class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="stock">gtk-media-pause</property> + </object> </interface> diff -r 70b89632bb4a -r a88e660b07dd data/gui/xml_console_window.ui --- a/data/gui/xml_console_window.ui Fri Sep 20 12:27:41 2013 +0400 +++ b/data/gui/xml_console_window.ui Fri Sep 20 12:35:49 2013 +0400 @@ -222,8 +222,8 @@ <object class="GtkScrolledWindow" id="scrolledwindow42"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="hscrollbar_policy">never</property> <property name="shadow_type">in</property> - <property name="hscrollbar_policy">never</property> <child> <object class="GtkTextView" id="input_textview"> <property name="height_request">120</property> @@ -290,47 +290,14 @@ </child> <child> <object class="GtkButton" id="send_button"> + <property name="label" translatable="yes">_Send</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="image">image1</property> + <property name="use_underline">True</property> <signal name="clicked" handler="on_send_button_clicked"/> - <child> - <object class="GtkAlignment" id="alignment80"> - <property name="visible">True</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <child> - <object class="GtkHBox" id="hbox2980"> - <property name="visible">True</property> - <property name="spacing">2</property> - <child> - <object class="GtkImage" id="image833"> - <property name="visible">True</property> - <property name="stock">gtk-apply</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="label341"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Send</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> @@ -364,4 +331,8 @@ </object> </child> </object> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-apply</property> + </object> </interface>