diff options
| author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-03-03 07:58:18 +0800 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-04-08 18:41:27 +0800 |
| commit | 3f48c12fe7821dc5068f2bb4fc3b5a08965b2fa8 (patch) | |
| tree | 30dca9cbe7d37a74158b601a9ae3fa067ad4941c /libempathy-gtk | |
| parent | 1826d062dc44aab9d1dc70ddff8d815b0975212b (diff) | |
| download | gsoc2013-empathy-3f48c12fe7821dc5068f2bb4fc3b5a08965b2fa8.tar gsoc2013-empathy-3f48c12fe7821dc5068f2bb4fc3b5a08965b2fa8.tar.gz gsoc2013-empathy-3f48c12fe7821dc5068f2bb4fc3b5a08965b2fa8.tar.bz2 gsoc2013-empathy-3f48c12fe7821dc5068f2bb4fc3b5a08965b2fa8.tar.lz gsoc2013-empathy-3f48c12fe7821dc5068f2bb4fc3b5a08965b2fa8.tar.xz gsoc2013-empathy-3f48c12fe7821dc5068f2bb4fc3b5a08965b2fa8.tar.zst gsoc2013-empathy-3f48c12fe7821dc5068f2bb4fc3b5a08965b2fa8.zip | |
Change "show my web status" to something clearer and add a Learn More link
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-account-widget-skype.ui | 279 |
1 files changed, 155 insertions, 124 deletions
diff --git a/libempathy-gtk/empathy-account-widget-skype.ui b/libempathy-gtk/empathy-account-widget-skype.ui index 54a7d32fe..b823cca60 100644 --- a/libempathy-gtk/empathy-account-widget-skype.ui +++ b/libempathy-gtk/empathy-account-widget-skype.ui @@ -261,149 +261,180 @@ Get one at <a href="http://www.skype.com/go/register">Skype.com</a>< <property name="visible">True</property> <property name="spacing">6</property> <child> - <object class="GtkTable" id="privacy-settings-table"> + <object class="GtkVBox" id="privacy-settings-table"> <property name="visible">True</property> - <property name="n_rows">5</property> - <property name="n_columns">2</property> - <property name="column_spacing">6</property> - <property name="row_spacing">6</property> + <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Allow _text chats from:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">allow-text-chats-from</property> - </object> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label4"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Allow _Skype calls from:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">allow-skype-calls-from</property> - </object> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label6"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Allow _outside calls from:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">allow-outside-calls-from</property> - </object> - <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="show-my-web-status"> - <property name="label" translatable="yes">Show my _web status</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="right_attach">2</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label7"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Show my _avatar to:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">show-my-avatar-to</property> - </object> - <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="allow-text-chats-from"> + <object class="GtkTable" id="table1"> <property name="visible">True</property> + <property name="n_rows">4</property> + <property name="n_columns">2</property> + <property name="column_spacing">6</property> + <property name="row_spacing">6</property> <child> - <object class="GtkCellRendererText" id="cellrenderertext1"/> - <attributes> - <attribute name="text">1</attribute> - </attributes> + <object class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Allow _text chats from:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">allow-text-chats-from</property> + </object> + <packing> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> + </packing> </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="allow-skype-calls-from"> - <property name="visible">True</property> <child> - <object class="GtkCellRendererText" id="cellrenderertext2"/> - <attributes> - <attribute name="text">1</attribute> - </attributes> + <object class="GtkLabel" id="label4"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Allow _Skype calls from:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">allow-skype-calls-from</property> + </object> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label6"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Allow _outside calls from:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">allow-outside-calls-from</property> + </object> + <packing> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label7"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Show my _avatar to:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">show-my-avatar-to</property> + </object> + <packing> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="allow-text-chats-from"> + <property name="visible">True</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext1"/> + <attributes> + <attribute name="text">1</attribute> + </attributes> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + </packing> </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="allow-outside-calls-from"> - <property name="visible">True</property> <child> - <object class="GtkCellRendererText" id="cellrenderertext4"/> - <attributes> - <attribute name="text">1</attribute> - </attributes> + <object class="GtkComboBox" id="allow-skype-calls-from"> + <property name="visible">True</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext2"/> + <attributes> + <attribute name="text">1</attribute> + </attributes> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="allow-outside-calls-from"> + <property name="visible">True</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext4"/> + <attributes> + <attribute name="text">1</attribute> + </attributes> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="show-my-avatar-to"> + <property name="visible">True</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext5"/> + <attributes> + <attribute name="text">1</attribute> + </attributes> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + </packing> </child> </object> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="expand">False</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkComboBox" id="show-my-avatar-to"> + <object class="GtkTable" id="table2"> <property name="visible">True</property> + <property name="n_columns">2</property> + <property name="column_spacing">6</property> + <property name="row_spacing">6</property> + <child> + <object class="GtkLabel" id="label5"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip_text" translatable="yes">Get your own customized button for your website</property> + <property name="label" translatable="yes"><a href="http://www.skype.com/intl/en-us/tell-a-friend/get-a-skype-button/">Learn More...</a></property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="x_options">GTK_FILL</property> + </packing> + </child> <child> - <object class="GtkCellRendererText" id="cellrenderertext5"/> - <attributes> - <attribute name="text">1</attribute> - </attributes> + <object class="GtkCheckButton" id="show-my-web-status"> + <property name="label" translatable="yes">Show my presence on the _web</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> </child> </object> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="expand">False</property> + <property name="position">1</property> </packing> </child> </object> |