diff options
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-account-widget-aim.ui (renamed from libempathy-gtk/empathy-account-widget-aim.glade) | 109 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-account-widget-generic.ui (renamed from libempathy-gtk/empathy-account-widget-generic.glade) | 44 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-account-widget-groupwise.ui (renamed from libempathy-gtk/empathy-account-widget-groupwise.glade) | 109 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-account-widget-icq.ui (renamed from libempathy-gtk/empathy-account-widget-icq.glade) | 121 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-account-widget-irc.ui (renamed from libempathy-gtk/empathy-account-widget-irc.glade) | 231 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-account-widget-jabber.ui (renamed from libempathy-gtk/empathy-account-widget-jabber.glade) | 187 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-account-widget-msn.ui (renamed from libempathy-gtk/empathy-account-widget-msn.glade) | 109 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-account-widget-salut.ui (renamed from libempathy-gtk/empathy-account-widget-salut.glade) | 108 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-account-widget-sip.ui (renamed from libempathy-gtk/empathy-account-widget-sip.glade) | 118 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-account-widget-yahoo.ui (renamed from libempathy-gtk/empathy-account-widget-yahoo.glade) | 149 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-chat.ui (renamed from libempathy-gtk/empathy-chat.glade) | 47 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-contact-dialogs.ui (renamed from libempathy-gtk/empathy-contact-dialogs.glade) | 47 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-contact-widget.ui (renamed from libempathy-gtk/empathy-contact-widget.glade) | 234 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-log-window.ui (renamed from libempathy-gtk/empathy-log-window.glade) | 133 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-new-message-dialog.ui (renamed from libempathy-gtk/empathy-new-message-dialog.glade) | 91 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-presence-chooser.ui (renamed from libempathy-gtk/empathy-presence-chooser.glade) | 69 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-spell-dialog.ui (renamed from libempathy-gtk/empathy-spell-dialog.glade) | 65 |
17 files changed, 983 insertions, 988 deletions
diff --git a/libempathy-gtk/empathy-account-widget-aim.glade b/libempathy-gtk/empathy-account-widget-aim.ui index c12ea7615..6536b9039 100644 --- a/libempathy-gtk/empathy-account-widget-aim.glade +++ b/libempathy-gtk/empathy-account-widget-aim.ui @@ -1,190 +1,193 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> +<?xml version="1.0"?> <!--*- mode: xml -*--> -<glade-interface> - <widget class="GtkWindow" id="account_aim_settings"> +<interface> + <object class="GtkAdjustment" id="adjustment1"> + <property name="upper">65555</property> + <property name="lower">0</property> + <property name="page_increment">10</property> + <property name="step_increment">1</property> + <property name="page_size">0</property> + <property name="value">5222</property> + </object> + <object class="GtkWindow" id="account_aim_settings"> <property name="visible">True</property> <property name="title">ICQ account settings</property> <property name="resizable">False</property> <child> - <widget class="GtkVBox" id="vbox_aim_settings"> + <object class="GtkVBox" id="vbox_aim_settings"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkTable" id="table_common_settings"> + <object class="GtkTable" id="table_common_settings"> <property name="visible">True</property> <property name="n_rows">2</property> <property name="n_columns">3</property> <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkLabel" id="label_password"> + <object class="GtkLabel" id="label_password"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Pass_word:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">entry_password</property> - </widget> + </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"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label_screenname"> + <object class="GtkLabel" id="label_screenname"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Screen _Name:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">entry_screenname</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkButton" id="button_forget"> + <object class="GtkButton" id="button_forget"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Forget password and clear the entry.</property> - <property name="response_id">0</property> + <property name="tooltip-text" translatable="yes">Forget password and clear the entry.</property> <child> - <widget class="GtkImage" id="image834"> + <object class="GtkImage" id="image834"> <property name="visible">True</property> <property name="stock">gtk-clear</property> <property name="icon_size">1</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options"></property> - <property name="y_options"></property> + <property name="x_options"/> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkEntry" id="entry_screenname"> + <object class="GtkEntry" id="entry_screenname"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">3</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkEntry" id="entry_password"> + <object class="GtkEntry" id="entry_password"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="visibility">False</property> - </widget> + </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> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkExpander" id="expander1"> + <object class="GtkExpander" id="expander1"> <property name="visible">True</property> <property name="can_focus">True</property> <child> - <widget class="GtkTable" id="table_advanced_settings"> + <object class="GtkTable" id="table_advanced_settings"> <property name="visible">True</property> <property name="n_rows">2</property> <property name="n_columns">2</property> <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkSpinButton" id="spinbutton_port"> + <object class="GtkSpinButton" id="spinbutton_port"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="adjustment">5222 0 65555 1 10 0</property> + <property name="adjustment">adjustment1</property> <property name="climb_rate">1</property> <property name="numeric">True</property> - </widget> + </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> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label_port"> + <object class="GtkLabel" id="label_port"> <property name="visible">True</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> - </widget> + </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"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkEntry" id="entry_server"> + <object class="GtkEntry" id="entry_server"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <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> - <widget class="GtkLabel" id="label_server"> + <object class="GtkLabel" id="label_server"> <property name="visible">True</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> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label1"> + <child type="label"> + <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Advanced</b></property> <property name="use_markup">True</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> +</interface> diff --git a/libempathy-gtk/empathy-account-widget-generic.glade b/libempathy-gtk/empathy-account-widget-generic.ui index e0ac01a98..fd9a609f2 100644 --- a/libempathy-gtk/empathy-account-widget-generic.glade +++ b/libempathy-gtk/empathy-account-widget-generic.ui @@ -1,17 +1,16 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> +<?xml version="1.0"?> <!--*- mode: xml -*--> -<glade-interface> - <widget class="GtkWindow" id="account_generic_settings"> +<interface> + <object class="GtkWindow" id="account_generic_settings"> <property name="visible">True</property> <property name="title">generic account settings</property> <property name="resizable">False</property> <child> - <widget class="GtkVBox" id="vbox_generic_settings"> + <object class="GtkVBox" id="vbox_generic_settings"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkTable" id="table_common_settings"> + <object class="GtkTable" id="table_common_settings"> <property name="visible">True</property> <property name="n_columns">3</property> <property name="column_spacing">12</property> @@ -25,30 +24,30 @@ <child> <placeholder/> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkExpander" id="expander1"> + <object class="GtkExpander" id="expander1"> <property name="visible">True</property> <property name="can_focus">True</property> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow1"> + <object class="GtkScrolledWindow" id="scrolledwindow1"> <property name="visible">True</property> <property name="can_focus">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="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <child> - <widget class="GtkViewport" id="viewport1"> + <object class="GtkViewport" id="viewport1"> <property name="visible">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="resize_mode">GTK_RESIZE_QUEUE</property> <child> - <widget class="GtkTable" id="table_advanced_settings"> + <object class="GtkTable" id="table_advanced_settings"> <property name="visible">True</property> <property name="n_columns">3</property> <property name="column_spacing">12</property> @@ -62,28 +61,25 @@ <child> <placeholder/> </child> - </widget> + </object> </child> - </widget> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label1"> + <child type="label"> + <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Advanced</b></property> <property name="use_markup">True</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> + </object> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> +</interface> diff --git a/libempathy-gtk/empathy-account-widget-groupwise.glade b/libempathy-gtk/empathy-account-widget-groupwise.ui index ef47f2d7a..a782250f0 100644 --- a/libempathy-gtk/empathy-account-widget-groupwise.glade +++ b/libempathy-gtk/empathy-account-widget-groupwise.ui @@ -1,192 +1,195 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> +<?xml version="1.0"?> <!--*- mode: xml -*--> -<glade-interface> - <widget class="GtkWindow" id="account_groupwise_settings"> +<interface> + <object class="GtkAdjustment" id="adjustment1"> + <property name="upper">65535</property> + <property name="lower">0</property> + <property name="page_increment">10</property> + <property name="step_increment">1</property> + <property name="page_size">0</property> + <property name="value">0</property> + </object> + <object class="GtkWindow" id="account_groupwise_settings"> <property name="visible">True</property> <property name="title">groupwise account settings</property> <property name="resizable">False</property> <child> - <widget class="GtkVBox" id="vbox_groupwise_settings"> + <object class="GtkVBox" id="vbox_groupwise_settings"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkTable" id="table_common_groupwise_settings"> + <object class="GtkTable" id="table_common_groupwise_settings"> <property name="visible">True</property> <property name="n_rows">2</property> <property name="n_columns">2</property> <property name="column_spacing">6</property> <property name="row_spacing">6</property> <child> - <widget class="GtkHBox" id="hbox1"> + <object class="GtkHBox" id="hbox1"> <property name="visible">True</property> <property name="spacing">2</property> <child> - <widget class="GtkEntry" id="entry_password"> + <object class="GtkEntry" id="entry_password"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="visibility">False</property> - </widget> + </object> </child> <child> - <widget class="GtkButton" id="button_forget"> + <object class="GtkButton" id="button_forget"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Forget password and clear the entry.</property> - <property name="response_id">0</property> + <property name="tooltip-text" translatable="yes">Forget password and clear the entry.</property> <child> - <widget class="GtkImage" id="image1"> + <object class="GtkImage" id="image1"> <property name="visible">True</property> <property name="stock">gtk-clear</property> <property name="icon_size">1</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">1</property> </packing> </child> - </widget> + </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> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label_password"> + <object class="GtkLabel" id="label_password"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Pass_word:</property> <property name="use_underline">True</property> - </widget> + </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"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label_id"> + <object class="GtkLabel" id="label_id"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Login I_D:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">entry_id</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkEntry" id="entry_id"> + <object class="GtkEntry" id="entry_id"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> </packing> </child> <child> - <widget class="GtkExpander" id="expander1"> + <object class="GtkExpander" id="expander1"> <property name="visible">True</property> <property name="can_focus">True</property> <child> - <widget class="GtkTable" id="table_advanced_groupwise_settings"> + <object class="GtkTable" id="table_advanced_groupwise_settings"> <property name="visible">True</property> <property name="n_rows">2</property> <property name="n_columns">2</property> <property name="column_spacing">6</property> <property name="row_spacing">6</property> <child> - <widget class="GtkLabel" id="label_port"> + <object class="GtkLabel" id="label_port"> <property name="visible">True</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> - </widget> + </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"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label_server"> + <object class="GtkLabel" id="label_server"> <property name="visible">True</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> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkEntry" id="entry_server"> + <object class="GtkEntry" id="entry_server"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <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> - <widget class="GtkSpinButton" id="spinbutton_port"> + <object class="GtkSpinButton" id="spinbutton_port"> <property name="visible">True</property> <property name="can_focus">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="adjustment">0 0 65535 1 10 0</property> + <property name="adjustment">adjustment1</property> <property name="climb_rate">1</property> <property name="numeric">True</property> - </widget> + </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> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label1"> + <child type="label"> + <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Advanced</b></property> <property name="use_markup">True</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> +</interface> diff --git a/libempathy-gtk/empathy-account-widget-icq.glade b/libempathy-gtk/empathy-account-widget-icq.ui index 83613c39b..1712466cd 100644 --- a/libempathy-gtk/empathy-account-widget-icq.glade +++ b/libempathy-gtk/empathy-account-widget-icq.ui @@ -1,218 +1,221 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> +<?xml version="1.0"?> <!--*- mode: xml -*--> -<glade-interface> - <widget class="GtkWindow" id="account_icq_settings"> +<interface> + <object class="GtkAdjustment" id="adjustment1"> + <property name="upper">65555</property> + <property name="lower">0</property> + <property name="page_increment">10</property> + <property name="step_increment">1</property> + <property name="page_size">0</property> + <property name="value">5222</property> + </object> + <object class="GtkWindow" id="account_icq_settings"> <property name="visible">True</property> <property name="title">ICQ account settings</property> <property name="resizable">False</property> <child> - <widget class="GtkVBox" id="vbox_icq_settings"> + <object class="GtkVBox" id="vbox_icq_settings"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkTable" id="table_common_settings"> + <object class="GtkTable" id="table_common_settings"> <property name="visible">True</property> <property name="n_rows">2</property> <property name="n_columns">3</property> <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkLabel" id="label_password"> + <object class="GtkLabel" id="label_password"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Pass_word:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">entry_password</property> - </widget> + </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"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label_uin"> + <object class="GtkLabel" id="label_uin"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">ICQ _UIN:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">entry_uin</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkButton" id="button_forget"> + <object class="GtkButton" id="button_forget"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Forget password and clear the entry.</property> - <property name="response_id">0</property> + <property name="tooltip-text" translatable="yes">Forget password and clear the entry.</property> <child> - <widget class="GtkImage" id="image834"> + <object class="GtkImage" id="image834"> <property name="visible">True</property> <property name="stock">gtk-clear</property> <property name="icon_size">1</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options"></property> - <property name="y_options"></property> + <property name="x_options"/> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkEntry" id="entry_uin"> + <object class="GtkEntry" id="entry_uin"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">3</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkEntry" id="entry_password"> + <object class="GtkEntry" id="entry_password"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="visibility">False</property> - </widget> + </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> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkExpander" id="expander1"> + <object class="GtkExpander" id="expander1"> <property name="visible">True</property> <property name="can_focus">True</property> <child> - <widget class="GtkTable" id="table_advanced_settings"> + <object class="GtkTable" id="table_advanced_settings"> <property name="visible">True</property> <property name="n_rows">3</property> <property name="n_columns">2</property> <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkLabel" id="label_charset"> + <object class="GtkLabel" id="label_charset"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Charset:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">entry_charset</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkSpinButton" id="spinbutton_port"> + <object class="GtkSpinButton" id="spinbutton_port"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="adjustment">5222 0 65555 1 10 0</property> + <property name="adjustment">adjustment1</property> <property name="climb_rate">1</property> <property name="numeric">True</property> - </widget> + </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="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkEntry" id="entry_server"> + <object class="GtkEntry" id="entry_server"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </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> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label_port"> + <object class="GtkLabel" id="label_port"> <property name="visible">True</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> - </widget> + </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"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label_server"> + <object class="GtkLabel" id="label_server"> <property name="visible">True</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> - </widget> + </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"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkEntry" id="entry_charset"> + <object class="GtkEntry" id="entry_charset"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label1"> + <child type="label"> + <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Advanced</b></property> <property name="use_markup">True</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> +</interface> diff --git a/libempathy-gtk/empathy-account-widget-irc.glade b/libempathy-gtk/empathy-account-widget-irc.ui index 3e9899f6a..a35528524 100644 --- a/libempathy-gtk/empathy-account-widget-irc.glade +++ b/libempathy-gtk/empathy-account-widget-irc.ui @@ -1,147 +1,144 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> +<?xml version="1.0"?> <!--Generated with glade3 3.4.1 on Wed Mar 5 15:39:45 2008 --> -<glade-interface> - <widget class="GtkWindow" id="account_irc_settings"> +<interface> + <object class="GtkWindow" id="account_irc_settings"> <property name="title">irc account settings</property> <property name="resizable">False</property> <child> - <widget class="GtkTable" id="vbox_irc_settings"> + <object class="GtkTable" id="vbox_irc_settings"> <property name="visible">True</property> <property name="n_rows">5</property> <property name="n_columns">2</property> <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkEntry" id="entry_quit_message"> + <object class="GtkEntry" id="entry_quit_message"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">4</property> <property name="bottom_attach">5</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label_quit_message"> + <object class="GtkLabel" id="label_quit_message"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Quit message:</property> - </widget> + </object> <packing> <property name="top_attach">4</property> <property name="bottom_attach">5</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkEntry" id="entry_fullname"> + <object class="GtkEntry" id="entry_fullname"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </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="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkEntry" id="entry_password"> + <object class="GtkEntry" id="entry_password"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="visibility">False</property> - </widget> + </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="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label_password"> + <object class="GtkLabel" id="label_password"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Password:</property> - </widget> + </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"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label_fullname"> + <object class="GtkLabel" id="label_fullname"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Real name:</property> - </widget> + </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"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkEntry" id="entry_nick"> + <object class="GtkEntry" id="entry_nick"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </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> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label_nick"> + <object class="GtkLabel" id="label_nick"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Nickname:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">entry_nick</property> - </widget> + </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"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkHBox" id="hbox174"> + <object class="GtkHBox" id="hbox174"> <property name="visible">True</property> <property name="spacing">2</property> <child> - <widget class="GtkComboBox" id="combobox_network"> + <object class="GtkComboBox" id="combobox_network"> <property name="visible">True</property> - <property name="items" translatable="yes"></property> - </widget> + </object> </child> <child> - <widget class="GtkButton" id="button_add_network"> + <object class="GtkButton" id="button_add_network"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Create a new IRC network</property> - <property name="response_id">0</property> + <property name="tooltip-text" translatable="yes">Create a new IRC network</property> <child> - <widget class="GtkImage" id="image2"> + <object class="GtkImage" id="image2"> <property name="visible">True</property> <property name="stock">gtk-add</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -149,18 +146,17 @@ </packing> </child> <child> - <widget class="GtkButton" id="button_network"> + <object class="GtkButton" id="button_network"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Edit the selected IRC network</property> - <property name="response_id">0</property> + <property name="tooltip-text" translatable="yes">Edit the selected IRC network</property> <child> - <widget class="GtkImage" id="image834"> + <object class="GtkImage" id="image834"> <property name="visible">True</property> <property name="stock">gtk-edit</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -168,25 +164,24 @@ </packing> </child> <child> - <widget class="GtkButton" id="button_remove"> + <object class="GtkButton" id="button_remove"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Remove the selected IRC network</property> - <property name="response_id">0</property> + <property name="tooltip-text" translatable="yes">Remove the selected IRC network</property> <child> - <widget class="GtkImage" id="image835"> + <object class="GtkImage" id="image835"> <property name="visible">True</property> <property name="stock">gtk-remove</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">3</property> </packing> </child> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -195,21 +190,21 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label_network"> + <object class="GtkLabel" id="label_network"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Network:</property> <property name="use_underline">True</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> - </widget> + </object> </child> - </widget> - <widget class="GtkDialog" id="irc_network_dialog"> + </object> + <object class="GtkDialog" id="irc_network_dialog"> <property name="visible">True</property> <property name="border_width">5</property> <property name="title" translatable="yes">Network</property> @@ -220,65 +215,65 @@ <property name="skip_pager_hint">True</property> <property name="has_separator">False</property> <child internal-child="vbox"> - <widget class="GtkVBox" id="dialog-vbox10"> + <object class="GtkVBox" id="dialog-vbox10"> <property name="visible">True</property> <property name="spacing">2</property> <child> - <widget class="GtkFrame" id="frame14"> + <object class="GtkFrame" id="frame14"> <property name="visible">True</property> <property name="label_xalign">0</property> <property name="shadow_type">GTK_SHADOW_NONE</property> <child> - <widget class="GtkAlignment" id="alignment28"> + <object class="GtkAlignment" id="alignment28"> <property name="visible">True</property> <property name="top_padding">6</property> <property name="left_padding">12</property> <child> - <widget class="GtkTable" id="table14"> + <object class="GtkTable" id="table14"> <property name="visible">True</property> <property name="n_rows">2</property> <property name="n_columns">2</property> <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkLabel" id="label_network"> + <object class="GtkLabel" id="label_network"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Network:</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label_charset"> + <object class="GtkLabel" id="label_charset"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Charset:</property> - </widget> + </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"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkEntry" id="entry_network"> + <object class="GtkEntry" id="entry_network"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <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> - <widget class="GtkComboBox" id="combobox_charset"> + <object class="GtkComboBox" id="combobox_charset"> <property name="visible">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -288,162 +283,158 @@ <property name="y_options">GTK_FILL</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label_network"> + <child type="label"> + <object class="GtkLabel" id="label_network"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Network</b></property> <property name="use_markup">True</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> + </object> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkFrame" id="frame15"> + <object class="GtkFrame" id="frame15"> <property name="visible">True</property> <property name="label_xalign">0</property> <property name="shadow_type">GTK_SHADOW_NONE</property> <child> - <widget class="GtkAlignment" id="alignment29"> + <object class="GtkAlignment" id="alignment29"> <property name="visible">True</property> <property name="top_padding">6</property> <property name="left_padding">12</property> <child> - <widget class="GtkTable" id="table15"> + <object class="GtkTable" id="table15"> <property name="visible">True</property> <property name="n_rows">1</property> <property name="n_columns">2</property> <property name="column_spacing">6</property> <property name="row_spacing">6</property> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow19"> + <object class="GtkScrolledWindow" id="scrolledwindow19"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">GTK_POLICY_NEVER</property> <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <property name="shadow_type">GTK_SHADOW_IN</property> <child> - <widget class="GtkTreeView" id="treeview_servers"> + <object class="GtkTreeView" id="treeview_servers"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="enable_search">False</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="y_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkVButtonBox" id="vbuttonbox1"> + <object class="GtkVButtonBox" id="vbuttonbox1"> <property name="visible">True</property> <property name="spacing">6</property> <property name="layout_style">GTK_BUTTONBOX_START</property> <child> - <widget class="GtkButton" id="button_add"> + <object class="GtkButton" id="button_add"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="label">gtk-add</property> <property name="use_stock">True</property> - <property name="response_id">0</property> - </widget> + </object> </child> <child> - <widget class="GtkButton" id="button_remove"> + <object class="GtkButton" id="button_remove"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="label">gtk-remove</property> <property name="use_stock">True</property> - <property name="response_id">0</property> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkButton" id="button_up"> + <object class="GtkButton" id="button_up"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="label">gtk-go-up</property> <property name="use_stock">True</property> - <property name="response_id">0</property> - </widget> + </object> <packing> <property name="position">2</property> </packing> </child> <child> - <widget class="GtkButton" id="button_down"> + <object class="GtkButton" id="button_down"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="label">gtk-go-down</property> <property name="use_stock">True</property> - <property name="response_id">0</property> - </widget> + </object> <packing> <property name="position">3</property> </packing> </child> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="x_options">GTK_FILL</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label_servers"> + <child type="label"> + <object class="GtkLabel" id="label_servers"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Servers</b></property> <property name="use_markup">True</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> + </object> </child> - </widget> + </object> <packing> <property name="position">2</property> </packing> </child> <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="dialog-action_area10"> + <object class="GtkHButtonBox" id="dialog-action_area10"> <property name="visible">True</property> <property name="layout_style">GTK_BUTTONBOX_END</property> <child> - <widget class="GtkButton" id="button_close"> + <object class="GtkButton" id="button_close"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="label">gtk-close</property> <property name="use_stock">True</property> - <property name="response_id">-7</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="pack_type">GTK_PACK_END</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + <action-widgets> + <action-widget response="0">button_add</action-widget> + <action-widget response="0">button_remove</action-widget> + <action-widget response="0">button_up</action-widget> + <action-widget response="0">button_down</action-widget> + <action-widget response="-7">button_close</action-widget> + </action-widgets> + </object> +</interface> diff --git a/libempathy-gtk/empathy-account-widget-jabber.glade b/libempathy-gtk/empathy-account-widget-jabber.ui index 6e221e380..9f52f6890 100644 --- a/libempathy-gtk/empathy-account-widget-jabber.glade +++ b/libempathy-gtk/empathy-account-widget-jabber.ui @@ -1,337 +1,342 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> +<?xml version="1.0"?> <!--*- mode: xml -*--> -<glade-interface> - <widget class="GtkWindow" id="account_jabber_settings"> +<interface> + <object class="GtkAdjustment" id="adjustment1"> + <property name="upper">127</property> + <property name="lower">-128</property> + <property name="page_increment">10</property> + <property name="step_increment">1</property> + <property name="page_size">0</property> + <property name="value">0</property> + </object> + <object class="GtkAdjustment" id="adjustment2"> + <property name="upper">65555</property> + <property name="lower">0</property> + <property name="page_increment">10</property> + <property name="step_increment">1</property> + <property name="page_size">0</property> + <property name="value">5222</property> + </object> + <object class="GtkWindow" id="account_jabber_settings"> <property name="visible">True</property> <property name="title">jabber account settings</property> <property name="resizable">False</property> <child> - <widget class="GtkVBox" id="vbox_jabber_settings"> + <object class="GtkVBox" id="vbox_jabber_settings"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkTable" id="table_common_settings"> + <object class="GtkTable" id="table_common_settings"> <property name="visible">True</property> <property name="n_rows">2</property> <property name="n_columns">3</property> <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkEntry" id="entry_password"> + <object class="GtkEntry" id="entry_password"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="visibility">False</property> - </widget> + </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> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkEntry" id="entry_id"> + <object class="GtkEntry" id="entry_id"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">3</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label_id"> + <object class="GtkLabel" id="label_id"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Login I_D:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">entry_id</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkButton" id="button_forget"> + <object class="GtkButton" id="button_forget"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Forget password and clear the entry.</property> - <property name="response_id">0</property> + <property name="tooltip-text" translatable="yes">Forget password and clear the entry.</property> <child> - <widget class="GtkImage" id="image834"> + <object class="GtkImage" id="image834"> <property name="visible">True</property> <property name="stock">gtk-clear</property> <property name="icon_size">1</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label_password"> + <object class="GtkLabel" id="label_password"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Pass_word:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">entry_password</property> - </widget> + </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"></property> + <property name="y_options"/> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkExpander" id="expander1"> + <object class="GtkExpander" id="expander1"> <property name="visible">True</property> <property name="can_focus">True</property> <child> - <widget class="GtkVBox" id="vbox1"> + <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> <child> - <widget class="GtkTable" id="table_advanced_settings"> + <object class="GtkTable" id="table_advanced_settings"> <property name="visible">True</property> <property name="n_rows">4</property> <property name="n_columns">3</property> <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkEntry" id="entry_resource"> + <object class="GtkEntry" id="entry_resource"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">3</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> - <widget class="GtkSpinButton" id="spinbutton_priority"> + <object class="GtkSpinButton" id="spinbutton_priority"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="adjustment">0 -128 127 1 10 0</property> + <property name="adjustment">adjustment1</property> <property name="climb_rate">1</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">3</property> <property name="top_attach">3</property> <property name="bottom_attach">4</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkCheckButton" id="checkbutton_ignore_ssl_errors"> + <object class="GtkCheckButton" id="checkbutton_ignore_ssl_errors"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="label" translatable="yes">_Ignore SSL certificate errors</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> - </widget> + </object> <packing> <property name="right_attach">3</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label_priority"> + <object class="GtkLabel" id="label_priority"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Pri_ority:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">spinbutton_priority</property> - </widget> + </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"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label_resource"> + <object class="GtkLabel" id="label_resource"> <property name="visible">True</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> - </widget> + </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"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkCheckButton" id="checkbutton_encryption"> + <object class="GtkCheckButton" id="checkbutton_encryption"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="label" translatable="yes">_Encryption required (TLS/SSL)</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> - </widget> + </object> <packing> <property name="right_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> - </widget> + </object> </child> <child> - <widget class="GtkFrame" id="frame1"> + <object class="GtkFrame" id="frame1"> <property name="visible">True</property> <property name="label_xalign">0</property> <property name="shadow_type">GTK_SHADOW_NONE</property> <child> - <widget class="GtkAlignment" id="alignment1"> + <object class="GtkAlignment" id="alignment1"> <property name="visible">True</property> <property name="left_padding">12</property> <child> - <widget class="GtkTable" id="table1"> + <object class="GtkTable" id="table1"> <property name="visible">True</property> <property name="n_rows">3</property> <property name="n_columns">2</property> <property name="column_spacing">6</property> <property name="row_spacing">6</property> <child> - <widget class="GtkSpinButton" id="spinbutton_port"> + <object class="GtkSpinButton" id="spinbutton_port"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="adjustment">5222 0 65555 1 10 0</property> + <property name="adjustment">adjustment2</property> <property name="climb_rate">1</property> <property name="numeric">True</property> - </widget> + </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> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkEntry" id="entry_server"> + <object class="GtkEntry" id="entry_server"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <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> - <widget class="GtkCheckButton" id="checkbutton_ssl"> + <object class="GtkCheckButton" id="checkbutton_ssl"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="label" translatable="yes">Use old SS_L</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> - </widget> + </object> <packing> <property name="right_attach">2</property> <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> - <widget class="GtkLabel" id="label_port"> + <object class="GtkLabel" id="label_port"> <property name="visible">True</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> - </widget> + </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"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label_server"> + <object class="GtkLabel" id="label_server"> <property name="visible">True</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> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label2"> + <child type="label"> + <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Override server settings</b></property> <property name="use_markup">True</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> + </object> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label1"> + <child type="label"> + <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Advanced</b></property> <property name="use_markup">True</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> +</interface> diff --git a/libempathy-gtk/empathy-account-widget-msn.glade b/libempathy-gtk/empathy-account-widget-msn.ui index 81a02052e..c91c33724 100644 --- a/libempathy-gtk/empathy-account-widget-msn.glade +++ b/libempathy-gtk/empathy-account-widget-msn.ui @@ -1,192 +1,195 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> +<?xml version="1.0"?> <!--*- mode: xml -*--> -<glade-interface> - <widget class="GtkWindow" id="account_msn_settings"> +<interface> + <object class="GtkAdjustment" id="adjustment1"> + <property name="upper">65535</property> + <property name="lower">0</property> + <property name="page_increment">10</property> + <property name="step_increment">1</property> + <property name="page_size">0</property> + <property name="value">0</property> + </object> + <object class="GtkWindow" id="account_msn_settings"> <property name="visible">True</property> <property name="title">msn account settings</property> <property name="resizable">False</property> <child> - <widget class="GtkVBox" id="vbox_msn_settings"> + <object class="GtkVBox" id="vbox_msn_settings"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkTable" id="table_common_msn_settings"> + <object class="GtkTable" id="table_common_msn_settings"> <property name="visible">True</property> <property name="n_rows">2</property> <property name="n_columns">2</property> <property name="column_spacing">6</property> <property name="row_spacing">6</property> <child> - <widget class="GtkHBox" id="hbox1"> + <object class="GtkHBox" id="hbox1"> <property name="visible">True</property> <property name="spacing">2</property> <child> - <widget class="GtkEntry" id="entry_password"> + <object class="GtkEntry" id="entry_password"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="visibility">False</property> - </widget> + </object> </child> <child> - <widget class="GtkButton" id="button_forget"> + <object class="GtkButton" id="button_forget"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Forget password and clear the entry.</property> - <property name="response_id">0</property> + <property name="tooltip-text" translatable="yes">Forget password and clear the entry.</property> <child> - <widget class="GtkImage" id="image1"> + <object class="GtkImage" id="image1"> <property name="visible">True</property> <property name="stock">gtk-clear</property> <property name="icon_size">1</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">1</property> </packing> </child> - </widget> + </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> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label_password"> + <object class="GtkLabel" id="label_password"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Pass_word:</property> <property name="use_underline">True</property> - </widget> + </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"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label_id"> + <object class="GtkLabel" id="label_id"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Login I_D:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">entry_id</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkEntry" id="entry_id"> + <object class="GtkEntry" id="entry_id"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> </packing> </child> <child> - <widget class="GtkExpander" id="expander1"> + <object class="GtkExpander" id="expander1"> <property name="visible">True</property> <property name="can_focus">True</property> <child> - <widget class="GtkTable" id="table_advanced_msn_settings"> + <object class="GtkTable" id="table_advanced_msn_settings"> <property name="visible">True</property> <property name="n_rows">2</property> <property name="n_columns">2</property> <property name="column_spacing">6</property> <property name="row_spacing">6</property> <child> - <widget class="GtkLabel" id="label_port"> + <object class="GtkLabel" id="label_port"> <property name="visible">True</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> - </widget> + </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"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label_server"> + <object class="GtkLabel" id="label_server"> <property name="visible">True</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> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkEntry" id="entry_server"> + <object class="GtkEntry" id="entry_server"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <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> - <widget class="GtkSpinButton" id="spinbutton_port"> + <object class="GtkSpinButton" id="spinbutton_port"> <property name="visible">True</property> <property name="can_focus">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="adjustment">0 0 65535 1 10 0</property> + <property name="adjustment">adjustment1</property> <property name="climb_rate">1</property> <property name="numeric">True</property> - </widget> + </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> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label1"> + <child type="label"> + <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Advanced</b></property> <property name="use_markup">True</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> +</interface> diff --git a/libempathy-gtk/empathy-account-widget-salut.glade b/libempathy-gtk/empathy-account-widget-salut.ui index 57fd822e3..6766a390b 100644 --- a/libempathy-gtk/empathy-account-widget-salut.glade +++ b/libempathy-gtk/empathy-account-widget-salut.ui @@ -1,219 +1,215 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> +<?xml version="1.0"?> <!--*- mode: xml -*--> -<glade-interface> - <widget class="GtkWindow" id="account_salut_settings"> +<interface> + <object class="GtkWindow" id="account_salut_settings"> <property name="visible">True</property> <property name="title">salut account settings</property> <property name="resizable">False</property> <child> - <widget class="GtkVBox" id="vbox_salut_settings"> + <object class="GtkVBox" id="vbox_salut_settings"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkTable" id="table_common_settings"> + <object class="GtkTable" id="table_common_settings"> <property name="visible">True</property> <property name="n_rows">3</property> <property name="n_columns">3</property> <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkEntry" id="entry_nickname"> + <object class="GtkEntry" id="entry_nickname"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">3</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> - <widget class="GtkEntry" id="entry_last_name"> + <object class="GtkEntry" id="entry_last_name"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <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> - <widget class="GtkEntry" id="entry_first_name"> + <object class="GtkEntry" id="entry_first_name"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">3</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label_nickname"> + <object class="GtkLabel" id="label_nickname"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Nickname:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">entry_nickname</property> - </widget> + </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"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label_last_name"> + <object class="GtkLabel" id="label_last_name"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Last Name:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">entry_last_name</property> - </widget> + </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"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label_first_name"> + <object class="GtkLabel" id="label_first_name"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">_First Name:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">entry_first_name</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkExpander" id="expander1"> + <object class="GtkExpander" id="expander1"> <property name="visible">True</property> <property name="can_focus">True</property> <child> - <widget class="GtkTable" id="table_advanced_settings"> + <object class="GtkTable" id="table_advanced_settings"> <property name="visible">True</property> <property name="n_rows">3</property> <property name="n_columns">3</property> <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkEntry" id="entry_published"> + <object class="GtkEntry" id="entry_published"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">3</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label_published"> + <object class="GtkLabel" id="label_published"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Published Name:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">entry_published</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkEntry" id="entry_jid"> + <object class="GtkEntry" id="entry_jid"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">3</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> - <widget class="GtkEntry" id="entry_email"> + <object class="GtkEntry" id="entry_email"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <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> - <widget class="GtkLabel" id="label_jid"> + <object class="GtkLabel" id="label_jid"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Jabber ID:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">entry_jid</property> - </widget> + </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"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label_email"> + <object class="GtkLabel" id="label_email"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Email:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">entry_email</property> - </widget> + </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"></property> + <property name="y_options"/> </packing> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label1"> + <child type="label"> + <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Advanced</b></property> <property name="use_markup">True</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> +</interface> diff --git a/libempathy-gtk/empathy-account-widget-sip.glade b/libempathy-gtk/empathy-account-widget-sip.ui index 3d026de1c..df25b843e 100644 --- a/libempathy-gtk/empathy-account-widget-sip.glade +++ b/libempathy-gtk/empathy-account-widget-sip.ui @@ -1,122 +1,128 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> +<?xml version="1.0"?> <!--*- mode: xml -*--> -<glade-interface> - <widget class="GtkWindow" id="account_sip_settings"> +<interface> + <object class="GtkAdjustment" id="adjustment1"> + <property name="upper">65535</property> + <property name="lower">0</property> + <property name="page_increment">10</property> + <property name="step_increment">1</property> + <property name="page_size">0</property> + <property name="value">0</property> + </object> + <object class="GtkWindow" id="account_sip_settings"> <property name="resizable">False</property> <child> - <widget class="GtkVBox" id="vbox_sip_settings"> + <object class="GtkVBox" id="vbox_sip_settings"> <property name="visible">True</property> <child> - <widget class="GtkTable" id="table1"> + <object class="GtkTable" id="table1"> <property name="visible">True</property> <property name="n_rows">2</property> <property name="n_columns">2</property> <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkLabel" id="label_password"> + <object class="GtkLabel" id="label_password"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Pass_word:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">entry_password</property> - </widget> + </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"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkEntry" id="entry_userid"> + <object class="GtkEntry" id="entry_userid"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <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> - <widget class="GtkLabel" id="label_userid"> + <object class="GtkLabel" id="label_userid"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Username:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">entry_password</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkHBox" id="hbox1"> + <object class="GtkHBox" id="hbox1"> <property name="visible">True</property> <child> - <widget class="GtkEntry" id="entry_password"> + <object class="GtkEntry" id="entry_password"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> </child> <child> - <widget class="GtkButton" id="button_forget"> + <object class="GtkButton" id="button_forget"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Forget password and clear the entry.</property> - <property name="response_id">0</property> + <property name="tooltip-text" translatable="yes">Forget password and clear the entry.</property> <child> - <widget class="GtkImage" id="image6"> + <object class="GtkImage" id="image6"> <property name="visible">True</property> <property name="stock">gtk-clear</property> <property name="icon_size">1</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">1</property> </packing> </child> - </widget> + </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> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkExpander" id="expander_advanced"> + <object class="GtkExpander" id="expander_advanced"> <property name="visible">True</property> <property name="can_focus">True</property> <child> - <widget class="GtkAlignment" id="alignment1"> + <object class="GtkAlignment" id="alignment1"> <property name="visible">True</property> <property name="xalign">0</property> <property name="left_padding">12</property> <child> - <widget class="GtkTable" id="table_advanced_sip_settings"> + <object class="GtkTable" id="table_advanced_sip_settings"> <property name="visible">True</property> <property name="n_rows">3</property> <property name="n_columns">2</property> <property name="column_spacing">6</property> <property name="row_spacing">6</property> <child> - <widget class="GtkEntry" id="entry_stun-server"> + <object class="GtkEntry" id="entry_stun-server"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -125,40 +131,40 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label_stun-port"> + <object class="GtkLabel" id="label_stun-port"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">STUN port:</property> <property name="mnemonic_widget">spinbutton_stun-port</property> - </widget> + </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"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label_stun-server"> + <object class="GtkLabel" id="label_stun-server"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">STUN Server:</property> <property name="mnemonic_widget">entry_stun-server</property> - </widget> + </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"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkSpinButton" id="spinbutton_stun-port"> + <object class="GtkSpinButton" id="spinbutton_stun-port"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="adjustment">0 0 65535 1 10 0</property> + <property name="adjustment">adjustment1</property> <property name="climb_rate">1</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -167,42 +173,38 @@ </packing> </child> <child> - <widget class="GtkCheckButton" id="checkbutton_discover-stun"> + <object class="GtkCheckButton" id="checkbutton_discover-stun"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes" comments="look up the DNS SRV record at the service's domain for the host name of a STUN server.">Discover STUN</property> + <property comments="look up the DNS SRV record at the service's domain for the host name of a STUN server." name="label" translatable="yes">Discover STUN</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> - </widget> + </object> <packing> <property name="right_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label_expander"> + <child type="label"> + <object class="GtkLabel" id="label_expander"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Advanced</b></property> <property name="use_markup">True</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> +</interface> diff --git a/libempathy-gtk/empathy-account-widget-yahoo.glade b/libempathy-gtk/empathy-account-widget-yahoo.ui index ca64533ee..439ff91db 100644 --- a/libempathy-gtk/empathy-account-widget-yahoo.glade +++ b/libempathy-gtk/empathy-account-widget-yahoo.ui @@ -1,287 +1,288 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> +<?xml version="1.0"?> <!--*- mode: xml -*--> -<glade-interface> - <widget class="GtkWindow" id="account_yahoo_settings"> +<interface> + <object class="GtkAdjustment" id="adjustment1"> + <property name="upper">65555</property> + <property name="lower">1</property> + <property name="page_increment">10</property> + <property name="step_increment">1</property> + <property name="page_size">0</property> + <property name="value">5050</property> + </object> + <object class="GtkWindow" id="account_yahoo_settings"> <property name="visible">True</property> <property name="title">Yahoo! account settings</property> <property name="resizable">False</property> <child> - <widget class="GtkVBox" id="vbox_yahoo_settings"> + <object class="GtkVBox" id="vbox_yahoo_settings"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkTable" id="table_common_settings"> + <object class="GtkTable" id="table_common_settings"> <property name="visible">True</property> <property name="n_rows">2</property> <property name="n_columns">3</property> <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkLabel" id="label_password"> + <object class="GtkLabel" id="label_password"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Pass_word:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">entry_password</property> - </widget> + </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"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkButton" id="button_forget"> + <object class="GtkButton" id="button_forget"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Forget password and clear the entry.</property> - <property name="response_id">0</property> + <property name="tooltip-text" translatable="yes">Forget password and clear the entry.</property> <child> - <widget class="GtkImage" id="image834"> + <object class="GtkImage" id="image834"> <property name="visible">True</property> <property name="stock">gtk-clear</property> <property name="icon_size">1</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label_id"> + <object class="GtkLabel" id="label_id"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Yahoo I_D:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">entry_id</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkEntry" id="entry_id"> + <object class="GtkEntry" id="entry_id"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">3</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkEntry" id="entry_password"> + <object class="GtkEntry" id="entry_password"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="visibility">False</property> - </widget> + </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> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkExpander" id="expander1"> + <object class="GtkExpander" id="expander1"> <property name="visible">True</property> <property name="can_focus">True</property> <child> - <widget class="GtkVBox" id="vbox1"> + <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> <child> - <widget class="GtkTable" id="table_advanced_settings"> + <object class="GtkTable" id="table_advanced_settings"> <property name="visible">True</property> <property name="n_rows">6</property> <property name="n_columns">2</property> <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkCheckButton" id="checkbutton_ignore_invites"> + <object class="GtkCheckButton" id="checkbutton_ignore_invites"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="label" translatable="yes">_Ignore conference and chatroom invitations</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> - </widget> + </object> <packing> <property name="right_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label_locale"> + <object class="GtkLabel" id="label_locale"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Room List locale:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">entry_locale</property> - </widget> + </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"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label_charset"> + <object class="GtkLabel" id="label_charset"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Charset:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">entry_charset</property> - </widget> + </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"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkEntry" id="entry_locale"> + <object class="GtkEntry" id="entry_locale"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </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> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkEntry" id="entry_charset"> + <object class="GtkEntry" id="entry_charset"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </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="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label_server"> + <object class="GtkLabel" id="label_server"> <property name="visible">True</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> - </widget> + </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"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label_port"> + <object class="GtkLabel" id="label_port"> <property name="visible">True</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> - </widget> + </object> <packing> <property name="top_attach">4</property> <property name="bottom_attach">5</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkEntry" id="entry_server"> + <object class="GtkEntry" id="entry_server"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </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="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkSpinButton" id="spinbutton_port"> + <object class="GtkSpinButton" id="spinbutton_port"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="adjustment">5050 1 65555 1 10 0</property> + <property name="adjustment">adjustment1</property> <property name="climb_rate">1</property> <property name="numeric">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">4</property> <property name="bottom_attach">5</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkCheckButton" id="checkbutton_yahoojp"> + <object class="GtkCheckButton" id="checkbutton_yahoojp"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="label" translatable="yes">Use _Yahoo Japan</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> - </widget> + </object> <packing> <property name="right_attach">2</property> <property name="top_attach">5</property> <property name="bottom_attach">6</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label1"> + <child type="label"> + <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Advanced</b></property> <property name="use_markup">True</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> +</interface> diff --git a/libempathy-gtk/empathy-chat.glade b/libempathy-gtk/empathy-chat.ui index f313c2f55..6a5fc4659 100644 --- a/libempathy-gtk/empathy-chat.glade +++ b/libempathy-gtk/empathy-chat.ui @@ -1,36 +1,35 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> +<?xml version="1.0"?> <!--*- mode: xml -*--> -<glade-interface> - <widget class="GtkWindow" id="chat_window"> +<interface> + <object class="GtkWindow" id="chat_window"> <property name="visible">True</property> <property name="border_width">6</property> <property name="title" translatable="yes">Group Chat</property> <property name="icon_name">system-users</property> <child> - <widget class="GtkVBox" id="chat_widget"> + <object class="GtkVBox" id="chat_widget"> <property name="visible">True</property> <property name="border_width">4</property> <property name="spacing">6</property> <child> - <widget class="GtkHBox" id="hbox_topic"> + <object class="GtkHBox" id="hbox_topic"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label80"> + <object class="GtkLabel" id="label80"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Topic:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkLabel" id="label_topic"> + <object class="GtkLabel" id="label_topic"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -39,12 +38,12 @@ <property name="selectable">True</property> <property name="ellipsize">PANGO_ELLIPSIZE_END</property> <property name="single_line_mode">True</property> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -52,15 +51,15 @@ </packing> </child> <child> - <widget class="GtkHPaned" id="hpaned"> + <object class="GtkHPaned" id="hpaned"> <property name="visible">True</property> <property name="can_focus">True</property> <child> - <widget class="GtkVBox" id="vbox_left"> + <object class="GtkVBox" id="vbox_left"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkScrolledWindow" id="scrolled_window_chat"> + <object class="GtkScrolledWindow" id="scrolled_window_chat"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> @@ -68,10 +67,10 @@ <child> <placeholder/> </child> - </widget> + </object> </child> <child> - <widget class="GtkScrolledWindow" id="scrolled_window_input"> + <object class="GtkScrolledWindow" id="scrolled_window_input"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">GTK_POLICY_NEVER</property> @@ -80,20 +79,20 @@ <child> <placeholder/> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="resize">True</property> <property name="shrink">True</property> </packing> </child> <child> - <widget class="GtkScrolledWindow" id="scrolled_window_contacts"> + <object class="GtkScrolledWindow" id="scrolled_window_contacts"> <property name="width_request">200</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -103,18 +102,18 @@ <child> <placeholder/> </child> - </widget> + </object> <packing> <property name="resize">False</property> <property name="shrink">True</property> </packing> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> +</interface> diff --git a/libempathy-gtk/empathy-contact-dialogs.glade b/libempathy-gtk/empathy-contact-dialogs.ui index 75d8af6a8..0986de1f5 100644 --- a/libempathy-gtk/empathy-contact-dialogs.glade +++ b/libempathy-gtk/empathy-contact-dialogs.ui @@ -1,8 +1,7 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> +<?xml version="1.0"?> <!--*- mode: xml -*--> -<glade-interface> - <widget class="GtkDialog" id="subscription_request_dialog"> +<interface> + <object class="GtkDialog" id="subscription_request_dialog"> <property name="border_width">5</property> <property name="title" translatable="yes">Subscription Request</property> <property name="role">subscription_request</property> @@ -11,21 +10,21 @@ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> <property name="has_separator">False</property> <child internal-child="vbox"> - <widget class="GtkVBox" id="dialog-vbox4"> + <object class="GtkVBox" id="dialog-vbox4"> <property name="visible">True</property> <property name="spacing">2</property> <child> - <widget class="GtkHBox" id="hbox_subscription"> + <object class="GtkHBox" id="hbox_subscription"> <property name="visible">True</property> <property name="border_width">5</property> <property name="spacing">12</property> <child> - <widget class="GtkImage" id="image5"> + <object class="GtkImage" id="image5"> <property name="visible">True</property> <property name="yalign">0</property> <property name="stock">gtk-dialog-question</property> <property name="icon_size">6</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -34,59 +33,61 @@ <child> <placeholder/> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="dialog-action_area4"> + <object class="GtkHButtonBox" id="dialog-action_area4"> <property name="visible">True</property> <property name="layout_style">GTK_BUTTONBOX_END</property> <child> - <widget class="GtkButton" id="button19"> + <object class="GtkButton" id="button19"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="label" translatable="yes">Decide _Later</property> <property name="use_underline">True</property> - <property name="response_id">-6</property> - </widget> + </object> </child> <child> - <widget class="GtkButton" id="button20"> + <object class="GtkButton" id="button20"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="label">gtk-no</property> <property name="use_stock">True</property> - <property name="response_id">-9</property> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkButton" id="button21"> + <object class="GtkButton" id="button21"> <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="label">gtk-yes</property> <property name="use_stock">True</property> - <property name="response_id">-8</property> - </widget> + </object> <packing> <property name="position">2</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="pack_type">GTK_PACK_END</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + <action-widgets> + <action-widget response="-6">button19</action-widget> + <action-widget response="-9">button20</action-widget> + <action-widget response="-8">button21</action-widget> + </action-widgets> + </object> +</interface> diff --git a/libempathy-gtk/empathy-contact-widget.glade b/libempathy-gtk/empathy-contact-widget.ui index 721ebe3fe..8d6266288 100644 --- a/libempathy-gtk/empathy-contact-widget.glade +++ b/libempathy-gtk/empathy-contact-widget.ui @@ -1,43 +1,42 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> +<?xml version="1.0"?> <!--*- mode: xml -*--> -<glade-interface> - <widget class="GtkWindow" id="contact_window"> +<interface> + <object class="GtkWindow" id="contact_window"> <property name="visible">True</property> <property name="title" translatable="yes">Contact information</property> <child> - <widget class="GtkVBox" id="vbox_contact_widget"> + <object class="GtkVBox" id="vbox_contact_widget"> <property name="spacing">6</property> <child> - <widget class="GtkVBox" id="vbox_contact"> + <object class="GtkVBox" id="vbox_contact"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label654"> + <object class="GtkLabel" id="label654"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes"><b>Contact</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkAlignment" id="alignment31"> + <object class="GtkAlignment" id="alignment31"> <property name="visible">True</property> <property name="left_padding">12</property> <child> - <widget class="GtkHBox" id="hbox189"> + <object class="GtkHBox" id="hbox189"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkVBox" id="vbox225"> + <object class="GtkVBox" id="vbox225"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkTable" id="table_contact"> + <object class="GtkTable" id="table_contact"> <property name="visible">True</property> <property name="n_rows">3</property> <property name="n_columns">2</property> @@ -53,167 +52,166 @@ <placeholder/> </child> <child> - <widget class="GtkLabel" id="label680"> + <object class="GtkLabel" id="label680"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Account:</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label655"> + <object class="GtkLabel" id="label655"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes" comments="Identifier to connect to Instant Messaging network">Identifier:</property> - </widget> + <property comments="Identifier to connect to Instant Messaging network" name="label" translatable="yes">Identifier:</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"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label_alias"> + <object class="GtkLabel" id="label_alias"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Alias:</property> - </widget> + </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"></property> + <property name="y_options"/> </packing> </child> - </widget> + </object> </child> <child> - <widget class="GtkHBox" id="hbox_presence"> + <object class="GtkHBox" id="hbox_presence"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkImage" id="image_state"> + <object class="GtkImage" id="image_state"> <property name="visible">True</property> <property name="stock">gtk-missing-image</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkLabel" id="label_status"> + <object class="GtkLabel" id="label_status"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> <property name="use_markup">True</property> <property name="wrap">True</property> <property name="selectable">True</property> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> <child> - <widget class="GtkVBox" id="vbox_avatar"> + <object class="GtkVBox" id="vbox_avatar"> <property name="visible">True</property> <child> <placeholder/> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> </packing> </child> <child> - <widget class="GtkVBox" id="vbox_groups"> + <object class="GtkVBox" id="vbox_groups"> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label672"> + <object class="GtkLabel" id="label672"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes"><b>Groups</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkAlignment" id="alignment33"> + <object class="GtkAlignment" id="alignment33"> <property name="visible">True</property> <property name="left_padding">12</property> <child> - <widget class="GtkVBox" id="vbox224"> + <object class="GtkVBox" id="vbox224"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label679"> + <object class="GtkLabel" id="label679"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Select the groups you want this contact to appear in. Note that you can select more than one group or no groups.</property> <property name="use_markup">True</property> <property name="wrap">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox188"> + <object class="GtkHBox" id="hbox188"> <property name="visible">True</property> <property name="spacing">12</property> <child> - <widget class="GtkEntry" id="entry_group"> + <object class="GtkEntry" id="entry_group"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> </child> <child> - <widget class="GtkButton" id="button_group"> + <object class="GtkButton" id="button_group"> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="label" translatable="yes">_Add Group</property> <property name="use_underline">True</property> - <property name="response_id">0</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -221,7 +219,7 @@ </packing> </child> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow17"> + <object class="GtkScrolledWindow" id="scrolledwindow17"> <property name="height_request">100</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -229,55 +227,55 @@ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <property name="shadow_type">GTK_SHADOW_IN</property> <child> - <widget class="GtkTreeView" id="treeview_groups"> + <object class="GtkTreeView" id="treeview_groups"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="headers_visible">False</property> <property name="enable_search">False</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="position">2</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkVBox" id="vbox_details"> + <object class="GtkVBox" id="vbox_details"> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label649"> + <object class="GtkLabel" id="label649"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes"><b>Contact Details</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkAlignment" id="alignment30"> + <object class="GtkAlignment" id="alignment30"> <property name="visible">True</property> <property name="left_padding">12</property> <child> - <widget class="GtkVBox" id="vbox218"> + <object class="GtkVBox" id="vbox218"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkTable" id="table_details"> + <object class="GtkTable" id="table_details"> <property name="n_rows">4</property> <property name="n_columns">2</property> <property name="column_spacing">12</property> @@ -295,136 +293,136 @@ <placeholder/> </child> <child> - <widget class="GtkLabel" id="label670"> + <object class="GtkLabel" id="label670"> <property name="xalign">0</property> <property name="label" translatable="yes">Fullname:</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label650"> + <object class="GtkLabel" id="label650"> <property name="xalign">0</property> <property name="label" translatable="yes">Email:</property> - </widget> + </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"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label651"> + <object class="GtkLabel" id="label651"> <property name="xalign">0</property> <property name="label" translatable="yes">Web site:</property> - </widget> + </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"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label652"> + <object class="GtkLabel" id="label652"> <property name="xalign">0</property> <property name="label" translatable="yes">Birthday:</property> - </widget> + </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"></property> + <property name="y_options"/> </packing> </child> - </widget> + </object> </child> <child> - <widget class="GtkHBox" id="hbox_details_requested"> + <object class="GtkHBox" id="hbox_details_requested"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkImage" id="image885"> + <object class="GtkImage" id="image885"> <property name="visible">True</property> <property name="stock">gtk-dialog-info</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkLabel" id="label653"> + <object class="GtkLabel" id="label653"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Information requested...</property> <property name="use_markup">True</property> <property name="wrap">True</property> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">2</property> </packing> </child> <child> - <widget class="GtkVBox" id="vbox_client"> + <object class="GtkVBox" id="vbox_client"> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label662"> + <object class="GtkLabel" id="label662"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes"><b>Client Information</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkAlignment" id="alignment32"> + <object class="GtkAlignment" id="alignment32"> <property name="visible">True</property> <property name="left_padding">12</property> <child> - <widget class="GtkVBox" id="vbox222"> + <object class="GtkVBox" id="vbox222"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkTable" id="table_client"> + <object class="GtkTable" id="table_client"> <property name="n_rows">3</property> <property name="n_columns">2</property> <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkLabel" id="label668"> + <object class="GtkLabel" id="label668"> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label" translatable="yes">OS:</property> - </widget> + </object> <packing> <property name="top_attach">2</property> <property name="bottom_attach">3</property> @@ -432,11 +430,11 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label667"> + <object class="GtkLabel" id="label667"> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label" translatable="yes">Version:</property> - </widget> + </object> <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> @@ -444,115 +442,115 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label666"> + <object class="GtkLabel" id="label666"> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label" translatable="yes">Client:</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="label_client"> + <object class="GtkLabel" id="label_client"> <property name="can_focus">True</property> <property name="xalign">0</property> <property name="xpad">2</property> <property name="wrap">True</property> <property name="selectable">True</property> - </widget> + </object> <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> - <widget class="GtkLabel" id="label_version"> + <object class="GtkLabel" id="label_version"> <property name="can_focus">True</property> <property name="xalign">0</property> <property name="xpad">2</property> <property name="wrap">True</property> <property name="selectable">True</property> - </widget> + </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> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label_os"> + <object class="GtkLabel" id="label_os"> <property name="can_focus">True</property> <property name="xalign">0</property> <property name="xpad">2</property> <property name="wrap">True</property> <property name="selectable">True</property> - </widget> + </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="y_options"></property> + <property name="y_options"/> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox_client_requested"> + <object class="GtkHBox" id="hbox_client_requested"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkImage" id="image887"> + <object class="GtkImage" id="image887"> <property name="visible">True</property> <property name="stock">gtk-dialog-info</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkLabel" id="label669"> + <object class="GtkLabel" id="label669"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Information requested...</property> <property name="use_markup">True</property> <property name="wrap">True</property> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">3</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> +</interface> diff --git a/libempathy-gtk/empathy-log-window.glade b/libempathy-gtk/empathy-log-window.ui index 4f0c55d35..d38618c24 100644 --- a/libempathy-gtk/empathy-log-window.glade +++ b/libempathy-gtk/empathy-log-window.ui @@ -1,52 +1,51 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> +<?xml version="1.0"?> <!--*- mode: xml -*--> -<glade-interface> - <widget class="GtkWindow" id="log_window"> +<interface> + <object class="GtkWindow" id="log_window"> <property name="title" translatable="yes">Previous Conversations</property> <property name="role">log</property> <property name="default_width">640</property> <property name="default_height">450</property> <property name="icon_name">document-open-recent</property> <child> - <widget class="GtkNotebook" id="notebook"> + <object class="GtkNotebook" id="notebook"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="border_width">2</property> <child> - <widget class="GtkVBox" id="vbox192"> + <object class="GtkVBox" id="vbox192"> <property name="visible">True</property> <property name="border_width">12</property> <property name="spacing">6</property> <child> - <widget class="GtkHBox" id="hbox144"> + <object class="GtkHBox" id="hbox144"> <property name="visible">True</property> <property name="spacing">12</property> <child> - <widget class="GtkLabel" id="label628"> + <object class="GtkLabel" id="label628"> <property name="visible">True</property> - <property name="label" translatable="yes" comments="Searching *for* something">_For:</property> + <property comments="Searching *for* something" name="label" translatable="yes">_For:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">entry_find</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkEntry" id="entry_find"> + <object class="GtkEntry" id="entry_find"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="has_focus">True</property> <property name="activates_default">True</property> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkButton" id="button_find"> + <object class="GtkButton" id="button_find"> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> @@ -55,51 +54,50 @@ <property name="label">gtk-find</property> <property name="use_stock">True</property> <property name="focus_on_click">False</property> - <property name="response_id">0</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">2</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkVPaned" id="vpaned1"> + <object class="GtkVPaned" id="vpaned1"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="position">120</property> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow14"> + <object class="GtkScrolledWindow" id="scrolledwindow14"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">GTK_POLICY_NEVER</property> <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <property name="shadow_type">GTK_SHADOW_IN</property> <child> - <widget class="GtkTreeView" id="treeview_find"> + <object class="GtkTreeView" id="treeview_find"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="enable_search">False</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="resize">False</property> <property name="shrink">True</property> </packing> </child> <child> - <widget class="GtkVBox" id="vbox215"> + <object class="GtkVBox" id="vbox215"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow_find"> + <object class="GtkScrolledWindow" id="scrolledwindow_find"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">GTK_POLICY_NEVER</property> @@ -107,25 +105,24 @@ <child> <placeholder/> </child> - </widget> + </object> </child> <child> - <widget class="GtkHBox" id="hbox171"> + <object class="GtkHBox" id="hbox171"> <property name="visible">True</property> <property name="spacing">12</property> <child> <placeholder/> </child> <child> - <widget class="GtkButton" id="button_previous"> + <object class="GtkButton" id="button_previous"> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="label">gtk-go-back</property> <property name="use_stock">True</property> <property name="focus_on_click">False</property> - <property name="response_id">0</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -134,15 +131,14 @@ </packing> </child> <child> - <widget class="GtkButton" id="button_next"> + <object class="GtkButton" id="button_next"> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="label">gtk-go-forward</property> <property name="use_stock">True</property> <property name="focus_on_click">False</property> - <property name="response_id">0</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -150,38 +146,37 @@ <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="resize">True</property> <property name="shrink">True</property> </packing> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label595"> + <child type="tab"> + <object class="GtkLabel" id="label595"> <property name="visible">True</property> - <property name="label" translatable="yes" comments="Tab Label">Search</property> - </widget> + <property comments="Tab Label" name="label" translatable="yes">Search</property> + </object> <packing> - <property name="type">tab</property> <property name="tab_fill">False</property> </packing> </child> <child> - <widget class="GtkTable" id="table7"> + <object class="GtkTable" id="table7"> <property name="visible">True</property> <property name="border_width">12</property> <property name="n_rows">2</property> @@ -189,20 +184,20 @@ <property name="column_spacing">6</property> <property name="row_spacing">6</property> <child> - <widget class="GtkVBox" id="vbox_chats"> + <object class="GtkVBox" id="vbox_chats"> <property name="visible">True</property> <property name="spacing">6</property> <child> <placeholder/> </child> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> <property name="y_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow_chats"> + <object class="GtkScrolledWindow" id="scrolledwindow_chats"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">GTK_POLICY_NEVER</property> @@ -210,7 +205,7 @@ <child> <placeholder/> </child> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -219,11 +214,11 @@ </packing> </child> <child> - <widget class="GtkVBox" id="vbox191"> + <object class="GtkVBox" id="vbox191"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow13"> + <object class="GtkScrolledWindow" id="scrolledwindow13"> <property name="width_request">150</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -231,26 +226,26 @@ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <property name="shadow_type">GTK_SHADOW_IN</property> <child> - <widget class="GtkTreeView" id="treeview_chats"> + <object class="GtkTreeView" id="treeview_chats"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="headers_visible">False</property> - </widget> + </object> </child> - </widget> + </object> </child> <child> - <widget class="GtkCalendar" id="calendar_chats"> + <object class="GtkCalendar" id="calendar_chats"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> @@ -258,30 +253,30 @@ </packing> </child> <child> - <widget class="GtkHBox" id="hbox143"> + <object class="GtkHBox" id="hbox143"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkImage" id="image247"> + <object class="GtkImage" id="image247"> <property name="visible">True</property> <property name="stock">gtk-find</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkEntry" id="entry_chats"> + <object class="GtkEntry" id="entry_chats"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="activates_default">True</property> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -289,23 +284,19 @@ <property name="y_options">GTK_FILL</property> </packing> </child> - </widget> - <packing> - <property name="position">1</property> - </packing> + </object> </child> - <child> - <widget class="GtkLabel" id="label596"> + <child type="tab"> + <object class="GtkLabel" id="label596"> <property name="visible">True</property> - <property name="label" translatable="yes" comments="Tab Label">Conversations</property> - </widget> + <property comments="Tab Label" name="label" translatable="yes">Conversations</property> + </object> <packing> - <property name="type">tab</property> <property name="position">1</property> <property name="tab_fill">False</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> +</interface> diff --git a/libempathy-gtk/empathy-new-message-dialog.glade b/libempathy-gtk/empathy-new-message-dialog.ui index d6317f8d4..e24095fba 100644 --- a/libempathy-gtk/empathy-new-message-dialog.glade +++ b/libempathy-gtk/empathy-new-message-dialog.ui @@ -1,8 +1,7 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> +<?xml version="1.0"?> <!--*- mode: xml -*--> -<glade-interface> - <widget class="GtkDialog" id="new_message_dialog"> +<interface> + <object class="GtkDialog" id="new_message_dialog"> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="border_width">5</property> <property name="title" translatable="yes">New Conversation</property> @@ -12,11 +11,11 @@ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> <property name="has_separator">False</property> <child internal-child="vbox"> - <widget class="GtkVBox" id="dialog-vbox1"> + <object class="GtkVBox" id="dialog-vbox1"> <property name="visible">True</property> <property name="spacing">2</property> <child> - <widget class="GtkTable" id="table_contact"> + <object class="GtkTable" id="table_contact"> <property name="visible">True</property> <property name="n_rows">2</property> <property name="n_columns">2</property> @@ -26,34 +25,34 @@ <placeholder/> </child> <child> - <widget class="GtkLabel" id="label1"> + <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Account:</property> - </widget> + </object> <packing> - <property name="x_options"></property> + <property name="x_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label2"> + <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Contact ID:</property> - </widget> + </object> <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options"></property> + <property name="x_options"/> </packing> </child> <child> - <widget class="GtkEntry" id="entry_id"> + <object class="GtkEntry" id="entry_id"> <property name="visible">True</property> <property name="can_focus">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="activates_default">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -61,124 +60,126 @@ <property name="bottom_attach">2</property> </packing> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="dialog-action_area1"> + <object class="GtkHButtonBox" id="dialog-action_area1"> <property name="visible">True</property> <property name="layout_style">GTK_BUTTONBOX_END</property> <child> - <widget class="GtkButton" id="button1"> + <object class="GtkButton" id="button1"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="label">gtk-cancel</property> <property name="use_stock">True</property> - <property name="response_id">-6</property> - </widget> + </object> </child> <child> - <widget class="GtkButton" id="button_call"> + <object class="GtkButton" id="button_call"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> - <property name="response_id">1</property> <child> - <widget class="GtkAlignment" id="alignment1"> + <object class="GtkAlignment" id="alignment1"> <property name="visible">True</property> <property name="xscale">0</property> <property name="yscale">0</property> <child> - <widget class="GtkHBox" id="hbox1"> + <object class="GtkHBox" id="hbox1"> <property name="visible">True</property> <property name="spacing">2</property> <child> - <widget class="GtkImage" id="image1"> + <object class="GtkImage" id="image1"> <property name="visible">True</property> <property name="icon_name">audio-input-microphone</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkLabel" id="label3"> + <object class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="label" translatable="yes">C_all</property> <property name="use_underline">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkButton" id="button_chat"> + <object class="GtkButton" id="button_chat"> <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="response_id">2</property> <child> - <widget class="GtkAlignment" id="alignment2"> + <object class="GtkAlignment" id="alignment2"> <property name="visible">True</property> <property name="xscale">0</property> <property name="yscale">0</property> <child> - <widget class="GtkHBox" id="hbox2"> + <object class="GtkHBox" id="hbox2"> <property name="visible">True</property> <property name="spacing">2</property> <child> - <widget class="GtkImage" id="image2"> + <object class="GtkImage" id="image2"> <property name="visible">True</property> <property name="icon_name">im-message-new</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkLabel" id="label4"> + <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="label" translatable="yes">C_hat</property> <property name="use_underline">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="position">2</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="pack_type">GTK_PACK_END</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + <action-widgets> + <action-widget response="-6">button1</action-widget> + <action-widget response="1">button_call</action-widget> + <action-widget response="2">button_chat</action-widget> + </action-widgets> + </object> +</interface> diff --git a/libempathy-gtk/empathy-presence-chooser.glade b/libempathy-gtk/empathy-presence-chooser.ui index ba79529f6..32b34ad0c 100644 --- a/libempathy-gtk/empathy-presence-chooser.glade +++ b/libempathy-gtk/empathy-presence-chooser.ui @@ -1,8 +1,7 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> +<?xml version="1.0"?> <!--*- mode: xml -*--> -<glade-interface> - <widget class="GtkDialog" id="custom_message_dialog"> +<interface> + <object class="GtkDialog" id="custom_message_dialog"> <property name="visible">True</property> <property name="border_width">5</property> <property name="title" translatable="yes">Custom message</property> @@ -10,10 +9,10 @@ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> <property name="has_separator">False</property> <child internal-child="vbox"> - <widget class="GtkVBox" id="dialog-vbox6"> + <object class="GtkVBox" id="dialog-vbox6"> <property name="visible">True</property> <child> - <widget class="GtkTable" id="table1"> + <object class="GtkTable" id="table1"> <property name="visible">True</property> <property name="border_width">5</property> <property name="n_rows">3</property> @@ -21,9 +20,9 @@ <property name="column_spacing">6</property> <property name="row_spacing">6</property> <child> - <widget class="GtkComboBox" id="combobox_status"> + <object class="GtkComboBox" id="combobox_status"> <property name="visible">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -32,13 +31,13 @@ </packing> </child> <child> - <widget class="GtkComboBoxEntry" id="comboboxentry_message"> + <object class="GtkComboBoxEntry" id="comboboxentry_message"> <property name="visible">True</property> <child internal-child="entry"> - <widget class="GtkEntry" id="comboboxentry-entry1"> - </widget> + <object class="GtkEntry" id="comboboxentry-entry1"> + </object> </child> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -49,84 +48,86 @@ </packing> </child> <child> - <widget class="GtkCheckButton" id="checkbutton_save"> + <object class="GtkCheckButton" id="checkbutton_save"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="label" translatable="yes">Save message</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> - </widget> + </object> <packing> <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> - <widget class="GtkLabel" id="label472"> + <object class="GtkLabel" id="label472"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Message:</property> - </widget> + </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"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="label471"> + <object class="GtkLabel" id="label471"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Status:</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="dialog-action_area6"> + <object class="GtkHButtonBox" id="dialog-action_area6"> <property name="visible">True</property> <property name="layout_style">GTK_BUTTONBOX_END</property> <child> - <widget class="GtkButton" id="closebutton1"> + <object class="GtkButton" id="closebutton1"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="label">gtk-cancel</property> <property name="use_stock">True</property> - <property name="response_id">-6</property> - </widget> + </object> </child> <child> - <widget class="GtkButton" id="button1"> + <object class="GtkButton" id="button1"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="label">gtk-apply</property> <property name="use_stock">True</property> - <property name="response_id">-10</property> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="pack_type">GTK_PACK_END</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + <action-widgets> + <action-widget response="0">checkbutton_save</action-widget> + <action-widget response="-6">closebutton1</action-widget> + <action-widget response="-10">button1</action-widget> + </action-widgets> + </object> +</interface> diff --git a/libempathy-gtk/empathy-spell-dialog.glade b/libempathy-gtk/empathy-spell-dialog.ui index 3ce1d5b56..382346c1a 100644 --- a/libempathy-gtk/empathy-spell-dialog.glade +++ b/libempathy-gtk/empathy-spell-dialog.ui @@ -1,8 +1,7 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> +<?xml version="1.0"?> <!--*- mode: xml -*--> -<glade-interface> - <widget class="GtkDialog" id="spell_dialog"> +<interface> + <object class="GtkDialog" id="spell_dialog"> <property name="border_width">5</property> <property name="title" translatable="yes">Spell Checker</property> <property name="modal">True</property> @@ -12,119 +11,121 @@ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> <property name="has_separator">False</property> <child internal-child="vbox"> - <widget class="GtkVBox" id="dialog-vbox7"> + <object class="GtkVBox" id="dialog-vbox7"> <property name="visible">True</property> <property name="spacing">2</property> <child> - <widget class="GtkVBox" id="vbox128"> + <object class="GtkVBox" id="vbox128"> <property name="visible">True</property> <property name="border_width">5</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label_word"> + <object class="GtkLabel" id="label_word"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Suggestions for the word:</property> <property name="use_markup">True</property> <property name="wrap">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow9"> + <object class="GtkScrolledWindow" id="scrolledwindow9"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <property name="shadow_type">GTK_SHADOW_IN</property> <child> - <widget class="GtkTreeView" id="treeview_words"> + <object class="GtkTreeView" id="treeview_words"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="headers_visible">False</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="dialog-action_area7"> + <object class="GtkHButtonBox" id="dialog-action_area7"> <property name="visible">True</property> <property name="layout_style">GTK_BUTTONBOX_END</property> <child> - <widget class="GtkButton" id="button_cancel"> + <object class="GtkButton" id="button_cancel"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="label">gtk-cancel</property> <property name="use_stock">True</property> - <property name="response_id">-6</property> - </widget> + </object> </child> <child> - <widget class="GtkButton" id="button_replace"> + <object class="GtkButton" id="button_replace"> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="can_default">True</property> - <property name="response_id">-5</property> <child> - <widget class="GtkAlignment" id="alignment6"> + <object class="GtkAlignment" id="alignment6"> <property name="visible">True</property> <property name="xscale">0</property> <property name="yscale">0</property> <child> - <widget class="GtkHBox" id="hbox135"> + <object class="GtkHBox" id="hbox135"> <property name="visible">True</property> <property name="spacing">2</property> <child> - <widget class="GtkImage" id="image245"> + <object class="GtkImage" id="image245"> <property name="visible">True</property> <property name="stock">gtk-convert</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkLabel" id="label594"> + <object class="GtkLabel" id="label594"> <property name="visible">True</property> <property name="label">_Replace</property> <property name="use_underline">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="pack_type">GTK_PACK_END</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + <action-widgets> + <action-widget response="-6">button_cancel</action-widget> + <action-widget response="-5">button_replace</action-widget> + </action-widgets> + </object> +</interface> |