diff options
| -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 | ||||
| -rw-r--r-- | src/empathy-accounts-dialog.ui (renamed from src/empathy-accounts-dialog.glade) | 200 | ||||
| -rw-r--r-- | src/empathy-call-window.glade | 145 | ||||
| -rw-r--r-- | src/empathy-call-window.ui | 140 | ||||
| -rw-r--r-- | src/empathy-chat-window.glade | 359 | ||||
| -rw-r--r-- | src/empathy-chat-window.ui | 326 | ||||
| -rw-r--r-- | src/empathy-chatrooms-window.ui (renamed from src/empathy-chatrooms-window.glade) | 142 | ||||
| -rw-r--r-- | src/empathy-ft-manager.ui (renamed from src/empathy-ft-manager.glade) | 49 | ||||
| -rw-r--r-- | src/empathy-import-dialog.ui (renamed from src/empathy-import-dialog.glade) | 41 | ||||
| -rw-r--r-- | src/empathy-main-window.glade | 299 | ||||
| -rw-r--r-- | src/empathy-main-window.ui | 220 | ||||
| -rw-r--r-- | src/empathy-new-chatroom-dialog.ui (renamed from src/empathy-new-chatroom-dialog.glade) | 129 | ||||
| -rw-r--r-- | src/empathy-preferences.ui (renamed from src/empathy-preferences.glade) | 354 | ||||
| -rw-r--r-- | src/empathy-status-icon.glade | 59 | ||||
| -rw-r--r-- | src/empathy-status-icon.ui | 53 |
31 files changed, 2160 insertions, 2327 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> diff --git a/src/empathy-accounts-dialog.glade b/src/empathy-accounts-dialog.ui index e81daa9bf..67879f718 100644 --- a/src/empathy-accounts-dialog.glade +++ b/src/empathy-accounts-dialog.ui @@ -1,199 +1,192 @@ -<?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="accounts_dialog"> +<interface> + <object class="GtkDialog" id="accounts_dialog"> <property name="border_width">5</property> <property name="title" translatable="yes">Accounts</property> <property name="role">accounts</property> <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-vbox3"> + <object class="GtkVBox" id="dialog-vbox3"> <property name="visible">True</property> <property name="spacing">2</property> <child> - <widget class="GtkHBox" id="hbox146"> + <object class="GtkHBox" id="hbox146"> <property name="visible">True</property> <property name="border_width">6</property> <property name="spacing">18</property> <child> - <widget class="GtkVBox" id="vbox195"> + <object class="GtkVBox" id="vbox195"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow17"> + <object class="GtkScrolledWindow" id="scrolledwindow17"> <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"> + <object class="GtkTreeView" id="treeview"> <property name="width_request">250</property> <property name="height_request">200</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="enable_search">False</property> - </widget> + </object> </child> - </widget> + </object> </child> <child> - <widget class="GtkVBox" id="vbox1"> + <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> <property name="spacing">6</property> <property name="homogeneous">True</property> <child> - <widget class="GtkHBox" id="hbox148"> + <object class="GtkHBox" id="hbox148"> <property name="visible">True</property> <property name="spacing">6</property> <property name="homogeneous">True</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="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="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> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkButton" id="button_import"> + <object class="GtkButton" id="button_import"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="label" translatable="yes">Import Accounts...</property> - <property name="response_id">0</property> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkVBox" id="vbox214"> + <object class="GtkVBox" id="vbox214"> <property name="width_request">415</property> <property name="visible">True</property> <property name="spacing">18</property> <child> - <widget class="GtkVBox" id="vbox_details"> + <object class="GtkVBox" id="vbox_details"> <property name="visible">True</property> <property name="spacing">18</property> <child> - <widget class="GtkHBox" id="hbox183"> + <object class="GtkHBox" id="hbox183"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label_name"> + <object class="GtkLabel" id="label_name"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="label"><big><b>Gmail</b></big></property> <property name="use_markup">True</property> <property name="selectable">True</property> - </widget> + </object> </child> <child> - <widget class="GtkImage" id="image_type"> + <object class="GtkImage" id="image_type"> <property name="visible">True</property> <property name="yalign">0</property> <property name="stock">gtk-cut</property> <property name="icon_size">6</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> </packing> </child> <child> - <widget class="GtkFrame" id="frame2"> + <object class="GtkFrame" id="frame2"> <property name="visible">True</property> <property name="label_xalign">0</property> <property name="shadow_type">GTK_SHADOW_NONE</property> <child> - <widget class="GtkAlignment" id="alignment_settings"> + <object class="GtkAlignment" id="alignment_settings"> <property name="visible">True</property> <property name="top_padding">6</property> <property name="left_padding">20</property> <child> <placeholder/> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label599"> + <child type="label"> + <object class="GtkLabel" id="label599"> <property name="visible">True</property> <property name="label" translatable="yes"><b>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="GtkFrame" id="frame_new_account"> + <object class="GtkFrame" id="frame_new_account"> <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">20</property> <child> - <widget class="GtkVBox" id="vbox216"> + <object class="GtkVBox" id="vbox216"> <property name="visible">True</property> <property name="spacing">12</property> <child> - <widget class="GtkHBox" id="hbox_type"> + <object class="GtkHBox" id="hbox_type"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label645"> + <object class="GtkLabel" id="label645"> <property name="visible">True</property> <property name="label" translatable="yes">Type:</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -202,67 +195,65 @@ <child> <placeholder/> </child> - </widget> + </object> </child> <child> - <widget class="GtkCheckButton" id="checkbutton_register"> + <object class="GtkCheckButton" id="checkbutton_register"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="label" translatable="yes">I already have an account I want to use</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="active">True</property> <property name="draw_indicator">True</property> - </widget> + </object> <packing> <property name="position">2</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox181"> + <object class="GtkHBox" id="hbox181"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkButton" id="button_create"> + <object class="GtkButton" id="button_create"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="response_id">0</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="stock">gtk-new</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkLabel" id="label1"> + <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="label" translatable="yes">Cr_eate</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="expand">False</property> <property name="fill">False</property> @@ -271,20 +262,19 @@ </packing> </child> <child> - <widget class="GtkButton" id="button_back"> + <object class="GtkButton" id="button_back"> <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">0</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="pack_type">GTK_PACK_END</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -292,108 +282,110 @@ <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label643"> + <child type="label"> + <object class="GtkLabel" id="label643"> <property name="visible">True</property> <property name="label" translatable="yes"><b>New Account</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="position">1</property> </packing> </child> <child> - <widget class="GtkFrame" id="frame_no_profile"> + <object class="GtkFrame" id="frame_no_profile"> <property name="label_xalign">0</property> <property name="shadow_type">GTK_SHADOW_NONE</property> <child> - <widget class="GtkAlignment" id="alignment21"> + <object class="GtkAlignment" id="alignment21"> <property name="visible">True</property> <property name="top_padding">6</property> <property name="left_padding">12</property> <child> - <widget class="GtkLabel" id="label2"> + <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="label" translatable="yes">To add a new account, you first have to install a backend for each protocol you want to use.</property> <property name="wrap">True</property> - </widget> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label_no_protocol"> + <child type="label"> + <object class="GtkLabel" id="label_no_protocol"> <property name="visible">True</property> <property name="label" translatable="yes"><b>No protocol installed</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">2</property> </packing> </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_area"> + <object class="GtkHButtonBox" id="dialog-action_area"> <property name="visible">True</property> <property name="layout_style">GTK_BUTTONBOX_END</property> <child> - <widget class="GtkButton" id="button_help"> + <object class="GtkButton" id="button_help"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="label">gtk-help</property> <property name="use_stock">True</property> - <property name="response_id">-11</property> - </widget> + </object> <packing> <property name="secondary">True</property> </packing> </child> <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> <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">button_add</action-widget> + <action-widget response="0">button_remove</action-widget> + <action-widget response="0">button_import</action-widget> + <action-widget response="0">checkbutton_register</action-widget> + <action-widget response="0">button_create</action-widget> + <action-widget response="0">button_back</action-widget> + <action-widget response="-11">button_help</action-widget> + <action-widget response="-7">button_close</action-widget> + </action-widgets> + </object> +</interface> diff --git a/src/empathy-call-window.glade b/src/empathy-call-window.glade deleted file mode 100644 index 712f10538..000000000 --- a/src/empathy-call-window.glade +++ /dev/null @@ -1,145 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> -<!--Generated with glade3 3.4.5 on Mon Feb 16 12:31:56 2009 --> -<glade-interface> - <widget class="GtkWindow" id="call_window"> - <child> - <widget class="GtkVBox" id="call_window_vbox"> - <property name="visible">True</property> - <child> - <widget class="GtkMenuBar" id="menubar1"> - <property name="visible">True</property> - <child> - <widget class="GtkMenuItem" id="menuitem1"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Call</property> - <property name="use_underline">True</property> - <child> - <widget class="GtkMenu" id="menu1"> - <property name="visible">True</property> - <child> - <widget class="GtkCheckMenuItem" id="send_video"> - <property name="visible">True</property> - <property name="label" translatable="yes">Send video</property> - <property name="use_underline">True</property> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="menuhangup"> - <property name="visible">True</property> - <property name="label" translatable="yes">Hang up</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="menu-item-image1"> - <property name="visible">True</property> - <property name="stock">gtk-cancel</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkMenuItem" id="menuitem3"> - <property name="visible">True</property> - <property name="label" translatable="yes">_View</property> - <property name="use_underline">True</property> - <child> - <widget class="GtkMenu" id="menu2"> - <property name="visible">True</property> - <child> - <widget class="GtkCheckMenuItem" id="show_preview"> - <property name="visible">True</property> - <property name="label" translatable="yes">Video preview</property> - <property name="use_underline">True</property> - </widget> - </child> - </widget> - </child> - </widget> - </child> - </widget> - <packing> - <property name="expand">False</property> - </packing> - </child> - <child> - <widget class="GtkToolbar" id="toolbar"> - <property name="visible">True</property> - <child> - <widget class="GtkToolButton" id="hangup"> - <property name="visible">True</property> - <property name="is_important">True</property> - <property name="label" translatable="yes">Hang up</property> - <property name="stock_id">gtk-cancel</property> - </widget> - <packing> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <widget class="GtkSeparatorToolItem" id="toolbutton1"> - <property name="visible">True</property> - </widget> - <packing> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <widget class="GtkToggleToolButton" id="microphone"> - <property name="visible">True</property> - <property name="label" translatable="yes">Send Audio</property> - <property name="icon_name">gnome-stock-mic</property> - </widget> - <packing> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <widget class="GtkToggleToolButton" id="camera"> - <property name="visible">True</property> - <property name="label" translatable="yes">Send video</property> - <property name="icon_name">camera-web</property> - </widget> - <packing> - <property name="homogeneous">True</property> - </packing> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <widget class="GtkHPaned" id="pane"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </widget> - <packing> - <property name="position">2</property> - </packing> - </child> - <child> - <widget class="GtkStatusbar" id="statusbar"> - <property name="visible">True</property> - <property name="spacing">2</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="position">3</property> - </packing> - </child> - </widget> - </child> - </widget> -</glade-interface> diff --git a/src/empathy-call-window.ui b/src/empathy-call-window.ui new file mode 100644 index 000000000..6d1bbf6e1 --- /dev/null +++ b/src/empathy-call-window.ui @@ -0,0 +1,140 @@ +<?xml version="1.0"?> +<!--Generated with glade3 3.4.5 on Mon Feb 16 12:31:56 2009 --> +<interface> + <object class="GtkUIManager" id="uimanager1"> + <child> + <object class="GtkActionGroup" id="actiongroup1"> + <child> + <object class="GtkAction" id="menuitem1"> + <property name="name">menuitem1</property> + <property name="label" translatable="yes">_Call</property> + </object> + </child> + <child> + <object class="GtkToggleAction" id="send_video"> + <property name="name">send_video</property> + <property name="label" translatable="yes">Send video</property> + </object> + </child> + <child> + <object class="GtkAction" id="menuhangup"> + <property name="stock_id">gtk-cancel</property> + <property name="name">menuhangup</property> + <property name="label" translatable="yes">Hang up</property> + </object> + </child> + <child> + <object class="GtkAction" id="menuitem3"> + <property name="name">menuitem3</property> + <property name="label" translatable="yes">_View</property> + </object> + </child> + <child> + <object class="GtkToggleAction" id="show_preview"> + <property name="name">show_preview</property> + <property name="label" translatable="yes">Video preview</property> + </object> + </child> + </object> + </child> + <ui> + <menubar name="menubar1"> + <menu action="menuitem1"> + <menuitem action="send_video"/> + <menuitem action="menuhangup"/> + </menu> + <menu action="menuitem3"> + <menuitem action="show_preview"/> + </menu> + </menubar> + </ui> + </object> + <object class="GtkWindow" id="call_window"> + <child> + <object class="GtkVBox" id="call_window_vbox"> + <property name="visible">True</property> + <child> + <object class="GtkMenuBar" constructor="uimanager1" id="menubar1"> + <property name="visible">True</property> + </object> + <packing> + <property name="expand">False</property> + </packing> + </child> + <child> + <object class="GtkToolbar" id="toolbar"> + <property name="visible">True</property> + <child> + <object class="GtkToolButton" id="hangup"> + <property name="visible">True</property> + <property name="is_important">True</property> + <property name="label" translatable="yes">Hang up</property> + <property name="stock_id">gtk-cancel</property> + </object> + <packing> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkSeparatorToolItem" id="toolbutton1"> + <property name="visible">True</property> + </object> + <packing> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToggleToolButton" id="microphone"> + <property name="visible">True</property> + <property name="label" translatable="yes">Send Audio</property> + <property name="icon_name">gnome-stock-mic</property> + </object> + <packing> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToggleToolButton" id="camera"> + <property name="visible">True</property> + <property name="label" translatable="yes">Send video</property> + <property name="icon_name">camera-web</property> + </object> + <packing> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkHPaned" id="pane"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkStatusbar" id="statusbar"> + <property name="visible">True</property> + <property name="spacing">2</property> + </object> + <packing> + <property name="expand">False</property> + <property name="position">3</property> + </packing> + </child> + </object> + </child> + </object> +</interface> diff --git a/src/empathy-chat-window.glade b/src/empathy-chat-window.glade deleted file mode 100644 index b62a5c219..000000000 --- a/src/empathy-chat-window.glade +++ /dev/null @@ -1,359 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> -<!--*- mode: xml -*--> -<glade-interface> - <widget class="GtkWindow" id="chat_window"> - <property name="title" translatable="yes">Chat</property> - <property name="role">chat</property> - <property name="default_width">350</property> - <property name="default_height">250</property> - <child> - <widget class="GtkVBox" id="chat_vbox"> - <property name="visible">True</property> - <child> - <widget class="GtkMenuBar" id="chats_menubar"> - <property name="visible">True</property> - <child> - <widget class="GtkMenuItem" id="menu_conv"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Conversation</property> - <property name="use_underline">True</property> - <child> - <widget class="GtkMenu" id="menu_conv_menu"> - <child> - <widget class="GtkImageMenuItem" id="menu_conv_clear"> - <property name="visible">True</property> - <property name="label" translatable="yes">C_lear</property> - <property name="use_underline">True</property> - <accelerator key="L" modifiers="GDK_CONTROL_MASK" signal="activate"/> - <child internal-child="image"> - <widget class="GtkImage" id="image262"> - <property name="visible">True</property> - <property name="stock">gtk-clear</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="menu_conv_insert_smiley"> - <property name="visible">True</property> - <property name="label" translatable="yes">Insert _Smiley</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="menu-item-image3"> - <property name="visible">True</property> - <property name="icon_size">1</property> - <property name="icon_name">face-smile</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkMenuItem" id="menu_conv_contact"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Contact</property> - <property name="use_underline">True</property> - </widget> - </child> - <child> - <widget class="GtkCheckMenuItem" id="menu_conv_favorite"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Favorite Chatroom</property> - <property name="use_underline">True</property> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="separator7"> - <property name="visible">True</property> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="menu_conv_close"> - <property name="visible">True</property> - <property name="label">gtk-close</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - <accelerator key="W" modifiers="GDK_CONTROL_MASK" signal="activate"/> - </widget> - </child> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkMenuItem" id="menu_edit"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Edit</property> - <property name="use_underline">True</property> - <child> - <widget class="GtkMenu" id="menu_edit_menu"> - <child> - <widget class="GtkImageMenuItem" id="menu_edit_cut"> - <property name="visible">True</property> - <property name="label">gtk-cut</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - <accelerator key="X" modifiers="GDK_CONTROL_MASK" signal="activate"/> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="menu_edit_copy"> - <property name="visible">True</property> - <property name="label">gtk-copy</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - <accelerator key="C" modifiers="GDK_CONTROL_MASK" signal="activate"/> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="menu_edit_paste"> - <property name="visible">True</property> - <property name="label">gtk-paste</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - <accelerator key="V" modifiers="GDK_CONTROL_MASK" signal="activate"/> - </widget> - </child> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkMenuItem" id="menu_tabs"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Tabs</property> - <property name="use_underline">True</property> - <child> - <widget class="GtkMenu" id="menu_tabs_menu"> - <child> - <widget class="GtkMenuItem" id="menu_tabs_prev"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Previous Tab</property> - <property name="use_underline">True</property> - <accelerator key="Page_Up" modifiers="GDK_CONTROL_MASK" signal="activate"/> - </widget> - </child> - <child> - <widget class="GtkMenuItem" id="menu_tabs_next"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Next Tab</property> - <property name="use_underline">True</property> - <accelerator key="Page_Down" modifiers="GDK_CONTROL_MASK" signal="activate"/> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="separator4"> - <property name="visible">True</property> - </widget> - </child> - <child> - <widget class="GtkMenuItem" id="menu_tabs_left"> - <property name="visible">True</property> - <property name="label" translatable="yes">Move Tab _Left</property> - <property name="use_underline">True</property> - </widget> - </child> - <child> - <widget class="GtkMenuItem" id="menu_tabs_right"> - <property name="visible">True</property> - <property name="label" translatable="yes">Move Tab _Right</property> - <property name="use_underline">True</property> - </widget> - </child> - <child> - <widget class="GtkMenuItem" id="menu_tabs_detach"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Detach Tab</property> - <property name="use_underline">True</property> - </widget> - </child> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkMenuItem" id="menu_help"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Help</property> - <property name="use_underline">True</property> - <child> - <widget class="GtkMenu" id="menu_help_menu"> - <child> - <widget class="GtkImageMenuItem" id="menu_help_contents"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Contents</property> - <property name="use_underline">True</property> - <accelerator key="F1" modifiers="" signal="activate"/> - <child internal-child="image"> - <widget class="GtkImage" id="image289"> - <property name="visible">True</property> - <property name="stock">gtk-help</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="menu_help_about"> - <property name="visible">True</property> - <property name="label">gtk-about</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </widget> - </child> - </widget> - </child> - </widget> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <placeholder/> - </child> - </widget> - </child> - </widget> - <widget class="GtkDialog" id="chat_invite_dialog"> - <property name="border_width">5</property> - <property name="title" translatable="yes">Invite</property> - <property name="modal">True</property> - <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> - <property name="default_width">275</property> - <property name="default_height">225</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> - <property name="has_separator">False</property> - <child internal-child="vbox"> - <widget class="GtkVBox" id="vbox6"> - <property name="visible">True</property> - <child> - <widget class="GtkVBox" id="vbox7"> - <property name="visible">True</property> - <property name="border_width">5</property> - <property name="spacing">18</property> - <child> - <widget class="GtkVBox" id="vbox7"> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <widget class="GtkLabel" id="label"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Select who would you like to invite:</property> - <property name="use_markup">True</property> - <property name="wrap">True</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkScrolledWindow" id="scrolledwindow1"> - <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"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">False</property> - </widget> - </child> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - </widget> - </child> - <child> - <widget class="GtkVBox" id="vbox8"> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <widget class="GtkLabel" id="label4"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Invitation _message:</property> - <property name="use_markup">True</property> - <property name="use_underline">True</property> - <property name="wrap">True</property> - <property name="mnemonic_widget">entry</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkEntry" id="entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="width_chars">40</property> - <property name="text" translatable="yes">You have been invited to join a chat conference.</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="hbuttonbox1"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - <child> - <widget 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> - </child> - <child> - <widget class="GtkButton" id="button_invite"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="label">In_vite</property> - <property name="use_underline">True</property> - <property name="response_id">-5</property> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="pack_type">GTK_PACK_END</property> - </packing> - </child> - </widget> - </child> - </widget> -</glade-interface> diff --git a/src/empathy-chat-window.ui b/src/empathy-chat-window.ui new file mode 100644 index 000000000..741bfee4c --- /dev/null +++ b/src/empathy-chat-window.ui @@ -0,0 +1,326 @@ +<?xml version="1.0"?> +<!--*- mode: xml -*--> +<interface> + <object class="GtkUIManager" id="uimanager1"> + <child> + <object class="GtkActionGroup" id="actiongroup1"> + <child> + <object class="GtkAction" id="menu_conv"> + <property name="name">menu_conv</property> + <property name="label" translatable="yes">_Conversation</property> + </object> + </child> + <child> + <object class="GtkAction" id="menu_conv_clear"> + <property name="stock_id">gtk-clear</property> + <property name="name">menu_conv_clear</property> + <property name="label" translatable="yes">C_lear</property> + </object> + <accelerator key="L" modifiers="GDK_CONTROL_MASK"/> + </child> + <child> + <object class="GtkAction" id="menu_conv_insert_smiley"> + <property name="name">menu_conv_insert_smiley</property> + <property name="label" translatable="yes">Insert _Smiley</property> + </object> + </child> + <child> + <object class="GtkAction" id="menu_conv_contact"> + <property name="name">menu_conv_contact</property> + <property name="label" translatable="yes">_Contact</property> + </object> + </child> + <child> + <object class="GtkToggleAction" id="menu_conv_favorite"> + <property name="name">menu_conv_favorite</property> + <property name="label" translatable="yes">_Favorite Chatroom</property> + </object> + </child> + <child> + <object class="GtkAction" id="menu_conv_close"> + <property name="stock_id">gtk-close</property> + <property name="name">menu_conv_close</property> + </object> + <accelerator key="W" modifiers="GDK_CONTROL_MASK"/> + </child> + <child> + <object class="GtkAction" id="menu_edit"> + <property name="name">menu_edit</property> + <property name="label" translatable="yes">_Edit</property> + </object> + </child> + <child> + <object class="GtkAction" id="menu_edit_cut"> + <property name="stock_id">gtk-cut</property> + <property name="name">menu_edit_cut</property> + </object> + <accelerator key="X" modifiers="GDK_CONTROL_MASK"/> + </child> + <child> + <object class="GtkAction" id="menu_edit_copy"> + <property name="stock_id">gtk-copy</property> + <property name="name">menu_edit_copy</property> + </object> + <accelerator key="C" modifiers="GDK_CONTROL_MASK"/> + </child> + <child> + <object class="GtkAction" id="menu_edit_paste"> + <property name="stock_id">gtk-paste</property> + <property name="name">menu_edit_paste</property> + </object> + <accelerator key="V" modifiers="GDK_CONTROL_MASK"/> + </child> + <child> + <object class="GtkAction" id="menu_tabs"> + <property name="name">menu_tabs</property> + <property name="label" translatable="yes">_Tabs</property> + </object> + </child> + <child> + <object class="GtkAction" id="menu_tabs_prev"> + <property name="name">menu_tabs_prev</property> + <property name="label" translatable="yes">_Previous Tab</property> + </object> + <accelerator key="Page_Up" modifiers="GDK_CONTROL_MASK"/> + </child> + <child> + <object class="GtkAction" id="menu_tabs_next"> + <property name="name">menu_tabs_next</property> + <property name="label" translatable="yes">_Next Tab</property> + </object> + <accelerator key="Page_Down" modifiers="GDK_CONTROL_MASK"/> + </child> + <child> + <object class="GtkAction" id="menu_tabs_left"> + <property name="name">menu_tabs_left</property> + <property name="label" translatable="yes">Move Tab _Left</property> + </object> + </child> + <child> + <object class="GtkAction" id="menu_tabs_right"> + <property name="name">menu_tabs_right</property> + <property name="label" translatable="yes">Move Tab _Right</property> + </object> + </child> + <child> + <object class="GtkAction" id="menu_tabs_detach"> + <property name="name">menu_tabs_detach</property> + <property name="label" translatable="yes">_Detach Tab</property> + </object> + </child> + <child> + <object class="GtkAction" id="menu_help"> + <property name="name">menu_help</property> + <property name="label" translatable="yes">_Help</property> + </object> + </child> + <child> + <object class="GtkAction" id="menu_help_contents"> + <property name="stock_id">gtk-help</property> + <property name="name">menu_help_contents</property> + <property name="label" translatable="yes">_Contents</property> + </object> + <accelerator key="F1" modifiers=""/> + </child> + <child> + <object class="GtkAction" id="menu_help_about"> + <property name="stock_id">gtk-about</property> + <property name="name">menu_help_about</property> + </object> + </child> + </object> + </child> + <ui> + <menubar name="chats_menubar"> + <menu action="menu_conv"> + <menuitem action="menu_conv_clear"/> + <menuitem action="menu_conv_insert_smiley"/> + <menuitem action="menu_conv_contact"/> + <menuitem action="menu_conv_favorite"/> + <separator/> + <menuitem action="menu_conv_close"/> + </menu> + <menu action="menu_edit"> + <menuitem action="menu_edit_cut"/> + <menuitem action="menu_edit_copy"/> + <menuitem action="menu_edit_paste"/> + </menu> + <menu action="menu_tabs"> + <menuitem action="menu_tabs_prev"/> + <menuitem action="menu_tabs_next"/> + <separator/> + <menuitem action="menu_tabs_left"/> + <menuitem action="menu_tabs_right"/> + <menuitem action="menu_tabs_detach"/> + </menu> + <menu action="menu_help"> + <menuitem action="menu_help_contents"/> + <menuitem action="menu_help_about"/> + </menu> + </menubar> + </ui> + </object> + <object class="GtkWindow" id="chat_window"> + <property name="title" translatable="yes">Chat</property> + <property name="role">chat</property> + <property name="default_width">350</property> + <property name="default_height">250</property> + <child> + <object class="GtkVBox" id="chat_vbox"> + <property name="visible">True</property> + <child> + <object class="GtkMenuBar" constructor="uimanager1" id="chats_menubar"> + <property name="visible">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + </object> + </child> + </object> + <object class="GtkDialog" id="chat_invite_dialog"> + <property name="border_width">5</property> + <property name="title" translatable="yes">Invite</property> + <property name="modal">True</property> + <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> + <property name="default_width">275</property> + <property name="default_height">225</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> + <property name="has_separator">False</property> + <child internal-child="vbox"> + <object class="GtkVBox" id="vbox6"> + <property name="visible">True</property> + <child> + <object class="GtkVBox" id="vbox7"> + <property name="visible">True</property> + <property name="border_width">5</property> + <property name="spacing">18</property> + <child> + <object class="GtkVBox" id="vbox7"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Select who would you like to invite:</property> + <property name="use_markup">True</property> + <property name="wrap">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow1"> + <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> + <object class="GtkTreeView" id="treeview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="headers_visible">False</property> + </object> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + <child> + <object class="GtkVBox" id="vbox8"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label4"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Invitation _message:</property> + <property name="use_markup">True</property> + <property name="use_underline">True</property> + <property name="wrap">True</property> + <property name="mnemonic_widget">entry</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="width_chars">40</property> + <property name="text" translatable="yes">You have been invited to join a chat conference.</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child internal-child="action_area"> + <object class="GtkHButtonBox" id="hbuttonbox1"> + <property name="visible">True</property> + <property name="layout_style">GTK_BUTTONBOX_END</property> + <child> + <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> + </object> + </child> + <child> + <object class="GtkButton" id="button_invite"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="label">In_vite</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="pack_type">GTK_PACK_END</property> + </packing> + </child> + </object> + </child> + <action-widgets> + <action-widget response="-6">button_cancel</action-widget> + <action-widget response="-5">button_invite</action-widget> + </action-widgets> + </object> +</interface> diff --git a/src/empathy-chatrooms-window.glade b/src/empathy-chatrooms-window.ui index ccccc81b0..e92de5934 100644 --- a/src/empathy-chatrooms-window.glade +++ b/src/empathy-chatrooms-window.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="edit_chatroom_dialog"> +<interface> + <object class="GtkDialog" id="edit_chatroom_dialog"> <property name="visible">True</property> <property name="border_width">5</property> <property name="title" translatable="yes">Edit Favorite Room</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-vbox3"> + <object class="GtkVBox" id="dialog-vbox3"> <property name="visible">True</property> <property name="spacing">2</property> <child> - <widget class="GtkTable" id="table4"> + <object class="GtkTable" id="table4"> <property name="visible">True</property> <property name="border_width">5</property> <property name="n_rows">5</property> @@ -27,197 +26,199 @@ <placeholder/> </child> <child> - <widget class="GtkCheckButton" id="checkbutton_auto_connect"> + <object class="GtkCheckButton" id="checkbutton_auto_connect"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Join this chat room when Empathy starts and you are connected</property> + <property name="tooltip-text" translatable="yes">Join this chat room when Empathy starts and you are connected</property> <property name="label" translatable="yes">Join room on start_up</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">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="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkEntry" id="entry_name"> + <object class="GtkEntry" id="entry_name"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="width_chars">25</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_name"> + <object class="GtkLabel" id="label_name"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">N_ame:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">entry_name</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_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">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">S_erver:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">entry_server</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_room"> + <object class="GtkLabel" id="label_room"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Room:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">entry_room</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_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">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="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_room"> + <object class="GtkEntry" id="entry_room"> <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> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="dialog-action_area3"> + <object class="GtkHButtonBox" id="dialog-action_area3"> <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_save"> + <object class="GtkButton" id="button_save"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="label">gtk-save</property> <property name="use_stock">True</property> - <property name="response_id">-5</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> - <widget class="GtkWindow" id="chatrooms_window"> + <action-widgets> + <action-widget response="0">checkbutton_auto_connect</action-widget> + <action-widget response="-6">button_cancel</action-widget> + <action-widget response="-5">button_save</action-widget> + </action-widgets> + </object> + <object class="GtkWindow" id="chatrooms_window"> <property name="visible">True</property> <property name="border_width">12</property> <property name="title" translatable="yes">Manage Favorite Rooms</property> <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> <child> - <widget class="GtkVBox" id="vbox12"> + <object class="GtkVBox" id="vbox12"> <property name="visible">True</property> <property name="spacing">12</property> <child> - <widget class="GtkVBox" id="vbox18"> + <object class="GtkVBox" id="vbox18"> <property name="visible">True</property> <property name="spacing">18</property> <child> - <widget class="GtkHBox" id="hbox_account"> + <object class="GtkHBox" id="hbox_account"> <property name="visible">True</property> <property name="spacing">12</property> <child> - <widget class="GtkLabel" id="label_account"> + <object class="GtkLabel" id="label_account"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Account:</property> - </widget> + </object> <packing> <property name="expand">False</property> </packing> @@ -225,13 +226,13 @@ <child> <placeholder/> </child> - </widget> + </object> <packing> <property name="expand">False</property> </packing> </child> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow1"> + <object class="GtkScrolledWindow" id="scrolledwindow1"> <property name="height_request">150</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -239,69 +240,66 @@ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <property name="shadow_type">GTK_SHADOW_IN</property> <child> - <widget class="GtkTreeView" id="treeview"> + <object class="GtkTreeView" id="treeview"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="has_focus">True</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> <child> - <widget class="GtkHButtonBox" id="hbuttonbox3"> + <object class="GtkHButtonBox" id="hbuttonbox3"> <property name="visible">True</property> <property name="spacing">6</property> <property name="layout_style">GTK_BUTTONBOX_END</property> <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> </child> <child> - <widget class="GtkButton" id="button_edit"> + <object class="GtkButton" id="button_edit"> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="label">gtk-edit</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_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">0</property> - </widget> + </object> <packing> <property name="position">2</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> -</glade-interface> + </object> +</interface> diff --git a/src/empathy-ft-manager.glade b/src/empathy-ft-manager.ui index 2a386145a..1e3c4af7d 100644 --- a/src/empathy-ft-manager.glade +++ b/src/empathy-ft-manager.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="ft_manager_dialog"> +<interface> + <object class="GtkDialog" id="ft_manager_dialog"> <property name="width_request">620</property> <property name="height_request">250</property> <property name="border_width">5</property> @@ -12,11 +11,11 @@ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> <property name="has_separator">False</property> <child internal-child="vbox"> - <widget class="GtkVBox" id="dialog-vbox31"> + <object class="GtkVBox" id="dialog-vbox31"> <property name="visible">True</property> <property name="spacing">2</property> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow1134"> + <object class="GtkScrolledWindow" id="scrolledwindow1134"> <property name="height_request">100</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -25,65 +24,67 @@ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <property name="shadow_type">GTK_SHADOW_IN</property> <child> - <widget class="GtkTreeView" id="ft_list"> + <object class="GtkTreeView" id="ft_list"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="dialog-action_area31"> + <object class="GtkHButtonBox" id="dialog-action_area31"> <property name="visible">True</property> <property name="layout_style">GTK_BUTTONBOX_END</property> <child> - <widget class="GtkButton" id="clear_button"> + <object class="GtkButton" id="clear_button"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="tooltip" translatable="yes">Remove completed, canceled and failed file transfers from the list</property> + <property name="tooltip-text" translatable="yes">Remove completed, canceled and failed file transfers from the list</property> <property name="label">gtk-clear</property> <property name="use_stock">True</property> - <property name="response_id">3</property> - </widget> + </object> </child> <child> - <widget class="GtkButton" id="open_button"> + <object class="GtkButton" id="open_button"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="label">gtk-open</property> <property name="use_stock">True</property> - <property name="response_id">1</property> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkButton" id="abort_button"> + <object class="GtkButton" id="abort_button"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="label">gtk-stop</property> <property name="use_stock">True</property> - <property name="response_id">2</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="3">clear_button</action-widget> + <action-widget response="1">open_button</action-widget> + <action-widget response="2">abort_button</action-widget> + </action-widgets> + </object> +</interface> diff --git a/src/empathy-import-dialog.glade b/src/empathy-import-dialog.ui index 4521d2e89..38ba434e4 100644 --- a/src/empathy-import-dialog.glade +++ b/src/empathy-import-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"?> <!--Generated with glade3 3.4.5 on Fri Oct 17 11:01:30 2008 --> -<glade-interface> - <widget class="GtkDialog" id="import_dialog"> +<interface> + <object class="GtkDialog" id="import_dialog"> <property name="border_width">5</property> <property name="title" translatable="yes">Import Accounts</property> <property name="modal">True</property> @@ -10,63 +9,65 @@ <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="GtkScrolledWindow" id="scrolledwindow17"> + <object class="GtkScrolledWindow" id="scrolledwindow17"> <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"> + <object class="GtkTreeView" id="treeview"> <property name="height_request">200</property> <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="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="button_cancel"> + <object class="GtkButton" id="button_cancel"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="label">gtk-cancel</property> <property name="use_stock">True</property> - <property name="response_id">0</property> - </widget> + </object> </child> <child> - <widget class="GtkButton" id="button_ok"> + <object class="GtkButton" id="button_ok"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="label">gtk-ok</property> <property name="use_stock">True</property> - <property name="response_id">-5</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">button_cancel</action-widget> + <action-widget response="-5">button_ok</action-widget> + </action-widgets> + </object> +</interface> diff --git a/src/empathy-main-window.glade b/src/empathy-main-window.glade deleted file mode 100644 index 737105d23..000000000 --- a/src/empathy-main-window.glade +++ /dev/null @@ -1,299 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> -<!--*- mode: xml -*--> -<glade-interface> - <widget class="GtkWindow" id="main_window"> - <property name="title" translatable="yes">Contact List</property> - <property name="role">contact_list</property> - <property name="default_width">225</property> - <property name="default_height">325</property> - <child> - <widget class="GtkVBox" id="main_vbox"> - <property name="visible">True</property> - <child> - <widget class="GtkMenuBar" id="menubar2"> - <property name="visible">True</property> - <child> - <widget class="GtkMenuItem" id="chat"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Chat</property> - <property name="use_underline">True</property> - <child> - <widget class="GtkMenu" id="chat_menu"> - <child> - <widget class="GtkImageMenuItem" id="chat_new_message"> - <property name="visible">True</property> - <property name="label" translatable="yes">_New Conversation...</property> - <property name="use_underline">True</property> - <accelerator key="N" modifiers="GDK_CONTROL_MASK" signal="activate"/> - <child internal-child="image"> - <widget class="GtkImage" id="image885"> - <property name="visible">True</property> - <property name="icon_size">1</property> - <property name="icon_name">im-message-new</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="chat_history"> - <property name="visible">True</property> - <property name="label" translatable="yes">_View Previous Conversations</property> - <property name="use_underline">True</property> - <accelerator key="F3" modifiers="" signal="activate"/> - <child internal-child="image"> - <widget class="GtkImage" id="image886"> - <property name="visible">True</property> - <property name="icon_size">1</property> - <property name="icon_name">document-open-recent</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="separator5"> - <property name="visible">True</property> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="chat_add_contact"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Add Contact...</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image887"> - <property name="visible">True</property> - <property name="stock">gtk-add</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="separator3"> - <property name="visible">True</property> - </widget> - </child> - <child> - <widget class="GtkCheckMenuItem" id="chat_show_offline"> - <property name="visible">True</property> - <property name="label" translatable="yes">Show _Offline Contacts</property> - <property name="use_underline">True</property> - <accelerator key="H" modifiers="GDK_CONTROL_MASK" signal="activate"/> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="separator6"> - <property name="visible">True</property> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="chat_quit"> - <property name="visible">True</property> - <property name="label">gtk-quit</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - <accelerator key="Q" modifiers="GDK_CONTROL_MASK" signal="activate"/> - </widget> - </child> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkMenuItem" id="edit"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Edit</property> - <property name="use_underline">True</property> - <child> - <widget class="GtkMenu" id="edit_menu"> - <child> - <widget class="GtkMenuItem" id="edit_context"> - <property name="visible">True</property> - <property name="label" translatable="yes">Context</property> - <property name="use_underline">True</property> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="edit_context_separator"> - <property name="visible">True</property> - </widget> - </child> - <child> - <widget class="GtkMenuItem" id="edit_accounts"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Accounts</property> - <property name="use_underline">True</property> - <accelerator key="F4" modifiers="" signal="activate"/> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="edit_personal_information"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Personal Information</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image894"> - <property name="visible">True</property> - <property name="icon_size">1</property> - <property name="icon_name">user-info</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="separator2"> - <property name="visible">True</property> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="edit_preferences"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Preferences</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image891"> - <property name="visible">True</property> - <property name="stock">gtk-preferences</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkMenuItem" id="room"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Room</property> - <property name="use_underline">True</property> - <child> - <widget class="GtkMenu" id="room_menu"> - <child> - <widget class="GtkMenuItem" id="room_join_new"> - <property name="visible">True</property> - <property name="label" translatable="yes">Join _New...</property> - <property name="use_underline">True</property> - </widget> - </child> - <child> - <widget class="GtkMenuItem" id="room_join_favorites"> - <property name="visible">True</property> - <property name="label" translatable="yes">Join _Favorites</property> - <property name="use_underline">True</property> - <accelerator key="F5" modifiers="" signal="activate"/> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="room_sep"> - <property name="visible">True</property> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="room_sep2"> - <property name="visible">True</property> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="room_manage_favorites"> - <property name="visible">True</property> - <property name="label" translatable="yes">Manage Favorites</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image890"> - <property name="visible">True</property> - <property name="icon_size">1</property> - <property name="icon_name">system-users</property> - </widget> - </child> - </widget> - </child> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkMenuItem" id="help"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Help</property> - <property name="use_underline">True</property> - <child> - <widget class="GtkMenu" id="help_menu"> - <child> - <widget class="GtkImageMenuItem" id="help_contents"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Contents</property> - <property name="use_underline">True</property> - <accelerator key="F1" modifiers="" signal="activate"/> - <child internal-child="image"> - <widget class="GtkImage" id="image892"> - <property name="visible">True</property> - <property name="stock">gtk-help</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="help_about"> - <property name="visible">True</property> - <property name="label">gtk-about</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </widget> - </child> - </widget> - </child> - </widget> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkToolbar" id="presence_toolbar"> - <property name="visible">True</property> - <property name="toolbar_style">GTK_TOOLBAR_BOTH</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <widget class="GtkVBox" id="errors_vbox"> - <child> - <placeholder/> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - <child> - <widget class="GtkScrolledWindow" id="roster_scrolledwindow"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="has_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> - <placeholder/> - </child> - </widget> - <packing> - <property name="position">3</property> - </packing> - </child> - </widget> - </child> - </widget> -</glade-interface> diff --git a/src/empathy-main-window.ui b/src/empathy-main-window.ui new file mode 100644 index 000000000..76c6428cd --- /dev/null +++ b/src/empathy-main-window.ui @@ -0,0 +1,220 @@ +<?xml version="1.0"?> +<!--*- mode: xml -*--> +<interface> + <object class="GtkUIManager" id="uimanager1"> + <child> + <object class="GtkActionGroup" id="actiongroup1"> + <child> + <object class="GtkAction" id="chat"> + <property name="name">chat</property> + <property name="label" translatable="yes">_Chat</property> + </object> + </child> + <child> + <object class="GtkAction" id="chat_new_message"> + <property name="name">chat_new_message</property> + <property name="label" translatable="yes">_New Conversation...</property> + </object> + <accelerator key="N" modifiers="GDK_CONTROL_MASK"/> + </child> + <child> + <object class="GtkAction" id="chat_history"> + <property name="name">chat_history</property> + <property name="label" translatable="yes">_View Previous Conversations</property> + </object> + <accelerator key="F3" modifiers=""/> + </child> + <child> + <object class="GtkAction" id="chat_add_contact"> + <property name="stock_id">gtk-add</property> + <property name="name">chat_add_contact</property> + <property name="label" translatable="yes">_Add Contact...</property> + </object> + </child> + <child> + <object class="GtkToggleAction" id="chat_show_offline"> + <property name="name">chat_show_offline</property> + <property name="label" translatable="yes">Show _Offline Contacts</property> + </object> + <accelerator key="H" modifiers="GDK_CONTROL_MASK"/> + </child> + <child> + <object class="GtkAction" id="chat_quit"> + <property name="stock_id">gtk-quit</property> + <property name="name">chat_quit</property> + </object> + <accelerator key="Q" modifiers="GDK_CONTROL_MASK"/> + </child> + <child> + <object class="GtkAction" id="edit"> + <property name="name">edit</property> + <property name="label" translatable="yes">_Edit</property> + </object> + </child> + <child> + <object class="GtkAction" id="edit_context"> + <property name="name">edit_context</property> + <property name="label" translatable="yes">Context</property> + </object> + </child> + <child> + <object class="GtkAction" id="edit_accounts"> + <property name="name">edit_accounts</property> + <property name="label" translatable="yes">_Accounts</property> + </object> + <accelerator key="F4" modifiers=""/> + </child> + <child> + <object class="GtkAction" id="edit_personal_information"> + <property name="name">edit_personal_information</property> + <property name="label" translatable="yes">_Personal Information</property> + </object> + </child> + <child> + <object class="GtkAction" id="edit_preferences"> + <property name="stock_id">gtk-preferences</property> + <property name="name">edit_preferences</property> + <property name="label" translatable="yes">_Preferences</property> + </object> + </child> + <child> + <object class="GtkAction" id="room"> + <property name="name">room</property> + <property name="label" translatable="yes">_Room</property> + </object> + </child> + <child> + <object class="GtkAction" id="room_join_new"> + <property name="name">room_join_new</property> + <property name="label" translatable="yes">Join _New...</property> + </object> + </child> + <child> + <object class="GtkAction" id="room_join_favorites"> + <property name="name">room_join_favorites</property> + <property name="label" translatable="yes">Join _Favorites</property> + </object> + <accelerator key="F5" modifiers=""/> + </child> + <child> + <object class="GtkAction" id="room_manage_favorites"> + <property name="name">room_manage_favorites</property> + <property name="label" translatable="yes">Manage Favorites</property> + </object> + </child> + <child> + <object class="GtkAction" id="help"> + <property name="name">help</property> + <property name="label" translatable="yes">_Help</property> + </object> + </child> + <child> + <object class="GtkAction" id="help_contents"> + <property name="stock_id">gtk-help</property> + <property name="name">help_contents</property> + <property name="label" translatable="yes">_Contents</property> + </object> + <accelerator key="F1" modifiers=""/> + </child> + <child> + <object class="GtkAction" id="help_about"> + <property name="stock_id">gtk-about</property> + <property name="name">help_about</property> + </object> + </child> + </object> + </child> + <ui> + <menubar name="menubar2"> + <menu action="chat"> + <menuitem action="chat_new_message"/> + <menuitem action="chat_history"/> + <separator/> + <menuitem action="chat_add_contact"/> + <separator/> + <menuitem action="chat_show_offline"/> + <separator/> + <menuitem action="chat_quit"/> + </menu> + <menu action="edit"> + <menuitem action="edit_context"/> + <separator/> + <menuitem action="edit_accounts"/> + <menuitem action="edit_personal_information"/> + <separator/> + <menuitem action="edit_preferences"/> + </menu> + <menu action="room"> + <menuitem action="room_join_new"/> + <menuitem action="room_join_favorites"/> + <separator/> + <separator/> + <menuitem action="room_manage_favorites"/> + </menu> + <menu action="help"> + <menuitem action="help_contents"/> + <menuitem action="help_about"/> + </menu> + </menubar> + </ui> + </object> + <object class="GtkWindow" id="main_window"> + <property name="title" translatable="yes">Contact List</property> + <property name="role">contact_list</property> + <property name="default_width">225</property> + <property name="default_height">325</property> + <child> + <object class="GtkVBox" id="main_vbox"> + <property name="visible">True</property> + <child> + <object class="GtkMenuBar" constructor="uimanager1" id="menubar2"> + <property name="visible">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <object class="GtkToolbar" id="presence_toolbar"> + <property name="visible">True</property> + <property name="toolbar_style">GTK_TOOLBAR_BOTH</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="errors_vbox"> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="roster_scrolledwindow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="has_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> + <placeholder/> + </child> + </object> + <packing> + <property name="position">3</property> + </packing> + </child> + </object> + </child> + </object> +</interface> diff --git a/src/empathy-new-chatroom-dialog.glade b/src/empathy-new-chatroom-dialog.ui index 98984f7f7..04927be2c 100644 --- a/src/empathy-new-chatroom-dialog.glade +++ b/src/empathy-new-chatroom-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_chatroom_dialog"> +<interface> + <object class="GtkDialog" id="new_chatroom_dialog"> <property name="visible">True</property> <property name="border_width">5</property> <property name="title" translatable="yes">Join New</property> @@ -12,16 +11,16 @@ <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">6</property> <child> - <widget class="GtkVBox" id="vbox_widgets"> + <object class="GtkVBox" id="vbox_widgets"> <property name="visible">True</property> <property name="border_width">5</property> <property name="spacing">18</property> <child> - <widget class="GtkTable" id="table_info"> + <object class="GtkTable" id="table_info"> <property name="visible">True</property> <property name="n_rows">3</property> <property name="n_columns">3</property> @@ -34,139 +33,138 @@ <placeholder/> </child> <child> - <widget class="GtkEntry" id="entry_room"> + <object class="GtkEntry" id="entry_room"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Enter the room name to join here or click on one or more rooms in the list.</property> + <property name="tooltip-text" translatable="yes">Enter the room name to join here or click on one or more rooms in the list.</property> <property name="activates_default">True</property> <property name="width_chars">32</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="GtkToggleButton" id="togglebutton_refresh"> + <object class="GtkToggleButton" id="togglebutton_refresh"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="label" translatable="yes">Re_fresh</property> <property name="use_underline">True</property> - <property name="response_id">0</property> - </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="GtkEntry" id="entry_server"> + <object class="GtkEntry" id="entry_server"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Enter the server which hosts the room, or leave it empty if the room is on the current account's server</property> + <property name="tooltip-text" translatable="yes">Enter the server which hosts the room, or leave it empty if the room is on the current account's server</property> <property name="width_chars">25</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_room"> + <object class="GtkLabel" id="label_room"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Room:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">entry_room</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="GtkLabel" id="label_account"> + <object class="GtkLabel" id="label_account"> <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> - </widget> + </object> </child> <child> - <widget class="GtkVBox" id="vbox_browse"> + <object class="GtkVBox" id="vbox_browse"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkHBox" id="hbox_status"> + <object class="GtkHBox" id="hbox_status"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkHBox" id="hbox35"> + <object class="GtkHBox" id="hbox35"> <property name="visible">True</property> <property name="spacing">3</property> <child> - <widget class="GtkImage" id="image_status"> + <object class="GtkImage" id="image_status"> <property name="visible">True</property> <property name="icon_size">2</property> <property name="icon_name">gtk-find</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="xalign">0</property> <property name="label" translatable="yes">Browse:</property> <property name="wrap">True</property> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> <child> <placeholder/> </child> - </widget> + </object> </child> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow2"> + <object class="GtkScrolledWindow" id="scrolledwindow2"> <property name="height_request">150</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -174,24 +172,24 @@ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <property name="shadow_type">GTK_SHADOW_IN</property> <child> - <widget class="GtkTreeView" id="treeview"> + <object class="GtkTreeView" id="treeview"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">This list represents all chat rooms hosted on the server you have entered.</property> + <property name="tooltip-text" translatable="yes">This list represents all chat rooms hosted on the server you have entered.</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> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -199,74 +197,77 @@ </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="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-close</property> <property name="use_stock">True</property> - <property name="response_id">-7</property> - </widget> + </object> </child> <child> - <widget class="GtkButton" id="button_join"> + <object class="GtkButton" id="button_join"> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="has_default">True</property> - <property name="response_id">-5</property> <child> - <widget class="GtkAlignment" id="alignment4"> + <object class="GtkAlignment" id="alignment4"> <property name="visible">True</property> <property name="xscale">0</property> <property name="yscale">0</property> <child> - <widget class="GtkHBox" id="hbox29"> + <object class="GtkHBox" id="hbox29"> <property name="visible">True</property> <property name="spacing">2</property> <child> - <widget class="GtkImage" id="image4"> + <object class="GtkImage" id="image4"> <property name="visible">True</property> <property name="stock">gtk-execute</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkLabel" id="label79"> + <object class="GtkLabel" id="label79"> <property name="visible">True</property> <property name="label" translatable="yes">Join</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="0">togglebutton_refresh</action-widget> + <action-widget response="-7">button_cancel</action-widget> + <action-widget response="-5">button_join</action-widget> + </action-widgets> + </object> +</interface> diff --git a/src/empathy-preferences.glade b/src/empathy-preferences.ui index c7c5ace4b..afc294c54 100644 --- a/src/empathy-preferences.glade +++ b/src/empathy-preferences.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="preferences_dialog"> +<interface> + <object class="GtkDialog" id="preferences_dialog"> <property name="border_width">5</property> <property name="title" translatable="yes">Preferences</property> <property name="role">preferences</property> @@ -11,58 +10,56 @@ <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-vbox5"> + <object class="GtkVBox" id="dialog-vbox5"> <property name="visible">True</property> <property name="spacing">2</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">5</property> <child> - <widget class="GtkVBox" id="vbox197"> + <object class="GtkVBox" id="vbox197"> <property name="visible">True</property> <property name="border_width">12</property> <property name="spacing">18</property> <child> - <widget class="GtkFrame" id="frame3"> + <object class="GtkFrame" id="frame3"> <property name="visible">True</property> <property name="label_xalign">0</property> <property name="shadow_type">GTK_SHADOW_NONE</property> <child> - <widget class="GtkAlignment" id="alignment11"> + <object class="GtkAlignment" id="alignment11"> <property name="visible">True</property> <property name="top_padding">6</property> <property name="left_padding">12</property> <child> - <widget class="GtkVBox" id="vbox199"> + <object class="GtkVBox" id="vbox199"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkCheckButton" id="checkbutton_compact_contact_list"> + <object class="GtkCheckButton" id="checkbutton_compact_contact_list"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="label" translatable="yes">Show co_mpact contact list</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="checkbutton_show_avatars"> + <object class="GtkCheckButton" id="checkbutton_show_avatars"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Avatars are user chosen images shown in the contact list</property> + <property name="tooltip-text" translatable="yes">Avatars are user chosen images shown in the contact list</property> <property name="label" translatable="yes">Show _avatars</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="active">True</property> <property name="draw_indicator">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -70,97 +67,88 @@ </packing> </child> <child> - <widget class="GtkCheckButton" id="checkbutton_show_smileys"> + <object class="GtkCheckButton" id="checkbutton_show_smileys"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="label" translatable="yes">Show _smileys as images</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="active">True</property> <property name="draw_indicator">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">2</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label611"> + <child type="label"> + <object class="GtkLabel" id="label611"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Appearance</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> </packing> </child> <child> - <widget class="GtkFrame" id="frame4"> + <object class="GtkFrame" id="frame4"> <property name="visible">True</property> <property name="label_xalign">0</property> <property name="shadow_type">GTK_SHADOW_NONE</property> <child> - <widget class="GtkAlignment" id="alignment12"> + <object class="GtkAlignment" id="alignment12"> <property name="visible">True</property> <property name="top_padding">6</property> <property name="left_padding">12</property> <child> - <widget class="GtkVBox" id="vbox218"> + <object class="GtkVBox" id="vbox218"> <property name="visible">True</property> <child> - <widget class="GtkCheckButton" id="checkbutton_separate_chat_windows"> + <object class="GtkCheckButton" id="checkbutton_separate_chat_windows"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="label" translatable="yes">_Open new chats in separate windows</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="checkbutton_autoconnect"> + <object class="GtkCheckButton" id="checkbutton_autoconnect"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="label" translatable="yes">Automatically _connect on startup </property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="active">True</property> <property name="draw_indicator">True</property> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label612"> + <child type="label"> + <object class="GtkLabel" id="label612"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Behavior</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> @@ -168,485 +156,465 @@ </packing> </child> <child> - <widget class="GtkFrame" id="frame13"> + <object class="GtkFrame" id="frame13"> <property name="visible">True</property> <property name="label_xalign">0</property> <property name="shadow_type">GTK_SHADOW_NONE</property> <child> - <widget class="GtkAlignment" id="alignment31"> + <object class="GtkAlignment" id="alignment31"> <property name="visible">True</property> <property name="top_padding">6</property> <property name="left_padding">12</property> <child> - <widget class="GtkVBox" id="vbox217"> + <object class="GtkVBox" id="vbox217"> <property name="visible">True</property> <child> - <widget class="GtkRadioButton" id="radiobutton_contact_list_sort_by_name"> + <object class="GtkRadioButton" id="radiobutton_contact_list_sort_by_name"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="label" translatable="yes">Sort by _name</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkRadioButton" id="radiobutton_contact_list_sort_by_state"> + <object class="GtkRadioButton" id="radiobutton_contact_list_sort_by_state"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="label" translatable="yes">Sort by s_tate</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <property name="group">radiobutton_contact_list_sort_by_name</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> - <child> - <widget class="GtkLabel" id="label644"> + <child type="label"> + <object class="GtkLabel" id="label644"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Contact List</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> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label602"> + <child type="tab"> + <object class="GtkLabel" id="label602"> <property name="visible">True</property> <property name="label" translatable="yes">General</property> - </widget> + </object> <packing> - <property name="type">tab</property> <property name="tab_fill">False</property> </packing> </child> <child> - <widget class="GtkVBox" id="vbox2"> + <object class="GtkVBox" id="vbox2"> <property name="visible">True</property> <property name="border_width">12</property> <property name="spacing">6</property> <child> - <widget class="GtkCheckButton" id="checkbutton_notifications_enabled"> + <object class="GtkCheckButton" id="checkbutton_notifications_enabled"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="label" translatable="yes">_Enable bubble notifications</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> <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="GtkVBox" id="vbox3"> + <object class="GtkVBox" id="vbox3"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkCheckButton" id="checkbutton_notifications_disabled_away"> + <object class="GtkCheckButton" id="checkbutton_notifications_disabled_away"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="label" translatable="yes">Disable notifications when _away or busy</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> - </widget> + </object> </child> <child> - <widget class="GtkCheckButton" id="checkbutton_notifications_focus"> + <object class="GtkCheckButton" id="checkbutton_notifications_focus"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="label" translatable="yes">Enable notifications when the _chat is not focused</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">1</property> </packing> </child> - </widget> - <packing> - <property name="position">1</property> - </packing> + </object> </child> - <child> - <widget class="GtkLabel" id="label1"> + <child type="tab"> + <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="label" translatable="yes">Notifications</property> - </widget> + </object> <packing> - <property name="type">tab</property> <property name="position">4</property> <property name="tab_fill">False</property> </packing> </child> <child> - <widget class="GtkVBox" id="outer_vbox"> + <object class="GtkVBox" id="outer_vbox"> <property name="visible">True</property> <property name="border_width">12</property> <property name="spacing">18</property> <child> - <widget class="GtkVBox" id="vbox219"> + <object class="GtkVBox" id="vbox219"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkCheckButton" id="checkbutton_sounds_enabled"> + <object class="GtkCheckButton" id="checkbutton_sounds_enabled"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="label" translatable="yes">_Enable sound notifications</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">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="GtkCheckButton" id="checkbutton_sounds_disabled_away"> + <object class="GtkCheckButton" id="checkbutton_sounds_disabled_away"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="label" translatable="yes">Disable sounds when _away or busy</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> </packing> </child> <child> - <widget class="GtkVBox" id="vbox221"> + <object class="GtkVBox" id="vbox221"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label645"> + <object class="GtkLabel" id="label645"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes"><b>Play sound for events</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="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_AUTOMATIC</property> <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <property name="shadow_type">GTK_SHADOW_IN</property> <child> - <widget class="GtkTreeView" id="treeview_sounds"> + <object class="GtkTreeView" id="treeview_sounds"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="headers_visible">False</property> - </widget> + </object> </child> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> - <packing> - <property name="position">2</property> - </packing> + </object> </child> - <child> - <widget class="GtkLabel" id="label607"> + <child type="tab"> + <object class="GtkLabel" id="label607"> <property name="visible">True</property> <property name="label" translatable="yes">Sounds</property> - </widget> + </object> <packing> - <property name="type">tab</property> <property name="position">2</property> <property name="tab_fill">False</property> </packing> </child> <child> - <widget class="GtkVBox" id="vbox168"> + <object class="GtkVBox" id="vbox168"> <property name="visible">True</property> <property name="border_width">12</property> <property name="spacing">18</property> <child> - <widget class="GtkFrame" id="frame7"> + <object class="GtkFrame" id="frame7"> <property name="visible">True</property> <property name="label_xalign">0</property> <property name="shadow_type">GTK_SHADOW_NONE</property> <child> - <widget class="GtkAlignment" id="alignment15"> + <object class="GtkAlignment" id="alignment15"> <property name="visible">True</property> <property name="top_padding">6</property> <property name="left_padding">12</property> <child> - <widget class="GtkVBox" id="vbox201"> + <object class="GtkVBox" id="vbox201"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkHBox" id="hbox153"> + <object class="GtkHBox" id="hbox153"> <property name="visible">True</property> <child> - <widget class="GtkHBox" id="hbox154"> + <object class="GtkHBox" id="hbox154"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow18"> + <object class="GtkScrolledWindow" id="scrolledwindow18"> <property name="visible">True</property> <property name="can_focus">False</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_spell_checker"> + <object class="GtkTreeView" id="treeview_spell_checker"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="headers_visible">False</property> - </widget> + </object> </child> - </widget> + </object> </child> - </widget> + </object> </child> - </widget> + </object> </child> <child> - <widget class="GtkHBox" id="hbox155"> + <object class="GtkHBox" id="hbox155"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkImage" id="image422"> + <object class="GtkImage" id="image422"> <property name="visible">True</property> <property name="yalign">0</property> <property name="stock">gtk-dialog-info</property> - </widget> + </object> <packing> <property name="expand">False</property> </packing> </child> <child> - <widget class="GtkLabel" id="label616"> + <object class="GtkLabel" id="label616"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes"><small>The list of languages reflects only the languages for which you have a dictionary installed.</small></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="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label615"> + <child type="label"> + <object class="GtkLabel" id="label615"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Enable spell checking for languages:</b></property> <property name="use_markup">True</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> + </object> </child> - </widget> + </object> </child> <child> <placeholder/> </child> - </widget> - <packing> - <property name="position">3</property> - </packing> + </object> </child> - <child> - <widget class="GtkLabel" id="label567"> + <child type="tab"> + <object class="GtkLabel" id="label567"> <property name="visible">True</property> <property name="label" translatable="yes">Spell Checking</property> - </widget> + </object> <packing> - <property name="type">tab</property> <property name="position">3</property> <property name="tab_fill">False</property> </packing> </child> <child> - <widget class="GtkVBox" id="vbox206"> + <object class="GtkVBox" id="vbox206"> <property name="visible">True</property> <property name="border_width">12</property> <property name="spacing">18</property> <child> - <widget class="GtkFrame" id="frame11"> + <object class="GtkFrame" id="frame11"> <property name="visible">True</property> <property name="label_xalign">0</property> <property name="shadow_type">GTK_SHADOW_NONE</property> <child> - <widget class="GtkAlignment" id="alignment19"> + <object class="GtkAlignment" id="alignment19"> <property name="visible">True</property> <property name="top_padding">6</property> <property name="left_padding">12</property> <child> - <widget class="GtkVBox" id="vbox207"> + <object class="GtkVBox" id="vbox207"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkHBox" id="hbox139"> + <object class="GtkHBox" id="hbox139"> <property name="visible">True</property> <property name="spacing">12</property> <child> - <widget class="GtkLabel" id="label586"> + <object class="GtkLabel" id="label586"> <property name="visible">True</property> <property name="label" translatable="yes">Chat Th_eme:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">combobox_chat_theme</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkComboBox" id="combobox_chat_theme"> + <object class="GtkComboBox" id="combobox_chat_theme"> <property name="visible">True</property> - <property name="items" translatable="yes"></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> </child> - <child> - <widget class="GtkLabel" id="label626"> + <child type="label"> + <object class="GtkLabel" id="label626"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Appearance</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> </packing> </child> - </widget> - <packing> - <property name="position">4</property> - </packing> + </object> </child> - <child> - <widget class="GtkLabel" id="label624"> + <child type="tab"> + <object class="GtkLabel" id="label624"> <property name="visible">True</property> <property name="label" translatable="yes">Themes</property> - </widget> + </object> <packing> - <property name="type">tab</property> <property name="position">4</property> <property name="tab_fill">False</property> </packing> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="dialog-action_area5"> + <object class="GtkHButtonBox" id="dialog-action_area5"> <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">-6</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">checkbutton_compact_contact_list</action-widget> + <action-widget response="0">checkbutton_show_avatars</action-widget> + <action-widget response="0">checkbutton_show_smileys</action-widget> + <action-widget response="0">checkbutton_separate_chat_windows</action-widget> + <action-widget response="0">checkbutton_autoconnect</action-widget> + <action-widget response="0">radiobutton_contact_list_sort_by_name</action-widget> + <action-widget response="0">radiobutton_contact_list_sort_by_state</action-widget> + <action-widget response="0">checkbutton_notifications_enabled</action-widget> + <action-widget response="0">checkbutton_notifications_disabled_away</action-widget> + <action-widget response="0">checkbutton_notifications_focus</action-widget> + <action-widget response="0">checkbutton_sounds_enabled</action-widget> + <action-widget response="0">checkbutton_sounds_disabled_away</action-widget> + <action-widget response="-6">button_close</action-widget> + </action-widgets> + </object> +</interface> diff --git a/src/empathy-status-icon.glade b/src/empathy-status-icon.glade deleted file mode 100644 index ab0f09f84..000000000 --- a/src/empathy-status-icon.glade +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> -<!--*- mode: xml -*--> -<glade-interface> - <widget class="GtkMenu" id="tray_menu"> - <child> - <widget class="GtkCheckMenuItem" id="tray_show_list"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Show Contact List</property> - <property name="use_underline">True</property> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="avskiljare5"> - <property name="visible">True</property> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="tray_new_message"> - <property name="visible">True</property> - <property name="label" translatable="yes">_New Conversation...</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image599"> - <property name="visible">True</property> - <property name="icon_size">1</property> - <property name="icon_name">im-message-new</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkMenuItem" id="tray_status"> - <property name="visible">True</property> - <property name="label" translatable="yes">Status</property> - <property name="use_underline">True</property> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="avskiljare6"> - <property name="visible">True</property> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="tray_quit"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Quit</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image600"> - <property name="visible">True</property> - <property name="stock">gtk-quit</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - </widget> -</glade-interface> diff --git a/src/empathy-status-icon.ui b/src/empathy-status-icon.ui new file mode 100644 index 000000000..2cfff903b --- /dev/null +++ b/src/empathy-status-icon.ui @@ -0,0 +1,53 @@ +<?xml version="1.0"?> +<!--*- mode: xml -*--> +<interface> + <object class="GtkUIManager" id="uimanager1"> + <child> + <object class="GtkActionGroup" id="actiongroup1"> + <child> + <object class="GtkToggleAction" id="tray_show_list"> + <property name="name">tray_show_list</property> + <property name="label" translatable="yes">_Show Contact List</property> + </object> + </child> + <child> + <object class="GtkAction" id="tray_new_message"> + <property name="name">tray_new_message</property> + <property name="label" translatable="yes">_New Conversation...</property> + </object> + </child> + <child> + <object class="GtkAction" id="tray_status"> + <property name="name">tray_status</property> + <property name="label" translatable="yes">Status</property> + </object> + </child> + <child> + <object class="GtkAction" id="tray_quit"> + <property name="stock_id">gtk-quit</property> + <property name="name">tray_quit</property> + <property name="label" translatable="yes">_Quit</property> + </object> + </child> + </object> + </child> + <ui> + <popup name="tray_menu"> + <menuitem action="tray_show_list"/> + <separator/> + <menuitem action="tray_new_message"/> + <menuitem action="tray_status"/> + <separator/> + <menuitem action="tray_quit"/> + </popup> + </ui> + </object> + <object class="GtkMenu" constructor="uimanager1" id="tray_menu"> + + + + + + + </object> +</interface> |