diff options
| author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2012-05-23 14:06:32 +0800 |
|---|---|---|
| committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2012-05-29 15:13:18 +0800 |
| commit | eb1d26c374afade8d4e7065a70d81dc6ff0a410d (patch) | |
| tree | e193758e6f91bfa41c72c84a69e9ef9e3d7692a0 /libempathy-gtk | |
| parent | 75c7d2ee8af7ba6e301286d09b3b4a2255cdaf21 (diff) | |
| download | gsoc2013-empathy-eb1d26c374afade8d4e7065a70d81dc6ff0a410d.tar.gz gsoc2013-empathy-eb1d26c374afade8d4e7065a70d81dc6ff0a410d.tar.zst gsoc2013-empathy-eb1d26c374afade8d4e7065a70d81dc6ff0a410d.zip | |
account-widget-jabber: remove colons, clean up advanced section
Don't dim labels in viewport, grey on white looks wrong.
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-account-widget-jabber.ui | 407 |
1 files changed, 223 insertions, 184 deletions
diff --git a/libempathy-gtk/empathy-account-widget-jabber.ui b/libempathy-gtk/empathy-account-widget-jabber.ui index 1dde7c93f..0ae306633 100644 --- a/libempathy-gtk/empathy-account-widget-jabber.ui +++ b/libempathy-gtk/empathy-account-widget-jabber.ui @@ -2,7 +2,6 @@ <interface> <requires lib="gtk+" version="2.16"/> <object class="GtkAdjustment" id="adjustment1"> - <property name="lower">0</property> <property name="upper">127</property> <property name="step_increment">1</property> <property name="page_increment">10</property> @@ -325,6 +324,24 @@ Use <a href="http://www.facebook.com/username/">this page</a> to cho <property name="height">1</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="left_attach">1</property> @@ -355,10 +372,13 @@ Use <a href="http://www.facebook.com/username/">this page</a> to cho <object class="GtkLabel" id="label_id"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Login I_D:</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">Login I_D</property> <property name="use_underline">True</property> <property name="mnemonic_widget">entry_id</property> + <style> + <class name="dim-label"/> + </style> </object> <packing> <property name="left_attach">0</property> @@ -371,11 +391,14 @@ Use <a href="http://www.facebook.com/username/">this page</a> to cho <object class="GtkLabel" id="label_password"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Pass_word:</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">Pass_word</property> <property name="use_underline">True</property> <property name="justify">right</property> <property name="mnemonic_widget">entry_password</property> + <style> + <class name="dim-label"/> + </style> </object> <packing> <property name="left_attach">0</property> @@ -384,6 +407,18 @@ Use <a href="http://www.facebook.com/username/">this page</a> to cho <property name="height">1</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">False</property> @@ -397,6 +432,7 @@ Use <a href="http://www.facebook.com/username/">this page</a> to cho <property name="can_focus">True</property> <child> <object class="GtkScrolledWindow" id="scrolledwindow1"> + <property name="height_request">200</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">never</property> @@ -407,199 +443,202 @@ Use <a href="http://www.facebook.com/username/">this page</a> to cho <property name="can_focus">False</property> <property name="shadow_type">none</property> <child> - <object class="GtkVBox" id="vbox_advanced"> + <object class="GtkGrid" id="grid_advanced_settings"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> + <property name="border_width">6</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="n_rows">8</property> + <property name="n_columns">2</property> + <child> + <object class="GtkEntry" id="entry_resource"> + <property name="visible">True</property> + <property name="can_focus">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="spinbutton_priority"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="adjustment">adjustment1</property> + <property name="climb_rate">1</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> <child> - <object class="GtkGrid" id="grid_advanced_settings"> + <object class="GtkCheckButton" id="checkbutton_ignore_ssl_errors"> + <property name="label" translatable="yes">I_gnore SSL certificate errors</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="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">2</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label_priority"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="column_spacing">12</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkEntry" id="entry_resource"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="spinbutton_priority"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">adjustment1</property> - <property name="climb_rate">1</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="checkbutton_ignore_ssl_errors"> - <property name="label" translatable="yes">I_gnore SSL certificate errors</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="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label_priority"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Priori_ty:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">spinbutton_priority</property> - </object> - <packing> - <property name="top_attach">3</property> - <property name="left_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label_resource"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Reso_urce:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">entry_resource</property> - </object> - <packing> - <property name="top_attach">2</property> - <property name="left_attach">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="checkbutton_encryption"> - <property name="label" translatable="yes">Encr_yption required (TLS/SSL)</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="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">0</property> - </packing> - </child> + <property name="xalign">1</property> + <property name="label" translatable="yes">Priori_ty</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">spinbutton_priority</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> <child> - <object class="GtkFrame" id="frame1"> + <object class="GtkLabel" id="label_resource"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> - <child> - <object class="GtkGrid" id="grid1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">12</property> - <property name="column_spacing">6</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkSpinButton" id="spinbutton_port"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">adjustment2</property> - <property name="climb_rate">1</property> - <property name="numeric">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="entry_server"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="checkbutton_ssl"> - <property name="label" translatable="yes">Use old SS_L</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="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="top_attach">2</property> - <property name="left_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label_port"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Port:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">spinbutton_port</property> - </object> - <packing> - <property name="top_attach">1</property> - <property name="left_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label_server"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Server:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">entry_server</property> - </object> - <packing> - <property name="left_attach">0</property> - </packing> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Override server settings</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - </child> + <property name="xalign">1</property> + <property name="label" translatable="yes">Reso_urce</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">entry_resource</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="checkbutton_encryption"> + <property name="label" translatable="yes">Encr_yption required (TLS/SSL)</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="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">2</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Override server settings</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + <property name="width">2</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label_server"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">_Server</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">entry_server</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">5</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label_port"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">_Port</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">spinbutton_port</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">6</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="checkbutton_ssl"> + <property name="label" translatable="yes">Use old SS_L</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="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">7</property> + <property name="width">2</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="entry_server"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">5</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="spinbutton_port"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + <property name="adjustment">adjustment2</property> + <property name="climb_rate">1</property> + <property name="numeric">True</property> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="left_attach">1</property> + <property name="top_attach">6</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> </object> |