changeset 4e0ebb229df9 in /home/hg/repos/gajim

author: Denis Fomin fominde@gmail.com branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=4e0ebb229df9 description: accounts and xml accounts creation dialogs. Do not "Show images on buttons". see #7186

diffstat:

data/gui/account_creation_wizard_window.ui | 108 ++++++-------------------- data/gui/accounts_window.ui | 118 +++++----------------------- 2 файлов изменено, 46 вставок(+), 180 удалений(-)

различия (урезанные с 372 до 300 строк):

diff -r a88e660b07dd -r 4e0ebb229df9 data/gui/account_creation_wizard_window.ui --- a/data/gui/account_creation_wizard_window.ui Fri Sep 20 12:35:49 2013 +0400 +++ b/data/gui/account_creation_wizard_window.ui Fri Sep 20 13:02:37 2013 +0400 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <interface> <requires lib="gtk+" version="2.16"/> - <!-- interface-naming-policy toplevel-contextual --> + <!-- interface-naming-policy project-wide --> <object class="GtkWindow" id="account_creation_wizard_window"> <property name="border_width">12</property> <property name="title" translatable="yes">Gajim: Account Creation Wizard</property> @@ -146,7 +146,7 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -161,7 +161,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -183,7 +183,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -198,7 +198,7 @@ <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -211,7 +211,7 @@ </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -223,7 +223,7 @@ <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> - <property name="x_options"></property> + <property name="x_options"/> </packing> </child> <child> @@ -363,7 +363,7 @@ </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -395,8 +395,8 @@ <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> - <property name="x_options"></property> - <property name="y_options"></property> + <property name="x_options"/> + <property name="y_options"/> </packing> </child> <child> @@ -413,7 +413,7 @@ <property name="right_attach">3</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -779,47 +779,14 @@ </child> <child> <object class="GtkButton" id="advanced_button"> + <property name="label" translatable="yes">_Advanced</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> <property name="no_show_all">True</property> + <property name="image">image2</property> + <property name="use_underline">True</property> <signal name="clicked" handler="on_advanced_button_clicked"/> - <child> - <object class="GtkAlignment" id="alignment96"> - <property name="visible">True</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <child> - <object class="GtkHBox" id="hbox2996"> - <property name="visible">True</property> - <property name="spacing">2</property> - <child> - <object class="GtkImage" id="image1265"> - <property name="visible">True</property> - <property name="stock">gtk-preferences</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="label364"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Advanced</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> @@ -829,47 +796,14 @@ </child> <child> <object class="GtkButton" id="finish_button"> + <property name="label" translatable="yes">_Finish</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> <property name="no_show_all">True</property> + <property name="image">image3</property> + <property name="use_underline">True</property> <signal name="clicked" handler="on_finish_button_clicked"/> - <child> - <object class="GtkAlignment" id="alignment87"> - <property name="visible">True</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <child> - <object class="GtkHBox" id="hbox2989"> - <property name="visible">True</property> - <property name="spacing">2</property> - <child> - <object class="GtkImage" id="image1112"> - <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="label352"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Finish</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> @@ -897,4 +831,12 @@ </row> </data> </object> + <object class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="stock">gtk-preferences</property> + </object> + <object class="GtkImage" id="image3"> + <property name="visible">True</property> + <property name="stock">gtk-apply</property> + </object> </interface> diff -r a88e660b07dd -r 4e0ebb229df9 data/gui/accounts_window.ui --- a/data/gui/accounts_window.ui Fri Sep 20 12:35:49 2013 +0400 +++ b/data/gui/accounts_window.ui Fri Sep 20 13:02:37 2013 +0400 @@ -63,42 +63,14 @@ </child> <child> <object class="GtkButton" id="add_button"> + <property name="label" translatable="yes">Add</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="image">image1</property> + <property name="use_underline">True</property> <signal name="clicked" handler="on_add_button_clicked"/> - <child> - <object class="GtkAlignment" id="alignment5"> - <property name="visible">True</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <child> - <object class="GtkHBox" id="hbox4"> - <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-add</property> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label29"> - <property name="visible">True</property> - <property name="label" translatable="yes">Add</property> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - </child> </object> <packing> <property name="expand">False</property> @@ -107,42 +79,14 @@ </child> <child> <object class="GtkButton" id="remove_button"> + <property name="label" translatable="yes">Delete</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="image">image2</property> + <property name="use_underline">True</property> <signal name="clicked" handler="on_remove_button_clicked"/> - <child> - <object class="GtkAlignment" id="alignment7"> - <property name="visible">True</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <child> - <object class="GtkHBox" id="hbox7"> - <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-remove</property> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label26"> - <property name="visible">True</property> - <property name="label" translatable="yes">Delete</property> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - </child>