diff options
129 files changed, 10499 insertions, 14422 deletions
diff --git a/README.html b/README.html index b648af9c0..e4c9ef85e 100644 --- a/README.html +++ b/README.html @@ -16,7 +16,6 @@ <ul> <li>python2.5 or higher</li> <li>pygtk2.16 or higher</li> -<li>python-libglade</li> <li>pysqlite2 (if you have python 2.5, you already have this)</li> </ul> diff --git a/autogen.sh b/autogen.sh index d6cdc6996..b8486bc57 100755 --- a/autogen.sh +++ b/autogen.sh @@ -8,7 +8,7 @@ fi echo "[encoding: UTF-8]" > po/POTFILES.in \ - && ls -1 data/gajim.desktop.in.in data/glade/*.glade \ + && ls -1 data/gajim.desktop.in.in data/gui/*.ui \ src/*py src/common/*py src/common/zeroconf/*.py | grep -v ipython_view.py >> \ po/POTFILES.in || exit 1 if test -z `which pkg-config 2>/dev/null`;then diff --git a/configure.ac b/configure.ac index cddf791c5..61f4052a4 100644 --- a/configure.ac +++ b/configure.ac @@ -80,7 +80,7 @@ AC_SUBST(PACKAGE) AC_CONFIG_FILES([ Makefile data/Makefile - data/glade/Makefile + data/gui/Makefile data/emoticons/Makefile data/pixmaps/Makefile data/iconsets/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index 65cfb1cf9..4d7e118e5 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = glade emoticons pixmaps iconsets moods activities +SUBDIRS = gui emoticons pixmaps iconsets moods activities @INTLTOOL_DESKTOP_RULE@ desktopdir = $(datadir)/applications diff --git a/data/glade/Makefile.am b/data/glade/Makefile.am deleted file mode 100644 index a8b810da5..000000000 --- a/data/glade/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ - -gladedir = $(pkgdatadir)/data/glade -glade_DATA = $(srcdir)/*.glade -EXTRA_DIST = $(glade_DATA) - -DISTCLEANFILES = *.h - -MAINTAINERCLEANFILES = Makefile.in diff --git a/data/glade/account_context_menu.glade b/data/glade/account_context_menu.glade deleted file mode 100644 index 4316c5f0c..000000000 --- a/data/glade/account_context_menu.glade +++ /dev/null @@ -1,144 +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="account_context_menu"> - <child> - <widget class="GtkImageMenuItem" id="status_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Status</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image1235"> - <property name="visible">True</property> - <property name="stock">gtk-network</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="pep_menuitem"> - <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="label" translatable="yes">_Personal Events</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="menu-item-image7"> - <property name="stock">gtk-home</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="separatormenuitem1"> - <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> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="start_chat_menuitem"> - <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="label" translatable="yes">_Start Chat...</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="menu-item-image7"> - <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="stock">gtk-jump-to</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="join_group_chat_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">Join _Group Chat...</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image1236"> - <property name="visible">True</property> - <property name="stock">gtk-connect</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="seperator"> - <property name="visible">True</property> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="add_contact_menuitem"> - <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="image1238"> - <property name="visible">True</property> - <property name="stock">gtk-add</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="service_discovery_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Discover Services</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image1239"> - <property name="visible">True</property> - <property name="stock">gtk-find</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="execute_command_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Execute Command...</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image1246"> - <property name="visible">True</property> - <property name="stock">gtk-execute</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkMenuItem" id="open_gmail_inbox_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Open Gmail Inbox</property> - <property name="use_underline">True</property> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="seperator"> - <property name="visible">True</property> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="edit_account_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Modify Account</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image1240"> - <property name="visible">True</property> - <property name="stock">gtk-preferences</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - </widget> -</glade-interface> diff --git a/data/glade/account_modification_window.glade b/data/glade/account_modification_window.glade deleted file mode 100644 index 1674103db..000000000 --- a/data/glade/account_modification_window.glade +++ /dev/null @@ -1,1283 +0,0 @@ -<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - -<glade-interface> - -<widget class="GtkWindow" id="account_modification_window"> - <property name="border_width">12</property> - <property name="title" translatable="yes">Account Modification</property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_NONE</property> - <property name="modal">False</property> - <property name="resizable">True</property> - <property name="destroy_with_parent">False</property> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="focus_on_map">True</property> - <property name="urgency_hint">False</property> - <signal name="destroy" handler="on_account_modification_window_destroy" last_modification_time="Mon, 07 Mar 2005 16:05:10 GMT"/> - - <child> - <widget class="GtkVBox" id="vbox7"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkHBox" id="hbox23"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">5</property> - - <child> - <widget class="GtkLabel" id="name_label"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Name:</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="mnemonic_widget">name_entry</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkEntry" id="name_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="has_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="activates_default">False</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">2</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkNotebook" id="notebook1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="show_tabs">True</property> - <property name="show_border">True</property> - <property name="tab_pos">GTK_POS_TOP</property> - <property name="scrollable">False</property> - <property name="enable_popup">False</property> - - <child> - <widget class="GtkTable" id="table24"> - <property name="border_width">6</property> - <property name="visible">True</property> - <property name="n_rows">5</property> - <property name="n_columns">3</property> - <property name="homogeneous">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">6</property> - - <child> - <widget class="GtkLabel" id="label9"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Jabber ID:</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="mnemonic_widget">jid_entry</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label202"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Password:</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="mnemonic_widget">password_entry</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkEntry" id="password_entry"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">False</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="activates_default">True</property> - </widget> - <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="x_options">expand|shrink|fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="save_password_checkbutton"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">If checked, Gajim will remember the password for this account</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Save pass_word</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">False</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_save_password_checkbutton_toggled" last_modification_time="Mon, 28 Feb 2005 20:25:48 GMT"/> - </widget> - <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">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label11"> - <property name="visible">True</property> - <property name="label" translatable="yes">Resour_ce:</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="mnemonic_widget">resource_entry</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label220"> - <property name="visible">True</property> - <property name="label" translatable="yes">Priori_ty:</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="mnemonic_widget">priority_spinbutton</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="adjust_priority_with_status_checkbutton"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Priority will change automatically according to your status.</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">_Adjust to status</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_adjust_priority_with_status_checkbutton_toggled" last_modification_time="Tue, 03 Oct 2006 00:04:37 GMT"/> - </widget> - <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="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkSpinButton" id="priority_spinbutton"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Priority is used in Jabber to determine who gets the events from the jabber server when two or more clients are connected using the same account; The client with the highest priority gets the events</property> - <property name="can_focus">True</property> - <property name="climb_rate">1</property> - <property name="digits">0</property> - <property name="numeric">True</property> - <property name="update_policy">GTK_UPDATE_ALWAYS</property> - <property name="snap_to_ticks">False</property> - <property name="wrap">False</property> - <property name="adjustment">5 0 127 1 5 5</property> - </widget> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkExpander" id="expander1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="expanded">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkHBox" id="hbox2968"> - <property name="visible">True</property> - <property name="homogeneous">True</property> - <property name="spacing">11</property> - - <child> - <widget class="GtkButton" id="synchronise_contacts_button"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Click to request authorization to all contacts of another account</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Synchronise contacts</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_synchronise_contacts_button_clicked" last_modification_time="Thu, 01 Mar 2007 11:05:20 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkButton" id="change_password_button"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Click to change account's password</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Chan_ge Password</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_change_password_button_clicked" last_modification_time="Fri, 04 Mar 2005 11:33:37 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> - - <child> - <widget class="GtkLabel" id="label361"> - <property name="visible">True</property> - <property name="label" translatable="yes">Administration operations</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> - </child> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">3</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">fill</property> - <property name="y_options">fill</property> - </packing> - </child> - - <child> - <widget class="GtkEntry" id="jid_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="activates_default">True</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">3</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkEntry" id="resource_entry"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes">Gajim</property> - <property name="has_frame">True</property> - <property name="activates_default">False</property> - </widget> - <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="x_options">expand|shrink|fill</property> - <property name="y_options"></property> - </packing> - </child> - </widget> - <packing> - <property name="tab_expand">False</property> - <property name="tab_fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label6"> - <property name="visible">True</property> - <property name="label" translatable="yes">Account</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="type">tab</property> - </packing> - </child> - - <child> - <widget class="GtkVBox" id="vbox38"> - <property name="border_width">6</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkCheckButton" id="autoconnect_checkbutton"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">If checked, Gajim, when launched, will automatically connect to jabber using this account</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">C_onnect on Gajim startup</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="autoreconnect_checkbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Auto-reconnect when connection is lost</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="log_history_checkbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Save conversation _logs for all contacts</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">True</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="sync_with_global_status_checkbutton"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Synch_ronize account status with global status</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="use_ft_proxies_checkbutton"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">If checked, Gajim will also broadcast some more IPs except from just your IP, so file transfer has higher chances of working.</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Use file transfer proxies</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="tab_expand">False</property> - <property name="tab_fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label7"> - <property name="visible">True</property> - <property name="label" translatable="yes">General</property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="type">tab</property> - </packing> - </child> - - <child> - <widget class="GtkVBox" id="vbox31"> - <property name="border_width">6</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">12</property> - - <child> - <widget class="GtkHBox" id="hbox2967"> - <property name="border_width">6</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkLabel" id="label322"> - <property name="visible">True</property> - <property name="label" translatable="yes">Proxy:</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkComboBox" id="proxies_combobox"> - <property name="visible">True</property> - <property name="items" translatable="yes" comments="None means no proxy profile selected">None</property> - <property name="add_tearoffs">False</property> - <property name="focus_on_click">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkButton" id="manage_proxies_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Manage...</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_manage_proxies_button_clicked" last_modification_time="Wed, 08 Jun 2005 13:01:02 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkFrame" id="misc_frame"> - <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="label_yalign">0.5</property> - <property name="shadow_type">GTK_SHADOW_NONE</property> - - <child> - <widget class="GtkAlignment" id="alignment66"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">1</property> - <property name="yscale">1</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">12</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkVBox" id="vbox96"> - <property name="border_width">6</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkCheckButton" id="use_ssl_checkbutton"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Check this so Gajim will connect in port 5223 where legacy servers are expected to have SSL capabilities. Note that Gajim uses TLS encryption by default if broadcasted by the server, and with this option enabled TLS will be disabled</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Use _SSL (legacy)</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_use_ssl_checkbutton_toggled" last_modification_time="Tue, 14 Jun 2005 10:44:56 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="send_keepalive_checkbutton"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Send keep-alive packets</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">True</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_send_keepalive_checkbutton_toggled" last_modification_time="Sat, 25 Jun 2005 21:29:56 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="custom_host_port_checkbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Use custom hostname/port</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_custom_host_port_checkbutton_toggled" last_modification_time="Mon, 13 Jun 2005 10:44:56 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkHBox" id="custom_host_port_hbox"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkLabel" id="label331"> - <property name="visible">True</property> - <property name="label" translatable="yes">Hostname: </property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkEntry" id="custom_host_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="activates_default">False</property> - <signal name="changed" handler="on_custom_host_entry_changed" last_modification_time="Mon, 13 Jun 2005 10:44:25 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label332"> - <property name="visible">True</property> - <property name="label" translatable="yes">Port: </property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkEntry" id="custom_port_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text">5222</property> - <property name="has_frame">True</property> - <property name="activates_default">False</property> - <property name="width_chars">6</property> - <signal name="changed" handler="on_custom_port_entry_changed" last_modification_time="Mon, 13 Jun 2005 10:44:32 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkLabel" id="label252"> - <property name="visible">True</property> - <property name="label" translatable="yes"><b>Miscellaneous</b></property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="tab_expand">False</property> - <property name="tab_fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label149"> - <property name="visible">True</property> - <property name="label" translatable="yes">Connection</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="type">tab</property> - </packing> - </child> - - <child> - <widget class="GtkVBox" id="vbox61"> - <property name="border_width">5</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkFrame" id="frame14"> - <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="label_yalign">0.5</property> - <property name="shadow_type">GTK_SHADOW_NONE</property> - - <child> - <widget class="GtkAlignment" id="alignment26"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">1</property> - <property name="yscale">1</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">12</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkVBox" id="vbox32"> - <property name="border_width">6</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkHBox" id="hbox39"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkLabel" id="gpg_key_label"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">No key selected</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="gpg_name_label"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label"></property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkButton" id="gpg_choose_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Choose _Key...</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_gpg_choose_button_clicked" last_modification_time="Mon, 28 Feb 2005 20:24:58 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkHBox" id="hbox40"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkCheckButton" id="gpg_save_password_checkbutton"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="tooltip" translatable="yes">If checked, Gajim will store the password in ~/.gajim/config with 'read' permission only for you</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Save _passphrase (insecure)</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_gpg_save_password_checkbutton_toggled" last_modification_time="Mon, 28 Feb 2005 21:56:59 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkEntry" id="gpg_password_entry"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">False</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="activates_default">False</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkLabel" id="label150"> - <property name="visible">True</property> - <property name="label" translatable="yes"><b>OpenPGP</b></property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkFrame" id="frame37"> - <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="label_yalign">0.5</property> - <property name="shadow_type">GTK_SHADOW_NONE</property> - - <child> - <widget class="GtkAlignment" id="alignment93"> - <property name="border_width">6</property> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">1</property> - <property name="yscale">1</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">12</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkButton" id="edit_details_button"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Information about you, as stored in the server</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Edit Personal Information...</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_edit_details_button_clicked" last_modification_time="Mon, 28 Feb 2005 20:32:40 GMT"/> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkLabel" id="label360"> - <property name="visible">True</property> - <property name="label" translatable="yes"><b>Personal Information</b></property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="tab_expand">False</property> - <property name="tab_fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label86"> - <property name="visible">True</property> - <property name="label" translatable="yes">Personal Information</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="type">tab</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkHButtonBox" id="hbuttonbox6"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - <property name="spacing">12</property> - - <child> - <widget class="GtkButton" id="cancel_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-cancel</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_cancel_button_clicked" last_modification_time="Sun, 17 Apr 2005 18:17:10 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkButton" id="save_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-save</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_save_button_clicked" last_modification_time="Mon, 28 Feb 2005 20:30:56 GMT"/> - </widget> - </child> - </widget> - <packing> - <property name="padding">6</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - </child> -</widget> - -</glade-interface> diff --git a/data/glade/adhoc_commands_window.glade b/data/glade/adhoc_commands_window.glade deleted file mode 100644 index 023510500..000000000 --- a/data/glade/adhoc_commands_window.glade +++ /dev/null @@ -1,723 +0,0 @@ -<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - -<glade-interface> - -<widget class="GtkWindow" id="adhoc_commands_window"> - <property name="border_width">6</property> - <property name="visible">True</property> - <property name="title" translatable="yes">Ad-hoc Commands - Gajim</property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_NONE</property> - <property name="modal">False</property> - <property name="resizable">True</property> - <property name="destroy_with_parent">False</property> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="focus_on_map">True</property> - <property name="urgency_hint">False</property> - <signal name="destroy" handler="on_adhoc_commands_window_destroy" last_modification_time="Thu, 22 Jun 2006 22:50:45 GMT"/> - - <child> - <widget class="GtkVBox" id="vbox1"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkNotebook" id="stages_notebook"> - <property name="width_request">400</property> - <property name="height_request">400</property> - <property name="visible">True</property> - <property name="show_tabs">False</property> - <property name="show_border">False</property> - <property name="tab_pos">GTK_POS_TOP</property> - <property name="scrollable">False</property> - <property name="enable_popup">False</property> - - <child> - <widget class="GtkVBox" id="retrieving_commands_stage_vbox"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkLabel" id="label247"> - <property name="visible">True</property> - <property name="label" translatable="yes">Please wait while retrieving command list...</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkProgressBar" id="retrieving_commands_progressbar"> - <property name="visible">True</property> - <property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property> - <property name="fraction">0</property> - <property name="pulse_step">0.0500000007451</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <placeholder/> - </child> - </widget> - <packing> - <property name="tab_expand">False</property> - <property name="tab_fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label264"> - <property name="visible">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="type">tab</property> - </packing> - </child> - - <child> - <placeholder/> - </child> - - <child> - <widget class="GtkLabel" id="label265"> - <property name="visible">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="type">tab</property> - </packing> - </child> - - <child> - <widget class="GtkVBox" id="command_list_stage_vbox"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkLabel" id="label253"> - <property name="visible">True</property> - <property name="label" translatable="yes"><b>Choose command to execute:</b></property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.20000000298</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">6</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <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_NONE</property> - <property name="window_placement">GTK_CORNER_TOP_LEFT</property> - - <child> - <widget class="GtkViewport" id="viewport1"> - <property name="visible">True</property> - <property name="shadow_type">GTK_SHADOW_IN</property> - - <child> - <widget class="GtkVBox" id="command_list_vbox"> - <property name="border_width">12</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - </widget> - </child> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkHBox" id="hbox2957"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <placeholder/> - </child> - - <child> - <widget class="GtkButton" id="check_commands_1_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Check once more</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_check_commands_1_button_clicked" last_modification_time="Fri, 23 Jun 2006 18:05:14 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">GTK_PACK_END</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="tab_expand">False</property> - <property name="tab_fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label266"> - <property name="visible">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="type">tab</property> - </packing> - </child> - - <child> - <placeholder/> - </child> - - <child> - <widget class="GtkLabel" id="label267"> - <property name="visible">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="type">tab</property> - </packing> - </child> - - <child> - <widget class="GtkVBox" id="sending_form_stage_vbox"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkLabel" id="notes_label"> - <property name="visible">True</property> - <property name="label" translatable="yes">Please wait while the command is sending...</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <placeholder/> - </child> - - <child> - <widget class="GtkProgressBar" id="sending_form_progressbar"> - <property name="visible">True</property> - <property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property> - <property name="fraction">0</property> - <property name="pulse_step">0.0500000007451</property> - <property name="text" translatable="yes">Please wait...</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">GTK_PACK_END</property> - </packing> - </child> - </widget> - <packing> - <property name="tab_expand">False</property> - <property name="tab_fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label268"> - <property name="visible">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="type">tab</property> - </packing> - </child> - - <child> - <placeholder/> - </child> - - <child> - <widget class="GtkLabel" id="label269"> - <property name="visible">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="type">tab</property> - </packing> - </child> - - <child> - <widget class="GtkVBox" id="no_commands_stage_vbox"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkLabel" id="label263"> - <property name="visible">True</property> - <property name="label" translatable="yes">This jabber entity does not expose any commands.</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <placeholder/> - </child> - - <child> - <widget class="GtkHBox" id="hbox2956"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <placeholder/> - </child> - - <child> - <widget class="GtkButton" id="check_commands_2_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Check once more</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_check_commands_2_button_clicked" last_modification_time="Fri, 23 Jun 2006 18:05:31 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">GTK_PACK_END</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">GTK_PACK_END</property> - </packing> - </child> - </widget> - <packing> - <property name="tab_expand">False</property> - <property name="tab_fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label270"> - <property name="visible">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="type">tab</property> - </packing> - </child> - - <child> - <placeholder/> - </child> - - <child> - <widget class="GtkLabel" id="label271"> - <property name="visible">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="type">tab</property> - </packing> - </child> - - <child> - <widget class="GtkVBox" id="error_stage_vbox"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkLabel" id="label257"> - <property name="visible">True</property> - <property name="label" translatable="yes"><b>An error has occurred:</b></property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="error_description_label"> - <property name="visible">True</property> - <property name="label" translatable="yes">Error description...</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">True</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="tab_expand">False</property> - <property name="tab_fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label272"> - <property name="visible">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="type">tab</property> - </packing> - </child> - - <child> - <placeholder/> - </child> - - <child> - <widget class="GtkLabel" id="label273"> - <property name="visible">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="type">tab</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkHButtonBox" id="hbuttonbox1"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - <property name="spacing">12</property> - - <child> - <widget class="GtkButton" id="back_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-go-back</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_back_button_clicked" last_modification_time="Mon, 20 Nov 2006 23:04:43 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkButton" id="forward_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-go-forward</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_forward_button_clicked" last_modification_time="Mon, 20 Nov 2006 23:05:15 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkButton" id="execute_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-execute</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_execute_button_clicked" last_modification_time="Mon, 20 Nov 2006 23:06:00 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkButton" id="close_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-close</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_close_button_clicked" last_modification_time="Mon, 20 Nov 2006 23:06:29 GMT"/> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> -</widget> - -</glade-interface> diff --git a/data/glade/advanced_configuration_window.glade b/data/glade/advanced_configuration_window.glade deleted file mode 100644 index 2d6d6a741..000000000 --- a/data/glade/advanced_configuration_window.glade +++ /dev/null @@ -1,257 +0,0 @@ -<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - -<glade-interface> - -<widget class="GtkWindow" id="advanced_configuration_window"> - <property name="border_width">6</property> - <property name="title" translatable="yes">Advanced Configuration Editor</property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_NONE</property> - <property name="modal">False</property> - <property name="default_width">650</property> - <property name="default_height">540</property> - <property name="resizable">True</property> - <property name="destroy_with_parent">False</property> - <property name="role">ace</property> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="focus_on_map">True</property> - <property name="urgency_hint">False</property> - <signal name="destroy" handler="on_advanced_configuration_window_destroy" last_modification_time="Sat, 14 May 2005 01:39:26 GMT"/> - - <child> - <widget class="GtkVBox" id="vbox70"> - <property name="border_width">6</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkTable" id="table26"> - <property name="visible">True</property> - <property name="n_rows">2</property> - <property name="n_columns">2</property> - <property name="homogeneous">False</property> - <property name="row_spacing">7</property> - <property name="column_spacing">12</property> - - <child> - <widget class="GtkLabel" id="label248"> - <property name="visible">True</property> - <property name="label" translatable="yes">Filter:</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkEntry" id="advanced_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="activates_default">False</property> - <signal name="changed" handler="on_advanced_entry_changed" last_modification_time="Wed, 27 Apr 2005 11:58:56 GMT"/> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkScrolledWindow" id="scrolledwindow36"> - <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> - <property name="window_placement">GTK_CORNER_TOP_LEFT</property> - - <child> - <widget class="GtkTreeView" id="advanced_treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">True</property> - <property name="rules_hint">True</property> - <property name="reorderable">False</property> - <property name="enable_search">True</property> - <property name="fixed_height_mode">False</property> - <property name="hover_selection">False</property> - <property name="hover_expand">False</property> - <signal name="row_activated" handler="on_advanced_treeview_row_activated"/> - </widget> - </child> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkFrame" id="frame36"> - <property name="border_width">3</property> - <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="label_yalign">0.5</property> - <property name="shadow_type">GTK_SHADOW_NONE</property> - - <child> - <widget class="GtkAlignment" id="alignment90"> - <property name="border_width">6</property> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">1</property> - <property name="yscale">1</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">12</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkLabel" id="advanced_desc_label"> - <property name="visible">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">True</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkLabel" id="label357"> - <property name="visible">True</property> - <property name="label" translatable="yes"><b>Description</b></property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="restart_label"> - <property name="label" translatable="yes"><b>NOTE:</b> You should restart Gajim for some settings to take effect</property> - <property name="use_underline">True</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkHButtonBox" id="hbuttonbox18"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkButton" id="advanced_close_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-close</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_advanced_close_button_clicked" last_modification_time="Sat, 23 Apr 2005 12:20:30 GMT"/> - </widget> - </child> - </widget> - <packing> - <property name="padding">6</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> -</widget> - -</glade-interface> diff --git a/data/glade/advanced_menuitem_menu.glade b/data/glade/advanced_menuitem_menu.glade deleted file mode 100644 index f90116d81..000000000 --- a/data/glade/advanced_menuitem_menu.glade +++ /dev/null @@ -1,80 +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="advanced_menuitem_menu"> - <child> - <widget class="GtkMenuItem" id="xml_console_menuitem"> - <property name="label" translatable="yes">Show _XML Console</property> - <property name="use_underline">True</property> - </widget> - </child> - <child> - <widget class="GtkMenuItem" id="privacy_lists_menuitem"> - <property name="label" translatable="yes">Edit _Privacy Lists...</property> - <property name="use_underline">True</property> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="separator8"> - </widget> - </child> - <child> - <widget class="GtkMenuItem" id="administrator_menuitem"> - <property name="label" translatable="yes">_Administrator</property> - <property name="use_underline">True</property> - <child> - <widget class="GtkMenu" id="administrator_menuitem_menu"> - <child> - <widget class="GtkImageMenuItem" id="send_server_message_menuitem"> - <property name="tooltip" translatable="yes">Sends a message to users currently connected to this server</property> - <property name="label" translatable="yes">_Send Server Message...</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image1468"> - <property name="visible">True</property> - <property name="stock">gtk-new</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="separator9"> - <property name="visible">True</property> - </widget> - </child> - <child> - <widget class="GtkMenuItem" id="set_motd_menuitem"> - <property name="tooltip" translatable="yes">Sets Message of the Day</property> - <property name="label" translatable="yes">Set MOTD...</property> - <property name="use_underline">True</property> - </widget> - </child> - <child> - <widget class="GtkMenuItem" id="update_motd_menuitem"> - <property name="tooltip" translatable="yes">Updates Message of the Day</property> - <property name="label" translatable="yes">Update MOTD...</property> - <property name="use_underline">True</property> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="delete_motd_menuitem"> - <property name="tooltip" translatable="yes">Deletes Message of the Day</property> - <property name="label" translatable="yes">Delete MOTD</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image1469"> - <property name="visible">True</property> - <property name="stock">gtk-clear</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - </widget> - </child> - </widget> - </child> - </widget> -</glade-interface> diff --git a/data/glade/atom_entry_window.glade b/data/glade/atom_entry_window.glade deleted file mode 100644 index 38c9bfa50..000000000 --- a/data/glade/atom_entry_window.glade +++ /dev/null @@ -1,372 +0,0 @@ -<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - -<glade-interface> - -<widget class="GtkWindow" id="atom_entry_window"> - <property name="visible">True</property> - <property name="title" translatable="yes">New entry received</property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_NONE</property> - <property name="modal">False</property> - <property name="resizable">True</property> - <property name="destroy_with_parent">False</property> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="focus_on_map">True</property> - <property name="urgency_hint">False</property> - - <child> - <widget class="GtkVBox" id="vbox112"> - <property name="border_width">6</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkLabel" id="new_entry_label"> - <property name="visible">True</property> - <property name="label" translatable="yes">You have received new entry:</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkHSeparator" id="hseparator14"> - <property name="visible">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkTable" id="table4"> - <property name="visible">True</property> - <property name="n_rows">4</property> - <property name="n_columns">2</property> - <property name="homogeneous">False</property> - <property name="row_spacing">0</property> - <property name="column_spacing">6</property> - - <child> - <widget class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="label" translatable="yes">Feed name:</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_RIGHT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="label" translatable="yes">Entry:</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="label" translatable="yes">Last modified:</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="feed_tagline_label"> - <property name="visible">True</property> - <property name="label"><small>Romeo and Juliet</small></property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <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> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="last_modified_label"> - <property name="visible">True</property> - <property name="label">2003-12-13T18:30:02Z</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <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> - </packing> - </child> - - <child> - <widget class="GtkEventBox" id="feed_title_eventbox"> - <property name="visible">True</property> - <property name="visible_window">True</property> - <property name="above_child">False</property> - <signal name="button_press_event" handler="on_feed_title_eventbox_button_press_event" last_modification_time="Thu, 20 Jul 2006 21:53:07 GMT"/> - - <child> - <widget class="GtkLabel" id="feed_title_label"> - <property name="visible">True</property> - <property name="label">Old stories</property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - </child> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options">fill</property> - </packing> - </child> - - <child> - <widget class="GtkEventBox" id="entry_title_eventbox"> - <property name="visible">True</property> - <property name="visible_window">True</property> - <property name="above_child">False</property> - <signal name="button_press_event" handler="on_entry_title_eventbox_button_press_event" last_modification_time="Thu, 20 Jul 2006 21:53:12 GMT"/> - - <child> - <widget class="GtkLabel" id="entry_title_label"> - <property name="visible">True</property> - <property name="label">Soliloquy</property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - </child> - </widget> - <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="x_options">fill</property> - <property name="y_options">fill</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkHSeparator" id="hseparator15"> - <property name="visible">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkHBox" id="hbox1"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkHBox" id="hbox2"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkButton" id="close_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-close</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_close_button_clicked" last_modification_time="Thu, 20 Jul 2006 21:29:17 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <placeholder/> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkButton" id="next_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label">Next entry</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_next_button_clicked" last_modification_time="Thu, 20 Jul 2006 21:29:21 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">GTK_PACK_END</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> -</widget> - -</glade-interface> diff --git a/data/glade/blocked_contacts_window.glade b/data/glade/blocked_contacts_window.glade deleted file mode 100644 index 9b2e870b0..000000000 --- a/data/glade/blocked_contacts_window.glade +++ /dev/null @@ -1,147 +0,0 @@ -<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - -<glade-interface> - -<widget class="GtkWindow" id="blocked_contacts_window"> - <property name="visible">True</property> - <property name="title" translatable="yes">Blocked Contacts</property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_NONE</property> - <property name="modal">False</property> - <property name="resizable">True</property> - <property name="destroy_with_parent">False</property> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="focus_on_map">True</property> - <property name="urgency_hint">False</property> - <signal name="destroy" handler="on_blocked_contacts_window_destroy" last_modification_time="Sun, 22 Apr 2007 14:44:11 GMT"/> - - <child> - <widget class="GtkVBox" id="vbox1"> - <property name="border_width">5</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkScrolledWindow" id="contacts_scrolledwindow"> - <property name="border_width">3</property> - <property name="width_request">250</property> - <property name="height_request">300</property> - <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> - <property name="window_placement">GTK_CORNER_TOP_LEFT</property> - - <child> - <widget class="GtkTreeView" id="contacts_treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">False</property> - <property name="rules_hint">True</property> - <property name="reorderable">False</property> - <property name="enable_search">True</property> - <property name="fixed_height_mode">False</property> - <property name="hover_selection">False</property> - <property name="hover_expand">False</property> - <signal name="row_activated" handler="on_contacts_treeview_row_activated" last_modification_time="Wed, 25 Apr 2007 13:09:39 GMT"/> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkButton" id="remove_button"> - <property name="border_width">3</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_remove_button_clicked" last_modification_time="Sun, 22 Apr 2007 14:02:48 GMT"/> - - <child> - <widget class="GtkAlignment" id="alignment1"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">0</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkHBox" id="hbox1"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">2</property> - - <child> - <widget class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="stock">gtk-remove</property> - <property name="icon_size">4</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="label">_Unblock</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - </child> -</widget> - -</glade-interface> diff --git a/data/glade/change_password_dialog.glade b/data/glade/change_password_dialog.glade deleted file mode 100644 index 9c4de59d2..000000000 --- a/data/glade/change_password_dialog.glade +++ /dev/null @@ -1,200 +0,0 @@ -<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - -<glade-interface> - -<widget class="GtkDialog" id="change_password_dialog"> - <property name="border_width">6</property> - <property name="title" translatable="yes">Change Password</property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_NONE</property> - <property name="modal">False</property> - <property name="resizable">True</property> - <property name="destroy_with_parent">False</property> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="focus_on_map">True</property> - <property name="has_separator">True</property> - - <child internal-child="vbox"> - <widget class="GtkVBox" id="dialog-vbox7"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="dialog-action_area6"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - - <child> - <widget class="GtkButton" id="cancelbutton2"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-cancel</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="response_id">-6</property> - </widget> - </child> - - <child> - <widget class="GtkButton" id="okbutton2"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-ok</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="response_id">-5</property> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">GTK_PACK_END</property> - </packing> - </child> - - <child> - <widget class="GtkHBox" id="hbox2928"> - <property name="border_width">6</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">12</property> - - <child> - <widget class="GtkImage" id="image416"> - <property name="visible">True</property> - <property name="stock">gtk-dialog-question</property> - <property name="icon_size">6</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkVBox" id="vbox54"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkLabel" id="label208"> - <property name="visible">True</property> - <property name="label" translatable="yes">Enter new password:</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">True</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkEntry" id="password1_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">False</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="activates_default">False</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label209"> - <property name="visible">True</property> - <property name="label" translatable="yes">Enter it again for confirmation:</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkEntry" id="password2_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">False</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="activates_default">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> -</widget> - -</glade-interface> diff --git a/data/glade/chat_context_menu.glade b/data/glade/chat_context_menu.glade deleted file mode 100644 index 7a0179187..000000000 --- a/data/glade/chat_context_menu.glade +++ /dev/null @@ -1,156 +0,0 @@ -<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - -<glade-interface> - -<widget class="GtkMenu" id="chat_context_menu"> - - <child> - <widget class="GtkImageMenuItem" id="copy_link_location_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Copy Link Location</property> - <property name="use_underline">True</property> - - <child internal-child="image"> - <widget class="GtkImage" id="image737"> - <property name="visible">True</property> - <property name="stock">gtk-copy</property> - <property name="icon_size">1</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkImageMenuItem" id="open_link_in_browser_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Open Link in Browser</property> - <property name="use_underline">True</property> - - <child internal-child="image"> - <widget class="GtkImage" id="image738"> - <property name="visible">True</property> - <property name="stock">gtk-jump-to</property> - <property name="icon_size">1</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkImageMenuItem" id="copy_email_address_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Copy JID/Email Address</property> - <property name="use_underline">True</property> - - <child internal-child="image"> - <widget class="GtkImage" id="image739"> - <property name="visible">True</property> - <property name="stock">gtk-copy</property> - <property name="icon_size">1</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkImageMenuItem" id="open_email_composer_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Open Email Composer</property> - <property name="use_underline">True</property> - - <child internal-child="image"> - <widget class="GtkImage" id="image740"> - <property name="visible">True</property> - <property name="stock">gtk-jump-to</property> - <property name="icon_size">1</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkSeparatorMenuItem" id="jid_section_separator"> - <property name="visible">True</property> - </widget> - </child> - - <child> - <widget class="GtkImageMenuItem" id="start_chat_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Start Chat</property> - <property name="use_underline">True</property> - - <child internal-child="image"> - <widget class="GtkImage" id="image741"> - <property name="visible">True</property> - <property name="stock">gtk-jump-to</property> - <property name="icon_size">1</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkImageMenuItem" id="join_group_chat_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">Join _Group Chat</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_join_group_chat_menuitem_activate" last_modification_time="Thu, 30 Jun 2005 16:13:06 GMT"/> - - <child internal-child="image"> - <widget class="GtkImage" id="image742"> - <property name="visible">True</property> - <property name="stock">gtk-connect</property> - <property name="icon_size">1</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkImageMenuItem" id="add_to_roster_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Add to Roster...</property> - <property name="use_underline">True</property> - - <child internal-child="image"> - <widget class="GtkImage" id="image743"> - <property name="visible">True</property> - <property name="stock">gtk-add</property> - <property name="icon_size">1</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> - </widget> - </child> -</widget> - -</glade-interface> diff --git a/data/glade/choose_gpg_key_dialog.glade b/data/glade/choose_gpg_key_dialog.glade deleted file mode 100644 index c70d33047..000000000 --- a/data/glade/choose_gpg_key_dialog.glade +++ /dev/null @@ -1,142 +0,0 @@ -<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - -<glade-interface> - -<widget class="GtkDialog" id="choose_gpg_key_dialog"> - <property name="border_width">6</property> - <property name="title" translatable="yes"></property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_NONE</property> - <property name="modal">False</property> - <property name="default_width">550</property> - <property name="default_height">300</property> - <property name="resizable">True</property> - <property name="destroy_with_parent">False</property> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="focus_on_map">True</property> - <property name="has_separator">True</property> - - <child internal-child="vbox"> - <widget class="GtkVBox" id="vbox33"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="hbuttonbox14"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - - <child> - <widget class="GtkButton" id="button26"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-cancel</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="response_id">-6</property> - </widget> - </child> - - <child> - <widget class="GtkButton" id="button27"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-ok</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="response_id">-5</property> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">GTK_PACK_END</property> - </packing> - </child> - - <child> - <widget class="GtkVBox" id="vbox91"> - <property name="border_width">6</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkLabel" id="prompt_label"> - <property name="visible">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkScrolledWindow" id="scrolledwindow20"> - <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> - <property name="window_placement">GTK_CORNER_TOP_LEFT</property> - - <child> - <widget class="GtkTreeView" id="keys_treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">True</property> - <property name="rules_hint">False</property> - <property name="reorderable">False</property> - <property name="enable_search">True</property> - <property name="fixed_height_mode">False</property> - <property name="hover_selection">False</property> - <property name="hover_expand">False</property> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> -</widget> - -</glade-interface> diff --git a/data/glade/contact_context_menu.glade b/data/glade/contact_context_menu.glade deleted file mode 100644 index 59989970d..000000000 --- a/data/glade/contact_context_menu.glade +++ /dev/null @@ -1,421 +0,0 @@ -<?xml version="1.0"?> -<glade-interface> - <!-- interface-requires gtk+ 2.16 --> - <!-- interface-naming-policy toplevel-contextual --> - <widget class="GtkMenu" id="contact_context_menu"> - <child> - <widget class="GtkImageMenuItem" id="start_chat_menuitem"> - <property name="label" translatable="yes">Start _Chat</property> - <property name="visible">True</property> - <property name="use_underline">True</property> - <property name="use_stock">False</property> - <child internal-child="image"> - <widget class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="stock">gtk-jump-to</property> - <property name="icon-size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="send_single_message_menuitem"> - <property name="label" translatable="yes">Send Single _Message...</property> - <property name="visible">True</property> - <property name="use_underline">True</property> - <property name="use_stock">False</property> - <child internal-child="image"> - <widget class="GtkImage" id="image3"> - <property name="visible">True</property> - <property name="stock">gtk-new</property> - <property name="icon-size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="send_file_menuitem"> - <property name="label" translatable="yes">Send _File...</property> - <property name="visible">True</property> - <property name="use_underline">True</property> - <property name="use_stock">False</property> - <child internal-child="image"> - <widget class="GtkImage" id="image4"> - <property name="visible">True</property> - <property name="stock">gtk-save</property> - <property name="icon-size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="invite_menuitem"> - <property name="label" translatable="yes">In_vite to</property> - <property name="visible">True</property> - <property name="use_underline">True</property> - <property name="use_stock">False</property> - <child internal-child="image"> - <widget class="GtkImage" id="image5"> - <property name="visible">True</property> - <property name="stock">gtk-missing-image</property> - <property name="icon-size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="convert_to_groupchat_menuitem"> - <property name="label" translatable="yes">Invite _Contacts</property> - <property name="visible">True</property> - <property name="use_underline">True</property> - <property name="use_stock">False</property> - <child internal-child="image"> - <widget class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="stock">gtk-missing-image</property> - <property name="icon-size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="encryption_separator"> - <property name="visible">True</property> - </widget> - </child> - <child> - <widget class="GtkCheckMenuItem" id="toggle_gpg_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">Toggle Open_PGP Encryption</property> - <property name="use_underline">True</property> - </widget> - </child> - <child> - <widget class="GtkCheckMenuItem" id="toggle_e2e_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">Toggle End to End Encryption</property> - <property name="use_underline">True</property> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="menuitem3"> - <property name="visible">True</property> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="send_custom_status_menuitem"> - <property name="label" translatable="yes">Send Cus_tom Status</property> - <property name="visible">True</property> - <property name="use_underline">True</property> - <property name="use_stock">False</property> - <child> - <widget class="GtkMenu" id="menu5"> - <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> - </widget> - </child> - <child internal-child="image"> - <widget class="GtkImage" id="image6"> - <property name="visible">True</property> - <property name="stock">gtk-missing-image</property> - <property name="icon-size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="execute_command_menuitem"> - <property name="label" translatable="yes">E_xecute Command...</property> - <property name="visible">True</property> - <property name="use_underline">True</property> - <property name="use_stock">False</property> - <child internal-child="image"> - <widget class="GtkImage" id="image7"> - <property name="visible">True</property> - <property name="stock">gtk-execute</property> - <property name="icon-size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="manage_contact"> - <property name="label" translatable="yes">_Manage Contact</property> - <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="use_underline">True</property> - <property name="use_stock">False</property> - <child> - <widget class="GtkMenu" id="menu2"> - <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> - <child> - <widget class="GtkImageMenuItem" id="rename_menuitem"> - <property name="label" translatable="yes">_Rename...</property> - <property name="use_underline">True</property> - <property name="use_stock">False</property> - <child internal-child="image"> - <widget class="GtkImage" id="image9"> - <property name="visible">True</property> - <property name="stock">gtk-refresh</property> - <property name="icon-size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="edit_groups_menuitem"> - <property name="label" translatable="yes">Edit _Groups...</property> - <property name="use_underline">True</property> - <property name="use_stock">False</property> - <child internal-child="image"> - <widget class="GtkImage" id="image10"> - <property name="visible">True</property> - <property name="stock">gtk-edit</property> - <property name="icon-size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="assign_openpgp_key_menuitem"> - <property name="label" translatable="yes">Assign Open_PGP Key...</property> - <property name="use_underline">True</property> - <property name="use_stock">False</property> - <signal name="activate" handler="on_assign_openpgp_key_menuitem_activate"/> - <child internal-child="image"> - <widget class="GtkImage" id="image11"> - <property name="visible">True</property> - <property name="stock">gtk-dialog-authentication</property> - <property name="icon-size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="set_custom_avatar_menuitem"> - <property name="label" translatable="yes">Set Custom _Avatar...</property> - <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="use_underline">True</property> - <property name="use_stock">False</property> - <child internal-child="image"> - <widget class="GtkImage" id="image12"> - <property name="visible">True</property> - <property name="stock">gtk-orientation-portrait</property> - <property name="icon-size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="add_special_notification_menuitem"> - <property name="label" translatable="yes">Add Special _Notification...</property> - <property name="no_show_all">True</property> - <property name="use_underline">True</property> - <property name="use_stock">False</property> - <child internal-child="image"> - <widget class="GtkImage" id="image13"> - <property name="visible">True</property> - <property name="stock">gtk-info</property> - <property name="icon-size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="separatormenuitem1"> - <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> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="subscription_menuitem"> - <property name="label" translatable="yes">_Subscription</property> - <property name="use_underline">True</property> - <property name="use_stock">False</property> - <child> - <widget class="GtkMenu" id="subscription_menuitem_menu"> - <child> - <widget class="GtkImageMenuItem" id="resend_authorization_to_menuitem"> - <property name="label" translatable="yes">_Allow him/her to see my status</property> - <property name="visible">True</property> - <property name="use_underline">True</property> - <property name="use_stock">False</property> - <child internal-child="image"> - <widget class="GtkImage" id="image15"> - <property name="visible">True</property> - <property name="stock">gtk-go-up</property> - <property name="icon-size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="rerequest_authorization_from_menuitem"> - <property name="label" translatable="yes">A_sk to see his/her status</property> - <property name="visible">True</property> - <property name="use_underline">True</property> - <property name="use_stock">False</property> - <child internal-child="image"> - <widget class="GtkImage" id="image16"> - <property name="visible">True</property> - <property name="stock">gtk-go-down</property> - <property name="icon-size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="forbid_him/her_to_see_my_status1"> - <property name="label" translatable="yes">_Forbid him/her to see my status</property> - <property name="visible">True</property> - <property name="use_underline">True</property> - <property name="use_stock">False</property> - <child internal-child="image"> - <widget class="GtkImage" id="image17"> - <property name="visible">True</property> - <property name="stock">gtk-stop</property> - <property name="icon-size">1</property> - </widget> - </child> - </widget> - </child> - </widget> - </child> - <child internal-child="image"> - <widget class="GtkImage" id="image14"> - <property name="visible">True</property> - <property name="stock">gtk-dialog-question</property> - <property name="icon-size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="unblock_menuitem"> - <property name="label" translatable="yes">_Unblock</property> - <property name="visible">True</property> - <property name="use_underline">True</property> - <property name="use_stock">False</property> - <child internal-child="image"> - <widget class="GtkImage" id="image18"> - <property name="visible">True</property> - <property name="stock">gtk-stop</property> - <property name="icon-size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="block_menuitem"> - <property name="label" translatable="yes">_Block</property> - <property name="visible">True</property> - <property name="use_underline">True</property> - <property name="use_stock">False</property> - <child internal-child="image"> - <widget class="GtkImage" id="image19"> - <property name="visible">True</property> - <property name="stock">gtk-stop</property> - <property name="icon-size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="unignore_menuitem"> - <property name="label" translatable="yes">_Unignore</property> - <property name="no_show_all">True</property> - <property name="use_underline">True</property> - <property name="use_stock">False</property> - <child internal-child="image"> - <widget class="GtkImage" id="image20"> - <property name="visible">True</property> - <property name="stock">gtk-stop</property> - <property name="icon-size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="ignore_menuitem"> - <property name="label" translatable="yes">_Ignore</property> - <property name="no_show_all">True</property> - <property name="use_underline">True</property> - <property name="use_stock">False</property> - <child internal-child="image"> - <widget class="GtkImage" id="image21"> - <property name="visible">True</property> - <property name="stock">gtk-stop</property> - <property name="icon-size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="add_to_roster_menuitem"> - <property name="label" translatable="yes">_Add to Roster...</property> - <property name="use_underline">True</property> - <property name="use_stock">False</property> - <child internal-child="image"> - <widget class="GtkImage" id="image22"> - <property name="visible">True</property> - <property name="stock">gtk-add</property> - <property name="icon-size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="remove_from_roster_menuitem"> - <property name="label" translatable="yes">Remo_ve</property> - <property name="use_underline">True</property> - <property name="use_stock">False</property> - <child internal-child="image"> - <widget class="GtkImage" id="image23"> - <property name="visible">True</property> - <property name="stock">gtk-remove</property> - <property name="icon-size">1</property> - </widget> - </child> - </widget> - </child> - </widget> - </child> - <child internal-child="image"> - <widget class="GtkImage" id="image8"> - <property name="visible">True</property> - <property name="stock">gtk-properties</property> - <property name="icon-size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="last_separator"> - <property name="visible">True</property> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="information_menuitem"> - <property name="label">gtk-info</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="history_menuitem"> - <property name="label" translatable="yes">_History</property> - <property name="use_underline">True</property> - <property name="use_stock">False</property> - <child internal-child="image"> - <widget class="GtkImage" id="image24"> - <property name="visible">True</property> - <property name="stock">gtk-justify-fill</property> - <property name="icon-size">1</property> - </widget> - </child> - </widget> - </child> - </widget> -</glade-interface> diff --git a/data/glade/data_form_window.glade b/data/glade/data_form_window.glade deleted file mode 100644 index 2d73ee5dd..000000000 --- a/data/glade/data_form_window.glade +++ /dev/null @@ -1,800 +0,0 @@ -<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - -<glade-interface> - -<widget class="GtkWindow" id="data_form_window"> - <property name="border_width">6</property> - <property name="title" translatable="yes">Room Configuration</property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_NONE</property> - <property name="modal">False</property> - <property name="default_width">650</property> - <property name="default_height">450</property> - <property name="resizable">True</property> - <property name="destroy_with_parent">False</property> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="focus_on_map">True</property> - <property name="urgency_hint">False</property> - <signal name="destroy" handler="on_data_form_window_destroy" last_modification_time="Thu, 19 Jan 2006 12:55:13 GMT"/> - - <child> - <widget class="GtkVBox" id="vbox68"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkScrolledWindow" id="scrolledwindow35"> - <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_ETCHED_IN</property> - <property name="window_placement">GTK_CORNER_TOP_LEFT</property> - - <child> - <widget class="GtkViewport" id="viewport1"> - <property name="visible">True</property> - <property name="shadow_type">GTK_SHADOW_IN</property> - - <child> - <widget class="GtkVBox" id="vbox110"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkVBox" id="config_vbox"> - <property name="border_width">5</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">5</property> - - <child> - <widget class="GtkLabel" id="instructions_label"> - <property name="visible">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">True</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">5</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkHSeparator" id="hseparator15"> - <property name="visible">True</property> - </widget> - <packing> - <property name="padding">5</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <placeholder/> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkHSeparator" id="hseparator14"> - <property name="visible">True</property> - </widget> - <packing> - <property name="padding">5</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkVBox" id="add_on_vbox"> - <property name="border_width">5</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">5</property> - - <child> - <placeholder/> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkHButtonBox" id="hbuttonbox32"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkButton" id="cancel_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-cancel</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_cancel_button_clicked" last_modification_time="Thu, 19 Jan 2006 12:47:07 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkButton" id="ok_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-ok</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_ok_button_clicked" last_modification_time="Thu, 19 Jan 2006 20:57:04 GMT"/> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> -</widget> - -<widget class="GtkWindow" id="data_form_old_fake_window"> - <property name="visible">True</property> - <property name="title" translatable="yes">window1</property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_NONE</property> - <property name="modal">False</property> - <property name="resizable">True</property> - <property name="destroy_with_parent">False</property> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="focus_on_map">True</property> - <property name="urgency_hint">False</property> - - <child> - <widget class="GtkVBox" id="vbox111"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">10</property> - - <child> - <widget class="GtkScrolledWindow" id="data_form_scrolledwindow"> - <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> - <property name="window_placement">GTK_CORNER_TOP_LEFT</property> - - <child> - <widget class="GtkViewport" id="viewport2"> - <property name="visible">True</property> - <property name="shadow_type">GTK_SHADOW_IN</property> - - <child> - <widget class="GtkVBox" id="container_vbox"> - <property name="border_width">5</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">5</property> - - <child> - <widget class="GtkLabel" id="form_instructions_label"> - <property name="visible">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">True</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">5</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkHSeparator" id="form_instructions_hseparator"> - <property name="visible">True</property> - </widget> - <packing> - <property name="padding">5</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <placeholder/> - </child> - </widget> - </child> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkTable" id="item_list_table"> - <property name="visible">True</property> - <property name="n_rows">1</property> - <property name="n_columns">2</property> - <property name="homogeneous">False</property> - <property name="row_spacing">0</property> - <property name="column_spacing">0</property> - - <child> - <widget class="GtkScrolledWindow" id="scrolledwindow36"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property> - <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property> - <property name="shadow_type">GTK_SHADOW_IN</property> - <property name="window_placement">GTK_CORNER_TOP_LEFT</property> - - <child> - <widget class="GtkTreeView" id="item_treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">False</property> - <property name="rules_hint">False</property> - <property name="reorderable">False</property> - <property name="enable_search">True</property> - <property name="fixed_height_mode">False</property> - <property name="hover_selection">False</property> - <property name="hover_expand">False</property> - </widget> - </child> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - </packing> - </child> - - <child> - <widget class="GtkVBox" id="vbox112"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkButton" id="clear_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-clear</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">GTK_PACK_END</property> - </packing> - </child> - - <child> - <widget class="GtkButton" id="remove_button"> - <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="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">GTK_PACK_END</property> - </packing> - </child> - - <child> - <widget class="GtkButton" id="add_button"> - <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="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkButton" id="edit_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-edit</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <placeholder/> - </child> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options">fill</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> -</widget> - -<widget class="GtkWindow" id="data_form_fake_window"> - <property name="visible">True</property> - <property name="title" translatable="yes">window1</property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_NONE</property> - <property name="modal">False</property> - <property name="resizable">True</property> - <property name="destroy_with_parent">False</property> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="focus_on_map">True</property> - <property name="urgency_hint">False</property> - - <child> - <widget class="GtkVBox" id="data_form_vbox"> - <property name="border_width">3</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">3</property> - - <child> - <widget class="GtkLabel" id="instructions_label"> - <property name="visible">True</property> - <property name="label" translatable="yes">Fill in the form.</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkNotebook" id="data_form_types_notebook"> - <property name="visible">True</property> - <property name="show_tabs">False</property> - <property name="show_border">False</property> - <property name="tab_pos">GTK_POS_TOP</property> - <property name="scrollable">False</property> - <property name="enable_popup">False</property> - - <child> - <widget class="GtkScrolledWindow" id="single_form_scrolledwindow"> - <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_NONE</property> - <property name="window_placement">GTK_CORNER_TOP_LEFT</property> - - <child> - <widget class="GtkViewport" id="single_form_viewport"> - <property name="visible">True</property> - <property name="shadow_type">GTK_SHADOW_NONE</property> - - <child> - <placeholder/> - </child> - </widget> - </child> - </widget> - <packing> - <property name="tab_expand">True</property> - <property name="tab_fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="type">tab</property> - </packing> - </child> - - <child> - <placeholder/> - </child> - - <child> - <widget class="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="type">tab</property> - </packing> - </child> - - <child> - <widget class="GtkHBox" id="multiple_form_hbox"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkScrolledWindow" id="scrolledwindow38"> - <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> - <property name="window_placement">GTK_CORNER_TOP_LEFT</property> - - <child> - <widget class="GtkTreeView" id="records_treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">True</property> - <property name="rules_hint">False</property> - <property name="reorderable">False</property> - <property name="enable_search">True</property> - <property name="fixed_height_mode">False</property> - <property name="hover_selection">False</property> - <property name="hover_expand">False</property> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkVBox" id="buttons_vbox"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkButton" id="add_button"> - <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="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_add_button_clicked" last_modification_time="Mon, 21 Aug 2006 22:32:45 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkButton" id="remove_button"> - <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="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_remove_button_clicked" last_modification_time="Mon, 21 Aug 2006 22:32:50 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkHSeparator" id="hseparator17"> - <property name="visible">True</property> - </widget> - <packing> - <property name="padding">3</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkButton" id="edit_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-edit</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_edit_button_clicked" last_modification_time="Mon, 21 Aug 2006 22:32:54 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkHSeparator" id="hseparator18"> - <property name="visible">True</property> - </widget> - <packing> - <property name="padding">3</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkButton" id="up_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-go-up</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_up_button_clicked" last_modification_time="Mon, 21 Aug 2006 22:32:59 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkButton" id="down_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-go-down</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_down_button_clicked" last_modification_time="Mon, 21 Aug 2006 22:33:03 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkHSeparator" id="hseparator19"> - <property name="visible">True</property> - </widget> - <packing> - <property name="padding">3</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkButton" id="clear_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-clear</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_clear_button_clicked" last_modification_time="Mon, 21 Aug 2006 22:33:07 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="tab_expand">False</property> - <property name="tab_fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="type">tab</property> - </packing> - </child> - - <child> - <placeholder/> - </child> - - <child> - <widget class="GtkLabel" id="label4"> - <property name="visible">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="type">tab</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> -</widget> - -</glade-interface> diff --git a/data/glade/dubbleinput_dialog.glade b/data/glade/dubbleinput_dialog.glade deleted file mode 100644 index 0b3672502..000000000 --- a/data/glade/dubbleinput_dialog.glade +++ /dev/null @@ -1,203 +0,0 @@ -<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - -<glade-interface> - -<widget class="GtkDialog" id="dubbleinput_dialog"> - <property name="border_width">6</property> - <property name="title" translatable="yes"></property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_NONE</property> - <property name="modal">False</property> - <property name="resizable">True</property> - <property name="destroy_with_parent">False</property> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="focus_on_map">True</property> - <property name="urgency_hint">False</property> - <property name="has_separator">False</property> - <signal name="destroy" handler="on_dubbleinput_dialog_destroy" last_modification_time="Sun, 11 Mar 2007 11:32:38 GMT"/> - - <child internal-child="vbox"> - <widget class="GtkVBox" id="dialog-vbox10"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="dialog-action_area9"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - - <child> - <widget class="GtkButton" id="cancelbutton"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-cancel</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="response_id">-6</property> - </widget> - </child> - - <child> - <widget class="GtkButton" id="okbutton"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-ok</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="response_id">-5</property> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">GTK_PACK_END</property> - </packing> - </child> - - <child> - <widget class="GtkVBox" id="vbox76"> - <property name="border_width">6</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkHBox" id="hbox2960"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">12</property> - - <child> - <widget class="GtkImage" id="image507"> - <property name="visible">True</property> - <property name="stock">gtk-dialog-question</property> - <property name="icon_size">6</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkEntry" id="input_entry1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="activates_default">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkEntry" id="input_entry2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="activates_default">False</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> -</widget> - -</glade-interface> diff --git a/data/glade/edit_groups_dialog.glade b/data/glade/edit_groups_dialog.glade deleted file mode 100644 index 0a9e88433..000000000 --- a/data/glade/edit_groups_dialog.glade +++ /dev/null @@ -1,190 +0,0 @@ -<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - -<glade-interface> - -<widget class="GtkDialog" id="edit_groups_dialog"> - <property name="border_width">6</property> - <property name="title" translatable="yes">Edit Groups</property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_NONE</property> - <property name="modal">True</property> - <property name="default_height">290</property> - <property name="resizable">True</property> - <property name="destroy_with_parent">False</property> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="focus_on_map">True</property> - <property name="urgency_hint">False</property> - <property name="has_separator">True</property> - <signal name="response" handler="on_edit_groups_dialog_response" last_modification_time="Fri, 22 Jul 2005 22:28:44 GMT"/> - - <child internal-child="vbox"> - <widget class="GtkVBox" id="dialog-vbox6"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="dialog-action_area5"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - - <child> - <widget class="GtkButton" id="close_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-close</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="response_id">-7</property> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">GTK_PACK_END</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="nickname_label"> - <property name="visible">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="jid_label"> - <property name="visible">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkHBox" id="hbox2926"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkEntry" id="group_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="activates_default">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkButton" id="add_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-add</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_add_button_clicked" last_modification_time="Thu, 17 Mar 2005 11:40:17 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkScrolledWindow" id="scrolledwindow32"> - <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> - <property name="window_placement">GTK_CORNER_TOP_LEFT</property> - - <child> - <widget class="GtkTreeView" id="groups_treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">False</property> - <property name="rules_hint">False</property> - <property name="reorderable">False</property> - <property name="enable_search">True</property> - <property name="fixed_height_mode">False</property> - <property name="hover_selection">False</property> - <property name="hover_expand">False</property> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> -</widget> - -</glade-interface> diff --git a/data/glade/esession_info_window.glade b/data/glade/esession_info_window.glade deleted file mode 100644 index 082e93df6..000000000 --- a/data/glade/esession_info_window.glade +++ /dev/null @@ -1,200 +0,0 @@ -<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - -<glade-interface> - -<widget class="GtkDialog" id="esession_info_window"> - <property name="border_width">5</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="title" translatable="yes"></property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> - <property name="modal">False</property> - <property name="resizable">True</property> - <property name="destroy_with_parent">False</property> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="focus_on_map">True</property> - <property name="urgency_hint">False</property> - <property name="has_separator">False</property> - - <child internal-child="vbox"> - <widget class="GtkVBox" id="dialog-vbox1"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">2</property> - - <child> - <widget class="GtkHBox" id="title-hbox"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkImage" id="security_image"> - <property name="width_request">32</property> - <property name="height_request">32</property> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="expand">False</property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="verification_status_label"> - <property name="visible">True</property> - <property name="xalign">0</property> - </widget> - </child> - </widget> - </child> - <child> - - <widget class="GtkHBox" id="hbox4"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">4</property> - - <child> - <widget class="GtkLabel" id="info_display"> - <property name="visible">True</property> - <property name="label" translatable="yes">(<b>ESession</b> info)</property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">True</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">10</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="dialog-action_area1"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - - <child> - <widget class="GtkButton" id="verify_now_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="response_id">-10</property> - <signal name="clicked" handler="on_verify_now_button_clicked" last_modification_time="Wed, 13 Aug 2008 21:08:46 GMT"/> - - <child> - <widget class="GtkAlignment" id="alignment2"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">0</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkHBox" id="hbox3"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">2</property> - - <child> - <widget class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="stock">gtk-apply</property> - <property name="icon_size">4</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="button_label"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Verify</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkButton" id="close_button3"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-close</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="response_id">-7</property> - <signal name="clicked" handler="on_close_button_clicked"/> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> -</widget> - -</glade-interface> diff --git a/data/glade/gajim_themes_window.glade b/data/glade/gajim_themes_window.glade deleted file mode 100644 index db8d7d13e..000000000 --- a/data/glade/gajim_themes_window.glade +++ /dev/null @@ -1,783 +0,0 @@ -<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - -<glade-interface> - -<widget class="GtkWindow" id="gajim_themes_window"> - <property name="border_width">12</property> - <property name="title" translatable="yes">Gajim Themes Customization</property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_NONE</property> - <property name="modal">False</property> - <property name="resizable">True</property> - <property name="destroy_with_parent">False</property> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="focus_on_map">True</property> - - <child> - <widget class="GtkVBox" id="vbox97"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">12</property> - - <child> - <widget class="GtkHBox" id="hbox2979"> - <property name="border_width">6</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">12</property> - - <child> - <widget class="GtkVBox" id="vbox98"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkScrolledWindow" id="themes_scrolledwindow"> - <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> - <property name="window_placement">GTK_CORNER_TOP_LEFT</property> - - <child> - <widget class="GtkTreeView" id="themes_treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">False</property> - <property name="rules_hint">False</property> - <property name="reorderable">False</property> - <property name="enable_search">True</property> - <property name="fixed_height_mode">False</property> - <property name="hover_selection">False</property> - <property name="hover_expand">False</property> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkHButtonBox" id="hbuttonbox27"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkButton" id="add_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-add</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_add_button_clicked" last_modification_time="Sat, 06 Aug 2005 18:55:20 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkButton" id="remove_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-remove</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_remove_button_clicked" last_modification_time="Sat, 06 Aug 2005 18:55:07 GMT"/> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkVBox" id="theme_options_vbox"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkComboBox" id="options_combobox"> - <property name="visible">True</property> - <property name="items" translatable="yes">Account row -Group row -Contact row -Chat Banner</property> - <property name="add_tearoffs">False</property> - <property name="focus_on_click">True</property> - <signal name="changed" handler="on_options_combobox_changed" last_modification_time="Fri, 16 Sep 2005 21:44:05 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkTable" id="table5"> - <property name="visible">True</property> - <property name="n_rows">4</property> - <property name="n_columns">3</property> - <property name="homogeneous">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">6</property> - - <child> - <widget class="GtkCheckButton" id="textcolor_checkbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Text _color:</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_textcolor_checkbutton_toggled" last_modification_time="Fri, 16 Sep 2005 21:15:55 GMT"/> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="background_checkbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">_Background:</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_background_checkbutton_toggled" last_modification_time="Fri, 16 Sep 2005 21:16:03 GMT"/> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="textfont_checkbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Text _font:</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_textfont_checkbutton_toggled" last_modification_time="Fri, 16 Sep 2005 21:16:09 GMT"/> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label334"> - <property name="visible">True</property> - <property name="label" translatable="yes">Font style:</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="mnemonic_widget">bold_togglebutton</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkColorButton" id="text_colorbutton"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="use_alpha">False</property> - <property name="focus_on_click">True</property> - <signal name="color_set" handler="on_text_colorbutton_color_set" last_modification_time="Fri, 16 Sep 2005 21:15:45 GMT"/> - </widget> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options"></property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkColorButton" id="background_colorbutton"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="use_alpha">False</property> - <property name="focus_on_click">True</property> - <signal name="color_set" handler="on_background_colorbutton_color_set" last_modification_time="Fri, 16 Sep 2005 21:15:38 GMT"/> - </widget> - <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> - </packing> - </child> - - <child> - <widget class="GtkFontButton" id="text_fontbutton"> - <property name="width_request">15</property> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="show_style">False</property> - <property name="show_size">True</property> - <property name="use_font">False</property> - <property name="use_size">False</property> - <property name="focus_on_click">True</property> - <signal name="font_set" handler="on_text_fontbutton_font_set" last_modification_time="Fri, 16 Sep 2005 21:14:43 GMT"/> - </widget> - <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> - </packing> - </child> - - <child> - <widget class="GtkToggleButton" id="bold_togglebutton"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Bold</property> - <property name="can_focus">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <signal name="toggled" handler="on_bold_togglebutton_toggled" last_modification_time="Fri, 16 Sep 2005 21:16:17 GMT"/> - - <child> - <widget class="GtkImage" id="image28"> - <property name="visible">True</property> - <property name="stock">gtk-bold</property> - <property name="icon_size">4</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> - </widget> - <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="x_options"></property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkToggleButton" id="italic_togglebutton"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Italic</property> - <property name="can_focus">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <signal name="toggled" handler="on_italic_togglebutton_toggled" last_modification_time="Fri, 16 Sep 2005 21:16:23 GMT"/> - - <child> - <widget class="GtkImage" id="image29"> - <property name="visible">True</property> - <property name="stock">gtk-italic</property> - <property name="icon_size">4</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> - </widget> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options"></property> - <property name="y_options"></property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkDrawingArea" id="drawingarea12"> - <property name="height_request">12</property> - <property name="visible">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkVSeparator" id="vseparator7"> - <property name="visible">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkTable" id="theme_options_table"> - <property name="visible">True</property> - <property name="n_rows">9</property> - <property name="n_columns">2</property> - <property name="homogeneous">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">6</property> - - <child> - <widget class="GtkLabel" id="label391"> - <property name="visible">True</property> - <property name="label" translatable="yes">Paused</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkColorButton" id="paused_colorbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="use_alpha">False</property> - <property name="focus_on_click">True</property> - <signal name="color_set" handler="on_paused_colorbutton_color_set" last_modification_time="Sat, 18 Mar 2006 22:36:56 GMT"/> - </widget> - <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">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkColorButton" id="composing_colorbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="use_alpha">False</property> - <property name="focus_on_click">True</property> - <signal name="color_set" handler="on_composing_colorbutton_color_set" last_modification_time="Sat, 18 Mar 2006 22:34:24 GMT"/> - </widget> - <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="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label390"> - <property name="visible">True</property> - <property name="label" translatable="yes">Composing</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label389"> - <property name="visible">True</property> - <property name="label" translatable="yes">Inactive</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkColorButton" id="inactive_colorbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="use_alpha">False</property> - <property name="focus_on_click">True</property> - <signal name="color_set" handler="on_inactive_colorbutton_color_set" last_modification_time="Sat, 18 Mar 2006 22:34:20 GMT"/> - </widget> - <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="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label393"> - <property name="visible">True</property> - <property name="label" translatable="yes"><b>Chatstate Tab Colors</b></property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">5</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label394"> - <property name="visible">True</property> - <property name="label" translatable="yes">Gone</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkColorButton" id="gone_colorbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="use_alpha">False</property> - <property name="focus_on_click">True</property> - <signal name="color_set" handler="on_gone_colorbutton_color_set" last_modification_time="Sat, 18 Mar 2006 22:34:33 GMT"/> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label392"> - <property name="visible">True</property> - <property name="label" translatable="yes">MUC -Messages</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">7</property> - <property name="bottom_attach">8</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkColorButton" id="muc_msg_colorbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="use_alpha">False</property> - <property name="focus_on_click">True</property> - <signal name="color_set" handler="on_muc_msg_colorbutton_color_set" last_modification_time="Sat, 18 Mar 2006 22:34:37 GMT"/> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">7</property> - <property name="bottom_attach">8</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkHSeparator" id="hseparator16"> - <property name="visible">True</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">2</property> - <property name="top_attach">6</property> - <property name="bottom_attach">7</property> - <property name="x_options">fill</property> - <property name="y_options">fill</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label395"> - <property name="visible">True</property> - <property name="label" translatable="yes">MUC Directed -Messages</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">8</property> - <property name="bottom_attach">9</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkColorButton" id="muc_directed_msg_colorbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="use_alpha">False</property> - <property name="focus_on_click">True</property> - <signal name="color_set" handler="on_muc_directed_msg_colorbutton_color_set" last_modification_time="Sat, 18 Mar 2006 22:34:41 GMT"/> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">8</property> - <property name="bottom_attach">9</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkHButtonBox" id="hbuttonbox28"> - <property name="border_width">6</property> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkButton" id="close_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-close</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_close_button_clicked" last_modification_time="Wed, 08 Jun 2005 23:15:48 GMT"/> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> -</widget> - -</glade-interface> diff --git a/data/glade/gc_control_popup_menu.glade b/data/glade/gc_control_popup_menu.glade deleted file mode 100644 index 88c352062..000000000 --- a/data/glade/gc_control_popup_menu.glade +++ /dev/null @@ -1,134 +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="gc_control_popup_menu"> - <child> - <widget class="GtkImageMenuItem" id="change_nick_menuitem"> - <property name="no_show_all">True</property> - <property name="label" translatable="yes">Change _Nickname...</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image1409"> - <property name="visible">True</property> - <property name="stock">gtk-edit</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="manage_room_menuitem"> - <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="label" translatable="yes">_Manage Room</property> - <property name="use_underline">True</property> - <child> - <widget class="GtkMenu" id="menu1"> - <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> - <child> - <widget class="GtkImageMenuItem" id="change_subject_menuitem"> - <property name="no_show_all">True</property> - <property name="label" translatable="yes">Change _Subject...</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image1408"> - <property name="visible">True</property> - <property name="stock">gtk-edit</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="configure_room_menuitem"> - <property name="label" translatable="yes">Configure _Room...</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image1406"> - <property name="visible">True</property> - <property name="stock">gtk-preferences</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="separatormenuitem3"> - <property name="visible">True</property> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="destroy_room_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Destroy Room</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image1407"> - <property name="visible">True</property> - <property name="stock">gtk-delete</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - </widget> - </child> - <child internal-child="image"> - <widget class="GtkImage" id="menu-item-image8"> - <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="stock">gtk-properties</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkCheckMenuItem" id="minimize_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Minimize on close</property> - <property name="use_underline">True</property> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="bookmark_separator"> - <property name="no_show_all">True</property> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="bookmark_room_menuitem"> - <property name="no_show_all">True</property> - <property name="label" translatable="yes">_Bookmark</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image1410"> - <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="separatormenuitem2"> - <property name="no_show_all">True</property> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="history_menuitem"> - <property name="no_show_all">True</property> - <property name="label" translatable="yes">_History</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image1405"> - <property name="visible">True</property> - <property name="stock">gtk-justify-fill</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - </widget> -</glade-interface> diff --git a/data/glade/gc_occupants_menu.glade b/data/glade/gc_occupants_menu.glade deleted file mode 100644 index 99c7e1648..000000000 --- a/data/glade/gc_occupants_menu.glade +++ /dev/null @@ -1,179 +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="gc_occupants_menu"> - <child> - <widget class="GtkImageMenuItem" id="send_private_message_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Send Private Message</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image1051"> - <property name="visible">True</property> - <property name="stock">gtk-jump-to</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="send_file_menuitem"> - <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="label" translatable="yes">Send _File</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="menu-item-image4"> - <property name="stock">gtk-save</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkMenuItem" id="group_chat_actions_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">Occupant Actions</property> - <property name="use_underline">True</property> - <child> - <widget class="GtkMenu" id="group_chat_actions_menuitem_menu"> - <child> - <widget class="GtkCheckMenuItem" id="voice_checkmenuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Voice</property> - <property name="use_underline">True</property> - </widget> - </child> - <child> - <widget class="GtkCheckMenuItem" id="moderator_checkmenuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">Mo_derator</property> - <property name="use_underline">True</property> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="separator5"> - <property name="visible">True</property> - </widget> - </child> - <child> - <widget class="GtkCheckMenuItem" id="member_checkmenuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Member</property> - <property name="use_underline">True</property> - </widget> - </child> - <child> - <widget class="GtkCheckMenuItem" id="admin_checkmenuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Admin</property> - <property name="use_underline">True</property> - </widget> - </child> - <child> - <widget class="GtkCheckMenuItem" id="owner_checkmenuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Owner</property> - <property name="use_underline">True</property> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="separator4"> - <property name="visible">True</property> - </widget> - </child> - <child> - <widget class="GtkMenuItem" id="kick_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Kick</property> - <property name="use_underline">True</property> - </widget> - </child> - <child> - <widget class="GtkMenuItem" id="ban_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Ban</property> - <property name="use_underline">True</property> - </widget> - </child> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="separator6"> - <property name="visible">True</property> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="add_to_roster_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Add to Roster</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image1052"> - <property name="visible">True</property> - <property name="stock">gtk-add</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="block_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Block</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="menu-item-image5"> - <property name="visible">True</property> - <property name="stock">gtk-stop</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="unblock_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Unblock</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="menu-item-image6"> - <property name="visible">True</property> - <property name="stock">gtk-stop</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="separator1"> - <property name="visible">True</property> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="information_menuitem"> - <property name="visible">True</property> - <property name="label">gtk-info</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="history_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_History</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image1053"> - <property name="visible">True</property> - <property name="stock">gtk-justify-fill</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - </widget> -</glade-interface> diff --git a/data/glade/groups_post_window.glade b/data/glade/groups_post_window.glade deleted file mode 100644 index d7c628000..000000000 --- a/data/glade/groups_post_window.glade +++ /dev/null @@ -1,230 +0,0 @@ -<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - -<glade-interface> - -<widget class="GtkWindow" id="groups_post_window"> - <property name="visible">True</property> - <property name="title" translatable="yes">Create new post</property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_NONE</property> - <property name="modal">False</property> - <property name="resizable">True</property> - <property name="destroy_with_parent">False</property> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="focus_on_map">True</property> - - <child> - <widget class="GtkVBox" id="vbox1"> - <property name="border_width">6</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">4</property> - - <child> - <widget class="GtkTable" id="table1"> - <property name="visible">True</property> - <property name="n_rows">2</property> - <property name="n_columns">2</property> - <property name="homogeneous">False</property> - <property name="row_spacing">0</property> - <property name="column_spacing">0</property> - - <child> - <widget class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="label" translatable="yes">From</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="label" translatable="yes">Subject</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkEntry" id="from_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="activates_default">False</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkEntry" id="subject_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="activates_default">False</property> - </widget> - <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> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</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> - <property name="window_placement">GTK_CORNER_TOP_LEFT</property> - - <child> - <widget class="GtkTextView" id="contents_textview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="overwrite">False</property> - <property name="accepts_tab">True</property> - <property name="justification">GTK_JUSTIFY_LEFT</property> - <property name="wrap_mode">GTK_WRAP_NONE</property> - <property name="cursor_visible">True</property> - <property name="pixels_above_lines">0</property> - <property name="pixels_below_lines">0</property> - <property name="pixels_inside_wrap">0</property> - <property name="left_margin">0</property> - <property name="right_margin">0</property> - <property name="indent">0</property> - <property name="text" translatable="yes"></property> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkHBox" id="hbox1"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkButton" id="cancel_button"> - <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="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_cancel_button_clicked" last_modification_time="Fri, 18 Aug 2006 16:27:42 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <placeholder/> - </child> - - <child> - <widget class="GtkButton" id="send_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-go-forward</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_send_button_clicked" last_modification_time="Fri, 18 Aug 2006 16:27:48 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> -</widget> - -</glade-interface> diff --git a/data/glade/manage_accounts_window.glade b/data/glade/manage_accounts_window.glade deleted file mode 100644 index 40fea546a..000000000 --- a/data/glade/manage_accounts_window.glade +++ /dev/null @@ -1,306 +0,0 @@ -<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - -<glade-interface> - -<widget class="GtkWindow" id="manage_accounts_window"> - <property name="border_width">12</property> - <property name="visible">True</property> - <property name="title" translatable="yes">Manage Accounts</property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_NONE</property> - <property name="modal">False</property> - <property name="resizable">True</property> - <property name="destroy_with_parent">False</property> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="focus_on_map">True</property> - - <child> - <widget class="GtkVBox" id="vbox99"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">12</property> - - <child> - <widget class="GtkHBox" id="hbox2978"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">12</property> - - <child> - <widget class="GtkVBox" id="vbox100"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkScrolledWindow" id="scrolledwindow41"> - <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> - <property name="window_placement">GTK_CORNER_TOP_LEFT</property> - - <child> - <widget class="GtkTreeView" id="treeview3"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">False</property> - <property name="rules_hint">False</property> - <property name="reorderable">False</property> - <property name="enable_search">True</property> - <property name="fixed_height_mode">False</property> - <property name="hover_selection">False</property> - <property name="hover_expand">False</property> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkHButtonBox" id="hbuttonbox28"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkButton" id="add_account_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-add</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_add_account_button_clicked" last_modification_time="Sat, 02 Jul 2005 16:51:27 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkButton" id="remove_account_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-remove</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_remove_account_button_clicked" last_modification_time="Sat, 02 Jul 2005 16:51:21 GMT"/> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkNotebook" id="notebook3"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="show_tabs">True</property> - <property name="show_border">True</property> - <property name="tab_pos">GTK_POS_TOP</property> - <property name="scrollable">False</property> - <property name="enable_popup">False</property> - - <child> - <widget class="GtkLabel" id="label340"> - <property name="visible">True</property> - <property name="label">TABS BECOME INVISIBLE VIA CODE -AND HERE WE DRAW ROWS FROM THE LEFT -ONE TAB ONE ROW. SO -MAIN (can't be clicked) - -- Account - -- General - -- Connection - -- Personal - -Maybe I'll refactor later</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="tab_expand">False</property> - <property name="tab_fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label340"> - <property name="visible">True</property> - <property name="label">Hold_Account</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="type">tab</property> - </packing> - </child> - - <child> - <placeholder/> - </child> - - <child> - <widget class="GtkLabel" id="label337"> - <property name="visible">True</property> - <property name="label">Hold_General</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="type">tab</property> - </packing> - </child> - - <child> - <placeholder/> - </child> - - <child> - <widget class="GtkLabel" id="label338"> - <property name="visible">True</property> - <property name="label">Hold_Connection</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="type">tab</property> - </packing> - </child> - - <child> - <placeholder/> - </child> - - <child> - <widget class="GtkLabel" id="label339"> - <property name="visible">True</property> - <property name="label">Hold_Personal_Details</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="type">tab</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkHButtonBox" id="hbuttonbox29"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - <property name="spacing">12</property> - - <child> - <widget class="GtkButton" id="close_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-close</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_close_button_clicked" last_modification_time="Sat, 02 Jul 2005 16:51:56 GMT"/> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> -</widget> - -</glade-interface> diff --git a/data/glade/popup_notification_window.glade b/data/glade/popup_notification_window.glade deleted file mode 100644 index 4557d71eb..000000000 --- a/data/glade/popup_notification_window.glade +++ /dev/null @@ -1,165 +0,0 @@ -<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - -<glade-interface> - -<widget class="GtkWindow" id="popup_notification_window"> - <property name="border_width">1</property> - <property name="width_request">312</property> - <property name="height_request">95</property> - <property name="title" translatable="yes"></property> - <property name="type">GTK_WINDOW_POPUP</property> - <property name="window_position">GTK_WIN_POS_NONE</property> - <property name="modal">False</property> - <property name="resizable">False</property> - <property name="destroy_with_parent">False</property> - <property name="decorated">False</property> - <property name="skip_taskbar_hint">True</property> - <property name="skip_pager_hint">True</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> - <property name="gravity">GDK_GRAVITY_SOUTH_EAST</property> - <property name="focus_on_map">True</property> - <property name="urgency_hint">False</property> - <signal name="button_press_event" handler="on_popup_notification_window_button_press_event" last_modification_time="Thu, 21 Apr 2005 21:20:43 GMT"/> - - <child> - <widget class="GtkEventBox" id="eventbox"> - <property name="visible">True</property> - <property name="visible_window">True</property> - <property name="above_child">False</property> - - <child> - <widget class="GtkHBox" id="hbox3019"> - <property name="border_width">4</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkImage" id="notification_image"> - <property name="width_request">68</property> - <property name="height_request">86</property> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkVBox" id="vbox111"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkHBox" id="hbox3020"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkLabel" id="event_type_label"> - <property name="width_request">196</property> - <property name="visible">True</property> - <property name="label">Event Type</property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">True</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkButton" id="close_button"> - <property name="visible">True</property> - <property name="relief">GTK_RELIEF_NONE</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_close_button_clicked" last_modification_time="Tue, 12 Apr 2005 12:48:32 GMT"/> - - <child> - <widget class="GtkImage" id="image496"> - <property name="visible">True</property> - <property name="stock">gtk-close</property> - <property name="icon_size">1</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="event_description_label"> - <property name="width_request">218</property> - <property name="height_request">64</property> - <property name="visible">True</property> - <property name="label">Event desc</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">True</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> -</widget> - -</glade-interface> diff --git a/data/glade/privacy_lists_window.glade b/data/glade/privacy_lists_window.glade deleted file mode 100644 index 273929983..000000000 --- a/data/glade/privacy_lists_window.glade +++ /dev/null @@ -1,212 +0,0 @@ -<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - -<glade-interface> - -<widget class="GtkWindow" id="privacy_lists_first_window"> - <property name="border_width">12</property> - <property name="visible">True</property> - <property name="title" translatable="yes">window1</property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_NONE</property> - <property name="modal">False</property> - <property name="resizable">True</property> - <property name="destroy_with_parent">False</property> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="focus_on_map">True</property> - <property name="urgency_hint">False</property> - <signal name="destroy" handler="on_privacy_lists_first_window_destroy" last_modification_time="Sun, 02 Jul 2006 20:56:21 GMT"/> - - <child> - <widget class="GtkVBox" id="vbox1"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkHBox" id="hbox1"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">12</property> - - <child> - <widget class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="label" translatable="yes">Privacy Lists:</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkComboBox" id="list_of_privacy_lists_combobox"> - <property name="visible">True</property> - <property name="items" translatable="yes"></property> - <property name="add_tearoffs">False</property> - <property name="focus_on_click">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkVBox" id="vbox1"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkHButtonBox" id="hbuttonbox2"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_SPREAD</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkButton" id="delete_privacy_list_button"> - <property name="border_width">5</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-delete</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_delete_privacy_list_button_clicked" last_modification_time="Sun, 02 Jul 2006 16:47:54 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkButton" id="open_privacy_list_button"> - <property name="border_width">5</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-edit</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_open_privacy_list_button_clicked" last_modification_time="Sun, 02 Jul 2006 16:47:34 GMT"/> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkHBox" id="hbox2"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkEntry" id="new_privacy_list_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="activates_default">False</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkButton" id="new_privacy_list_button"> - <property name="border_width">5</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-new</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_new_privacy_list_button_clicked" last_modification_time="Sun, 02 Jul 2006 16:47:16 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkHButtonBox" id="hbuttonbox1"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkButton" id="close_privacy_lists_window_button"> - <property name="border_width">5</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-close</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_close_button_clicked" last_modification_time="Sun, 02 Jul 2006 20:53:03 GMT"/> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> -</widget> - -</glade-interface> diff --git a/data/glade/progress_dialog.glade b/data/glade/progress_dialog.glade deleted file mode 100644 index 4f0b34e04..000000000 --- a/data/glade/progress_dialog.glade +++ /dev/null @@ -1,98 +0,0 @@ -<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - -<glade-interface> - -<widget class="GtkDialog" id="progress_dialog"> - <property name="title" translatable="yes"></property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_NONE</property> - <property name="modal">False</property> - <property name="resizable">True</property> - <property name="destroy_with_parent">False</property> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="focus_on_map">True</property> - <property name="has_separator">True</property> - <signal name="delete_event" handler="on_progress_dialog_delete_event" last_modification_time="Fri, 02 Dec 2005 15:52:45 GMT"/> - - <child internal-child="vbox"> - <widget class="GtkVBox" id="dialog-vbox"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="dialog-action_area11"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - - <child> - <widget class="GtkButton" id="close_button"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-close</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="response_id">-7</property> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">GTK_PACK_END</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label"> - <property name="visible">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkProgressBar" id="progressbar"> - <property name="visible">True</property> - <property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property> - <property name="fraction">0</property> - <property name="pulse_step">0.10000000149</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - </child> -</widget> - -</glade-interface> diff --git a/data/glade/remove_account_window.glade b/data/glade/remove_account_window.glade deleted file mode 100644 index 19083da11..000000000 --- a/data/glade/remove_account_window.glade +++ /dev/null @@ -1,263 +0,0 @@ -<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - -<glade-interface> - -<widget class="GtkWindow" id="remove_account_window"> - <property name="border_width">6</property> - <property name="title" translatable="yes"></property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_NONE</property> - <property name="modal">False</property> - <property name="resizable">True</property> - <property name="destroy_with_parent">False</property> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="focus_on_map">True</property> - <signal name="destroy" handler="on_remove_account_window_destroy" last_modification_time="Tue, 19 Apr 2005 23:40:23 GMT"/> - - <child> - <widget class="GtkVBox" id="vbox69"> - <property name="border_width">3</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkHBox" id="hbox2951"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkImage" id="image498"> - <property name="visible">True</property> - <property name="stock">gtk-dialog-question</property> - <property name="icon_size">6</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkFrame" id="frame30"> - <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="label_yalign">0.5</property> - <property name="shadow_type">GTK_SHADOW_NONE</property> - - <child> - <widget class="GtkAlignment" id="alignment59"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">1</property> - <property name="yscale">1</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">12</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkVBox" id="vbox69"> - <property name="border_width">6</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkRadioButton" id="remove_only_radiobutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Remove account _only from Gajim</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkRadioButton" id="remove_and_unregister_radiobutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Remove account from Gajim and from _server</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <property name="group">remove_only_radiobutton</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkLabel" id="label242"> - <property name="visible">True</property> - <property name="label" translatable="yes"><b>What do you want to do?</b></property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkHButtonBox" id="hbuttonbox16"> - <property name="border_width">6</property> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - <property name="spacing">12</property> - - <child> - <widget class="GtkButton" id="cancel_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-cancel</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_cancel_button_clicked" last_modification_time="Tue, 19 Apr 2005 23:17:51 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkButton" id="remove_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_remove_button_clicked" last_modification_time="Tue, 19 Apr 2005 23:17:59 GMT"/> - - <child> - <widget class="GtkAlignment" id="alignment62"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">0</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkHBox" id="hbox2954"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">2</property> - - <child> - <widget class="GtkImage" id="image501"> - <property name="visible">True</property> - <property name="stock">gtk-delete</property> - <property name="icon_size">4</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label245"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Remove</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - </child> -</widget> - -</glade-interface> diff --git a/data/glade/single_message_window.glade b/data/glade/single_message_window.glade deleted file mode 100644 index f65415d70..000000000 --- a/data/glade/single_message_window.glade +++ /dev/null @@ -1,344 +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="single_message_window"> - <property name="border_width">6</property> - <property name="default_width">550</property> - <property name="default_height">280</property> - <signal name="key_press_event" handler="on_single_message_window_key_press_event"/> - <signal name="delete_event" handler="on_single_message_window_delete_event"/> - <signal name="destroy" handler="on_single_message_window_destroy"/> - <child> - <widget class="GtkVBox" id="vbox97"> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <widget class="GtkTable" id="headers_table"> - <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="GtkLabel" id="to_label"> - <property name="visible">True</property> - <property name="no_show_all">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">To:</property> - </widget> - <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> - </packing> - </child> - <child> - <widget class="GtkLabel" id="from_label"> - <property name="visible">True</property> - <property name="no_show_all">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">From:</property> - </widget> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkEntry" id="to_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="no_show_all">True</property> - </widget> - <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> - </packing> - </child> - <child> - <widget class="GtkLabel" id="count_chars_label"> - <property name="visible">True</property> - <property name="label" translatable="yes">0</property> - </widget> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</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> - </packing> - </child> - <child> - <widget class="GtkEntry" id="subject_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </widget> - <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> - </packing> - </child> - <child> - <widget class="GtkEntry" id="from_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="no_show_all">True</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">3</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label335"> - <property name="visible">True</property> - <property name="label" translatable="yes">Subject:</property> - </widget> - <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> - </packing> - </child> - </widget> - <packing> - <property name="expand">False</property> - </packing> - </child> - <child> - <widget class="GtkScrolledWindow" id="conversation_scrolledwindow"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="no_show_all">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> - <placeholder/> - </child> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - <child> - <widget class="GtkScrolledWindow" id="message_scrolledwindow"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="no_show_all">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="GtkTextView" id="message_textview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="wrap_mode">GTK_WRAP_WORD</property> - </widget> - </child> - </widget> - <packing> - <property name="position">2</property> - </packing> - </child> - <child> - <widget class="GtkHButtonBox" id="hbuttonbox26"> - <property name="visible">True</property> - <property name="spacing">12</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - <child> - <widget class="GtkButton" id="close_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="no_show_all">True</property> - <property name="label">gtk-close</property> - <property name="use_stock">True</property> - <property name="response_id">0</property> - <signal name="clicked" handler="on_close_button_clicked"/> - </widget> - </child> - <child> - <widget class="GtkButton" id="cancel_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="no_show_all">True</property> - <property name="label">gtk-cancel</property> - <property name="use_stock">True</property> - <property name="response_id">0</property> - <signal name="clicked" handler="on_cancel_button_clicked"/> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - <child> - <widget class="GtkButton" id="send_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="no_show_all">True</property> - <property name="tooltip" translatable="yes">Send message</property> - <property name="response_id">0</property> - <signal name="clicked" handler="on_send_button_clicked"/> - <child> - <widget class="GtkAlignment" id="alignment98"> - <property name="visible">True</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <child> - <widget class="GtkHBox" id="hbox3003"> - <property name="visible">True</property> - <property name="spacing">2</property> - <child> - <widget class="GtkImage" id="image1326"> - <property name="visible">True</property> - <property name="stock">gtk-jump-to</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label370"> - <property name="visible">True</property> - <property name="label" translatable="yes">Sen_d</property> - <property name="use_underline">True</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - </widget> - <packing> - <property name="position">2</property> - </packing> - </child> - <child> - <widget class="GtkButton" id="reply_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="no_show_all">True</property> - <property name="tooltip" translatable="yes">Reply to this message</property> - <property name="response_id">0</property> - <signal name="clicked" handler="on_reply_button_clicked"/> - <child> - <widget class="GtkAlignment" id="alignment82"> - <property name="visible">True</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <child> - <widget class="GtkHBox" id="hbox2982"> - <property name="visible">True</property> - <property name="spacing">2</property> - <child> - <widget class="GtkImage" id="image862"> - <property name="visible">True</property> - <property name="stock">gtk-ok</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label346"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Reply</property> - <property name="use_underline">True</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - </widget> - <packing> - <property name="position">3</property> - </packing> - </child> - <child> - <widget class="GtkButton" id="send_and_close_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="no_show_all">True</property> - <property name="tooltip" translatable="yes">Send message and close window</property> - <property name="response_id">0</property> - <signal name="clicked" handler="on_send_and_close_button_clicked"/> - <child> - <widget class="GtkAlignment" id="alignment83"> - <property name="visible">True</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <child> - <widget class="GtkHBox" id="hbox2983"> - <property name="visible">True</property> - <property name="spacing">2</property> - <child> - <widget class="GtkImage" id="image878"> - <property name="visible">True</property> - <property name="stock">gtk-ok</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label347"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Send & Close</property> - <property name="use_underline">True</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - </widget> - <packing> - <property name="position">4</property> - </packing> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="padding">6</property> - <property name="position">3</property> - </packing> - </child> - </widget> - </child> - </widget> -</glade-interface> diff --git a/data/glade/subscription_request_popup_menu.glade b/data/glade/subscription_request_popup_menu.glade deleted file mode 100644 index 3290d3237..000000000 --- a/data/glade/subscription_request_popup_menu.glade +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - -<glade-interface> - -<widget class="GtkMenu" id="subscription_request_popup_menu"> - - <child> - <widget class="GtkImageMenuItem" id="start_chat_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Start Chat</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_start_chat_activate" last_modification_time="Sun, 01 Oct 2006 16:49:43 GMT"/> - - <child internal-child="image"> - <widget class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="stock">gtk-jump-to</property> - <property name="icon_size">1</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkImageMenuItem" id="information_menuitem"> - <property name="visible">True</property> - <property name="label">gtk-info</property> - <property name="use_stock">True</property> - <signal name="activate" handler="on_contact_info_activate" last_modification_time="Sun, 01 Oct 2006 16:49:43 GMT"/> - </widget> - </child> -</widget> - -</glade-interface> diff --git a/data/glade/subscription_request_window.glade b/data/glade/subscription_request_window.glade deleted file mode 100644 index 90878983e..000000000 --- a/data/glade/subscription_request_window.glade +++ /dev/null @@ -1,364 +0,0 @@ -<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - -<glade-interface> - -<widget class="GtkWindow" id="subscription_request_window"> - <property name="border_width">12</property> - <property name="title" translatable="yes">Subscription Request</property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_NONE</property> - <property name="modal">False</property> - <property name="resizable">True</property> - <property name="destroy_with_parent">False</property> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="focus_on_map">True</property> - <property name="urgency_hint">False</property> - - <child> - <widget class="GtkVBox" id="vbox10"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">5</property> - - <child> - <widget class="GtkLabel" id="from_label"> - <property name="visible">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkScrolledWindow" id="scrolledwindow8"> - <property name="border_width">5</property> - <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> - <property name="window_placement">GTK_CORNER_TOP_LEFT</property> - - <child> - <widget class="GtkTextView" id="message_textview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">False</property> - <property name="overwrite">False</property> - <property name="accepts_tab">True</property> - <property name="justification">GTK_JUSTIFY_LEFT</property> - <property name="wrap_mode">GTK_WRAP_WORD</property> - <property name="cursor_visible">False</property> - <property name="pixels_above_lines">0</property> - <property name="pixels_below_lines">0</property> - <property name="pixels_inside_wrap">0</property> - <property name="left_margin">0</property> - <property name="right_margin">0</property> - <property name="indent">0</property> - <property name="text" translatable="yes"></property> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkHButtonBox" id="hbuttonbox3"> - <property name="border_width">5</property> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - <property name="spacing">12</property> - - <child> - <widget class="GtkButton" id="close_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-close</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_close_button_clicked" last_modification_time="Tue, 01 Mar 2005 13:56:50 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkButton" id="deny_button"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Deny authorization from contact so he or she cannot know when you're connected</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_deny_button_clicked" last_modification_time="Tue, 01 Mar 2005 13:57:29 GMT"/> - - <child> - <widget class="GtkAlignment" id="alignment12"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">0</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkHBox" id="hbox16"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">2</property> - - <child> - <widget class="GtkImage" id="image70"> - <property name="visible">True</property> - <property name="stock">gtk-cancel</property> - <property name="icon_size">4</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label25"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Deny</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkButton" id="actions_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_actions_button_clicked" last_modification_time="Sun, 01 Oct 2006 17:53:28 GMT"/> - - <child> - <widget class="GtkAlignment" id="alignment101"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">0</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkHBox" id="hbox3009"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">2</property> - - <child> - <widget class="GtkImage" id="image1338"> - <property name="visible">True</property> - <property name="stock">gtk-execute</property> - <property name="icon_size">4</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label372"> - <property name="visible">True</property> - <property name="label" translatable="yes" comments="Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)">_Actions</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkArrow" id="arrow4"> - <property name="visible">True</property> - <property name="arrow_type">GTK_ARROW_DOWN</property> - <property name="shadow_type">GTK_SHADOW_OUT</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkButton" id="authorize_button"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Authorize contact so he or she can know when you're connected</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="can_focus">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_authorize_button_clicked" last_modification_time="Tue, 01 Mar 2005 13:57:14 GMT"/> - - <child> - <widget class="GtkAlignment" id="alignment13"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">0</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkHBox" id="hbox17"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">2</property> - - <child> - <widget class="GtkImage" id="image71"> - <property name="visible">True</property> - <property name="stock">gtk-add</property> - <property name="icon_size">4</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label26"> - <property name="visible">True</property> - <property name="label" translatable="yes">Au_thorize</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - </child> -</widget> - -</glade-interface> diff --git a/data/glade/synchronise_select_account_dialog.glade b/data/glade/synchronise_select_account_dialog.glade deleted file mode 100644 index e75ed5d7e..000000000 --- a/data/glade/synchronise_select_account_dialog.glade +++ /dev/null @@ -1,131 +0,0 @@ -<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - -<glade-interface> - -<widget class="GtkDialog" id="synchronise_select_account_dialog"> - <property name="border_width">12</property> - <property name="title" translatable="yes">Synchronise contacts</property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_NONE</property> - <property name="modal">False</property> - <property name="default_width">350</property> - <property name="default_height">300</property> - <property name="resizable">True</property> - <property name="destroy_with_parent">False</property> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="focus_on_map">True</property> - <property name="urgency_hint">False</property> - <property name="has_separator">True</property> - - <child internal-child="vbox"> - <widget class="GtkVBox" id="dialog-vbox7"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="dialog-action_area6"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - - <child> - <widget class="GtkButton" id="cancel_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-cancel</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="response_id">-6</property> - <signal name="clicked" handler="on_cancel_button_clicked" last_modification_time="Thu, 01 Mar 2007 14:08:01 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkButton" id="ok_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-ok</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="response_id">-5</property> - <signal name="clicked" handler="on_ok_button_clicked" last_modification_time="Thu, 01 Mar 2007 14:07:38 GMT"/> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">GTK_PACK_END</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label210"> - <property name="visible">True</property> - <property name="label" translatable="yes">Select the account with which you want to synchronise</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkScrolledWindow" id="scrolledwindow"> - <property name="width_request">150</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property> - <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property> - <property name="shadow_type">GTK_SHADOW_IN</property> - <property name="window_placement">GTK_CORNER_TOP_LEFT</property> - - <child> - <widget class="GtkTreeView" id="accounts_treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">True</property> - <property name="rules_hint">False</property> - <property name="reorderable">False</property> - <property name="enable_search">True</property> - <property name="fixed_height_mode">False</property> - <property name="hover_selection">False</property> - <property name="hover_expand">False</property> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> -</widget> - -</glade-interface> diff --git a/data/glade/synchronise_select_contacts_dialog.glade b/data/glade/synchronise_select_contacts_dialog.glade deleted file mode 100644 index e5f2a67f7..000000000 --- a/data/glade/synchronise_select_contacts_dialog.glade +++ /dev/null @@ -1,131 +0,0 @@ -<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - -<glade-interface> - -<widget class="GtkDialog" id="synchronise_select_contacts_dialog"> - <property name="border_width">12</property> - <property name="title" translatable="yes">Synchronise : select contacts</property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_NONE</property> - <property name="modal">False</property> - <property name="default_width">400</property> - <property name="default_height">300</property> - <property name="resizable">True</property> - <property name="destroy_with_parent">False</property> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="focus_on_map">True</property> - <property name="urgency_hint">False</property> - <property name="has_separator">True</property> - - <child internal-child="vbox"> - <widget class="GtkVBox" id="dialog-vbox7"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="dialog-action_area6"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - - <child> - <widget class="GtkButton" id="cancel_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-cancel</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="response_id">-6</property> - <signal name="clicked" handler="on_cancel_button_clicked" last_modification_time="Thu, 01 Mar 2007 14:08:01 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkButton" id="ok_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-ok</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="response_id">-5</property> - <signal name="clicked" handler="on_ok_button_clicked" last_modification_time="Thu, 01 Mar 2007 14:07:38 GMT"/> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">GTK_PACK_END</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label210"> - <property name="visible">True</property> - <property name="label" translatable="yes">Select the contacts you want to synchronise</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkScrolledWindow" id="scrolledwindow"> - <property name="width_request">150</property> - <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> - <property name="window_placement">GTK_CORNER_TOP_LEFT</property> - - <child> - <widget class="GtkTreeView" id="contacts_treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">True</property> - <property name="rules_hint">False</property> - <property name="reorderable">False</property> - <property name="enable_search">True</property> - <property name="fixed_height_mode">False</property> - <property name="hover_selection">False</property> - <property name="hover_expand">False</property> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> -</widget> - -</glade-interface> diff --git a/data/glade/systray_context_menu.glade b/data/glade/systray_context_menu.glade deleted file mode 100644 index 04a2c7811..000000000 --- a/data/glade/systray_context_menu.glade +++ /dev/null @@ -1,158 +0,0 @@ -<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - -<glade-interface> - -<widget class="GtkMenu" id="systray_context_menu"> - - <child> - <widget class="GtkImageMenuItem" id="status_menu"> - <property name="visible">True</property> - <property name="label" translatable="yes">Sta_tus</property> - <property name="use_underline">True</property> - - <child internal-child="image"> - <widget class="GtkImage" id="image1455"> - <property name="visible">True</property> - <property name="stock">gtk-network</property> - <property name="icon_size">1</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkImageMenuItem" id="chat_with_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Start Chat</property> - <property name="use_underline">True</property> - - <child internal-child="image"> - <widget class="GtkImage" id="image1456"> - <property name="visible">True</property> - <property name="stock">gtk-jump-to</property> - <property name="icon_size">1</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkImageMenuItem" id="join_gc_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Group Chat</property> - <property name="use_underline">True</property> - - <child internal-child="image"> - <widget class="GtkImage" id="image1457"> - <property name="visible">True</property> - <property name="stock">gtk-connect</property> - <property name="icon_size">1</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkImageMenuItem" id="single_message_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">Send Single _Message</property> - <property name="use_underline">True</property> - - <child internal-child="image"> - <widget class="GtkImage" id="image1458"> - <property name="visible">True</property> - <property name="stock">gtk-new</property> - <property name="icon_size">1</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkSeparatorMenuItem" id="separator12"> - <property name="visible">True</property> - </widget> - </child> - - <child> - <widget class="GtkMenuItem" id="show_all_events_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">Show All Pending _Events</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_show_all_events_menuitem_activate" last_modification_time="Sat, 29 Oct 2005 23:55:24 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkCheckMenuItem" id="sounds_mute_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">Mute Sounds</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_sounds_mute_menuitem_activate" last_modification_time="Sat, 29 Oct 2005 23:55:24 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkImageMenuItem" id="show_roster_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">Show _Roster</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_show_roster_menuitem_activate" last_modification_time="Sat, 29 Oct 2005 23:55:24 GMT"/> - - <child internal-child="image"> - <widget class="GtkImage" id="image1459"> - <property name="visible">True</property> - <property name="stock">gtk-home</property> - <property name="icon_size">1</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkImageMenuItem" id="preferences_menuitem"> - <property name="visible">True</property> - <property name="label">gtk-preferences</property> - <property name="use_stock">True</property> - <signal name="activate" handler="on_preferences_menuitem_activate" last_modification_time="Wed, 15 Jun 2005 10:18:26 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkSeparatorMenuItem" id="separator"> - <property name="visible">True</property> - </widget> - </child> - - <child> - <widget class="GtkImageMenuItem" id="quit_menuitem"> - <property name="visible">True</property> - <property name="label">gtk-quit</property> - <property name="use_stock">True</property> - <signal name="activate" handler="on_quit_menuitem_activate" last_modification_time="Tue, 15 Mar 2005 00:15:28 GMT"/> - </widget> - </child> -</widget> - -</glade-interface> diff --git a/data/glade/zeroconf_context_menu.glade b/data/glade/zeroconf_context_menu.glade deleted file mode 100644 index 349383017..000000000 --- a/data/glade/zeroconf_context_menu.glade +++ /dev/null @@ -1,41 +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="zeroconf_context_menu"> - <child> - <widget class="GtkImageMenuItem" id="status_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Status</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image1258"> - <property name="visible">True</property> - <property name="stock">gtk-network</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="separatormenuitem1"> - <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> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="zeroconf_properties_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Modify Account...</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image1259"> - <property name="visible">True</property> - <property name="stock">gtk-preferences</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - </widget> -</glade-interface> diff --git a/data/glade/zeroconf_information_window.glade b/data/glade/zeroconf_information_window.glade deleted file mode 100644 index 8cdf7e891..000000000 --- a/data/glade/zeroconf_information_window.glade +++ /dev/null @@ -1,666 +0,0 @@ -<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - -<glade-interface> - -<widget class="GtkWindow" id="zeroconf_information_window"> - <property name="border_width">12</property> - <property name="title">Contact Information</property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_NONE</property> - <property name="modal">False</property> - <property name="resizable">False</property> - <property name="destroy_with_parent">False</property> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="focus_on_map">True</property> - <signal name="key_press_event" handler="on_zeroconf_information_window_key_press_event" last_modification_time="Fri, 29 Sep 2006 13:23:38 GMT"/> - <signal name="destroy" handler="on_zeroconf_information_window_destroy" last_modification_time="Fri, 29 Sep 2006 13:23:44 GMT"/> - - <child> - <widget class="GtkVBox" id="vbox1"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">12</property> - - <child> - <widget class="GtkLabel" id="nickname_label"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">True</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkNotebook" id="information_notebook"> - <property name="visible">True</property> - <property name="show_tabs">True</property> - <property name="show_border">True</property> - <property name="tab_pos">GTK_POS_TOP</property> - <property name="scrollable">False</property> - <property name="enable_popup">False</property> - - <child> - <widget class="GtkHBox" id="hbox3"> - <property name="border_width">12</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">12</property> - - <child> - <widget class="GtkTable" id="table7"> - <property name="visible">True</property> - <property name="n_rows">4</property> - <property name="n_columns">2</property> - <property name="homogeneous">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - - <child> - <widget class="GtkLabel" id="label51"> - <property name="visible">True</property> - <property name="label" translatable="yes">Local jid:</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label53"> - <property name="visible">True</property> - <property name="label" translatable="yes">Resource:</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label54"> - <property name="visible">True</property> - <property name="label" translatable="yes">Status:</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="local_jid_label"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkEventBox" id="resource_prio_label_eventbox"> - <property name="visible">True</property> - <property name="visible_window">False</property> - <property name="above_child">False</property> - - <child> - <widget class="GtkLabel" id="resource_prio_label"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - </child> - </widget> - <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> - </packing> - </child> - - <child> - <widget class="GtkEventBox" id="status_label_eventbox"> - <property name="visible">True</property> - <property name="visible_window">True</property> - <property name="above_child">False</property> - - <child> - <widget class="GtkLabel" id="status_label"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - </child> - </widget> - <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="x_options">fill</property> - <property name="y_options">fill</property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="log_history_checkbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">_Log conversation history</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">True</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkVBox" id="vbox2"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkEventBox" id="PHOTO_eventbox"> - <property name="visible">True</property> - <property name="visible_window">False</property> - <property name="above_child">False</property> - <signal name="button_press_event" handler="on_PHOTO_eventbox_button_press_event" last_modification_time="Fri, 08 Sep 2006 21:34:18 GMT"/> - - <child> - <widget class="GtkImage" id="PHOTO_image"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <placeholder/> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="tab_expand">False</property> - <property name="tab_fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="label" translatable="yes">Contact</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="type">tab</property> - </packing> - </child> - - <child> - <widget class="GtkTable" id="table8"> - <property name="border_width">16</property> - <property name="visible">True</property> - <property name="n_rows">4</property> - <property name="n_columns">2</property> - <property name="homogeneous">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - - <child> - <widget class="GtkLabel" id="label55"> - <property name="visible">True</property> - <property name="label" translatable="yes">Jabber ID:</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="jabber_id_label"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <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="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label56"> - <property name="visible">True</property> - <property name="label" translatable="yes">E-Mail:</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="email_label"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">True</property> - <property name="selectable">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <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="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label58"> - <property name="visible">True</property> - <property name="label" translatable="yes">Last Name:</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label59"> - <property name="visible">True</property> - <property name="label" translatable="yes">First Name:</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="first_name_label"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="y_options">expand</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="last_name_label"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <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="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - </widget> - <packing> - <property name="tab_expand">True</property> - <property name="tab_fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label57"> - <property name="visible">True</property> - <property name="label" translatable="yes">Personal</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="type">tab</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkHButtonBox" id="hbuttonbox1"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkButton" id="close_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-close</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_close_button_clicked" last_modification_time="Mon, 25 Sep 2006 05:08:55 GMT"/> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> -</widget> - -</glade-interface> diff --git a/data/gui/Makefile.am b/data/gui/Makefile.am new file mode 100644 index 000000000..b36d5d7fe --- /dev/null +++ b/data/gui/Makefile.am @@ -0,0 +1,8 @@ + +guidir = $(pkgdatadir)/data/gui +gui_DATA = $(srcdir)/*.ui +EXTRA_DIST = $(gui_DATA) + +DISTCLEANFILES = *.h + +MAINTAINERCLEANFILES = Makefile.in diff --git a/data/gui/account_context_menu.ui b/data/gui/account_context_menu.ui new file mode 100644 index 000000000..9576edd5e --- /dev/null +++ b/data/gui/account_context_menu.ui @@ -0,0 +1,105 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkMenu" id="account_context_menu"> + <child> + <object class="GtkImageMenuItem" id="status_menuitem"> + <property name="label">_Status</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="pep_menuitem"> + <property name="label">_Personal Events</property> + <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="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separatormenuitem1"> + <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> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="start_chat_menuitem"> + <property name="label">_Start Chat...</property> + <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="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="join_group_chat_menuitem"> + <property name="label">Join _Group Chat...</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="seperator"> + <property name="visible">True</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="add_contact_menuitem"> + <property name="label">_Add Contact...</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="service_discovery_menuitem"> + <property name="label">_Discover Services</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="execute_command_menuitem"> + <property name="label">_Execute Command...</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="open_gmail_inbox_menuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Open Gmail Inbox</property> + <property name="use_underline">True</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="seperator1"> + <property name="visible">True</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="edit_account_menuitem"> + <property name="label">_Modify Account</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> + </child> + </object> + <object class="GtkAccelGroup" id="accelgroup1"/> +</interface> diff --git a/data/glade/account_creation_wizard_window.glade b/data/gui/account_creation_wizard_window.ui index 028492ba3..c6a3ec35a 100644 --- a/data/glade/account_creation_wizard_window.glade +++ b/data/gui/account_creation_wizard_window.ui @@ -1,32 +1,34 @@ <?xml version="1.0"?> -<glade-interface> - <!-- interface-requires gtk+ 2.16 --> +<interface> + <requires lib="gtk+" version="2.16"/> <!-- interface-naming-policy toplevel-contextual --> - <widget class="GtkWindow" id="account_creation_wizard_window"> + <object class="GtkWindow" id="account_creation_wizard_window"> <property name="border_width">12</property> <property name="title" translatable="yes">Gajim: Account Creation Wizard</property> <property name="resizable">False</property> <signal name="destroy" handler="on_wizard_window_destroy"/> <child> - <widget class="GtkVBox" id="vbox77"> + <object class="GtkVBox" id="vbox77"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkNotebook" id="notebook"> + <object class="GtkNotebook" id="notebook"> <property name="visible">True</property> <property name="show_tabs">False</property> <property name="show_border">False</property> <child> - <widget class="GtkVBox" id="vbox78"> + <object class="GtkVBox" id="vbox78"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <widget class="GtkLabel" id="label256"> + <object class="GtkLabel" id="label256"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">You need to have an account in order to connect to the Jabber network.</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -34,29 +36,30 @@ to the Jabber network.</property> </packing> </child> <child> - <widget class="GtkFrame" id="frame33"> + <object class="GtkFrame" id="frame33"> <property name="visible">True</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <widget class="GtkAlignment" id="alignment68"> + <object class="GtkAlignment" id="alignment68"> <property name="visible">True</property> <property name="top_padding">5</property> <property name="left_padding">12</property> <child> - <widget class="GtkVBox" id="vbox83"> + <object class="GtkVBox" id="vbox83"> <property name="visible">True</property> <property name="border_width">6</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkRadioButton" id="use_existing_account_radiobutton"> + <object class="GtkRadioButton" id="use_existing_account_radiobutton"> <property name="label" translatable="yes">I already have an account I want to _use</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -64,7 +67,7 @@ to the Jabber network.</property> </packing> </child> <child> - <widget class="GtkRadioButton" id="register_new_account_radiobutton"> + <object class="GtkRadioButton" id="register_new_account_radiobutton"> <property name="label" translatable="yes">I want to _register for a new account</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -72,57 +75,54 @@ to the Jabber network.</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <property name="group">use_existing_account_radiobutton</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="label269"> + <child type="label"> + <object class="GtkLabel" id="label269"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Please choose one of the options below:</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> - <child> - <widget class="GtkLabel" id="label259"> + <child type="tab"> + <object class="GtkLabel" id="label259"> <property name="visible">True</property> - </widget> + </object> <packing> <property name="tab_fill">False</property> - <property name="type">tab</property> </packing> </child> <child> - <widget class="GtkVBox" id="register_vbox"> + <object class="GtkVBox" id="register_vbox"> <property name="visible">True</property> <property name="border_width">6</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <widget class="GtkLabel" id="label270"> + <object class="GtkLabel" id="label270"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes"><b>Please fill in the data for your existing account</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -130,18 +130,18 @@ to the Jabber network.</property> </packing> </child> <child> - <widget class="GtkTable" id="table27"> + <object class="GtkTable" id="table27"> <property name="visible">True</property> <property name="n_rows">3</property> <property name="n_columns">4</property> <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkEntry" id="username_entry"> + <object class="GtkEntry" id="username_entry"> <property name="visible">True</property> <property name="can_focus">True</property> <signal name="key_press_event" handler="on_username_entry_key_press_event"/> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -149,13 +149,13 @@ to the Jabber network.</property> </packing> </child> <child> - <widget class="GtkLabel" id="label263"> + <object class="GtkLabel" id="label263"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Password:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">password_entry</property> - </widget> + </object> <packing> <property name="top_attach">2</property> <property name="bottom_attach">3</property> @@ -164,18 +164,18 @@ to the Jabber network.</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="save_password_checkbutton"> + <object class="GtkCheckButton" id="save_password_checkbutton"> <property name="label" translatable="yes">Save pass_word</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip" translatable="yes">If checked, Gajim will remember the password for this account</property> + <property name="tooltip_text" translatable="yes">If checked, Gajim will remember the password for this account</property> <property name="use_underline">True</property> <property name="focus_on_click">False</property> <property name="active">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_save_password_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">4</property> @@ -186,12 +186,12 @@ to the Jabber network.</property> </packing> </child> <child> - <widget class="GtkEntry" id="password_entry"> + <object class="GtkEntry" id="password_entry"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="visibility">False</property> <property name="activates_default">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -201,24 +201,24 @@ to the Jabber network.</property> </packing> </child> <child> - <widget class="GtkLabel" id="label262"> + <object class="GtkLabel" id="label262"> <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">username_entry</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </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">@</property> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> @@ -226,9 +226,9 @@ to the Jabber network.</property> </packing> </child> <child> - <widget class="GtkComboBoxEntry" id="server_comboboxentry"> + <object class="GtkComboBoxEntry" id="server_comboboxentry"> <property name="visible">True</property> - </widget> + </object> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> @@ -237,7 +237,7 @@ to the Jabber network.</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="anonymous_checkbutton1"> + <object class="GtkCheckButton" id="anonymous_checkbutton1"> <property name="label" translatable="yes">Anon_ymous authentication</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -245,7 +245,7 @@ to the Jabber network.</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_anonymous_checkbutton1_toggled"/> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">4</property> @@ -256,39 +256,39 @@ to the Jabber network.</property> <child> <placeholder/> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - <child> - <widget class="GtkLabel" id="label261"> + <child type="tab"> + <object class="GtkLabel" id="label261"> <property name="visible">True</property> - </widget> + </object> <packing> <property name="position">1</property> <property name="tab_fill">False</property> - <property name="type">tab</property> </packing> </child> <child> - <widget class="GtkVBox" id="vbox105"> + <object class="GtkVBox" id="vbox105"> <property name="visible">True</property> <property name="border_width">6</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <widget class="GtkLabel" id="label368"> + <object class="GtkLabel" id="label368"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes"><b>Please select a server</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -296,16 +296,16 @@ to the Jabber network.</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox2997"> + <object class="GtkHBox" id="hbox2997"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label369"> + <object class="GtkLabel" id="label369"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Server:</property> <property name="use_underline">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -313,14 +313,14 @@ to the Jabber network.</property> </packing> </child> <child> - <widget class="GtkComboBoxEntry" id="server_comboboxentry1"> + <object class="GtkComboBoxEntry" id="server_comboboxentry1"> <property name="visible">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> @@ -328,25 +328,25 @@ to the Jabber network.</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="anonymous_checkbutton2"> + <object class="GtkCheckButton" id="anonymous_checkbutton2"> <property name="label" translatable="yes">Anon_ymous authentication</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">2</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="table32"> + <object class="GtkTable" id="table32"> <property name="visible">True</property> <property name="border_width">5</property> <property name="n_rows">3</property> @@ -354,22 +354,28 @@ to the Jabber network.</property> <property name="column_spacing">5</property> <property name="row_spacing">5</property> <child> - <widget class="GtkLabel" id="label381"> + <object class="GtkLabel" id="label381"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Prox_y:</property> <property name="use_underline">True</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkComboBox" id="proxies_combobox"> + <object class="GtkComboBox" id="proxies_combobox"> <property name="visible">True</property> - <property name="items">None</property> - </widget> + <property name="model">liststore1</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext1"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -377,14 +383,14 @@ to the Jabber network.</property> </packing> </child> <child> - <widget class="GtkButton" id="manage_proxies_button"> + <object class="GtkButton" id="manage_proxies_button"> <property name="label" translatable="yes">Manage...</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> <signal name="clicked" handler="on_manage_proxies_button_clicked"/> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> @@ -393,7 +399,7 @@ to the Jabber network.</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="custom_host_port_checkbutton"> + <object class="GtkCheckButton" id="custom_host_port_checkbutton"> <property name="label" translatable="yes">Use custom hostname/port</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -401,7 +407,7 @@ to the Jabber network.</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_custom_host_port_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="right_attach">3</property> <property name="top_attach">1</property> @@ -410,18 +416,18 @@ to the Jabber network.</property> </packing> </child> <child> - <widget class="GtkHBox" id="custom_host_hbox"> + <object class="GtkHBox" id="custom_host_hbox"> <property name="visible">True</property> <property name="sensitive">False</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label380"> + <object class="GtkLabel" id="label380"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Hostname:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">custom_host_entry</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -429,22 +435,22 @@ to the Jabber network.</property> </packing> </child> <child> - <widget class="GtkEntry" id="custom_host_entry"> + <object class="GtkEntry" id="custom_host_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkLabel" id="label379"> + <object class="GtkLabel" id="label379"> <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">custom_port_entry</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -452,18 +458,18 @@ to the Jabber network.</property> </packing> </child> <child> - <widget class="GtkEntry" id="custom_port_entry"> + <object class="GtkEntry" id="custom_port_entry"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="width_chars">6</property> <property name="text">5222</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">3</property> </packing> </child> - </widget> + </object> <packing> <property name="right_attach">3</property> <property name="top_attach">2</property> @@ -472,74 +478,71 @@ to the Jabber network.</property> <property name="y_options">GTK_FILL</property> </packing> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label378"> + <child type="label"> + <object class="GtkLabel" id="label378"> <property name="visible">True</property> <property name="label" translatable="yes">_Advanced</property> <property name="use_underline">True</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> + </object> </child> - </widget> + </object> <packing> <property name="position">3</property> </packing> </child> - </widget> + </object> <packing> <property name="position">2</property> </packing> </child> - <child> - <widget class="GtkLabel" id="label367"> + <child type="tab"> + <object class="GtkLabel" id="label367"> <property name="visible">True</property> - </widget> + </object> <packing> <property name="position">2</property> <property name="tab_fill">False</property> - <property name="type">tab</property> </packing> </child> <child> - <widget class="GtkVBox" id="ssl_vbox"> + <object class="GtkVBox" id="ssl_vbox"> <property name="visible">True</property> + <property name="orientation">vertical</property> <child> - <widget class="GtkHBox" id="hbox1"> + <object class="GtkHBox" id="hbox1"> <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> <child> - <widget class="GtkImage" id="image1"> + <object class="GtkImage" id="image1"> <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="stock">gtk-dialog-warning</property> <property name="icon-size">5</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkLabel" id="ssl_label"> + <object class="GtkLabel" id="ssl_label"> <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> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="fill">False</property> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="ssl_checkbutton"> + <object class="GtkCheckButton" id="ssl_checkbutton"> <property name="label" translatable="yes">Add this certificate to the list of trusted certificates. SHA1 fingerprint of the certificate: </property> @@ -548,103 +551,103 @@ SHA1 fingerprint of the certificate: <property name="receives_default">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="draw_indicator">True</property> - </widget> + </object> <packing> <property name="fill">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="position">3</property> </packing> </child> - <child> - <widget class="GtkLabel" id="label482"> + <child type="tab"> + <object class="GtkLabel" id="label482"> <property name="visible">True</property> - </widget> + </object> <packing> <property name="position">3</property> <property name="tab_fill">False</property> - <property name="type">tab</property> </packing> </child> <child> - <widget class="GtkVBox" id="form_vbox"> + <object class="GtkVBox" id="form_vbox"> <property name="visible">True</property> + <property name="orientation">vertical</property> <child> <placeholder/> </child> - </widget> + </object> <packing> <property name="position">4</property> </packing> </child> - <child> - <widget class="GtkLabel" id="label382"> + <child type="tab"> + <object class="GtkLabel" id="label382"> <property name="visible">True</property> - </widget> + </object> <packing> <property name="position">4</property> <property name="tab_fill">False</property> - <property name="type">tab</property> </packing> </child> <child> - <widget class="GtkVBox" id="vbox104"> + <object class="GtkVBox" id="vbox104"> <property name="visible">True</property> + <property name="orientation">vertical</property> <child> - <widget class="GtkLabel" id="progressbar_label"> + <object class="GtkLabel" id="progressbar_label"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Connecting to server</b> Please wait...</property> <property name="use_markup">True</property> <property name="justify">center</property> - </widget> + </object> <packing> <property name="fill">False</property> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkProgressBar" id="progressbar"> + <object class="GtkProgressBar" id="progressbar"> <property name="visible">True</property> <property name="pulse_step">0.10000000149</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="position">5</property> </packing> </child> - <child> - <widget class="GtkLabel" id="label365"> + <child type="tab"> + <object class="GtkLabel" id="label365"> <property name="visible">True</property> - </widget> + </object> <packing> <property name="position">5</property> <property name="tab_fill">False</property> - <property name="type">tab</property> </packing> </child> <child> - <widget class="GtkVBox" id="vbox103"> + <object class="GtkVBox" id="vbox103"> <property name="visible">True</property> + <property name="orientation">vertical</property> <child> - <widget class="GtkHBox" id="hbox2986"> + <object class="GtkHBox" id="hbox2986"> <property name="visible">True</property> <property name="spacing">12</property> <child> - <widget class="GtkImage" id="finish_image"> + <object class="GtkImage" id="finish_image"> <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> @@ -652,23 +655,23 @@ Please wait...</property> </packing> </child> <child> - <widget class="GtkLabel" id="finish_label"> + <object class="GtkLabel" id="finish_label"> <property name="visible">True</property> <property name="xalign">0.10000000149011612</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="position">0</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="go_online_checkbutton"> + <object class="GtkCheckButton" id="go_online_checkbutton"> <property name="label" translatable="yes">Connect when I press Finish</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -676,7 +679,7 @@ Please wait...</property> <property name="use_underline">True</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> @@ -684,7 +687,7 @@ Please wait...</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="show_vcard_checkbutton"> + <object class="GtkCheckButton" id="show_vcard_checkbutton"> <property name="label" translatable="yes">Set my profile when I connect</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -692,40 +695,39 @@ Please wait...</property> <property name="use_underline">True</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> <packing> <property name="position">6</property> </packing> </child> - <child> - <widget class="GtkLabel" id="label286"> + <child type="tab"> + <object class="GtkLabel" id="label286"> <property name="visible">True</property> - </widget> + </object> <packing> <property name="position">6</property> <property name="tab_fill">False</property> - <property name="type">tab</property> </packing> </child> - </widget> + </object> <packing> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkHButtonBox" id="hbuttonbox19"> + <object class="GtkHButtonBox" id="hbuttonbox19"> <property name="visible">True</property> <property name="spacing">12</property> <property name="layout_style">end</property> <child> - <widget class="GtkButton" id="cancel_button"> + <object class="GtkButton" id="cancel_button"> <property name="label">gtk-cancel</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -733,7 +735,7 @@ Please wait...</property> <property name="receives_default">False</property> <property name="use_stock">True</property> <signal name="clicked" handler="on_cancel_button_clicked"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -741,7 +743,7 @@ Please wait...</property> </packing> </child> <child> - <widget class="GtkButton" id="back_button"> + <object class="GtkButton" id="back_button"> <property name="label">gtk-go-back</property> <property name="visible">True</property> <property name="sensitive">False</property> @@ -750,7 +752,7 @@ Please wait...</property> <property name="receives_default">False</property> <property name="use_stock">True</property> <signal name="clicked" handler="on_back_button_clicked"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -758,7 +760,7 @@ Please wait...</property> </packing> </child> <child> - <widget class="GtkButton" id="forward_button"> + <object class="GtkButton" id="forward_button"> <property name="label">gtk-go-forward</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -767,7 +769,7 @@ Please wait...</property> <property name="receives_default">False</property> <property name="use_stock">True</property> <signal name="clicked" handler="on_forward_button_clicked"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -775,26 +777,26 @@ Please wait...</property> </packing> </child> <child> - <widget class="GtkButton" id="advanced_button"> + <object class="GtkButton" id="advanced_button"> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> <property name="no_show_all">True</property> <signal name="clicked" handler="on_advanced_button_clicked"/> <child> - <widget class="GtkAlignment" id="alignment96"> + <object class="GtkAlignment" id="alignment96"> <property name="visible">True</property> <property name="xscale">0</property> <property name="yscale">0</property> <child> - <widget class="GtkHBox" id="hbox2996"> + <object class="GtkHBox" id="hbox2996"> <property name="visible">True</property> <property name="spacing">2</property> <child> - <widget class="GtkImage" id="image1265"> + <object class="GtkImage" id="image1265"> <property name="visible">True</property> <property name="stock">gtk-preferences</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -802,22 +804,22 @@ Please wait...</property> </packing> </child> <child> - <widget class="GtkLabel" id="label364"> + <object class="GtkLabel" id="label364"> <property name="visible">True</property> <property name="label" translatable="yes">_Advanced</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> @@ -825,26 +827,26 @@ Please wait...</property> </packing> </child> <child> - <widget class="GtkButton" id="finish_button"> + <object class="GtkButton" id="finish_button"> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> <property name="no_show_all">True</property> <signal name="clicked" handler="on_finish_button_clicked"/> <child> - <widget class="GtkAlignment" id="alignment87"> + <object class="GtkAlignment" id="alignment87"> <property name="visible">True</property> <property name="xscale">0</property> <property name="yscale">0</property> <child> - <widget class="GtkHBox" id="hbox2989"> + <object class="GtkHBox" id="hbox2989"> <property name="visible">True</property> <property name="spacing">2</property> <child> - <widget class="GtkImage" id="image1112"> + <object class="GtkImage" id="image1112"> <property name="visible">True</property> <property name="stock">gtk-apply</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -852,35 +854,46 @@ Please wait...</property> </packing> </child> <child> - <widget class="GtkLabel" id="label352"> + <object class="GtkLabel" id="label352"> <property name="visible">True</property> <property name="label" translatable="yes">_Finish</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> <property name="position">4</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> + <object class="GtkListStore" id="liststore1"> + <columns> + <!-- column-name item --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">None</col> + </row> + </data> + </object> +</interface> diff --git a/data/glade/accounts_window.glade b/data/gui/accounts_window.ui index bb5f3cb9a..96de16994 100644 --- a/data/glade/accounts_window.glade +++ b/data/gui/accounts_window.ui @@ -1,109 +1,123 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> -<!--Generated with glade3 3.4.5 on Tue Oct 6 11:00:58 2009 --> -<glade-interface> - <widget class="GtkWindow" id="accounts_window"> +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkListStore" id="liststore1"> + <columns> + <!-- column-name item text --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">None</col> + </row> + </data> + </object> + <object class="GtkWindow" id="accounts_window"> <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">12</property> <property name="title" translatable="yes">Accounts</property> <property name="default_width">800</property> - <signal name="key_press_event" handler="on_accounts_window_key_press_event"/> <signal name="destroy" handler="on_accounts_window_destroy"/> + <signal name="key_press_event" handler="on_accounts_window_key_press_event"/> <child> - <widget class="GtkVBox" id="vbox1"> + <object class="GtkVBox" id="vbox1"> <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="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkHPaned" id="hpaned1"> + <object class="GtkHPaned" id="hpaned1"> <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="position">175</property> <child> - <widget class="GtkVBox" id="vbox2"> + <object class="GtkVBox" id="vbox2"> <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="orientation">vertical</property> <property name="spacing">6</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> - <property name="shadow_type">GTK_SHADOW_IN</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> <child> - <widget class="GtkTreeView" id="accounts_treeview"> + <object class="GtkTreeView" id="accounts_treeview"> <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="headers_visible">False</property> <signal name="cursor_changed" handler="on_accounts_treeview_cursor_changed"/> - </widget> + </object> </child> - </widget> + </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkButton" id="add_button"> + <object class="GtkButton" id="add_button"> + <property name="label">gtk-add</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">gtk-add</property> <property name="use_stock">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_add_button_clicked"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkButton" id="remove_button"> + <object class="GtkButton" id="remove_button"> + <property name="label">gtk-remove</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">gtk-remove</property> <property name="use_stock">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_remove_button_clicked"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">2</property> </packing> </child> <child> - <widget class="GtkButton" id="rename_button"> + <object class="GtkButton" id="rename_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="response_id">0</property> <signal name="clicked" handler="on_rename_button_clicked"/> <child> - <widget class="GtkHBox" id="hbox8"> + <object class="GtkHBox" id="hbox8"> <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="spacing">6</property> <child> - <widget class="GtkLabel" id="label26"> + <object class="GtkLabel" id="label26"> <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> - </widget> + </object> <packing> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkImage" id="rename_image"> + <object class="GtkImage" id="rename_image"> <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="stock">gtk-missing-image</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -111,83 +125,82 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label25"> + <object class="GtkLabel" id="label25"> <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="label" translatable="yes">Re_name</property> <property name="use_underline">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">2</property> </packing> </child> <child> - <widget class="GtkLabel" id="label27"> + <object class="GtkLabel" id="label27"> <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> - </widget> + </object> <packing> <property name="position">3</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">3</property> </packing> </child> - </widget> + </object> <packing> <property name="resize">False</property> <property name="shrink">True</property> </packing> </child> <child> - <widget class="GtkNotebook" id="notebook"> + <object class="GtkNotebook" id="notebook"> <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="show_tabs">False</property> <property name="show_border">False</property> <child> - <widget class="GtkLabel" id="label1"> + <object class="GtkLabel" id="label1"> <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> - </widget> + </object> </child> - <child> + <child type="tab"> <placeholder/> - <packing> - <property name="type">tab</property> - </packing> </child> <child> - <widget class="GtkVBox" id="vbox3"> + <object class="GtkVBox" id="vbox3"> <property name="visible">True</property> + <property name="orientation">vertical</property> <child> - <widget class="GtkCheckButton" id="enable_checkbutton1"> + <object class="GtkCheckButton" id="enable_checkbutton1"> + <property name="label" translatable="yes">_Enable</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Enable</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_enable_checkbutton1_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkNotebook" id="normal_notebook1"> + <object class="GtkNotebook" id="normal_notebook1"> <property name="visible">True</property> <property name="can_focus">True</property> <child> - <widget class="GtkTable" id="table1"> + <object class="GtkTable" id="table1"> <property name="visible">True</property> <property name="border_width">6</property> <property name="n_rows">5</property> @@ -195,14 +208,14 @@ <property name="column_spacing">6</property> <property name="row_spacing">6</property> <child> - <widget class="GtkCheckButton" id="anonymous_checkbutton1"> + <object class="GtkCheckButton" id="anonymous_checkbutton1"> + <property name="label" translatable="yes">Anonymous authentication</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Anonymous authentication</property> - <property name="response_id">0</property> + <property name="receives_default">False</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_anonymous_checkbutton1_toggled"/> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> @@ -211,13 +224,13 @@ </packing> </child> <child> - <widget class="GtkEntry" id="resource_entry1"> + <object class="GtkEntry" id="resource_entry1"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)</property> + <property name="tooltip_text" translatable="yes">Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)</property> <property name="text" translatable="yes">Gajim</property> <signal name="focus_out_event" handler="on_resource_entry1_focus_out_event"/> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">3</property> @@ -228,12 +241,12 @@ </packing> </child> <child> - <widget class="GtkEntry" id="jid_entry1"> + <object class="GtkEntry" id="jid_entry1"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="activates_default">True</property> <signal name="focus_out_event" handler="on_jid_entry1_focus_out_event"/> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -241,55 +254,53 @@ </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="GtkHBox" id="hbox1"> + <object class="GtkHBox" id="hbox1"> <property name="visible">True</property> <property name="spacing">11</property> <property name="homogeneous">True</property> <child> - <widget class="GtkButton" id="synchronise_contacts_button1"> + <object class="GtkButton" id="synchronise_contacts_button1"> + <property name="label" translatable="yes">Synchronise contacts</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Click to request authorization to all contacts of another account</property> - <property name="label" translatable="yes">Synchronise contacts</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Click to request authorization to all contacts of another account</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_synchronise_contacts_button1_clicked"/> - </widget> + </object> <packing> <property name="expand">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkButton" id="change_password_button1"> + <object class="GtkButton" id="change_password_button1"> + <property name="label" translatable="yes">Chan_ge Password</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Click to change account's password</property> - <property name="label" translatable="yes">Chan_ge Password</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Click to change account's password</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_change_password_button1_clicked"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label6"> + <child type="label"> + <object class="GtkLabel" id="label6"> <property name="visible">True</property> <property name="label" translatable="yes">Administration operations</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> + </object> </child> - </widget> + </object> <packing> <property name="right_attach">3</property> <property name="top_attach">4</property> @@ -299,15 +310,15 @@ </packing> </child> <child> - <widget class="GtkSpinButton" id="priority_spinbutton1"> + <object class="GtkSpinButton" id="priority_spinbutton1"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Priority is used in Jabber to determine who gets the events from the jabber server when two or more clients are connected using the same account; The client with the highest priority gets the events</property> - <property name="adjustment">5 0 127 1 5 0</property> + <property name="tooltip_text" translatable="yes">Priority is used in Jabber to determine who gets the events from the jabber server when two or more clients are connected using the same account; The client with the highest priority gets the events</property> + <property name="adjustment">adjustment1</property> <property name="climb_rate">1</property> <property name="numeric">True</property> <signal name="value_changed" handler="on_priority_spinbutton1_value_changed"/> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> @@ -318,16 +329,16 @@ </packing> </child> <child> - <widget class="GtkCheckButton" id="adjust_priority_with_status_checkbutton1"> + <object class="GtkCheckButton" id="adjust_priority_with_status_checkbutton1"> + <property name="label" translatable="yes">A_djust to status</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Priority will change automatically according to your status.</property> - <property name="label" translatable="yes">A_djust to status</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Priority will change automatically according to your status.</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_adjust_priority_with_status_checkbutton1_toggled"/> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -338,13 +349,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label5"> + <object class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Priori_ty:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">priority_spinbutton1</property> - </widget> + </object> <packing> <property name="top_attach">3</property> <property name="bottom_attach">4</property> @@ -353,13 +364,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label4"> + <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Resour_ce:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">resource_entry1</property> - </widget> + </object> <packing> <property name="top_attach">2</property> <property name="bottom_attach">3</property> @@ -368,17 +379,17 @@ </packing> </child> <child> - <widget class="GtkCheckButton" id="save_password_checkbutton1"> + <object class="GtkCheckButton" id="save_password_checkbutton1"> + <property name="label" translatable="yes">Save pass_word</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">If checked, Gajim will remember the password for this account</property> - <property name="label" translatable="yes">Save pass_word</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">If checked, Gajim will remember the password for this account</property> <property name="use_underline">True</property> <property name="focus_on_click">False</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_save_password_checkbutton1_toggled"/> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> @@ -389,14 +400,14 @@ </packing> </child> <child> - <widget class="GtkEntry" id="password_entry1"> + <object class="GtkEntry" id="password_entry1"> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="visibility">False</property> <property name="activates_default">True</property> <signal name="changed" handler="on_password_entry1_changed"/> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -407,13 +418,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label3"> + <object class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Password:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">password_entry1</property> - </widget> + </object> <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> @@ -422,61 +433,62 @@ </packing> </child> <child> - <widget class="GtkLabel" id="jid_label1"> + <object class="GtkLabel" id="jid_label1"> <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">jid_entry1</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label7"> + <child type="tab"> + <object class="GtkLabel" id="label7"> <property name="visible">True</property> <property name="label" translatable="yes">Account</property> - </widget> + </object> <packing> - <property name="type">tab</property> <property name="tab_fill">False</property> </packing> </child> <child> - <widget class="GtkVBox" id="vbox6"> + <object class="GtkVBox" id="vbox6"> <property name="visible">True</property> <property name="border_width">6</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkCheckButton" id="autoconnect_checkbutton1"> + <object class="GtkCheckButton" id="autoconnect_checkbutton1"> + <property name="label" translatable="yes">C_onnect on Gajim startup</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">If checked, Gajim, when launched, will automatically connect to jabber using this account</property> - <property name="label" translatable="yes">C_onnect on Gajim startup</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">If checked, Gajim, when launched, will automatically connect to jabber using this account</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_autoconnect_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="autoreconnect_checkbutton1"> + <object class="GtkCheckButton" id="autoreconnect_checkbutton1"> + <property name="label" translatable="yes">Auto-reconnect when connection is lost</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Auto-reconnect when connection is lost</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_autoreconnect_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -484,16 +496,16 @@ </packing> </child> <child> - <widget class="GtkCheckButton" id="log_history_checkbutton1"> + <object class="GtkCheckButton" id="log_history_checkbutton1"> + <property name="label" translatable="yes">Save conversation _logs for all contacts</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Save conversation _logs for all contacts</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="active">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_log_history_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -501,16 +513,16 @@ </packing> </child> <child> - <widget class="GtkCheckButton" id="sync_with_global_status_checkbutton1"> + <object class="GtkCheckButton" id="sync_with_global_status_checkbutton1"> + <property name="label" translatable="yes">Synch_ronize account status with global status</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly</property> - <property name="label" translatable="yes">Synch_ronize account status with global status</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_sync_with_global_status_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -518,167 +530,180 @@ </packing> </child> <child> - <widget class="GtkCheckButton" id="use_ft_proxies_checkbutton1"> + <object class="GtkCheckButton" id="use_ft_proxies_checkbutton1"> + <property name="label" translatable="yes">Use file transfer proxies</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">If checked, Gajim will also broadcast some more IPs except from just your IP, so file transfer has higher chances of working.</property> - <property name="label" translatable="yes">Use file transfer proxies</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">If checked, Gajim will also broadcast some more IPs except from just your IP, so file transfer has higher chances of working.</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_use_ft_proxies_checkbutton1_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">4</property> </packing> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - <child> - <widget class="GtkLabel" id="label8"> + <child type="tab"> + <object class="GtkLabel" id="label8"> <property name="visible">True</property> <property name="label" translatable="yes">General</property> <property name="use_markup">True</property> - </widget> + </object> <packing> - <property name="type">tab</property> <property name="position">1</property> <property name="tab_fill">False</property> </packing> </child> <child> - <widget class="GtkVBox" id="vbox7"> + <object class="GtkVBox" id="vbox7"> <property name="visible">True</property> <property name="border_width">6</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <widget class="GtkFrame" id="frame3"> + <object class="GtkFrame" id="frame3"> <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="label_xalign">0</property> - <property name="shadow_type">GTK_SHADOW_NONE</property> + <property name="shadow_type">none</property> <child> - <widget class="GtkAlignment" id="alignment4"> + <object class="GtkAlignment" id="alignment4"> <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="left_padding">12</property> <child> - <widget class="GtkVBox" id="vbox11"> + <object class="GtkVBox" id="vbox11"> <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="border_width">6</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkCheckButton" id="use_env_http_proxy_checkbutton1"> + <object class="GtkCheckButton" id="use_env_http_proxy_checkbutton1"> + <property name="label" translatable="yes">_use HTTP__PROXY environment variable</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">_use HTTP__PROXY environment variable</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_use_env_http_proxy_checkbutton1_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkHBox" id="proxy_hbox1"> + <object class="GtkHBox" id="proxy_hbox1"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkComboBox" id="proxies_combobox1"> + <object class="GtkComboBox" id="proxies_combobox1"> <property name="visible">True</property> - <property name="items" translatable="yes" comments="None means no proxy profile selected">None</property> + <property name="model">liststore1</property> <signal name="changed" handler="on_proxies_combobox1_changed"/> - </widget> + <child> + <object class="GtkCellRendererText" id="cellrenderertext1"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkButton" id="manage_proxies_button1"> + <object class="GtkButton" id="manage_proxies_button1"> + <property name="label" translatable="yes">_Manage...</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Manage...</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_manage_proxies_button1_clicked"/> - </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">1</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label9"> + <child type="label"> + <object class="GtkLabel" id="label9"> <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="label" translatable="yes"><b>Proxy</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">0</property> + </packing> </child> <child> - <widget class="GtkFrame" id="misc_frame1"> + <object class="GtkFrame" id="misc_frame1"> <property name="visible">True</property> <property name="label_xalign">0</property> - <property name="shadow_type">GTK_SHADOW_NONE</property> + <property name="shadow_type">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="GtkVBox" id="vbox7"> + <object class="GtkVBox" id="vbox4"> <property name="visible">True</property> <property name="border_width">6</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkCheckButton" id="warn_when_insecure_connection_checkbutton1"> + <object class="GtkCheckButton" id="warn_when_insecure_connection_checkbutton1"> + <property name="label" translatable="yes">_Warn before using an insecure connection</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Check this so Gajim will ask you before sending your password over an insecure connection.</property> - <property name="label" translatable="yes">_Warn before using an insecure connection</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Check this so Gajim will ask you before sending your password over an insecure connection.</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_warn_when_insecure_connection_checkbutton1_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="send_keepalive_checkbutton1"> + <object class="GtkCheckButton" id="send_keepalive_checkbutton1"> + <property name="label" translatable="yes">Send _keep-alive packets</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection</property> - <property name="label" translatable="yes">Send _keep-alive packets</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="active">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_send_keepalive_checkbutton1_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -686,15 +711,15 @@ </packing> </child> <child> - <widget class="GtkCheckButton" id="custom_host_port_checkbutton1"> + <object class="GtkCheckButton" id="custom_host_port_checkbutton1"> + <property name="label" translatable="yes">Use cust_om hostname/port</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Use cust_om hostname/port</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_custom_host_port_checkbutton1_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -702,37 +727,38 @@ </packing> </child> <child> - <widget class="GtkHBox" id="custom_host_port_hbox1"> + <object class="GtkHBox" id="custom_host_port_hbox1"> <property name="visible">True</property> <property name="sensitive">False</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label10"> + <object class="GtkLabel" id="label10"> <property name="visible">True</property> <property name="label" translatable="yes">_Hostname: </property> <property name="use_underline">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkEntry" id="custom_host_entry1"> + <object class="GtkEntry" id="custom_host_entry1"> <property name="visible">True</property> <property name="can_focus">True</property> <signal name="changed" handler="on_custom_host_entry1_changed"/> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkLabel" id="label18"> + <object class="GtkLabel" id="label18"> <property name="visible">True</property> <property name="label" translatable="yes">_Port: </property> <property name="use_underline">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -740,287 +766,282 @@ </packing> </child> <child> - <widget class="GtkEntry" id="custom_port_entry1"> + <object class="GtkEntry" id="custom_port_entry1"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="width_chars">6</property> <property name="text">5222</property> <signal name="focus_out_event" handler="on_custom_port_entry_focus_out_event"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">3</property> </packing> </child> - </widget> + </object> <packing> <property name="position">3</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label19"> + <child type="label"> + <object class="GtkLabel" id="label19"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Miscellaneous</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> - </widget> + </object> <packing> <property name="position">2</property> </packing> </child> - <child> - <widget class="GtkLabel" id="label20"> + <child type="tab"> + <object class="GtkLabel" id="label20"> <property name="visible">True</property> <property name="label" translatable="yes">Connection</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="vbox8"> + <object class="GtkVBox" id="vbox8"> <property name="visible">True</property> <property name="border_width">5</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <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> + <property name="shadow_type">none</property> <child> - <widget class="GtkAlignment" id="alignment2"> + <object class="GtkAlignment" id="alignment2"> <property name="visible">True</property> <property name="left_padding">12</property> <child> - <widget class="GtkVBox" id="vbox9"> + <object class="GtkVBox" id="vbox9"> <property name="visible">True</property> <property name="border_width">6</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkHBox" id="hbox3"> + <object class="GtkHBox" id="hbox3"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="gpg_key_label1"> + <object class="GtkLabel" id="gpg_key_label1"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="label" translatable="yes">No key selected</property> <property name="selectable">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkLabel" id="gpg_name_label1"> + <object class="GtkLabel" id="gpg_name_label1"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="selectable">True</property> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkButton" id="gpg_choose_button1"> + <object class="GtkButton" id="gpg_choose_button1"> + <property name="label" translatable="yes">Choose _Key...</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Choose _Key...</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_gpg_choose_button_clicked"/> - </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="position">0</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="use_gpg_agent_checkbutton1"> + <object class="GtkCheckButton" id="use_gpg_agent_checkbutton1"> + <property name="label" translatable="yes">Use G_PG Agent</property> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">If checked, Gajim will get the password from a GPG agent like seahorse</property> - <property name="label" translatable="yes">Use G_PG Agent</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">If checked, Gajim will get the password from a GPG agent like seahorse</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_use_gpg_agent_checkbutton_toggled"/> - </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="label21"> + <child type="label"> + <object class="GtkLabel" id="label21"> <property name="visible">True</property> <property name="label" translatable="yes"><b>OpenPGP</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">0</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> + <property name="shadow_type">none</property> <child> - <widget class="GtkAlignment" id="alignment3"> + <object class="GtkAlignment" id="alignment3"> <property name="visible">True</property> <property name="border_width">6</property> <property name="left_padding">12</property> <child> - <widget class="GtkButton" id="edit_details_button1"> + <object class="GtkButton" id="edit_details_button1"> + <property name="label" translatable="yes">_Edit Personal Information...</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Information about you, as stored in the server</property> - <property name="label" translatable="yes">_Edit Personal Information...</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Information about you, as stored in the server</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_edit_details_button1_clicked"/> - </widget> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label22"> + <child type="label"> + <object class="GtkLabel" id="label22"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Personal Information</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> - </widget> + </object> <packing> <property name="position">3</property> </packing> </child> - <child> - <widget class="GtkLabel" id="label23"> + <child type="tab"> + <object class="GtkLabel" id="label23"> <property name="visible">True</property> <property name="label" translatable="yes">Personal Information</property> - </widget> + </object> <packing> - <property name="type">tab</property> <property name="position">3</property> <property name="tab_fill">False</property> </packing> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - <child> + <child type="tab"> <placeholder/> - <packing> - <property name="type">tab</property> - </packing> </child> <child> - <widget class="GtkVBox" id="vbox4"> + <object class="GtkVBox" id="vbox5"> <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="orientation">vertical</property> <property name="spacing">1</property> <child> - <widget class="GtkCheckButton" id="enable_zeroconf_checkbutton2"> + <object class="GtkCheckButton" id="enable_zeroconf_checkbutton2"> + <property name="label" translatable="yes">_Enable</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">_Enable</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_enable_zeroconf_checkbutton2_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkNotebook" id="zeroconf_notebook"> + <object class="GtkNotebook" id="zeroconf_notebook"> <property name="visible">True</property> <property name="can_focus">True</property> <child> - <widget class="GtkVBox" id="vbox5"> + <object class="GtkVBox" id="vbox10"> <property name="visible">True</property> <property name="border_width">6</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkCheckButton" id="autoconnect_checkbutton2"> + <object class="GtkCheckButton" id="autoconnect_checkbutton2"> + <property name="label" translatable="yes">Co_nnect on Gajim startup</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">If checked, Gajim, when launched, will automatically connect to jabber using this account</property> - <property name="label" translatable="yes">Co_nnect on Gajim startup</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">If checked, Gajim, when launched, will automatically connect to jabber using this account</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_autoconnect_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="log_history_checkbutton2"> + <object class="GtkCheckButton" id="log_history_checkbutton2"> + <property name="label" translatable="yes">Save conversation _logs for all contacts</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Save conversation _logs for all contacts</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_log_history_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -1028,16 +1049,16 @@ </packing> </child> <child> - <widget class="GtkCheckButton" id="sync_with_global_status_checkbutton2"> + <object class="GtkCheckButton" id="sync_with_global_status_checkbutton2"> + <property name="label" translatable="yes">Synchroni_ze account status with global status</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly</property> - <property name="label" translatable="yes">Synchroni_ze account status with global status</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_sync_with_global_status_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -1045,60 +1066,60 @@ </packing> </child> <child> - <widget class="GtkHBox" id="hbox5"> + <object class="GtkHBox" id="hbox5"> <property name="visible">True</property> <child> - <widget class="GtkCheckButton" id="custom_port_checkbutton2"> + <object class="GtkCheckButton" id="custom_port_checkbutton2"> + <property name="label" translatable="yes">Use cust_om port:</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">If the default port that is used for incoming messages is unfitting for your setup you can select another one here. + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">If the default port that is used for incoming messages is unfitting for your setup you can select another one here. You might consider to change possible firewall settings.</property> - <property name="label" translatable="yes">Use cust_om port:</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_custom_port_checkbutton2_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkEntry" id="custom_port_entry2"> + <object class="GtkEntry" id="custom_port_entry2"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="width_chars">6</property> <signal name="focus_out_event" handler="on_custom_port_entry_focus_out_event"/> - </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="padding">10</property> <property name="position">3</property> </packing> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label11"> + <child type="tab"> + <object class="GtkLabel" id="label11"> <property name="visible">True</property> <property name="label" translatable="yes">General</property> <property name="use_markup">True</property> - </widget> + </object> <packing> - <property name="type">tab</property> <property name="tab_fill">False</property> </packing> </child> <child> - <widget class="GtkTable" id="table2"> + <object class="GtkTable" id="table2"> <property name="visible">True</property> <property name="border_width">6</property> <property name="n_rows">6</property> @@ -1106,93 +1127,96 @@ You might consider to change possible firewall settings.</property> <property name="column_spacing">2</property> <property name="row_spacing">5</property> <child> - <widget class="GtkVBox" id="vbox10"> + <object class="GtkVBox" id="vbox12"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">5</property> <child> - <widget class="GtkLabel" id="label17"> + <object class="GtkLabel" id="label17"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes"><b>OpenPGP</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox6"> + <object class="GtkHBox" id="hbox6"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="gpg_key_label2"> + <object class="GtkLabel" id="gpg_key_label2"> <property name="visible">True</property> <property name="label" translatable="yes">No key selected</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkLabel" id="gpg_name_label2"> + <object class="GtkLabel" id="gpg_name_label2"> <property name="visible">True</property> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkButton" id="gpg_choose_button2"> + <object class="GtkButton" id="gpg_choose_button2"> + <property name="label" translatable="yes">Choose _Key...</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Choose _Key...</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_gpg_choose_button_clicked"/> - </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> <child> - <widget class="GtkCheckButton" id="use_gpg_agent_checkbutton2"> + <object class="GtkCheckButton" id="use_gpg_agent_checkbutton2"> + <property name="label" translatable="yes">Use G_PG Agent</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">If checked, Gajim will get the password from a GPG agent like seahorse</property> - <property name="label" translatable="yes">Use G_PG Agent</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">If checked, Gajim will get the password from a GPG agent like seahorse</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_use_gpg_agent_checkbutton_toggled"/> - </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="right_attach">2</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="label16"> + <object class="GtkLabel" id="label16"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes"><b>Personal Information</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="right_attach">2</property> <property name="top_attach">1</property> @@ -1202,11 +1226,11 @@ You might consider to change possible firewall settings.</property> </packing> </child> <child> - <widget class="GtkEntry" id="first_name_entry2"> + <object class="GtkEntry" id="first_name_entry2"> <property name="visible">True</property> <property name="can_focus">True</property> <signal name="changed" handler="on_first_name_entry2_changed"/> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -1216,10 +1240,10 @@ You might consider to change possible firewall settings.</property> </packing> </child> <child> - <widget class="GtkLabel" id="label15"> + <object class="GtkLabel" id="label15"> <property name="visible">True</property> <property name="label" translatable="yes">First Name:</property> - </widget> + </object> <packing> <property name="top_attach">2</property> <property name="bottom_attach">3</property> @@ -1228,11 +1252,11 @@ You might consider to change possible firewall settings.</property> </packing> </child> <child> - <widget class="GtkEntry" id="last_name_entry2"> + <object class="GtkEntry" id="last_name_entry2"> <property name="visible">True</property> <property name="can_focus">True</property> <signal name="changed" handler="on_last_name_entry2_changed"/> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -1242,10 +1266,10 @@ You might consider to change possible firewall settings.</property> </packing> </child> <child> - <widget class="GtkLabel" id="label14"> + <object class="GtkLabel" id="label14"> <property name="visible">True</property> <property name="label" translatable="yes">Last Name:</property> - </widget> + </object> <packing> <property name="top_attach">3</property> <property name="bottom_attach">4</property> @@ -1254,11 +1278,11 @@ You might consider to change possible firewall settings.</property> </packing> </child> <child> - <widget class="GtkEntry" id="email_entry2"> + <object class="GtkEntry" id="email_entry2"> <property name="visible">True</property> <property name="can_focus">True</property> <signal name="changed" handler="on_email_entry2_changed"/> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -1268,10 +1292,10 @@ You might consider to change possible firewall settings.</property> </packing> </child> <child> - <widget class="GtkLabel" id="label13"> + <object class="GtkLabel" id="label13"> <property name="visible">True</property> <property name="label" translatable="yes">E-Mail:</property> - </widget> + </object> <packing> <property name="top_attach">5</property> <property name="bottom_attach">6</property> @@ -1280,10 +1304,10 @@ You might consider to change possible firewall settings.</property> </packing> </child> <child> - <widget class="GtkLabel" id="label12"> + <object class="GtkLabel" id="label12"> <property name="visible">True</property> <property name="label" translatable="yes">Jabber ID:</property> - </widget> + </object> <packing> <property name="top_attach">4</property> <property name="bottom_attach">5</property> @@ -1292,11 +1316,11 @@ You might consider to change possible firewall settings.</property> </packing> </child> <child> - <widget class="GtkEntry" id="jabber_id_entry2"> + <object class="GtkEntry" id="jabber_id_entry2"> <property name="visible">True</property> <property name="can_focus">True</property> <signal name="changed" handler="on_jabber_id_entry2_changed"/> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -1305,90 +1329,95 @@ You might consider to change possible firewall settings.</property> <property name="y_options"></property> </packing> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - <child> - <widget class="GtkLabel" id="label24"> + <child type="tab"> + <object class="GtkLabel" id="label24"> <property name="visible">True</property> <property name="label" translatable="yes">Personal Information</property> - </widget> + </object> <packing> - <property name="type">tab</property> <property name="position">1</property> <property name="tab_fill">False</property> </packing> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="position">2</property> </packing> </child> - <child> + <child type="tab"> <placeholder/> - <packing> - <property name="type">tab</property> - </packing> </child> - </widget> + </object> <packing> <property name="resize">True</property> <property name="shrink">True</property> </packing> </child> - </widget> + </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkCheckButton" id="merge_checkbutton"> + <object class="GtkCheckButton" id="merge_checkbutton"> + <property name="label" translatable="yes">Mer_ge accounts</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Mer_ge accounts</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="position">1</property> </packing> </child> <child> - <widget class="GtkHButtonBox" id="hbuttonbox1"> + <object class="GtkHButtonBox" id="hbuttonbox1"> <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="spacing">6</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> + <property name="layout_style">end</property> <child> - <widget class="GtkButton" id="close_button"> + <object class="GtkButton" id="close_button"> + <property name="label">gtk-close</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">gtk-close</property> <property name="use_stock">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_close_button_clicked"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</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> + <object class="GtkAdjustment" id="adjustment1"> + <property name="value">5</property> + <property name="upper">127</property> + <property name="step_increment">1</property> + <property name="page_increment">5</property> + </object> +</interface> diff --git a/data/glade/add_new_contact_window.glade b/data/gui/add_new_contact_window.ui index fabacacc6..f8a05a8f1 100644 --- a/data/glade/add_new_contact_window.glade +++ b/data/gui/add_new_contact_window.ui @@ -1,47 +1,56 @@ -<?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="add_new_contact_window"> +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkWindow" id="add_new_contact_window"> <property name="border_width">6</property> <property name="title" translatable="yes">Add New Contact</property> <property name="resizable">False</property> - <signal name="key_press_event" handler="on_add_new_contact_window_key_press_event"/> <signal name="destroy" handler="on_add_new_contact_window_destroy"/> + <signal name="key_press_event" handler="on_add_new_contact_window_key_press_event"/> <child> - <widget class="GtkVBox" id="vbox8"> + <object class="GtkVBox" id="vbox8"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="prompt_label"> + <object class="GtkLabel" id="prompt_label"> <property name="visible">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkHBox" id="account_hbox"> + <object class="GtkHBox" id="account_hbox"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="account_label"> + <object class="GtkLabel" id="account_label"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">A_ccount:</property> <property name="use_underline">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkComboBox" id="account_combobox"> + <object class="GtkComboBox" id="account_combobox"> <property name="visible">True</property> - <property name="items" translatable="yes"></property> - </widget> + <property name="model">liststore3</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext3"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -51,33 +60,34 @@ <child> <placeholder/> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkHBox" id="protocol_hbox"> + <object class="GtkHBox" id="protocol_hbox"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="protocol_label"> + <object class="GtkLabel" id="protocol_label"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Protocol:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">uid_entry</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkComboBox" id="protocol_combobox"> + <object class="GtkComboBox" id="protocol_combobox"> <property name="visible">True</property> <signal name="changed" handler="on_protocol_combobox_changed"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -85,22 +95,28 @@ </packing> </child> <child> - <widget class="GtkComboBox" id="protocol_jid_combobox"> + <object class="GtkComboBox" id="protocol_jid_combobox"> <property name="visible">True</property> <property name="no_show_all">True</property> - <property name="items" translatable="yes"></property> - </widget> + <property name="model">liststore2</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext2"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> <packing> <property name="position">2</property> </packing> </child> - </widget> + </object> <packing> <property name="position">2</property> </packing> </child> <child> - <widget class="GtkTable" id="subscription_table"> + <object class="GtkTable" id="subscription_table"> <property name="visible">True</property> <property name="no_show_all">True</property> <property name="border_width">6</property> @@ -109,25 +125,25 @@ <property name="column_spacing">6</property> <property name="row_spacing">6</property> <child> - <widget class="GtkLabel" id="uid_label"> + <object class="GtkLabel" id="uid_label"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">_User ID:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">uid_entry</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="uid_entry"> + <object class="GtkEntry" id="uid_entry"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="activates_default">True</property> <signal name="changed" handler="on_uid_entry_changed"/> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -135,13 +151,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label188"> + <object class="GtkLabel" id="label188"> <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">nickname_entry</property> - </widget> + </object> <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> @@ -150,11 +166,11 @@ </packing> </child> <child> - <widget class="GtkEntry" id="nickname_entry"> + <object class="GtkEntry" id="nickname_entry"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="activates_default">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -164,12 +180,12 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label223"> + <object class="GtkLabel" id="label223"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Group:</property> <property name="use_underline">True</property> - </widget> + </object> <packing> <property name="top_attach">2</property> <property name="bottom_attach">3</property> @@ -178,14 +194,16 @@ </packing> </child> <child> - <widget class="GtkComboBoxEntry" id="group_comboboxentry"> + <object class="GtkComboBoxEntry" id="group_comboboxentry"> <property name="visible">True</property> - <property name="items" translatable="yes"></property> - <child internal-child="entry"> - <widget class="GtkEntry" id="comboboxentry-entry1"> - </widget> + <property name="model">liststore1</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext1"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> </child> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -194,23 +212,23 @@ <property name="x_options">GTK_FILL</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">3</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="auto_authorize_checkbutton"> + <object class="GtkCheckButton" id="auto_authorize_checkbutton"> + <property name="label" translatable="yes">A_llow this contact to view my status</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="no_show_all">True</property> - <property name="label" translatable="yes">A_llow this contact to view my status</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> @@ -218,34 +236,34 @@ </packing> </child> <child> - <widget class="GtkScrolledWindow" id="message_scrolledwindow"> + <object class="GtkScrolledWindow" id="message_scrolledwindow"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="no_show_all">True</property> <property name="border_width">6</property> - <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">etched-in</property> <child> - <widget class="GtkTextView" id="message_textview"> + <object class="GtkTextView" id="message_textview"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="wrap_mode">GTK_WRAP_WORD</property> - <property name="text" translatable="yes">I would like to add you to my contact list.</property> - </widget> + <property name="wrap_mode">word</property> + <property name="buffer">textbuffer1</property> + </object> </child> - </widget> + </object> <packing> <property name="position">5</property> </packing> </child> <child> - <widget class="GtkHBox" id="register_hbox"> + <object class="GtkHBox" id="register_hbox"> <property name="visible">True</property> <property name="no_show_all">True</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label224"> + <object class="GtkLabel" id="label224"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">You have to register with this transport @@ -253,36 +271,39 @@ to be able to add a contact from this protocol. Click on register button to proceed.</property> <property name="wrap">True</property> - </widget> + </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkButton" id="register_button"> + <object class="GtkButton" id="register_button"> + <property name="label" translatable="yes">_Register</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> - <property name="label" translatable="yes">_Register</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_register_button_clicked"/> - </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="position">6</property> </packing> </child> <child> - <widget class="GtkLabel" id="connected_label"> + <object class="GtkLabel" id="connected_label"> <property name="visible">True</property> <property name="no_show_all">True</property> <property name="label" translatable="yes">You must be connected to the transport to be able to add a contact from this protocol.</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -290,45 +311,73 @@ to add a contact from this protocol.</property> </packing> </child> <child> - <widget class="GtkHButtonBox" id="hbuttonbox1"> + <object class="GtkHButtonBox" id="hbuttonbox1"> <property name="visible">True</property> <property name="border_width">5</property> <property name="spacing">12</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> + <property name="layout_style">end</property> <child> - <widget class="GtkButton" id="cancel_button"> + <object class="GtkButton" id="cancel_button"> + <property name="label">gtk-cancel</property> <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="receives_default">False</property> <property name="use_stock">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_cancel_button_clicked"/> - </widget> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkButton" id="add_button"> + <object class="GtkButton" id="add_button"> + <property name="label">gtk-add</property> <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-add</property> + <property name="receives_default">False</property> <property name="use_stock">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_add_button_clicked"/> - </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> <property name="position">8</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> + <object class="GtkTextBuffer" id="textbuffer1"> + <property name="text" translatable="yes">I would like to add you to my contact list.</property> + </object> + <object class="GtkListStore" id="liststore1"> + <columns> + <!-- column-name item text --> + <column type="gchararray"/> + </columns> + </object> + <object class="GtkListStore" id="liststore2"> + <columns> + <!-- column-name item text --> + <column type="gchararray"/> + </columns> + </object> + <object class="GtkListStore" id="liststore3"> + <columns> + <!-- column-name item text --> + <column type="gchararray"/> + </columns> + </object> +</interface> diff --git a/data/gui/adhoc_commands_window.ui b/data/gui/adhoc_commands_window.ui new file mode 100644 index 000000000..b3bedc500 --- /dev/null +++ b/data/gui/adhoc_commands_window.ui @@ -0,0 +1,434 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkWindow" id="adhoc_commands_window"> + <property name="visible">True</property> + <property name="border_width">6</property> + <property name="title" translatable="yes">Ad-hoc Commands - Gajim</property> + <signal name="destroy" handler="on_adhoc_commands_window_destroy"/> + <child> + <object class="GtkVBox" id="vbox1"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkNotebook" id="stages_notebook"> + <property name="width_request">400</property> + <property name="height_request">400</property> + <property name="visible">True</property> + <property name="show_tabs">False</property> + <property name="show_border">False</property> + <child> + <object class="GtkVBox" id="retrieving_commands_stage_vbox"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel" id="label247"> + <property name="visible">True</property> + <property name="label" translatable="yes">Please wait while retrieving command list...</property> + </object> + <packing> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkProgressBar" id="retrieving_commands_progressbar"> + <property name="visible">True</property> + <property name="pulse_step">0.050000000745099998</property> + </object> + <packing> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <placeholder/> + </child> + </object> + </child> + <child type="tab"> + <object class="GtkLabel" id="label264"> + <property name="visible">True</property> + </object> + <packing> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="label265"> + <property name="visible">True</property> + </object> + <packing> + <property name="position">1</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="command_list_stage_vbox"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel" id="label253"> + <property name="visible">True</property> + <property name="xalign">0.20000000298023224</property> + <property name="ypad">6</property> + <property name="label" translatable="yes"><b>Choose command to execute:</b></property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <child> + <object class="GtkViewport" id="viewport1"> + <property name="visible">True</property> + <child> + <object class="GtkVBox" id="command_list_vbox"> + <property name="visible">True</property> + <property name="border_width">12</property> + <property name="orientation">vertical</property> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox2957"> + <property name="visible">True</property> + <child> + <placeholder/> + </child> + <child> + <object class="GtkButton" id="check_commands_1_button"> + <property name="label" translatable="yes">Check once more</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="on_check_commands_1_button_clicked"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">end</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="position">2</property> + </packing> + </child> + <child type="tab"> + <object class="GtkLabel" id="label266"> + <property name="visible">True</property> + </object> + <packing> + <property name="position">2</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="label267"> + <property name="visible">True</property> + </object> + <packing> + <property name="position">3</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="sending_form_stage_vbox"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel" id="notes_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">Please wait while the command is sending...</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <object class="GtkProgressBar" id="sending_form_progressbar"> + <property name="visible">True</property> + <property name="pulse_step">0.050000000745099998</property> + <property name="text" translatable="yes">Please wait...</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">end</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="position">4</property> + </packing> + </child> + <child type="tab"> + <object class="GtkLabel" id="label268"> + <property name="visible">True</property> + </object> + <packing> + <property name="position">4</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="label269"> + <property name="visible">True</property> + </object> + <packing> + <property name="position">5</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="no_commands_stage_vbox"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel" id="label263"> + <property name="visible">True</property> + <property name="label" translatable="yes">This jabber entity does not expose any commands.</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <object class="GtkHBox" id="hbox2956"> + <property name="visible">True</property> + <child> + <placeholder/> + </child> + <child> + <object class="GtkButton" id="check_commands_2_button"> + <property name="label" translatable="yes">Check once more</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="on_check_commands_2_button_clicked"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">end</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">end</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="position">6</property> + </packing> + </child> + <child type="tab"> + <object class="GtkLabel" id="label270"> + <property name="visible">True</property> + </object> + <packing> + <property name="position">6</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="label271"> + <property name="visible">True</property> + </object> + <packing> + <property name="position">7</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="error_stage_vbox"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel" id="label257"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>An error has occurred:</b></property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="error_description_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">Error description...</property> + <property name="wrap">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">8</property> + </packing> + </child> + <child type="tab"> + <object class="GtkLabel" id="label272"> + <property name="visible">True</property> + </object> + <packing> + <property name="position">8</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="label273"> + <property name="visible">True</property> + </object> + <packing> + <property name="position">9</property> + <property name="tab_fill">False</property> + </packing> + </child> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHButtonBox" id="hbuttonbox1"> + <property name="visible">True</property> + <property name="spacing">12</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="back_button"> + <property name="label">gtk-go-back</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_back_button_clicked"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="forward_button"> + <property name="label">gtk-go-forward</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_forward_button_clicked"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="execute_button"> + <property name="label">gtk-execute</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_execute_button_clicked"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="close_button"> + <property name="label">gtk-close</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_close_button_clicked"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">3</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> +</interface> diff --git a/data/gui/advanced_configuration_window.ui b/data/gui/advanced_configuration_window.ui new file mode 100644 index 000000000..1286efe8e --- /dev/null +++ b/data/gui/advanced_configuration_window.ui @@ -0,0 +1,153 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkWindow" id="advanced_configuration_window"> + <property name="border_width">6</property> + <property name="title" translatable="yes">Advanced Configuration Editor</property> + <property name="role">ace</property> + <property name="default_width">650</property> + <property name="default_height">540</property> + <signal name="destroy" handler="on_advanced_configuration_window_destroy"/> + <child> + <object class="GtkVBox" id="vbox70"> + <property name="visible">True</property> + <property name="border_width">6</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkTable" id="table26"> + <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">7</property> + <child> + <object class="GtkLabel" id="label248"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Filter:</property> + </object> + <packing> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkEntry" id="advanced_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <signal name="changed" handler="on_advanced_entry_changed"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow36"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">never</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTreeView" id="advanced_treeview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="rules_hint">True</property> + <signal name="row_activated" handler="on_advanced_treeview_row_activated"/> + </object> + </child> + </object> + <packing> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + </packing> + </child> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="frame36"> + <property name="visible">True</property> + <property name="border_width">3</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment90"> + <property name="visible">True</property> + <property name="border_width">6</property> + <property name="left_padding">12</property> + <child> + <object class="GtkLabel" id="advanced_desc_label"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="wrap">True</property> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label357"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Description</b></property> + <property name="use_markup">True</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="restart_label"> + <property name="xalign">0</property> + <property name="label" translatable="yes"><b>NOTE:</b> You should restart Gajim for some settings to take effect</property> + <property name="use_markup">True</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkHButtonBox" id="hbuttonbox18"> + <property name="visible">True</property> + <property name="spacing">6</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="advanced_close_button"> + <property name="label">gtk-close</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_advanced_close_button_clicked"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="padding">6</property> + <property name="position">3</property> + </packing> + </child> + </object> + </child> + </object> +</interface> diff --git a/data/gui/advanced_menuitem_menu.ui b/data/gui/advanced_menuitem_menu.ui new file mode 100644 index 000000000..e168f5a75 --- /dev/null +++ b/data/gui/advanced_menuitem_menu.ui @@ -0,0 +1,70 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkMenu" id="advanced_menuitem_menu"> + <child> + <object class="GtkMenuItem" id="xml_console_menuitem"> + <property name="label" translatable="yes">Show _XML Console</property> + <property name="use_underline">True</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="privacy_lists_menuitem"> + <property name="label" translatable="yes">Edit _Privacy Lists...</property> + <property name="use_underline">True</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separator8"/> + </child> + <child> + <object class="GtkMenuItem" id="administrator_menuitem"> + <property name="label" translatable="yes">_Administrator</property> + <property name="use_underline">True</property> + <child type="submenu"> + <object class="GtkMenu" id="administrator_menuitem_menu"> + <child> + <object class="GtkImageMenuItem" id="send_server_message_menuitem"> + <property name="label">_Send Server Message...</property> + <property name="tooltip_text" translatable="yes">Sends a message to users currently connected to this server</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separator9"> + <property name="visible">True</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="set_motd_menuitem"> + <property name="tooltip_text" translatable="yes">Sets Message of the Day</property> + <property name="label" translatable="yes">Set MOTD...</property> + <property name="use_underline">True</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="update_motd_menuitem"> + <property name="tooltip_text" translatable="yes">Updates Message of the Day</property> + <property name="label" translatable="yes">Update MOTD...</property> + <property name="use_underline">True</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="delete_motd_menuitem"> + <property name="label">Delete MOTD</property> + <property name="tooltip_text" translatable="yes">Deletes Message of the Day</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> + </child> + </object> + </child> + </object> + </child> + </object> + <object class="GtkAccelGroup" id="accelgroup1"/> +</interface> diff --git a/data/glade/advanced_notifications_window.glade b/data/gui/advanced_notifications_window.ui index ffbacbb0b..73b36e041 100644 --- a/data/glade/advanced_notifications_window.glade +++ b/data/gui/advanced_notifications_window.ui @@ -1,292 +1,371 @@ -<?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="advanced_notifications_window"> +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkListStore" id="liststore1"> + <columns> + <!-- column-name item text --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">contact(s)</col> + </row> + <row> + <col id="0" translatable="yes">group(s)</col> + </row> + <row> + <col id="0" translatable="yes">everybody</col> + </row> + </data> + </object> + <object class="GtkListStore" id="liststore2"> + <columns> + <!-- column-name item text --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">Receive a Message</col> + </row> + <row> + <col id="0" translatable="yes">Contact Disconnected </col> + </row> + <row> + <col id="0" translatable="yes">Contact Change Status </col> + </row> + <row> + <col id="0" translatable="yes">Group Chat Message Highlight </col> + </row> + <row> + <col id="0" translatable="yes">Group Chat Message Received </col> + </row> + <row> + <col id="0" translatable="yes">File Transfer Request </col> + </row> + <row> + <col id="0" translatable="yes">File Transfer Started </col> + </row> + <row> + <col id="0" translatable="yes">File Transfer Finished</col> + </row> + </data> + </object> + <object class="GtkWindow" id="advanced_notifications_window"> <property name="border_width">6</property> <property name="title" translatable="yes">Advanced Notifications Control</property> <property name="role">Advanced Notifications Control</property> <property name="resizable">False</property> <property name="destroy_with_parent">True</property> <child> - <widget class="GtkVBox" id="vbox95"> + <object class="GtkVBox" id="vbox95"> <property name="visible">True</property> <property name="border_width">12</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <widget class="GtkHBox" id="hbox3041"> + <object class="GtkHBox" id="hbox3041"> <property name="visible">True</property> <child> - <widget class="GtkLabel" id="label396"> + <object class="GtkLabel" id="label396"> <property name="visible">True</property> - <property name="label">Hi SVN users ! This window does nothing for the moment. Discussions about this take place in ticket #1005.</property> + <property name="label">Hi HG users ! This window does nothing for the moment. Discussions about this take place in ticket #1005.</property> <property name="wrap">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> <placeholder/> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkVBox" id="vbox100"> + <object class="GtkVBox" id="vbox100"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">5</property> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow23"> + <object class="GtkScrolledWindow" id="scrolledwindow23"> <property name="height_request">90</property> <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> + <property name="hscrollbar_policy">never</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> <child> - <widget class="GtkTreeView" id="conditions_treeview"> + <object class="GtkTreeView" id="conditions_treeview"> <property name="visible">True</property> <property name="can_focus">True</property> <signal name="cursor_changed" handler="on_conditions_treeview_cursor_changed"/> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkAlignment" id="alignment99"> + <object class="GtkAlignment" id="alignment99"> <property name="visible">True</property> <property name="xalign">1</property> <property name="left_padding">212</property> <child> - <widget class="GtkHBox" id="hbox3045"> + <object class="GtkHBox" id="hbox3045"> <property name="visible">True</property> <child> - <widget class="GtkHButtonBox" id="hbuttonbox2"> + <object class="GtkHButtonBox" id="hbuttonbox2"> <property name="visible">True</property> <property name="spacing">10</property> <child> - <widget class="GtkButton" id="new_button"> + <object class="GtkButton" id="new_button"> + <property name="label">gtk-new</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> - <property name="label">gtk-new</property> + <property name="receives_default">False</property> <property name="use_stock">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_new_button_clicked"/> - </widget> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkButton" id="up_button"> + <object class="GtkButton" id="up_button"> + <property name="label">gtk-go-up</property> <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="receives_default">False</property> <property name="use_stock">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_up_button_clicked"/> - </widget> + </object> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkButton" id="down_button"> + <object class="GtkButton" id="down_button"> + <property name="label">gtk-go-down</property> <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="receives_default">False</property> <property name="use_stock">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_down_button_clicked"/> - </widget> + </object> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">2</property> </packing> </child> <child> - <widget class="GtkButton" id="delete_button"> + <object class="GtkButton" id="delete_button"> + <property name="label">gtk-delete</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> - <property name="label">gtk-delete</property> + <property name="receives_default">False</property> <property name="use_stock">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_delete_button_clicked"/> - </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="fill">False</property> + <property name="position">0</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="position">1</property> </packing> </child> <child> - <widget class="GtkVBox" id="config_vbox"> + <object class="GtkVBox" id="config_vbox"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">5</property> <child> - <widget class="GtkLabel" id="label391"> + <object class="GtkLabel" id="label391"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Conditions</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkVBox" id="vbox101"> + <object class="GtkVBox" id="vbox101"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">5</property> <child> - <widget class="GtkHBox" id="hbox3042"> + <object class="GtkHBox" id="hbox3042"> <property name="visible">True</property> <property name="spacing">5</property> <child> - <widget class="GtkLabel" id="label401"> + <object class="GtkLabel" id="label401"> <property name="visible">True</property> <property name="label" translatable="yes">When </property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkComboBox" id="event_combobox"> + <object class="GtkComboBox" id="event_combobox"> <property name="visible">True</property> - <property name="items" translatable="yes">Receive a Message -Contact Disconnected -Contact Change Status -Group Chat Message Highlight -Group Chat Message Received -File Transfer Request -File Transfer Started -File Transfer Finished</property> + <property name="model">liststore2</property> <signal name="changed" handler="on_event_combobox_changed"/> - </widget> + <child> + <object class="GtkCellRendererText" id="cellrenderertext2"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkHBox" id="hbox3048"> + <object class="GtkHBox" id="hbox3048"> <property name="visible">True</property> <property name="spacing">5</property> <child> - <widget class="GtkLabel" id="label400"> + <object class="GtkLabel" id="label400"> <property name="visible">True</property> <property name="label" translatable="yes">for </property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkComboBox" id="recipient_type_combobox"> + <object class="GtkComboBox" id="recipient_type_combobox"> <property name="visible">True</property> - <property name="items" translatable="yes">contact(s) -group(s) -everybody</property> + <property name="model">liststore1</property> <signal name="changed" handler="on_recipient_type_combobox_changed"/> - </widget> + <child> + <object class="GtkCellRendererText" id="cellrenderertext1"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> <packing> <property name="expand">False</property> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkEntry" id="recipient_list_entry"> + <object class="GtkEntry" id="recipient_list_entry"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="no_show_all">True</property> <signal name="changed" handler="on_recipient_list_entry_changed"/> - </widget> + </object> <packing> <property name="position">2</property> </packing> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox3049"> + <object class="GtkHBox" id="hbox3049"> <property name="visible">True</property> <child> - <widget class="GtkLabel" id="label402"> + <object class="GtkLabel" id="label402"> <property name="visible">True</property> <property name="label" translatable="yes">when I'm in</property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkHBox" id="status_hbox"> + <object class="GtkHBox" id="status_hbox"> <property name="visible">True</property> <property name="spacing">3</property> <child> - <widget class="GtkRadioButton" id="all_status_rb"> + <object class="GtkRadioButton" id="all_status_rb"> + <property name="label" translatable="yes">All statuses</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">All statuses</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_status_radiobutton_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkRadioButton" id="special_status_rb"> + <object class="GtkRadioButton" id="special_status_rb"> + <property name="label" translatable="yes">One or more special statuses...</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">One or more special statuses...</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <property name="group">all_status_rb</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -294,16 +373,16 @@ everybody</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="online_cb"> + <object class="GtkCheckButton" id="online_cb"> + <property name="label" translatable="yes">Online / Free For Chat</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="no_show_all">True</property> - <property name="label" translatable="yes">Online / Free For Chat</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_status_cb_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -311,16 +390,16 @@ everybody</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="away_cb"> + <object class="GtkCheckButton" id="away_cb"> + <property name="label" translatable="yes">Away</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="no_show_all">True</property> - <property name="label" translatable="yes">Away</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_status_cb_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -328,16 +407,16 @@ everybody</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="xa_cb"> + <object class="GtkCheckButton" id="xa_cb"> + <property name="label" translatable="yes">Not Available</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="no_show_all">True</property> - <property name="label" translatable="yes">Not Available</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_status_cb_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -345,16 +424,16 @@ everybody</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="dnd_cb"> + <object class="GtkCheckButton" id="dnd_cb"> + <property name="label" translatable="yes">Busy </property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="no_show_all">True</property> - <property name="label" translatable="yes">Busy </property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_status_cb_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -362,56 +441,57 @@ everybody</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="invisible_cb"> + <object class="GtkCheckButton" id="invisible_cb"> + <property name="label" translatable="yes">Invisible</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="no_show_all">True</property> - <property name="label" translatable="yes">Invisible</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_status_cb_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">6</property> </packing> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="position">2</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox3053"> + <object class="GtkHBox" id="hbox3053"> <property name="visible">True</property> <child> - <widget class="GtkLabel" id="label408"> + <object class="GtkLabel" id="label408"> <property name="visible">True</property> <property name="label" translatable="yes">and I </property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="tab_opened_cb"> + <object class="GtkCheckButton" id="tab_opened_cb"> + <property name="label" translatable="yes">Have </property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Have </property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_tab_opened_cb_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -419,15 +499,15 @@ everybody</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="not_tab_opened_cb"> + <object class="GtkCheckButton" id="not_tab_opened_cb"> + <property name="label" translatable="yes">Don't have </property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Don't have </property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_not_tab_opened_cb_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -435,33 +515,33 @@ everybody</property> </packing> </child> <child> - <widget class="GtkLabel" id="label409"> + <object class="GtkLabel" id="label409"> <property name="visible">True</property> <property name="label" translatable="yes"> a window/tab opened with that contact </property> <property name="use_markup">True</property> - </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="position">3</property> </packing> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkLabel" id="label392"> + <object class="GtkLabel" id="label392"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Actions</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -469,98 +549,106 @@ everybody</property> </packing> </child> <child> - <widget class="GtkFrame" id="frame35"> + <object class="GtkFrame" id="frame35"> <property name="visible">True</property> <property name="label_xalign">0</property> - <property name="shadow_type">GTK_SHADOW_NONE</property> + <property name="shadow_type">none</property> <child> - <widget class="GtkHBox" id="hbox3027"> + <object class="GtkHBox" id="hbox3027"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkCheckButton" id="use_popup_cb"> + <object class="GtkCheckButton" id="use_popup_cb"> + <property name="label" translatable="yes">_Inform me with a popup window</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Inform me with a popup window</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_use_popup_cb_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="disable_popup_cb"> + <object class="GtkCheckButton" id="disable_popup_cb"> + <property name="label" translatable="yes">_Disable existing popup window</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Disable existing popup window</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_disable_popup_cb_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - <child> - <widget class="GtkFrame" id="frame38"> + <child type="label"> + <object class="GtkFrame" id="frame38"> <property name="visible">True</property> <property name="label_xalign">0</property> - <property name="shadow_type">GTK_SHADOW_NONE</property> + <property name="shadow_type">none</property> <child> - <widget class="GtkAlignment" id="alignment93"> + <object class="GtkAlignment" id="alignment93"> <property name="visible">True</property> <property name="border_width">6</property> <property name="left_padding">12</property> <child> - <widget class="GtkVBox" id="vbox98"> + <object class="GtkVBox" id="vbox98"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkHBox" id="hbox3028"> + <object class="GtkHBox" id="hbox3028"> <property name="visible">True</property> <property name="spacing">6</property> <property name="homogeneous">True</property> <child> - <widget class="GtkCheckButton" id="use_sound_cb"> + <object class="GtkCheckButton" id="use_sound_cb"> + <property name="label" translatable="yes">Play a sound</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Play a sound</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_use_sound_cb_toggled"/> - </widget> + </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkHBox" id="sound_file_hbox"> + <object class="GtkHBox" id="sound_file_hbox"> <property name="visible">True</property> <property name="sensitive">False</property> <property name="spacing">6</property> <child> - <widget class="GtkEntry" id="sound_entry"> + <object class="GtkEntry" id="sound_entry"> <property name="visible">True</property> <property name="can_focus">True</property> <signal name="changed" handler="on_sound_entry_changed"/> - </widget> + </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkButton" id="button4"> + <object class="GtkButton" id="button4"> + <property name="label">...</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label">...</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_browse_for_sounds_button_clicked"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -568,298 +656,296 @@ everybody</property> </packing> </child> <child> - <widget class="GtkButton" id="play_button"> + <object class="GtkButton" id="play_button"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="response_id">0</property> + <property name="receives_default">False</property> <signal name="clicked" handler="on_play_button_clicked"/> <child> - <widget class="GtkImage" id="image1372"> + <object class="GtkImage" id="image1372"> <property name="visible">True</property> <property name="stock">gtk-media-play</property> - </widget> + </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="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="disable_sound_cb"> + <object class="GtkCheckButton" id="disable_sound_cb"> + <property name="label" translatable="yes">_Disable existing sound for this event</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Disable existing sound for this event</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_disable_sound_cb_toggled"/> - </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="label394"> + <child type="label"> + <object class="GtkLabel" id="label394"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Sounds</b></property> <property name="use_markup">True</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> + </object> </child> - </widget> - <packing> - <property name="type">label_item</property> - </packing> + </object> </child> - </widget> + </object> <packing> <property name="position">3</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox3032"> + <object class="GtkHBox" id="hbox3032"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkCheckButton" id="use_auto_open_cb"> + <object class="GtkCheckButton" id="use_auto_open_cb"> + <property name="label" translatable="yes">_Open chat window with user</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Open chat window with user</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_use_auto_open_cb_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="disable_auto_open_cb"> + <object class="GtkCheckButton" id="disable_auto_open_cb"> + <property name="label" translatable="yes">_Disable auto opening chat window</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Disable auto opening chat window</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_disable_auto_open_cb_toggled"/> - </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="position">4</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> <property name="expanded">True</property> <child> - <widget class="GtkVBox" id="vbox99"> + <object class="GtkVBox" id="vbox99"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">5</property> <child> - <widget class="GtkHBox" id="hbox3033"> + <object class="GtkHBox" id="hbox3033"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkCheckButton" id="run_command_cb"> + <object class="GtkCheckButton" id="run_command_cb"> + <property name="label" translatable="yes">Launch a command</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Launch a command</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_run_command_cb_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkEntry" id="command_entry"> + <object class="GtkEntry" id="command_entry"> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> <signal name="changed" handler="on_command_entry_changed"/> - </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">0</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox3035"> + <object class="GtkHBox" id="hbox3035"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkCheckButton" id="use_systray_cb"> + <object class="GtkCheckButton" id="use_systray_cb"> + <property name="label" translatable="yes">_Show event in systray</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Show event in systray</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_use_systray_cb_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="disable_systray_cb"> + <object class="GtkCheckButton" id="disable_systray_cb"> + <property name="label" translatable="yes">_Disable showing event in systray</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Disable showing event in systray</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_disable_systray_cb_toggled"/> - </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="position">1</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox3052"> + <object class="GtkHBox" id="hbox3052"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkCheckButton" id="use_roster_cb"> + <object class="GtkCheckButton" id="use_roster_cb"> + <property name="label" translatable="yes">_Show event in roster</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Show event in roster</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_use_roster_cb_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="disable_roster_cb"> + <object class="GtkCheckButton" id="disable_roster_cb"> + <property name="label" translatable="yes">_Disable showing event in roster</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Disable showing event in roster</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_disable_roster_cb_toggled"/> - </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="position">2</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="urgency_hint_cb"> + <object class="GtkCheckButton" id="urgency_hint_cb"> + <property name="label" translatable="yes">_Activate window manager's UrgencyHint to make chat window in taskbar flash</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Activate window manager's UrgencyHint to make chat window in taskbar flash</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_urgency_hint_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">3</property> </packing> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label395"> + <child type="label"> + <object class="GtkLabel" id="label395"> <property name="visible">True</property> <property name="label" translatable="yes">Advanced Actions</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> + </object> </child> - </widget> + </object> <packing> <property name="position">5</property> </packing> </child> - </widget> + </object> <packing> <property name="position">2</property> </packing> </child> <child> - <widget class="GtkAlignment" id="alignment97"> + <object class="GtkAlignment" id="alignment97"> <property name="visible">True</property> <property name="left_padding">413</property> <child> - <widget class="GtkButton" id="close_button"> + <object class="GtkButton" id="close_button"> + <property name="label">gtk-close</property> <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="receives_default">False</property> <property name="use_stock">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_close_window"/> - </widget> + </object> </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/data/gui/atom_entry_window.ui b/data/gui/atom_entry_window.ui new file mode 100644 index 000000000..8886b45c2 --- /dev/null +++ b/data/gui/atom_entry_window.ui @@ -0,0 +1,219 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkWindow" id="atom_entry_window"> + <property name="visible">True</property> + <property name="title" translatable="yes">New entry received</property> + <child> + <object class="GtkVBox" id="vbox112"> + <property name="visible">True</property> + <property name="border_width">6</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel" id="new_entry_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">You have received new entry:</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHSeparator" id="hseparator14"> + <property name="visible">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkTable" id="table4"> + <property name="visible">True</property> + <property name="n_rows">4</property> + <property name="n_columns">2</property> + <property name="column_spacing">6</property> + <child> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Feed name:</property> + <property name="justify">right</property> + </object> + <packing> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Entry:</property> + </object> + <packing> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Last modified:</property> + </object> + <packing> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkLabel" id="feed_tagline_label"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label"><small>Romeo and Juliet</small></property> + <property name="use_markup">True</property> + </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> + </packing> + </child> + <child> + <object class="GtkLabel" id="last_modified_label"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label">2003-12-13T18:30:02Z</property> + </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> + </packing> + </child> + <child> + <object class="GtkEventBox" id="feed_title_eventbox"> + <property name="visible">True</property> + <signal name="button_press_event" handler="on_feed_title_eventbox_button_press_event"/> + <child> + <object class="GtkLabel" id="feed_title_label"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label">Old stories</property> + <property name="use_markup">True</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + <child> + <object class="GtkEventBox" id="entry_title_eventbox"> + <property name="visible">True</property> + <signal name="button_press_event" handler="on_entry_title_eventbox_button_press_event"/> + <child> + <object class="GtkLabel" id="entry_title_label"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label">Soliloquy</property> + <property name="use_markup">True</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkHSeparator" id="hseparator15"> + <property name="visible">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox1"> + <property name="visible">True</property> + <child> + <object class="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <child> + <object class="GtkButton" id="close_button"> + <property name="label">gtk-close</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_close_button_clicked"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="next_button"> + <property name="label">Next entry</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="on_next_button_clicked"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">end</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="position">4</property> + </packing> + </child> + </object> + </child> + </object> +</interface> diff --git a/data/gui/blocked_contacts_window.ui b/data/gui/blocked_contacts_window.ui new file mode 100644 index 000000000..fc8522060 --- /dev/null +++ b/data/gui/blocked_contacts_window.ui @@ -0,0 +1,91 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkWindow" id="blocked_contacts_window"> + <property name="visible">True</property> + <property name="title" translatable="yes">Blocked Contacts</property> + <signal name="destroy" handler="on_blocked_contacts_window_destroy"/> + <child> + <object class="GtkVBox" id="vbox1"> + <property name="visible">True</property> + <property name="border_width">5</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkScrolledWindow" id="contacts_scrolledwindow"> + <property name="width_request">250</property> + <property name="height_request">300</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="border_width">3</property> + <property name="hscrollbar_policy">never</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTreeView" id="contacts_treeview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="headers_visible">False</property> + <property name="rules_hint">True</property> + <signal name="row_activated" handler="on_contacts_treeview_row_activated"/> + </object> + </child> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="remove_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="border_width">3</property> + <signal name="clicked" handler="on_remove_button_clicked"/> + <child> + <object class="GtkAlignment" id="alignment1"> + <property name="visible">True</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <child> + <object class="GtkHBox" id="hbox1"> + <property name="visible">True</property> + <property name="spacing">2</property> + <child> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-remove</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="label">_Unblock</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> +</interface> diff --git a/data/glade/change_activity_dialog.glade b/data/gui/change_activity_dialog.ui index 5c321eadf..fc20d9010 100644 --- a/data/glade/change_activity_dialog.glade +++ b/data/gui/change_activity_dialog.ui @@ -1,26 +1,27 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> -<!--*- mode: xml -*--> -<glade-interface> - <widget class="GtkDialog" id="change_activity_dialog"> +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkDialog" id="change_activity_dialog"> <property name="border_width">6</property> <property name="title" translatable="yes">Set Activity</property> <property name="default_width">270</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> + <property name="type_hint">dialog</property> <signal name="key_press_event" handler="on_change_status_message_dialog_key_press_event"/> <child internal-child="vbox"> - <widget class="GtkVBox" id="dialog-vbox5"> + <object class="GtkVBox" id="dialog-vbox5"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkCheckButton" id="enable_checkbutton"> + <object class="GtkCheckButton" id="enable_checkbutton"> + <property name="label" translatable="yes">Set an activity</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Set an activity</property> - <property name="response_id">0</property> + <property name="receives_default">False</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_enable_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -28,256 +29,257 @@ </packing> </child> <child> - <widget class="GtkNotebook" id="notebook"> + <object class="GtkNotebook" id="notebook"> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> <child> - <widget class="GtkVBox" id="doing_chores_vbox"> + <object class="GtkVBox" id="doing_chores_vbox"> <property name="visible">True</property> - </widget> + <property name="orientation">vertical</property> + </object> </child> - <child> - <widget class="GtkImage" id="doing_chores_image"> + <child type="tab"> + <object class="GtkImage" id="doing_chores_image"> <property name="visible">True</property> <property name="stock">gtk-missing-image</property> - <property name="icon_size">1</property> - </widget> + <property name="icon-size">1</property> + </object> <packing> - <property name="type">tab</property> <property name="tab_fill">False</property> </packing> </child> <child> - <widget class="GtkVBox" id="drinking_vbox"> + <object class="GtkVBox" id="drinking_vbox"> <property name="visible">True</property> - </widget> + <property name="orientation">vertical</property> + </object> <packing> <property name="position">1</property> </packing> </child> - <child> - <widget class="GtkImage" id="drinking_image"> + <child type="tab"> + <object class="GtkImage" id="drinking_image"> <property name="visible">True</property> <property name="stock">gtk-missing-image</property> - <property name="icon_size">1</property> - </widget> + <property name="icon-size">1</property> + </object> <packing> - <property name="type">tab</property> <property name="position">1</property> <property name="tab_fill">False</property> </packing> </child> <child> - <widget class="GtkVBox" id="eating_vbox"> + <object class="GtkVBox" id="eating_vbox"> <property name="visible">True</property> - </widget> + <property name="orientation">vertical</property> + </object> <packing> <property name="position">2</property> </packing> </child> - <child> - <widget class="GtkImage" id="eating_image"> + <child type="tab"> + <object class="GtkImage" id="eating_image"> <property name="visible">True</property> <property name="stock">gtk-missing-image</property> - <property name="icon_size">1</property> - </widget> + <property name="icon-size">1</property> + </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="exercising_vbox"> + <object class="GtkVBox" id="exercising_vbox"> <property name="visible">True</property> - </widget> + <property name="orientation">vertical</property> + </object> <packing> <property name="position">3</property> </packing> </child> - <child> - <widget class="GtkImage" id="exercising_image"> + <child type="tab"> + <object class="GtkImage" id="exercising_image"> <property name="visible">True</property> <property name="stock">gtk-missing-image</property> - <property name="icon_size">1</property> - </widget> + <property name="icon-size">1</property> + </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="grooming_vbox"> + <object class="GtkVBox" id="grooming_vbox"> <property name="visible">True</property> - </widget> + <property name="orientation">vertical</property> + </object> <packing> <property name="position">4</property> </packing> </child> - <child> - <widget class="GtkImage" id="grooming_image"> + <child type="tab"> + <object class="GtkImage" id="grooming_image"> <property name="visible">True</property> <property name="stock">gtk-missing-image</property> - <property name="icon_size">1</property> - </widget> + <property name="icon-size">1</property> + </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="having_appointment_vbox"> + <object class="GtkVBox" id="having_appointment_vbox"> <property name="visible">True</property> - </widget> + <property name="orientation">vertical</property> + </object> <packing> <property name="position">5</property> </packing> </child> - <child> - <widget class="GtkImage" id="having_appointment_image"> + <child type="tab"> + <object class="GtkImage" id="having_appointment_image"> <property name="visible">True</property> <property name="stock">gtk-missing-image</property> - <property name="icon_size">1</property> - </widget> + <property name="icon-size">1</property> + </object> <packing> - <property name="type">tab</property> <property name="position">5</property> <property name="tab_fill">False</property> </packing> </child> <child> - <widget class="GtkVBox" id="inactive_vbox"> + <object class="GtkVBox" id="inactive_vbox"> <property name="visible">True</property> - </widget> + <property name="orientation">vertical</property> + </object> <packing> <property name="position">6</property> </packing> </child> - <child> - <widget class="GtkImage" id="inactive_image"> + <child type="tab"> + <object class="GtkImage" id="inactive_image"> <property name="visible">True</property> <property name="stock">gtk-missing-image</property> - <property name="icon_size">1</property> - </widget> + <property name="icon-size">1</property> + </object> <packing> - <property name="type">tab</property> <property name="position">6</property> <property name="tab_fill">False</property> </packing> </child> <child> - <widget class="GtkVBox" id="relaxing_vbox"> + <object class="GtkVBox" id="relaxing_vbox"> <property name="visible">True</property> - </widget> + <property name="orientation">vertical</property> + </object> <packing> <property name="position">7</property> </packing> </child> - <child> - <widget class="GtkImage" id="relaxing_image"> + <child type="tab"> + <object class="GtkImage" id="relaxing_image"> <property name="visible">True</property> <property name="stock">gtk-missing-image</property> - <property name="icon_size">1</property> - </widget> + <property name="icon-size">1</property> + </object> <packing> - <property name="type">tab</property> <property name="position">7</property> <property name="tab_fill">False</property> </packing> </child> <child> - <widget class="GtkVBox" id="talking_vbox"> + <object class="GtkVBox" id="talking_vbox"> <property name="visible">True</property> - </widget> + <property name="orientation">vertical</property> + </object> <packing> <property name="position">8</property> </packing> </child> - <child> - <widget class="GtkImage" id="talking_image"> + <child type="tab"> + <object class="GtkImage" id="talking_image"> <property name="visible">True</property> <property name="stock">gtk-missing-image</property> - <property name="icon_size">1</property> - </widget> + <property name="icon-size">1</property> + </object> <packing> - <property name="type">tab</property> <property name="position">8</property> <property name="tab_fill">False</property> </packing> </child> <child> - <widget class="GtkVBox" id="traveling_vbox"> + <object class="GtkVBox" id="traveling_vbox"> <property name="visible">True</property> - </widget> + <property name="orientation">vertical</property> + </object> <packing> <property name="position">9</property> </packing> </child> - <child> - <widget class="GtkImage" id="traveling_image"> + <child type="tab"> + <object class="GtkImage" id="traveling_image"> <property name="visible">True</property> <property name="stock">gtk-missing-image</property> - <property name="icon_size">1</property> - </widget> + <property name="icon-size">1</property> + </object> <packing> - <property name="type">tab</property> <property name="position">9</property> <property name="tab_fill">False</property> </packing> </child> <child> - <widget class="GtkVBox" id="working_vbox"> + <object class="GtkVBox" id="working_vbox"> <property name="visible">True</property> - </widget> + <property name="orientation">vertical</property> + </object> <packing> <property name="position">10</property> </packing> </child> - <child> - <widget class="GtkImage" id="working_image"> + <child type="tab"> + <object class="GtkImage" id="working_image"> <property name="visible">True</property> <property name="stock">gtk-missing-image</property> - <property name="icon_size">1</property> - </widget> + <property name="icon-size">1</property> + </object> <packing> - <property name="type">tab</property> <property name="position">10</property> <property name="tab_fill">False</property> </packing> </child> - </widget> + </object> <packing> <property name="position">3</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox1"> + <object class="GtkHBox" id="hbox1"> <property name="visible">True</property> <child> - <widget class="GtkLabel" id="label1"> + <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Message:</b> </property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkEntry" id="description_entry"> + <object class="GtkEntry" id="description_entry"> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">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> @@ -285,43 +287,55 @@ </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> + <property name="layout_style">end</property> <child> - <widget class="GtkButton" id="cancel_button"> + <object class="GtkButton" id="cancel_button"> + <property name="label">gtk-cancel</property> <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="receives_default">False</property> <property name="use_stock">True</property> - <property name="response_id">-6</property> <signal name="clicked" handler="on_cancel_button_clicked"/> - </widget> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkButton" id="ok_button"> + <object class="GtkButton" id="ok_button"> + <property name="label">gtk-ok</property> <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-ok</property> + <property name="receives_default">False</property> <property name="use_stock">True</property> - <property name="response_id">-5</property> <signal name="clicked" handler="on_ok_button_clicked"/> - </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> - <property name="pack_type">GTK_PACK_END</property> + <property name="pack_type">end</property> + <property name="position">0</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + <action-widgets> + <action-widget response="-6">cancel_button</action-widget> + <action-widget response="-5">ok_button</action-widget> + </action-widgets> + </object> +</interface> diff --git a/data/glade/change_mood_dialog.glade b/data/gui/change_mood_dialog.ui index e632357ee..509e6fd2e 100644 --- a/data/glade/change_mood_dialog.glade +++ b/data/gui/change_mood_dialog.ui @@ -1,29 +1,30 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> -<!--*- mode: xml -*--> -<glade-interface> - <widget class="GtkDialog" id="change_mood_dialog"> +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkDialog" id="change_mood_dialog"> <property name="border_width">6</property> <property name="default_width">270</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> + <property name="type_hint">dialog</property> <signal name="key_press_event" handler="on_change_status_message_dialog_key_press_event"/> <child internal-child="vbox"> - <widget class="GtkVBox" id="dialog-vbox5"> + <object class="GtkVBox" id="dialog-vbox5"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</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="GtkLabel" id="mood_label"> + <object class="GtkLabel" id="mood_label"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">None</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -33,12 +34,25 @@ </packing> </child> <child> - <widget class="GtkTable" id="mood_icons_table"> + <object class="GtkTable" id="mood_icons_table"> <property name="visible">True</property> <property name="n_rows">6</property> <property name="n_columns">11</property> <child> - <placeholder/> + <object class="GtkRadioButton" id="no_mood_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="relief">none</property> + <property name="draw_indicator">False</property> + <child> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-cancel</property> + <property name="icon-size">1</property> + </object> + </child> + </object> </child> <child> <placeholder/> @@ -233,31 +247,18 @@ <placeholder/> </child> <child> - <widget class="GtkRadioButton" id="no_mood_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip_text">No mood</property> - <property name="relief">GTK_RELIEF_NONE</property> - <property name="response_id">0</property> - <child> - <widget class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="stock">gtk-cancel</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> + <placeholder/> </child> - </widget> + </object> <packing> <property name="right_attach">2</property> </packing> </child> <child> - <widget class="GtkEntry" id="description_entry"> + <object class="GtkEntry" id="description_entry"> <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> @@ -267,11 +268,11 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label"> + <object class="GtkLabel" id="label"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Mood:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> @@ -280,11 +281,11 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label2"> + <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Message:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="top_attach">2</property> <property name="bottom_attach">3</property> @@ -292,49 +293,61 @@ <property name="y_options"></property> </packing> </child> - </widget> + </object> <packing> <property name="position">2</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> + <property name="layout_style">end</property> <child> - <widget class="GtkButton" id="cancel_button"> + <object class="GtkButton" id="cancel_button"> + <property name="label">gtk-cancel</property> <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="receives_default">False</property> <property name="use_stock">True</property> - <property name="response_id">-6</property> <signal name="clicked" handler="on_cancel_button_clicked"/> - </widget> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkButton" id="ok_button"> + <object class="GtkButton" id="ok_button"> + <property name="label">gtk-ok</property> <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-ok</property> + <property name="receives_default">False</property> <property name="use_stock">True</property> - <property name="response_id">-5</property> <signal name="clicked" handler="on_ok_button_clicked"/> - </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> - <property name="pack_type">GTK_PACK_END</property> + <property name="pack_type">end</property> + <property name="position">0</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + <action-widgets> + <action-widget response="-6">cancel_button</action-widget> + <action-widget response="-5">ok_button</action-widget> + </action-widgets> + </object> +</interface> diff --git a/data/gui/change_password_dialog.ui b/data/gui/change_password_dialog.ui new file mode 100644 index 000000000..1f7da1cb3 --- /dev/null +++ b/data/gui/change_password_dialog.ui @@ -0,0 +1,143 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkDialog" id="change_password_dialog"> + <property name="border_width">6</property> + <property name="title" translatable="yes">Change Password</property> + <property name="type_hint">dialog</property> + <child internal-child="vbox"> + <object class="GtkVBox" id="dialog-vbox7"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkHBox" id="hbox2928"> + <property name="visible">True</property> + <property name="border_width">6</property> + <property name="spacing">12</property> + <child> + <object class="GtkImage" id="image416"> + <property name="visible">True</property> + <property name="stock">gtk-dialog-question</property> + <property name="icon-size">6</property> + </object> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="vbox54"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label208"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Enter new password:</property> + <property name="wrap">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="password1_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="visibility">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label209"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Enter it again for confirmation:</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="password2_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="visibility">False</property> + <property name="activates_default">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">3</property> + </packing> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">2</property> + </packing> + </child> + <child internal-child="action_area"> + <object class="GtkHButtonBox" id="dialog-action_area6"> + <property name="visible">True</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="cancelbutton2"> + <property name="label">gtk-cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="okbutton2"> + <property name="label">gtk-ok</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</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="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + </object> + </child> + <action-widgets> + <action-widget response="-6">cancelbutton2</action-widget> + <action-widget response="-5">okbutton2</action-widget> + </action-widgets> + </object> +</interface> diff --git a/data/glade/change_status_message_dialog.glade b/data/gui/change_status_message_dialog.ui index b5be94445..c7c350cdf 100644 --- a/data/glade/change_status_message_dialog.glade +++ b/data/gui/change_status_message_dialog.ui @@ -1,98 +1,109 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> -<!--*- mode: xml -*--> -<glade-interface> - <widget class="GtkDialog" id="change_status_message_dialog"> +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkDialog" id="change_status_message_dialog"> <property name="border_width">6</property> <property name="default_width">270</property> <property name="default_height">175</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> + <property name="type_hint">dialog</property> <signal name="key_press_event" handler="on_change_status_message_dialog_key_press_event"/> <child internal-child="vbox"> - <widget class="GtkVBox" id="dialog-vbox5"> + <object class="GtkVBox" id="dialog-vbox5"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkFrame" id="frame38"> + <object class="GtkFrame" id="frame38"> <property name="visible">True</property> <property name="label_xalign">0</property> - <property name="shadow_type">GTK_SHADOW_NONE</property> + <property name="shadow_type">none</property> <child> - <widget class="GtkAlignment" id="alignment107"> + <object class="GtkAlignment" id="alignment107"> <property name="visible">True</property> <property name="left_padding">12</property> <child> - <widget class="GtkVBox" id="vbox112"> + <object class="GtkVBox" id="vbox112"> <property name="visible">True</property> <property name="border_width">6</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow24"> + <object class="GtkScrolledWindow" id="scrolledwindow24"> <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> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> <child> - <widget class="GtkTextView" id="message_textview"> + <object class="GtkTextView" id="message_textview"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="has_focus">True</property> - <property name="wrap_mode">GTK_WRAP_WORD</property> - </widget> + <property name="wrap_mode">word</property> + </object> </child> - </widget> + </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkHButtonBox" id="hbuttonbox33"> + <object class="GtkHButtonBox" id="hbuttonbox33"> <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> + <property name="layout_style">end</property> <child> - <widget class="GtkButton" id="save_as_preset_button"> + <object class="GtkButton" id="save_as_preset_button"> <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">0</property> + <property name="receives_default">False</property> <signal name="clicked" handler="on_save_as_preset_button_clicked"/> <child> - <widget class="GtkAlignment" id="alignment106"> + <object class="GtkAlignment" id="alignment106"> <property name="visible">True</property> <property name="xscale">0</property> <property name="yscale">0</property> <child> - <widget class="GtkHBox" id="hbox3021"> + <object class="GtkHBox" id="hbox3021"> <property name="visible">True</property> <property name="spacing">2</property> <child> - <widget class="GtkImage" id="image1369"> + <object class="GtkImage" id="image1369"> <property name="visible">True</property> <property name="stock">gtk-save-as</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkLabel" id="label380"> + <object class="GtkLabel" id="label380"> <property name="visible">True</property> <property name="label" translatable="yes">Save as Preset...</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> + <property name="position">0</property> + </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -100,45 +111,45 @@ </packing> </child> <child> - <widget class="GtkTable" id="under_table"> + <object class="GtkTable" id="under_table"> <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="GtkButton" id="mood_button"> + <object class="GtkButton" id="mood_button"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_mood_button_clicked"/> <child> - <widget class="GtkHBox" id="hbox2"> + <object class="GtkHBox" id="hbox2"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkImage" id="mood_image"> + <object class="GtkImage" id="mood_image"> <property name="visible">True</property> <property name="stock">gtk-missing-image</property> - </widget> + </object> <packing> <property name="expand">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkLabel" id="mood_button_label"> + <object class="GtkLabel" id="mood_button_label"> <property name="visible">True</property> <property name="xalign">0</property> <property name="wrap">True</property> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -147,38 +158,38 @@ </packing> </child> <child> - <widget class="GtkButton" id="activity_button"> + <object class="GtkButton" id="activity_button"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_activity_button_clicked"/> <child> - <widget class="GtkHBox" id="hbox1"> + <object class="GtkHBox" id="hbox1"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkImage" id="activity_image"> + <object class="GtkImage" id="activity_image"> <property name="visible">True</property> <property name="stock">gtk-missing-image</property> - </widget> + </object> <packing> <property name="expand">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkLabel" id="activity_button_label"> + <object class="GtkLabel" id="activity_button_label"> <property name="visible">True</property> <property name="xalign">0</property> <property name="wrap">True</property> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -187,11 +198,11 @@ </packing> </child> <child> - <widget class="GtkLabel" id="mood_label"> + <object class="GtkLabel" id="mood_label"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Mood:</property> - </widget> + </object> <packing> <property name="top_attach">2</property> <property name="bottom_attach">3</property> @@ -199,11 +210,11 @@ </packing> </child> <child> - <widget class="GtkLabel" id="activity_label"> + <object class="GtkLabel" id="activity_label"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Activity:</property> - </widget> + </object> <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> @@ -211,86 +222,95 @@ </packing> </child> <child> - <widget class="GtkComboBox" id="message_combobox"> + <object class="GtkComboBox" id="message_combobox"> <property name="visible">True</property> <signal name="changed" handler="on_message_combobox_changed"/> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> </packing> </child> <child> - <widget class="GtkLabel" id="label165"> + <object class="GtkLabel" id="label165"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Preset messages:</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">2</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label383"> + <child type="label"> + <object class="GtkLabel" id="label383"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Type your new status message</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_area"> + <object class="GtkHButtonBox" id="dialog-action_area"> <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> + <property name="layout_style">end</property> <child> - <widget class="GtkButton" id="cancel_button"> + <object class="GtkButton" id="cancel_button"> + <property name="label">gtk-cancel</property> <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="receives_default">False</property> <property name="use_stock">True</property> - <property name="response_id">-6</property> - </widget> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkButton" id="ok_button"> + <object class="GtkButton" id="ok_button"> + <property name="label">gtk-ok</property> <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-ok</property> + <property name="receives_default">False</property> <property name="use_stock">True</property> - <property name="response_id">-5</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> - <property name="pack_type">GTK_PACK_END</property> + <property name="pack_type">end</property> + <property name="position">0</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + <action-widgets> + <action-widget response="-6">cancel_button</action-widget> + <action-widget response="-5">ok_button</action-widget> + </action-widgets> + </object> +</interface> diff --git a/data/gui/chat_context_menu.ui b/data/gui/chat_context_menu.ui new file mode 100644 index 000000000..523aea79e --- /dev/null +++ b/data/gui/chat_context_menu.ui @@ -0,0 +1,77 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkMenu" id="chat_context_menu"> + <child> + <object class="GtkImageMenuItem" id="copy_link_location_menuitem"> + <property name="label">_Copy Link Location</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="open_link_in_browser_menuitem"> + <property name="label">_Open Link in Browser</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="copy_email_address_menuitem"> + <property name="label">_Copy JID/Email Address</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="open_email_composer_menuitem"> + <property name="label">_Open Email Composer</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="jid_section_separator"> + <property name="visible">True</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="start_chat_menuitem"> + <property name="label">_Start Chat</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="join_group_chat_menuitem"> + <property name="label">Join _Group Chat</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + <signal name="activate" handler="on_join_group_chat_menuitem_activate"/> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="add_to_roster_menuitem"> + <property name="label">_Add to Roster...</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> + </child> + </object> + <object class="GtkAccelGroup" id="accelgroup1"/> +</interface> diff --git a/data/glade/chat_to_muc_window.glade b/data/gui/chat_to_muc_window.ui index dda2f98c1..035418d2f 100644 --- a/data/glade/chat_to_muc_window.glade +++ b/data/gui/chat_to_muc_window.ui @@ -1,171 +1,170 @@ -<?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_to_muc_window"> +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkWindow" id="chat_to_muc_window"> <property name="visible">True</property> <property name="border_width">5</property> <property name="title" translatable="yes">Invite Friends!</property> - <signal name="key_press_event" handler="on_chat_to_muc_window_key_press_event"/> <signal name="destroy" handler="on_chat_to_muc_window_destroy"/> + <signal name="key_press_event" handler="on_chat_to_muc_window_key_press_event"/> <child> - <widget class="GtkVBox" id="general_vbox"> + <object class="GtkVBox" id="general_vbox"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label3"> + <object class="GtkLabel" id="label3"> <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="label" translatable="yes">You are going to begin a Multi-User Chat. Select the contacts you want to invite</property> - <property name="justify">GTK_JUSTIFY_CENTER</property> - </widget> + <property name="justify">center</property> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="padding">4</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkScrolledWindow" id="guests_scrolledwindow"> + <object class="GtkScrolledWindow" id="guests_scrolledwindow"> <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> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> <child> - <widget class="GtkTreeView" id="guests_treeview"> + <object class="GtkTreeView" id="guests_treeview"> <property name="height_request">300</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="headers_visible">False</property> + <signal name="drag_end" handler="on_guests_treeview_drag_end"/> <signal name="drag_data_get" handler="on_guests_treeview_drag_data_get"/> <signal name="drag_data_received" handler="on_guests_treeview_drag_data_received"/> - <signal name="drag_end" handler="on_guests_treeview_drag_end"/> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="padding">4</property> <property name="position">1</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> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <child> - <widget class="GtkVBox" id="vbox1"> + <object class="GtkVBox" id="vbox1"> <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="orientation">vertical</property> <child> - <widget class="GtkLabel" id="server_select_label"> + <object class="GtkLabel" id="server_select_label"> <property name="visible">True</property> <property name="label" translatable="yes">Please select a MUC server.</property> - <property name="justify">GTK_JUSTIFY_CENTER</property> + <property name="justify">center</property> <property name="wrap">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="padding">4</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkComboBoxEntry" id="server_list_comboboxentry"> + <object class="GtkComboBoxEntry" id="server_list_comboboxentry"> <property name="visible">True</property> - <child internal-child="entry"> - <widget class="GtkEntry" id="comboboxentry-entry1"> - </widget> - </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">1</property> </packing> </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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes">MUC server</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">2</property> </packing> </child> <child> - <widget class="GtkHButtonBox" id="hbuttonbox1"> + <object class="GtkHButtonBox" id="hbuttonbox1"> <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="spacing">6</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> + <property name="layout_style">end</property> <child> - <widget class="GtkButton" id="cancel_button"> + <object class="GtkButton" id="cancel_button"> + <property name="label">gtk-cancel</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label">gtk-cancel</property> + <property name="receives_default">False</property> <property name="use_stock">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_cancel_button_clicked"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="padding">3</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkButton" id="invite_button"> + <object class="GtkButton" id="invite_button"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="response_id">0</property> + <property name="receives_default">False</property> <signal name="clicked" handler="on_invite_button_clicked"/> <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="hbox2"> + <object class="GtkHBox" id="hbox2"> <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-jump-to</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkLabel" id="label1"> + <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="label" translatable="yes">In_vite</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> @@ -173,13 +172,13 @@ Select the contacts you want to invite</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/data/gui/choose_gpg_key_dialog.ui b/data/gui/choose_gpg_key_dialog.ui new file mode 100644 index 000000000..f9aa41613 --- /dev/null +++ b/data/gui/choose_gpg_key_dialog.ui @@ -0,0 +1,104 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkDialog" id="choose_gpg_key_dialog"> + <property name="border_width">6</property> + <property name="default_width">550</property> + <property name="default_height">300</property> + <property name="type_hint">dialog</property> + <child internal-child="vbox"> + <object class="GtkVBox" id="vbox33"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkVBox" id="vbox91"> + <property name="visible">True</property> + <property name="border_width">6</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="prompt_label"> + <property name="visible">True</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow20"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTreeView" id="keys_treeview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + </object> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">2</property> + </packing> + </child> + <child internal-child="action_area"> + <object class="GtkHButtonBox" id="hbuttonbox14"> + <property name="visible">True</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="button26"> + <property name="label">gtk-cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="button27"> + <property name="label">gtk-ok</property> + <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="receives_default">False</property> + <property name="use_stock">True</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="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + </object> + </child> + <action-widgets> + <action-widget response="-6">button26</action-widget> + <action-widget response="-5">button27</action-widget> + </action-widgets> + </object> +</interface> diff --git a/data/gui/contact_context_menu.ui b/data/gui/contact_context_menu.ui new file mode 100644 index 000000000..06acb8572 --- /dev/null +++ b/data/gui/contact_context_menu.ui @@ -0,0 +1,399 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkMenu" id="contact_context_menu"> + <child> + <object class="GtkImageMenuItem" id="start_chat_menuitem"> + <property name="label" translatable="yes">Start _Chat</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="image">image2</property> + <property name="use_stock">False</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="send_single_message_menuitem"> + <property name="label" translatable="yes">Send Single _Message...</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="image">image3</property> + <property name="use_stock">False</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="send_file_menuitem"> + <property name="label" translatable="yes">Send _File...</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="image">image4</property> + <property name="use_stock">False</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="invite_menuitem"> + <property name="label" translatable="yes">In_vite to</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="image">image5</property> + <property name="use_stock">False</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="convert_to_groupchat_menuitem"> + <property name="label" translatable="yes">Invite _Contacts</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="image">image1</property> + <property name="use_stock">False</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="encryption_separator"> + <property name="visible">True</property> + </object> + </child> + <child> + <object class="GtkCheckMenuItem" id="toggle_gpg_menuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">Toggle Open_PGP Encryption</property> + <property name="use_underline">True</property> + </object> + </child> + <child> + <object class="GtkCheckMenuItem" id="toggle_e2e_menuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">Toggle End to End Encryption</property> + <property name="use_underline">True</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="menuitem3"> + <property name="visible">True</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="send_custom_status_menuitem"> + <property name="label" translatable="yes">Send Cus_tom Status</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="image">image6</property> + <property name="use_stock">False</property> + <child type="submenu"> + <object class="GtkMenu" id="menu5"> + <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> + </object> + </child> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="execute_command_menuitem"> + <property name="label" translatable="yes">E_xecute Command...</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="image">image7</property> + <property name="use_stock">False</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="manage_contact"> + <property name="label" translatable="yes">_Manage Contact</property> + <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="use_underline">True</property> + <property name="image">image8</property> + <property name="use_stock">False</property> + <child type="submenu"> + <object class="GtkMenu" id="menu2"> + <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> + <child> + <object class="GtkImageMenuItem" id="rename_menuitem"> + <property name="label" translatable="yes">_Rename...</property> + <property name="use_underline">True</property> + <property name="image">image9</property> + <property name="use_stock">False</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="edit_groups_menuitem"> + <property name="label" translatable="yes">Edit _Groups...</property> + <property name="use_underline">True</property> + <property name="image">image10</property> + <property name="use_stock">False</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="assign_openpgp_key_menuitem"> + <property name="label" translatable="yes">Assign Open_PGP Key...</property> + <property name="use_underline">True</property> + <property name="image">image11</property> + <property name="use_stock">False</property> + <signal name="activate" handler="on_assign_openpgp_key_menuitem_activate"/> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="set_custom_avatar_menuitem"> + <property name="label" translatable="yes">Set Custom _Avatar...</property> + <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="use_underline">True</property> + <property name="image">image12</property> + <property name="use_stock">False</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="add_special_notification_menuitem"> + <property name="label" translatable="yes">Add Special _Notification...</property> + <property name="no_show_all">True</property> + <property name="use_underline">True</property> + <property name="image">image13</property> + <property name="use_stock">False</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separatormenuitem1"> + <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> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="subscription_menuitem"> + <property name="label" translatable="yes">_Subscription</property> + <property name="use_underline">True</property> + <property name="image">image14</property> + <property name="use_stock">False</property> + <child type="submenu"> + <object class="GtkMenu" id="subscription_menuitem_menu"> + <child> + <object class="GtkImageMenuItem" id="resend_authorization_to_menuitem"> + <property name="label" translatable="yes">_Allow him/her to see my status</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="image">image15</property> + <property name="use_stock">False</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="rerequest_authorization_from_menuitem"> + <property name="label" translatable="yes">A_sk to see his/her status</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="image">image16</property> + <property name="use_stock">False</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="forbid_him/her_to_see_my_status1"> + <property name="label" translatable="yes">_Forbid him/her to see my status</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="image">image17</property> + <property name="use_stock">False</property> + </object> + </child> + </object> + </child> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="unblock_menuitem"> + <property name="label" translatable="yes">_Unblock</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="image">image18</property> + <property name="use_stock">False</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="block_menuitem"> + <property name="label" translatable="yes">_Block</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="image">image19</property> + <property name="use_stock">False</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="unignore_menuitem"> + <property name="label" translatable="yes">_Unignore</property> + <property name="no_show_all">True</property> + <property name="use_underline">True</property> + <property name="image">image20</property> + <property name="use_stock">False</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="ignore_menuitem"> + <property name="label" translatable="yes">_Ignore</property> + <property name="no_show_all">True</property> + <property name="use_underline">True</property> + <property name="image">image21</property> + <property name="use_stock">False</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="add_to_roster_menuitem"> + <property name="label" translatable="yes">_Add to Roster...</property> + <property name="use_underline">True</property> + <property name="image">image22</property> + <property name="use_stock">False</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="remove_from_roster_menuitem"> + <property name="label" translatable="yes">Remo_ve</property> + <property name="use_underline">True</property> + <property name="image">image23</property> + <property name="use_stock">False</property> + </object> + </child> + </object> + </child> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="last_separator"> + <property name="visible">True</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="information_menuitem"> + <property name="label">gtk-info</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="history_menuitem"> + <property name="label" translatable="yes">_History</property> + <property name="use_underline">True</property> + <property name="image">image24</property> + <property name="use_stock">False</property> + </object> + </child> + </object> + <object class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="stock">gtk-jump-to</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image3"> + <property name="visible">True</property> + <property name="stock">gtk-new</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image4"> + <property name="visible">True</property> + <property name="stock">gtk-save</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image5"> + <property name="visible">True</property> + <property name="stock">gtk-missing-image</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-missing-image</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image6"> + <property name="visible">True</property> + <property name="stock">gtk-missing-image</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image7"> + <property name="visible">True</property> + <property name="stock">gtk-execute</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image9"> + <property name="visible">True</property> + <property name="stock">gtk-refresh</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image10"> + <property name="visible">True</property> + <property name="stock">gtk-edit</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image11"> + <property name="visible">True</property> + <property name="stock">gtk-dialog-authentication</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image12"> + <property name="visible">True</property> + <property name="stock">gtk-orientation-portrait</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image13"> + <property name="visible">True</property> + <property name="stock">gtk-info</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image15"> + <property name="visible">True</property> + <property name="stock">gtk-go-up</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image16"> + <property name="visible">True</property> + <property name="stock">gtk-go-down</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image17"> + <property name="visible">True</property> + <property name="stock">gtk-stop</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image14"> + <property name="visible">True</property> + <property name="stock">gtk-dialog-question</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image18"> + <property name="visible">True</property> + <property name="stock">gtk-stop</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image19"> + <property name="visible">True</property> + <property name="stock">gtk-stop</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image20"> + <property name="visible">True</property> + <property name="stock">gtk-stop</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image21"> + <property name="visible">True</property> + <property name="stock">gtk-stop</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image22"> + <property name="visible">True</property> + <property name="stock">gtk-add</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image23"> + <property name="visible">True</property> + <property name="stock">gtk-remove</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image8"> + <property name="visible">True</property> + <property name="stock">gtk-properties</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image24"> + <property name="visible">True</property> + <property name="stock">gtk-justify-fill</property> + <property name="icon-size">1</property> + </object> + <object class="GtkAccelGroup" id="accelgroup1"/> +</interface> diff --git a/data/gui/data_form_window.ui b/data/gui/data_form_window.ui new file mode 100644 index 000000000..1edcd70c5 --- /dev/null +++ b/data/gui/data_form_window.ui @@ -0,0 +1,146 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkWindow" id="data_form_window"> + <property name="border_width">6</property> + <property name="title" translatable="yes">Room Configuration</property> + <property name="default_width">650</property> + <property name="default_height">450</property> + <signal name="destroy" handler="on_data_form_window_destroy"/> + <child> + <object class="GtkVBox" id="vbox68"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow35"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">etched-in</property> + <child> + <object class="GtkViewport" id="viewport1"> + <property name="visible">True</property> + <child> + <object class="GtkVBox" id="vbox110"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkVBox" id="config_vbox"> + <property name="visible">True</property> + <property name="border_width">5</property> + <property name="orientation">vertical</property> + <property name="spacing">5</property> + <child> + <object class="GtkLabel" id="instructions_label"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="wrap">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHSeparator" id="hseparator15"> + <property name="visible">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="padding">5</property> + <property name="position">1</property> + </packing> + </child> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHSeparator" id="hseparator14"> + <property name="visible">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="padding">5</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="add_on_vbox"> + <property name="visible">True</property> + <property name="border_width">5</property> + <property name="orientation">vertical</property> + <property name="spacing">5</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="position">2</property> + </packing> + </child> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHButtonBox" id="hbuttonbox32"> + <property name="visible">True</property> + <property name="spacing">6</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="cancel_button"> + <property name="label">gtk-cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_cancel_button_clicked"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="ok_button"> + <property name="label">gtk-ok</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_ok_button_clicked"/> + </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="position">1</property> + </packing> + </child> + </object> + </child> + </object> +</interface> diff --git a/data/gui/dubbleinput_dialog.ui b/data/gui/dubbleinput_dialog.ui new file mode 100644 index 000000000..159939468 --- /dev/null +++ b/data/gui/dubbleinput_dialog.ui @@ -0,0 +1,138 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkDialog" id="dubbleinput_dialog"> + <property name="border_width">6</property> + <property name="type_hint">dialog</property> + <property name="has_separator">False</property> + <signal name="destroy" handler="on_dubbleinput_dialog_destroy"/> + <child internal-child="vbox"> + <object class="GtkVBox" id="dialog-vbox10"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkVBox" id="vbox76"> + <property name="visible">True</property> + <property name="border_width">6</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkHBox" id="hbox2960"> + <property name="visible">True</property> + <property name="spacing">12</property> + <child> + <object class="GtkImage" id="image507"> + <property name="visible">True</property> + <property name="stock">gtk-dialog-question</property> + <property name="icon-size">6</property> + </object> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="input_entry1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="input_entry2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">3</property> + </packing> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child internal-child="action_area"> + <object class="GtkHButtonBox" id="dialog-action_area9"> + <property name="visible">True</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="cancelbutton"> + <property name="label">gtk-cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="okbutton"> + <property name="label">gtk-ok</property> + <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="receives_default">False</property> + <property name="use_stock">True</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="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + </object> + </child> + <action-widgets> + <action-widget response="-6">cancelbutton</action-widget> + <action-widget response="-5">okbutton</action-widget> + </action-widgets> + </object> +</interface> diff --git a/data/gui/edit_groups_dialog.ui b/data/gui/edit_groups_dialog.ui new file mode 100644 index 000000000..0f61221fc --- /dev/null +++ b/data/gui/edit_groups_dialog.ui @@ -0,0 +1,125 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkDialog" id="edit_groups_dialog"> + <property name="border_width">6</property> + <property name="title" translatable="yes">Edit Groups</property> + <property name="modal">True</property> + <property name="default_height">290</property> + <property name="type_hint">normal</property> + <signal name="response" handler="on_edit_groups_dialog_response"/> + <child internal-child="vbox"> + <object class="GtkVBox" id="dialog-vbox6"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="nickname_label"> + <property name="visible">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="jid_label"> + <property name="visible">True</property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox2926"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <object class="GtkEntry" id="group_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="add_button"> + <property name="label">gtk-add</property> + <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="receives_default">False</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_add_button_clicked"/> + </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">4</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow32"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTreeView" id="groups_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">5</property> + </packing> + </child> + <child internal-child="action_area"> + <object class="GtkHButtonBox" id="dialog-action_area5"> + <property name="visible">True</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="close_button"> + <property name="label">gtk-close</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + </object> + </child> + <action-widgets> + <action-widget response="-7">close_button</action-widget> + </action-widgets> + </object> +</interface> diff --git a/data/gui/esession_info_window.ui b/data/gui/esession_info_window.ui new file mode 100644 index 000000000..9e6dee5b2 --- /dev/null +++ b/data/gui/esession_info_window.ui @@ -0,0 +1,151 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkDialog" id="esession_info_window"> + <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="window_position">center-on-parent</property> + <property name="type_hint">dialog</property> + <property name="has_separator">False</property> + <child internal-child="vbox"> + <object class="GtkVBox" id="dialog-vbox1"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">2</property> + <child> + <object class="GtkHBox" id="title-hbox"> + <property name="visible">True</property> + <child> + <object class="GtkImage" id="security_image"> + <property name="width_request">32</property> + <property name="height_request">32</property> + <property name="visible">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="verification_status_label"> + <property name="visible">True</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox4"> + <property name="visible">True</property> + <property name="spacing">4</property> + <child> + <object class="GtkLabel" id="info_display"> + <property name="visible">True</property> + <property name="label" translatable="yes">(<b>ESession</b> info)</property> + <property name="use_markup">True</property> + <property name="wrap">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="padding">10</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <child internal-child="action_area"> + <object class="GtkHButtonBox" id="dialog-action_area1"> + <property name="visible">True</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="verify_now_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <signal name="clicked" handler="on_verify_now_button_clicked"/> + <child> + <object class="GtkAlignment" id="alignment2"> + <property name="visible">True</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <child> + <object class="GtkHBox" id="hbox3"> + <property name="visible">True</property> + <property name="spacing">2</property> + <child> + <object class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="stock">gtk-apply</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="button_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Verify</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="close_button3"> + <property name="label">gtk-close</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_close_button_clicked"/> + </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="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + </object> + </child> + <action-widgets> + <action-widget response="-10">verify_now_button</action-widget> + <action-widget response="-7">close_button3</action-widget> + </action-widgets> + </object> +</interface> diff --git a/data/glade/features_window.glade b/data/gui/features_window.ui index 792246f61..1625564f6 100644 --- a/data/glade/features_window.glade +++ b/data/gui/features_window.ui @@ -1,117 +1,119 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> -<!--Generated with glade3 3.4.1 on Sun Mar 2 00:51:06 2008 --> -<glade-interface> - <widget class="GtkWindow" id="features_window"> +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkWindow" id="features_window"> <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">12</property> <property name="title" translatable="yes">Features</property> <property name="default_width">300</property> <property name="default_height">530</property> <child> - <widget class="GtkVBox" id="vbox1"> + <object class="GtkVBox" id="vbox1"> <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="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label1"> + <object class="GtkLabel" id="label1"> <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="xalign">0</property> <property name="label" translatable="yes"><b>List of possible features in Gajim:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <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> - <property name="shadow_type">GTK_SHADOW_OUT</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">out</property> <child> - <widget class="GtkTreeView" id="features_treeview"> + <object class="GtkTreeView" id="features_treeview"> <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="headers_clickable">True</property> <signal name="cursor_changed" handler="on_features_treeview_cursor_changed"/> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkFrame" id="frame2"> + <object class="GtkFrame" id="frame2"> <property name="visible">True</property> <property name="border_width">3</property> <property name="label_xalign">0</property> - <property name="shadow_type">GTK_SHADOW_NONE</property> + <property name="shadow_type">none</property> <child> - <widget class="GtkAlignment" id="alignment2"> + <object class="GtkAlignment" id="alignment2"> <property name="visible">True</property> <property name="border_width">6</property> <property name="xalign">0</property> <property name="xscale">0.5</property> <property name="left_padding">12</property> <child> - <widget class="GtkLabel" id="feature_desc_label"> + <object class="GtkLabel" id="feature_desc_label"> <property name="visible">True</property> <property name="xalign">0</property> <property name="wrap">True</property> <property name="selectable">True</property> - </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>Description</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">3</property> </packing> </child> <child> - <widget class="GtkHButtonBox" id="hbuttonbox1"> + <object class="GtkHButtonBox" id="hbuttonbox1"> <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="layout_style">GTK_BUTTONBOX_END</property> + <property name="layout_style">end</property> <child> - <widget class="GtkButton" id="close_button"> + <object class="GtkButton" id="close_button"> + <property name="label">gtk-close</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">gtk-close</property> <property name="use_stock">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_close_button_clicked"/> - </widget> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> - <property name="pack_type">GTK_PACK_END</property> + <property name="pack_type">end</property> <property name="position">2</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> +</interface> diff --git a/data/glade/filetransfers.glade b/data/gui/filetransfers.ui index 6f85e0e16..5230bf0ac 100644 --- a/data/glade/filetransfers.glade +++ b/data/gui/filetransfers.ui @@ -1,62 +1,72 @@ -<?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="file_transfers_window"> +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkWindow" id="file_transfers_window"> <property name="border_width">12</property> <property name="title" translatable="yes">File Transfers</property> - <accessibility> - <atkproperty name="AtkObject::accessible_name" translatable="yes">File Transfers</atkproperty> - <atkproperty name="AtkObject::accessible_description" translatable="yes">Shows a list of file transfers between you and others</atkproperty> - </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="file_transfers_window-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">File Transfers</property> + <property name="AtkObject::accessible-description" translatable="yes">Shows a list of file transfers between you and others</property> + </object> + </child> <signal name="key_press_event" handler="on_file_transfers_window_key_press_event"/> <signal name="delete_event" handler="on_file_transfers_dialog_delete_event"/> <child> - <widget class="GtkVBox" id="vbox1"> + <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkScrolledWindow" id="transfers_scrolledwindow"> + <object class="GtkScrolledWindow" id="transfers_scrolledwindow"> <property name="width_request">460</property> <property name="height_request">150</property> <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> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> <child> - <widget class="GtkTreeView" id="transfers_list"> + <object class="GtkTreeView" id="transfers_list"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="rules_hint">True</property> <property name="enable_search">False</property> - <accessibility> - <atkproperty name="AtkObject::accessible_name" translatable="yes">file transfers list</atkproperty> - <atkproperty name="AtkObject::accessible_description" translatable="yes">A list of active, completed and stopped file transfers</atkproperty> - </accessibility> - <signal name="leave_notify_event" handler="on_transfers_list_leave_notify_event"/> + <child internal-child="accessible"> + <object class="AtkObject" id="transfers_list-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">file transfers list</property> + <property name="AtkObject::accessible-description" translatable="yes">A list of active, completed and stopped file transfers</property> + </object> + </child> <signal name="button_press_event" handler="on_transfers_list_button_press_event"/> <signal name="motion_notify_event" handler="on_transfers_list_motion_notify_event"/> <signal name="key_press_event" handler="on_transfers_list_key_press_event"/> + <signal name="leave_notify_event" handler="on_transfers_list_leave_notify_event"/> <signal name="row_activated" handler="on_transfers_list_row_activated"/> <signal name="button_release_event" handler="on_transfers_list_button_release_event"/> - </widget> + </object> </child> - </widget> + </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkCheckButton" id="notify_ft_complete_checkbox"> + <object class="GtkCheckButton" id="notify_ft_complete_checkbox"> + <property name="label" translatable="yes">_Notify me when a file transfer is complete</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Notify me when a file transfer is complete</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> - <accessibility> - <atkproperty name="AtkObject::accessible_description" translatable="yes">When a file transfer is complete show a popup notification</atkproperty> - </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="notify_ft_complete_checkbox-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes">When a file transfer is complete show a popup notification</property> + </object> + </child> <signal name="toggled" handler="on_notify_ft_complete_checkbox_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -64,218 +74,223 @@ </packing> </child> <child> - <widget class="GtkHButtonBox" id="hbuttonbox1"> + <object class="GtkHButtonBox" id="hbuttonbox1"> <property name="visible">True</property> <property name="spacing">6</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> + <property name="layout_style">end</property> <child> - <widget class="GtkButton" id="cleanup_button"> + <object class="GtkButton" id="cleanup_button"> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="can_default">True</property> - <property name="tooltip" translatable="yes">Removes completed, cancelled and failed file transfers from the list</property> - <property name="response_id">0</property> - <accessibility> - <atkproperty name="AtkObject::accessible_name" translatable="yes">Remove file transfer from the list.</atkproperty> - <atkproperty name="AtkObject::accessible_description" translatable="yes">This action removes single file transfer from the list. If the transfer is active, it is first stopped and then removed</atkproperty> - </accessibility> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Removes completed, cancelled and failed file transfers from the list</property> + <child internal-child="accessible"> + <object class="AtkObject" id="cleanup_button-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Remove file transfer from the list.</property> + <property name="AtkObject::accessible-description" translatable="yes">This action removes single file transfer from the list. If the transfer is active, it is first stopped and then removed</property> + </object> + </child> <signal name="clicked" handler="on_cleanup_button_clicked"/> <child> - <widget class="GtkAlignment" id="alignment91"> + <object class="GtkAlignment" id="alignment91"> <property name="visible">True</property> <property name="xscale">0</property> <property name="yscale">0</property> <child> - <widget class="GtkHBox" id="hbox2992"> + <object class="GtkHBox" id="hbox2992"> <property name="visible">True</property> <property name="spacing">2</property> <child> - <widget class="GtkImage" id="image1143"> + <object class="GtkImage" id="image1143"> <property name="visible">True</property> <property name="stock">gtk-clear</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkLabel" id="label358"> + <object class="GtkLabel" id="label358"> <property name="visible">True</property> <property name="label" translatable="yes">Clean _up</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> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkButton" id="pause_restore_button"> + <object class="GtkButton" id="pause_restore_button"> <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">0</property> + <property name="receives_default">False</property> <signal name="clicked" handler="on_pause_restore_button_clicked"/> <child> - <widget class="GtkAlignment" id="alignment92"> + <object class="GtkAlignment" id="alignment92"> <property name="visible">True</property> <property name="xscale">0</property> <property name="yscale">0</property> <child> - <widget class="GtkHBox" id="hbox2993"> + <object class="GtkHBox" id="hbox2993"> <property name="visible">True</property> <property name="spacing">2</property> <child> - <widget class="GtkImage" id="image1147"> + <object class="GtkImage" id="image1147"> <property name="visible">True</property> <property name="stock">gtk-media-pause</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkLabel" id="label359"> + <object class="GtkLabel" id="label359"> <property name="visible">True</property> <property name="label" translatable="yes">_Pause</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> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkButton" id="cancel_button"> + <object class="GtkButton" id="cancel_button"> + <property name="label">gtk-cancel</property> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="can_default">True</property> - <property name="tooltip" translatable="yes">Cancels the selected file transfer and removes incomplete file</property> - <property name="label">gtk-cancel</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Cancels the selected file transfer and removes incomplete file</property> <property name="use_stock">True</property> - <property name="response_id">0</property> - <accessibility> - <atkproperty name="AtkObject::accessible_name" translatable="yes">Cancel file transfer</atkproperty> - <atkproperty name="AtkObject::accessible_description" translatable="yes">Cancels the selected file transfer</atkproperty> - </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="cancel_button-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Cancel file transfer</property> + <property name="AtkObject::accessible-description" translatable="yes">Cancels the selected file transfer</property> + </object> + </child> <signal name="clicked" handler="on_cancel_button_clicked"/> - </widget> + </object> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">2</property> </packing> </child> <child> - <widget class="GtkButton" id="close_button"> + <object class="GtkButton" id="close_button"> + <property name="label">gtk-close</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="has_focus">True</property> <property name="can_default">True</property> - <property name="tooltip" translatable="yes">Hides the window</property> - <property name="label">gtk-close</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Hides the window</property> <property name="use_stock">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_close_button_clicked"/> - </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="expand">False</property> - <property name="pack_type">GTK_PACK_END</property> + <property name="pack_type">end</property> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> - <widget class="GtkMenu" id="file_transfers_menu"> + </object> + <object class="GtkMenu" id="file_transfers_menu"> <child> - <widget class="GtkImageMenuItem" id="remove_menuitem"> + <object class="GtkImageMenuItem" id="remove_menuitem"> <property name="label">gtk-remove</property> <property name="use_underline">True</property> <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_remove_menuitem_activate"/> - </widget> + </object> </child> <child> - <widget class="GtkImageMenuItem" id="continue_menuitem"> + <object class="GtkImageMenuItem" id="continue_menuitem"> + <property name="label">_Continue</property> <property name="no_show_all">True</property> - <property name="label" translatable="yes">_Continue</property> <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_continue_menuitem_activate"/> - <child internal-child="image"> - <widget class="GtkImage" id="image1144"> - <property name="visible">True</property> - <property name="stock">gtk-media-play</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> + </object> </child> <child> - <widget class="GtkImageMenuItem" id="pause_menuitem"> - <property name="label" translatable="yes">_Pause</property> + <object class="GtkImageMenuItem" id="pause_menuitem"> + <property name="label">_Pause</property> <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_pause_menuitem_activate"/> - <child internal-child="image"> - <widget class="GtkImage" id="image1145"> - <property name="visible">True</property> - <property name="stock">gtk-media-pause</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> + </object> </child> <child> - <widget class="GtkImageMenuItem" id="cancel_menuitem"> + <object class="GtkImageMenuItem" id="cancel_menuitem"> <property name="label">gtk-cancel</property> <property name="use_underline">True</property> <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_cancel_menuitem_activate"/> - </widget> + </object> </child> <child> - <widget class="GtkSeparatorMenuItem" id="separator11"> + <object class="GtkSeparatorMenuItem" id="separator11"> <property name="visible">True</property> - </widget> + </object> </child> <child> - <widget class="GtkImageMenuItem" id="open_folder_menuitem"> - <property name="label" translatable="yes">_Open Containing Folder</property> + <object class="GtkImageMenuItem" id="open_folder_menuitem"> + <property name="label">_Open Containing Folder</property> <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_open_folder_menuitem_activate"/> - <child internal-child="image"> - <widget class="GtkImage" id="image1146"> - <property name="visible">True</property> - <property name="stock">gtk-directory</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> + <object class="GtkAccelGroup" id="accelgroup1"/> +</interface> diff --git a/data/gui/gajim_themes_window.ui b/data/gui/gajim_themes_window.ui new file mode 100644 index 000000000..82062ca33 --- /dev/null +++ b/data/gui/gajim_themes_window.ui @@ -0,0 +1,586 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkListStore" id="liststore1"> + <columns> + <!-- column-name item text --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">Account row</col> + </row> + <row> + <col id="0" translatable="yes">Group row</col> + </row> + <row> + <col id="0" translatable="yes">Contact row</col> + </row> + <row> + <col id="0" translatable="yes">Chat Banner</col> + </row> + </data> + </object> + <object class="GtkWindow" id="gajim_themes_window"> + <property name="border_width">12</property> + <property name="title" translatable="yes">Gajim Themes Customization</property> + <child> + <object class="GtkVBox" id="vbox97"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <child> + <object class="GtkHBox" id="hbox2979"> + <property name="visible">True</property> + <property name="border_width">6</property> + <property name="spacing">12</property> + <child> + <object class="GtkVBox" id="vbox98"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkScrolledWindow" id="themes_scrolledwindow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTreeView" id="themes_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">0</property> + </packing> + </child> + <child> + <object class="GtkHButtonBox" id="hbuttonbox27"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <object class="GtkButton" id="add_button"> + <property name="label">gtk-add</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_add_button_clicked"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="remove_button"> + <property name="label">gtk-remove</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_remove_button_clicked"/> + </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="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="theme_options_vbox"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkComboBox" id="options_combobox"> + <property name="visible">True</property> + <property name="model">liststore1</property> + <signal name="changed" handler="on_options_combobox_changed"/> + <child> + <object class="GtkCellRendererText" id="cellrenderertext1"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkTable" id="table5"> + <property name="visible">True</property> + <property name="n_rows">4</property> + <property name="n_columns">3</property> + <property name="column_spacing">6</property> + <property name="row_spacing">6</property> + <child> + <object class="GtkCheckButton" id="textcolor_checkbutton"> + <property name="label" translatable="yes">Text _color:</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_textcolor_checkbutton_toggled"/> + </object> + <packing> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="background_checkbutton"> + <property name="label" translatable="yes">_Background:</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_background_checkbutton_toggled"/> + </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> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="textfont_checkbutton"> + <property name="label" translatable="yes">Text _font:</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_textfont_checkbutton_toggled"/> + </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> + </packing> + </child> + <child> + <object class="GtkLabel" id="label334"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Font style:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">bold_togglebutton</property> + </object> + <packing> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkColorButton" id="text_colorbutton"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <signal name="color_set" handler="on_text_colorbutton_color_set"/> + </object> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="x_options"></property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkColorButton" id="background_colorbutton"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <signal name="color_set" handler="on_background_colorbutton_color_set"/> + </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> + </packing> + </child> + <child> + <object class="GtkFontButton" id="text_fontbutton"> + <property name="width_request">15</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="show_style">False</property> + <signal name="font_set" handler="on_text_fontbutton_font_set"/> + </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> + </packing> + </child> + <child> + <object class="GtkToggleButton" id="bold_togglebutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Bold</property> + <signal name="toggled" handler="on_bold_togglebutton_toggled"/> + <child> + <object class="GtkImage" id="image28"> + <property name="visible">True</property> + <property name="stock">gtk-bold</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options"></property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkToggleButton" id="italic_togglebutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Italic</property> + <signal name="toggled" handler="on_italic_togglebutton_toggled"/> + <child> + <object class="GtkImage" id="image29"> + <property name="visible">True</property> + <property name="stock">gtk-italic</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options"></property> + <property name="y_options"></property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkDrawingArea" id="drawingarea12"> + <property name="height_request">12</property> + <property name="visible">True</property> + </object> + <packing> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkVSeparator" id="vseparator7"> + <property name="visible">True</property> + </object> + <packing> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkTable" id="theme_options_table"> + <property name="visible">True</property> + <property name="n_rows">9</property> + <property name="n_columns">2</property> + <property name="column_spacing">6</property> + <property name="row_spacing">6</property> + <child> + <object class="GtkLabel" id="label391"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Paused</property> + </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> + </packing> + </child> + <child> + <object class="GtkColorButton" id="paused_colorbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <signal name="color_set" handler="on_paused_colorbutton_color_set"/> + </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> + </packing> + </child> + <child> + <object class="GtkColorButton" id="composing_colorbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <signal name="color_set" handler="on_composing_colorbutton_color_set"/> + </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="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label390"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Composing</property> + </object> + <packing> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label389"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Inactive</property> + </object> + <packing> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkColorButton" id="inactive_colorbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <signal name="color_set" handler="on_inactive_colorbutton_color_set"/> + </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="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label393"> + <property name="visible">True</property> + <property name="ypad">5</property> + <property name="label" translatable="yes"><b>Chatstate Tab Colors</b></property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="right_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label394"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Gone</property> + </object> + <packing> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkColorButton" id="gone_colorbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <signal name="color_set" handler="on_gone_colorbutton_color_set"/> + </object> + <packing> + <property name="left_attach">1</property> + <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> + </packing> + </child> + <child> + <object class="GtkLabel" id="label392"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">MUC +Messages</property> + </object> + <packing> + <property name="top_attach">7</property> + <property name="bottom_attach">8</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkColorButton" id="muc_msg_colorbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <signal name="color_set" handler="on_muc_msg_colorbutton_color_set"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">7</property> + <property name="bottom_attach">8</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkHSeparator" id="hseparator16"> + <property name="visible">True</property> + </object> + <packing> + <property name="right_attach">2</property> + <property name="top_attach">6</property> + <property name="bottom_attach">7</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label395"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">MUC Directed +Messages</property> + </object> + <packing> + <property name="top_attach">8</property> + <property name="bottom_attach">9</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkColorButton" id="muc_directed_msg_colorbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <signal name="color_set" handler="on_muc_directed_msg_colorbutton_color_set"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">8</property> + <property name="bottom_attach">9</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="position">3</property> + </packing> + </child> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHButtonBox" id="hbuttonbox28"> + <property name="visible">True</property> + <property name="border_width">6</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="close_button"> + <property name="label">gtk-close</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_close_button_clicked"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> +</interface> diff --git a/data/gui/gc_control_popup_menu.ui b/data/gui/gc_control_popup_menu.ui new file mode 100644 index 000000000..729ab47d5 --- /dev/null +++ b/data/gui/gc_control_popup_menu.ui @@ -0,0 +1,99 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkMenu" id="gc_control_popup_menu"> + <child> + <object class="GtkImageMenuItem" id="change_nick_menuitem"> + <property name="label">Change _Nickname...</property> + <property name="no_show_all">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="manage_room_menuitem"> + <property name="label">_Manage Room</property> + <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="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + <child type="submenu"> + <object class="GtkMenu" id="menu1"> + <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> + <child> + <object class="GtkImageMenuItem" id="change_subject_menuitem"> + <property name="label">Change _Subject...</property> + <property name="no_show_all">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="configure_room_menuitem"> + <property name="label">Configure _Room...</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separatormenuitem3"> + <property name="visible">True</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="destroy_room_menuitem"> + <property name="label">_Destroy Room</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> + </child> + </object> + </child> + </object> + </child> + <child> + <object class="GtkCheckMenuItem" id="minimize_menuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Minimize on close</property> + <property name="use_underline">True</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="bookmark_separator"> + <property name="no_show_all">True</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="bookmark_room_menuitem"> + <property name="label">_Bookmark</property> + <property name="no_show_all">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separatormenuitem2"> + <property name="no_show_all">True</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="history_menuitem"> + <property name="label">_History</property> + <property name="no_show_all">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> + </child> + </object> + <object class="GtkAccelGroup" id="accelgroup1"/> +</interface> diff --git a/data/gui/gc_occupants_menu.ui b/data/gui/gc_occupants_menu.ui new file mode 100644 index 000000000..ddcf383f1 --- /dev/null +++ b/data/gui/gc_occupants_menu.ui @@ -0,0 +1,152 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkMenu" id="gc_occupants_menu"> + <child> + <object class="GtkImageMenuItem" id="send_private_message_menuitem"> + <property name="label">_Send Private Message</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="send_file_menuitem"> + <property name="label">Send _File</property> + <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="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="group_chat_actions_menuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">Occupant Actions</property> + <property name="use_underline">True</property> + <child type="submenu"> + <object class="GtkMenu" id="group_chat_actions_menuitem_menu"> + <child> + <object class="GtkCheckMenuItem" id="voice_checkmenuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Voice</property> + <property name="use_underline">True</property> + </object> + </child> + <child> + <object class="GtkCheckMenuItem" id="moderator_checkmenuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">Mo_derator</property> + <property name="use_underline">True</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separator5"> + <property name="visible">True</property> + </object> + </child> + <child> + <object class="GtkCheckMenuItem" id="member_checkmenuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Member</property> + <property name="use_underline">True</property> + </object> + </child> + <child> + <object class="GtkCheckMenuItem" id="admin_checkmenuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Admin</property> + <property name="use_underline">True</property> + </object> + </child> + <child> + <object class="GtkCheckMenuItem" id="owner_checkmenuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Owner</property> + <property name="use_underline">True</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separator4"> + <property name="visible">True</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="kick_menuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Kick</property> + <property name="use_underline">True</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="ban_menuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Ban</property> + <property name="use_underline">True</property> + </object> + </child> + </object> + </child> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separator6"> + <property name="visible">True</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="add_to_roster_menuitem"> + <property name="label">_Add to Roster</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="block_menuitem"> + <property name="label">_Block</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="unblock_menuitem"> + <property name="label">_Unblock</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separator1"> + <property name="visible">True</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="information_menuitem"> + <property name="label">gtk-info</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="history_menuitem"> + <property name="label">_History</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> + </child> + </object> + <object class="GtkAccelGroup" id="accelgroup1"/> +</interface> diff --git a/data/gui/groups_post_window.ui b/data/gui/groups_post_window.ui new file mode 100644 index 000000000..ae4706854 --- /dev/null +++ b/data/gui/groups_post_window.ui @@ -0,0 +1,138 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkWindow" id="groups_post_window"> + <property name="visible">True</property> + <property name="title" translatable="yes">Create new post</property> + <child> + <object class="GtkVBox" id="vbox1"> + <property name="visible">True</property> + <property name="border_width">6</property> + <property name="orientation">vertical</property> + <property name="spacing">4</property> + <child> + <object class="GtkTable" id="table1"> + <property name="visible">True</property> + <property name="n_rows">2</property> + <property name="n_columns">2</property> + <child> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">From</property> + </object> + <packing> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Subject</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> + </packing> + </child> + <child> + <object class="GtkEntry" id="from_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkEntry" id="subject_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + </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> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTextView" id="contents_textview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="buffer">textbuffer1</property> + </object> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox1"> + <property name="visible">True</property> + <child> + <object class="GtkButton" id="cancel_button"> + <property name="label">gtk-cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_cancel_button_clicked"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <object class="GtkButton" id="send_button"> + <property name="label">gtk-go-forward</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_send_button_clicked"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="position">2</property> + </packing> + </child> + </object> + </child> + </object> + <object class="GtkTextBuffer" id="textbuffer1"/> +</interface> diff --git a/data/glade/history_manager.glade b/data/gui/history_manager.ui index 0ed565d08..dadc7f4a7 100644 --- a/data/glade/history_manager.glade +++ b/data/gui/history_manager.ui @@ -1,75 +1,84 @@ -<?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="history_manager_window"> +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkWindow" id="history_manager_window"> <property name="border_width">6</property> <property name="title" translatable="yes">Gajim History Logs Manager</property> <property name="default_width">650</property> <property name="default_height">500</property> <signal name="delete_event" handler="on_history_manager_window_delete_event"/> <child> - <widget class="GtkVBox" id="vbox"> + <object class="GtkVBox" id="vbox"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkHPaned" id="hpaned"> + <object class="GtkHPaned" id="hpaned"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="position">200</property> <child> - <widget class="GtkScrolledWindow" id="jids_scrolledwindow"> + <object class="GtkScrolledWindow" id="jids_scrolledwindow"> <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> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> <child> - <widget class="GtkTreeView" id="jids_listview"> + <object class="GtkTreeView" id="jids_listview"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="rules_hint">True</property> <signal name="button_press_event" handler="on_listview_button_press_event"/> <signal name="key_press_event" handler="on_jids_listview_key_press_event"/> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="resize">False</property> <property name="shrink">True</property> </packing> </child> <child> - <widget class="GtkVBox" id="vbox1"> + <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> + <property name="orientation">vertical</property> <child> - <widget class="GtkVBox" id="welcome_vbox"> + <object class="GtkVBox" id="welcome_vbox"> <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="orientation">vertical</property> <child> - <widget class="GtkLabel" id="welcome_label"> + <object class="GtkLabel" id="welcome_label"> <property name="visible">True</property> <property name="label" translatable="yes"><big><b>Welcome to Gajim History Logs Manager</b></big></property> <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_CENTER</property> + <property name="justify">center</property> <property name="wrap">True</property> - </widget> + </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkHBox" id="hbox3"> + <object class="GtkHBox" id="hbox3"> <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> <child> - <widget class="GtkImage" id="image3"> + <object class="GtkImage" id="image3"> <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="xalign">1</property> <property name="yalign">0</property> <property name="stock">gtk-info</property> - </widget> + </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkLabel" id="info_label"> + <object class="GtkLabel" id="info_label"> <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="label" translatable="yes">This log manager is not intended for log viewing. If you are looking for such functionality, use the history window instead. @@ -77,12 +86,12 @@ Use this program to delete or export logs. You can select logs from the left and/or search database from below.</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> @@ -91,32 +100,35 @@ Use this program to delete or export logs. You can select logs from the left and </packing> </child> <child> - <widget class="GtkHBox" id="hbox2"> + <object class="GtkHBox" id="hbox2"> <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> <child> - <widget class="GtkImage" id="warning_image"> + <object class="GtkImage" id="warning_image"> <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="xalign">1</property> <property name="yalign">0</property> <property name="stock">gtk-dialog-warning</property> - </widget> + </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkLabel" id="warning_label"> + <object class="GtkLabel" id="warning_label"> <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="label" translatable="yes"><b>WARNING:</b> If you plan to do massive deletions, please make sure Gajim is not running. Generally avoid deletions with contacts you currently chat with.</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> @@ -124,198 +136,215 @@ If you plan to do massive deletions, please make sure Gajim is not running. Gene <property name="position">2</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkScrolledWindow" id="logs_scrolledwindow"> + <object class="GtkScrolledWindow" id="logs_scrolledwindow"> <property name="can_focus">True</property> <property name="no_show_all">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> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> <child> - <widget class="GtkTreeView" id="logs_listview"> + <object class="GtkTreeView" id="logs_listview"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="rules_hint">True</property> <property name="enable_search">False</property> <signal name="button_press_event" handler="on_listview_button_press_event"/> <signal name="key_press_event" handler="on_logs_listview_key_press_event"/> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkScrolledWindow" id="search_results_scrolledwindow"> + <object class="GtkScrolledWindow" id="search_results_scrolledwindow"> <property name="can_focus">True</property> <property name="no_show_all">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> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> <child> - <widget class="GtkTreeView" id="search_results_listview"> + <object class="GtkTreeView" id="search_results_listview"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="rules_hint">True</property> <signal name="button_press_event" handler="on_listview_button_press_event"/> <signal name="row_activated" handler="on_search_results_listview_row_activated"/> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="position">2</property> </packing> </child> - </widget> + </object> <packing> <property name="resize">True</property> <property name="shrink">True</property> </packing> </child> - </widget> + </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkHBox" id="hbox"> + <object class="GtkHBox" id="hbox"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkEntry" id="search_entry"> + <object class="GtkEntry" id="search_entry"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="activates_default">True</property> - </widget> + </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkButton" id="search_db_button"> + <object class="GtkButton" id="search_db_button"> <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">0</property> + <property name="receives_default">False</property> <signal name="clicked" handler="on_search_db_button_clicked"/> <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-find</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkLabel" id="label1"> + <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="label" translatable="yes">_Search Database</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> <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> - <widget class="GtkMenu" id="context_menu"> + </object> + <object class="GtkMenu" id="context_menu"> <child> - <widget class="GtkMenuItem" id="export_menuitem"> + <object class="GtkMenuItem" id="export_menuitem"> <property name="visible">True</property> <property name="label" translatable="yes">Export</property> <property name="use_underline">True</property> <signal name="activate" handler="on_export_menuitem_activate"/> - </widget> + </object> </child> <child> - <widget class="GtkImageMenuItem" id="delete_menuitem"> + <object class="GtkImageMenuItem" id="delete_menuitem"> + <property name="label">Delete</property> <property name="visible">True</property> - <property name="label" translatable="yes">Delete</property> <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="stock">gtk-remove</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> </child> - </widget> - <widget class="GtkFileChooserDialog" id="filechooserdialog"> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> - <property name="action">GTK_FILE_CHOOSER_ACTION_SAVE</property> + </object> + <object class="GtkFileChooserDialog" id="filechooserdialog"> + <property name="type_hint">dialog</property> + <property name="action">save</property> <child internal-child="vbox"> - <widget class="GtkVBox" id="dialog-vbox1"> + <object class="GtkVBox" id="dialog-vbox1"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">24</property> <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> + <property name="layout_style">end</property> <child> - <widget class="GtkButton" id="cancel_button"> + <object class="GtkButton" id="cancel_button"> + <property name="label">gtk-cancel</property> <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="receives_default">False</property> <property name="use_stock">True</property> - <property name="response_id">-6</property> - </widget> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkButton" id="save_button"> + <object class="GtkButton" id="save_button"> + <property name="label">gtk-save</property> <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-save</property> + <property name="receives_default">False</property> <property name="use_stock">True</property> - <property name="response_id">-5</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="pack_type">GTK_PACK_END</property> + <property name="pack_type">end</property> + <property name="position">0</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + <action-widgets> + <action-widget response="-6">cancel_button</action-widget> + <action-widget response="-5">save_button</action-widget> + </action-widgets> + </object> + <object class="GtkAccelGroup" id="accelgroup1"/> +</interface> diff --git a/data/glade/history_window.glade b/data/gui/history_window.ui index 11f8f10b2..538a716a1 100644 --- a/data/glade/history_window.glade +++ b/data/gui/history_window.ui @@ -1,54 +1,71 @@ -<?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="history_window"> +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkListStore" id="liststore1"> + <columns> + <!-- column-name item text --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">Enter JID or Contact name</col> + </row> + <row> + <col id="0" translatable="yes">Groupchat Histories</col> + </row> + <row> + <col id="0" translatable="yes">All Chat Histories</col> + </row> + </data> + </object> + <object class="GtkWindow" id="history_window"> <property name="title" translatable="yes">Conversation History</property> <property name="role">history</property> <property name="default_width">650</property> <property name="default_height">450</property> - <signal name="key_press_event" handler="on_history_window_key_press_event"/> <signal name="destroy" handler="on_history_window_destroy"/> + <signal name="key_press_event" handler="on_history_window_key_press_event"/> <child> - <widget class="GtkVBox" id="vbox"> + <object class="GtkVBox" id="vbox"> <property name="visible">True</property> <property name="border_width">12</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkVBox" id="vbox1"> + <object class="GtkVBox" id="vbox1"> <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="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkHBox" id="hbox1"> + <object class="GtkHBox" id="hbox1"> <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="spacing">6</property> <child> - <widget class="GtkComboBoxEntry" id="query_combobox"> + <object class="GtkComboBoxEntry" id="query_combobox"> <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="items" translatable="yes">Enter JID or Contact name -Groupchat Histories -All Chat Histories</property> + <property name="model">liststore1</property> <signal name="changed" handler="on_query_combobox_changed"/> - <child internal-child="entry"> - <widget class="GtkEntry" id="jid_entry"> - <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> - <signal name="activate" handler="on_jid_entry_activate"/> - <signal name="focus" handler="on_jid_entry_focus"/> - </widget> + <child> + <object class="GtkCellRendererText" id="cellrenderertext1"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> </child> - </widget> + </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkLabel" id="label3"> + <object class="GtkLabel" id="label3"> <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="label" translatable="yes">Search:</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -56,155 +73,167 @@ All Chat Histories</property> </packing> </child> <child> - <widget class="GtkEntry" id="query_entry"> + <object class="GtkEntry" id="query_entry"> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="activates_default">True</property> <signal name="activate" handler="on_query_entry_activate"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">2</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> + <property name="position">0</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> <child> - <widget class="GtkHPaned" id="hpaned"> + <object class="GtkHPaned" id="hpaned"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="position">165</property> <child> - <widget class="GtkVBox" id="vbox"> + <object class="GtkVBox" id="vbox2"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkCalendar" id="calendar"> + <object class="GtkCalendar" id="calendar"> <property name="visible">True</property> <property name="can_focus">True</property> - <signal name="month_changed" handler="on_calendar_month_changed"/> <signal name="day_selected" handler="on_calendar_day_selected"/> - </widget> + <signal name="month_changed" handler="on_calendar_month_changed"/> + </object> <packing> <property name="expand">False</property> + <property name="position">0</property> </packing> </child> - </widget> + </object> <packing> <property name="resize">False</property> <property name="shrink">False</property> </packing> </child> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow"> + <object class="GtkScrolledWindow" id="scrolledwindow"> <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_ETCHED_IN</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">etched-in</property> <child> <placeholder/> </child> - </widget> + </object> <packing> <property name="resize">True</property> <property name="shrink">False</property> </packing> </child> - </widget> + </object> <packing> <property name="resize">False</property> <property name="shrink">True</property> </packing> </child> <child> - <widget class="GtkScrolledWindow" id="results_scrolledwindow"> + <object class="GtkScrolledWindow" id="results_scrolledwindow"> <property name="can_focus">True</property> <property name="no_show_all">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> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> <child> - <widget class="GtkTreeView" id="results_treeview"> + <object class="GtkTreeView" id="results_treeview"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="rules_hint">True</property> <signal name="row_activated" handler="on_results_treeview_row_activated"/> - </widget> + </object> </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> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkHBox" id="hbox2"> + <object class="GtkHBox" id="hbox2"> <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> <child> - <widget class="GtkCheckButton" id="log_history_checkbutton"> + <object class="GtkCheckButton" id="log_history_checkbutton"> + <property name="label" translatable="yes">_Log conversation history</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Log conversation history</property> + <property name="receives_default">False</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">0</property> </packing> </child> <child> <placeholder/> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkHButtonBox" id="hbuttonbox"> + <object class="GtkHButtonBox" id="hbuttonbox"> <property name="visible">True</property> <property name="spacing">6</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> + <property name="layout_style">end</property> <child> - <widget class="GtkButton" id="close_button"> + <object class="GtkButton" id="close_button"> + <property name="label">gtk-close</property> <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="receives_default">False</property> <property name="use_stock">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_close_button_clicked"/> - </widget> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">2</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> +</interface> diff --git a/data/glade/input_dialog.glade b/data/gui/input_dialog.ui index c71dd4337..71c10548f 100644 --- a/data/glade/input_dialog.glade +++ b/data/gui/input_dialog.ui @@ -1,82 +1,83 @@ <?xml version="1.0"?> -<glade-interface> - <!-- interface-requires gtk+ 2.12 --> +<interface> + <requires lib="gtk+" version="2.16"/> <!-- interface-naming-policy toplevel-contextual --> - <widget class="GtkDialog" id="input_dialog"> + <object class="GtkDialog" id="input_dialog"> <property name="border_width">6</property> <property name="type_hint">dialog</property> <property name="has_separator">False</property> <signal name="delete_event" handler="on_input_dialog_delete_event"/> <child internal-child="vbox"> - <widget class="GtkVBox" id="dialog-vbox10"> + <object class="GtkVBox" id="dialog-vbox10"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkVBox" id="vbox"> + <object class="GtkVBox" id="vbox"> <property name="visible">True</property> <property name="border_width">6</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkHBox" id="hbox2960"> + <object class="GtkHBox" id="hbox2960"> <property name="visible">True</property> <property name="spacing">12</property> <child> - <widget class="GtkImage" id="image507"> + <object class="GtkImage" id="image507"> <property name="visible">True</property> <property name="stock">gtk-dialog-question</property> <property name="icon-size">6</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkLabel" id="label"> + <object class="GtkLabel" id="label"> <property name="visible">True</property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkEntry" id="input_entry"> + <object class="GtkEntry" id="input_entry"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="activates_default">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="position">1</property> </packing> </child> <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="dialog-action_area9"> + <object class="GtkHButtonBox" id="dialog-action_area9"> <property name="visible">True</property> <property name="layout_style">end</property> <child> - <widget class="GtkButton" id="cancelbutton"> + <object class="GtkButton" id="cancelbutton"> <property name="label">gtk-cancel</property> - <property name="response_id">-6</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> <property name="use_stock">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -84,30 +85,33 @@ </packing> </child> <child> - <widget class="GtkButton" id="okbutton"> + <object class="GtkButton" id="okbutton"> <property name="label">gtk-ok</property> - <property name="response_id">-5</property> <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="receives_default">False</property> <property name="use_stock">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="expand">False</property> <property name="pack_type">end</property> <property name="position">0</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + <action-widgets> + <action-widget response="-6">cancelbutton</action-widget> + <action-widget response="-5">okbutton</action-widget> + </action-widgets> + </object> +</interface> diff --git a/data/glade/input_text_dialog.glade b/data/gui/input_text_dialog.ui index ca53873c1..68fc57979 100644 --- a/data/glade/input_text_dialog.glade +++ b/data/gui/input_text_dialog.ui @@ -1,109 +1,125 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> -<!--*- mode: xml -*--> -<glade-interface> - <widget class="GtkDialog" id="input_dialog"> +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkDialog" id="input_dialog"> <property name="border_width">6</property> <property name="default_width">400</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> + <property name="type_hint">dialog</property> <property name="has_separator">False</property> <signal name="destroy" handler="on_input_dialog_destroy"/> <child internal-child="vbox"> - <widget class="GtkVBox" id="dialog-vbox10"> + <object class="GtkVBox" id="dialog-vbox10"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkVBox" id="vbox76"> + <object class="GtkVBox" id="vbox76"> <property name="visible">True</property> <property name="border_width">6</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkHBox" id="hbox2960"> + <object class="GtkHBox" id="hbox2960"> <property name="visible">True</property> <property name="spacing">12</property> <child> - <widget class="GtkImage" id="image507"> + <object class="GtkImage" id="image507"> <property name="visible">True</property> <property name="stock">gtk-dialog-question</property> - <property name="icon_size">6</property> - </widget> + <property name="icon-size">6</property> + </object> <packing> <property name="expand">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkLabel" id="label"> + <object class="GtkLabel" id="label"> <property name="visible">True</property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow1"> + <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_NEVER</property> - <property name="shadow_type">GTK_SHADOW_IN</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">never</property> + <property name="shadow_type">in</property> <child> - <widget class="GtkTextView" id="input_textview"> + <object class="GtkTextView" id="input_textview"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="wrap_mode">GTK_WRAP_WORD</property> - </widget> + <property name="wrap_mode">word</property> + </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_area9"> + <object class="GtkHButtonBox" id="dialog-action_area9"> <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> + <property name="layout_style">end</property> <child> - <widget class="GtkButton" id="cancelbutton"> + <object class="GtkButton" id="cancelbutton"> + <property name="label">gtk-cancel</property> <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="receives_default">False</property> <property name="use_stock">True</property> - <property name="response_id">-6</property> - </widget> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkButton" id="okbutton"> + <object class="GtkButton" id="okbutton"> + <property name="label">gtk-ok</property> <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-ok</property> + <property name="receives_default">False</property> <property name="use_stock">True</property> - <property name="response_id">-5</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="pack_type">GTK_PACK_END</property> + <property name="pack_type">end</property> + <property name="position">0</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + <action-widgets> + <action-widget response="-6">cancelbutton</action-widget> + <action-widget response="-5">okbutton</action-widget> + </action-widgets> + </object> +</interface> diff --git a/data/glade/join_groupchat_window.glade b/data/gui/join_groupchat_window.ui index 2a3d63c34..4f41dd1b4 100644 --- a/data/glade/join_groupchat_window.glade +++ b/data/gui/join_groupchat_window.ui @@ -1,31 +1,32 @@ -<?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 Oct 5 15:18:48 2009 --> -<glade-interface> - <widget class="GtkWindow" id="join_groupchat_window"> +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkWindow" id="join_groupchat_window"> <property name="border_width">6</property> <property name="title" translatable="yes">Join Group Chat</property> - <signal name="key_press_event" handler="on_join_groupchat_window_key_press_event"/> <signal name="destroy" handler="on_join_groupchat_window_destroy"/> + <signal name="key_press_event" handler="on_join_groupchat_window_key_press_event"/> <child> - <widget class="GtkVBox" id="vbox28"> + <object class="GtkVBox" id="vbox28"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <widget class="GtkTable" id="table15"> + <object class="GtkTable" id="table15"> <property name="visible">True</property> <property name="n_rows">7</property> <property name="n_columns">2</property> <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkEntry" id="room_jid_entry"> + <object class="GtkEntry" id="room_jid_entry"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="has_focus">True</property> <property name="activates_default">True</property> <signal name="changed" handler="on_required_entry_changed"/> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -35,12 +36,12 @@ </packing> </child> <child> - <widget class="GtkEntry" id="nickname_entry"> + <object class="GtkEntry" id="nickname_entry"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="activates_default">True</property> <signal name="changed" handler="on_required_entry_changed"/> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -50,11 +51,11 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label143"> + <object class="GtkLabel" id="label143"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Room:</property> - </widget> + </object> <packing> <property name="top_attach">3</property> <property name="bottom_attach">4</property> @@ -63,11 +64,11 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label142"> + <object class="GtkLabel" id="label142"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Nickname:</property> - </widget> + </object> <packing> <property name="top_attach">2</property> <property name="bottom_attach">3</property> @@ -76,11 +77,11 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label225"> + <object class="GtkLabel" id="label225"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Recently:</property> - </widget> + </object> <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> @@ -89,10 +90,10 @@ </packing> </child> <child> - <widget class="GtkComboBox" id="recently_combobox"> + <object class="GtkComboBox" id="recently_combobox"> <property name="visible">True</property> <signal name="changed" handler="on_recently_combobox_changed"/> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -103,11 +104,11 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label145"> + <object class="GtkLabel" id="label145"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Password:</property> - </widget> + </object> <packing> <property name="top_attach">4</property> <property name="bottom_attach">5</property> @@ -116,12 +117,12 @@ </packing> </child> <child> - <widget class="GtkEntry" id="password_entry"> + <object class="GtkEntry" id="password_entry"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="visibility">False</property> <property name="activates_default">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -131,15 +132,15 @@ </packing> </child> <child> - <widget class="GtkCheckButton" id="auto_join_checkbutton"> + <object class="GtkCheckButton" id="auto_join_checkbutton"> + <property name="label" translatable="yes">Join this room automatically when I connect</property> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Join this room automatically when I connect</property> + <property name="receives_default">False</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">6</property> @@ -149,21 +150,21 @@ </packing> </child> <child> - <widget class="GtkLabel" id="account_label"> + <object class="GtkLabel" id="account_label"> <property name="no_show_all">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> </packing> </child> <child> - <widget class="GtkComboBox" id="account_combobox"> + <object class="GtkComboBox" id="account_combobox"> <property name="no_show_all">True</property> <signal name="changed" handler="on_account_combobox_changed"/> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -172,14 +173,14 @@ </packing> </child> <child> - <widget class="GtkCheckButton" id="bookmark_checkbutton"> + <object class="GtkCheckButton" id="bookmark_checkbutton"> + <property name="label" translatable="yes">Bookmark this room</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Bookmark this room</property> - <property name="response_id">0</property> + <property name="receives_default">False</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_bookmark_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="right_attach">2</property> <property name="top_attach">5</property> @@ -188,85 +189,90 @@ <property name="y_options"></property> </packing> </child> - </widget> + </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkHButtonBox" id="hbuttonbox12"> + <object class="GtkHButtonBox" id="hbuttonbox12"> <property name="visible">True</property> <property name="spacing">12</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> + <property name="layout_style">end</property> <child> - <widget class="GtkButton" id="cancel_button"> + <object class="GtkButton" id="cancel_button"> + <property name="label">gtk-cancel</property> <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="receives_default">False</property> <property name="use_stock">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_cancel_button_clicked"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkButton" id="join_button"> + <object class="GtkButton" id="join_button"> <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">0</property> + <property name="receives_default">False</property> <signal name="clicked" handler="on_join_button_clicked"/> <child> - <widget class="GtkAlignment" id="alignment25"> + <object class="GtkAlignment" id="alignment25"> <property name="visible">True</property> <property name="xscale">0</property> <property name="yscale">0</property> <child> - <widget class="GtkHBox" id="hbox37"> + <object class="GtkHBox" id="hbox37"> <property name="visible">True</property> <property name="spacing">2</property> <child> - <widget class="GtkImage" id="image148"> + <object class="GtkImage" id="image148"> <property name="visible">True</property> <property name="stock">gtk-apply</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkLabel" id="label146"> + <object class="GtkLabel" id="label146"> <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="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">1</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> +</interface> diff --git a/data/glade/manage_bookmarks_window.glade b/data/gui/manage_bookmarks_window.ui index acf0ee6ff..1bdaff98b 100644 --- a/data/glade/manage_bookmarks_window.glade +++ b/data/gui/manage_bookmarks_window.ui @@ -1,90 +1,113 @@ -<?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="manage_bookmarks_window"> +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkListStore" id="liststore1"> + <columns> + <!-- column-name item text --> + <column type="gchararray"/> + </columns> + </object> + <object class="GtkWindow" id="manage_bookmarks_window"> <property name="border_width">12</property> <property name="title" translatable="yes">Manage Bookmarks</property> <property name="default_width">550</property> <property name="default_height">300</property> <signal name="button_press_event" handler="on_manage_bookmarks_window_button_press_event"/> <child> - <widget class="GtkVBox" id="vbox86"> + <object class="GtkVBox" id="vbox86"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <widget class="GtkHBox" id="hbox2965"> + <object class="GtkHBox" id="hbox2965"> <property name="visible">True</property> <property name="spacing">12</property> <child> - <widget class="GtkVBox" id="vbox94"> + <object class="GtkVBox" id="vbox94"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow37"> + <object class="GtkScrolledWindow" id="scrolledwindow37"> <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> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> <child> - <widget class="GtkTreeView" id="bookmarks_treeview"> + <object class="GtkTreeView" id="bookmarks_treeview"> <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">0</property> + </packing> </child> <child> - <widget class="GtkHButtonBox" id="hbuttonbox25"> + <object class="GtkHButtonBox" id="hbuttonbox25"> <property name="visible">True</property> <property name="spacing">6</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> + <property name="layout_style">end</property> <child> - <widget class="GtkButton" id="add_bookmark_button"> + <object class="GtkButton" id="add_bookmark_button"> + <property name="label">gtk-add</property> <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="receives_default">False</property> <property name="use_stock">True</property> <signal name="clicked" handler="on_add_bookmark_button_clicked"/> - </widget> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkButton" id="remove_bookmark_button"> + <object class="GtkButton" id="remove_bookmark_button"> + <property name="label">gtk-remove</property> <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="receives_default">False</property> <property name="use_stock">True</property> <signal name="clicked" handler="on_remove_bookmark_button_clicked"/> - </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">1</property> </packing> </child> - </widget> + </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkTable" id="table33"> + <object class="GtkTable" id="table33"> <property name="visible">True</property> <property name="n_rows">7</property> <property name="n_columns">2</property> <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkLabel" id="label318"> + <object class="GtkLabel" id="label318"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Password:</property> - </widget> + </object> <packing> <property name="top_attach">4</property> <property name="bottom_attach">5</property> @@ -93,12 +116,12 @@ </packing> </child> <child> - <widget class="GtkEntry" id="pass_entry"> - <property name="sensitive">False</property> + <object class="GtkEntry" id="pass_entry"> <property name="visible">True</property> + <property name="sensitive">False</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> @@ -108,11 +131,11 @@ </packing> </child> <child> - <widget class="GtkEntry" id="server_entry"> - <property name="sensitive">False</property> + <object class="GtkEntry" id="server_entry"> <property name="visible">True</property> + <property name="sensitive">False</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -122,11 +145,11 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label317"> + <object class="GtkLabel" id="label317"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Server:</property> - </widget> + </object> <packing> <property name="top_attach">3</property> <property name="bottom_attach">4</property> @@ -135,11 +158,11 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label316"> + <object class="GtkLabel" id="label316"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Room:</property> - </widget> + </object> <packing> <property name="top_attach">2</property> <property name="bottom_attach">3</property> @@ -148,11 +171,11 @@ </packing> </child> <child> - <widget class="GtkEntry" id="room_entry"> - <property name="sensitive">False</property> + <object class="GtkEntry" id="room_entry"> <property name="visible">True</property> + <property name="sensitive">False</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -162,11 +185,11 @@ </packing> </child> <child> - <widget class="GtkEntry" id="nick_entry"> - <property name="sensitive">False</property> + <object class="GtkEntry" id="nick_entry"> <property name="visible">True</property> + <property name="sensitive">False</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -176,11 +199,11 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label315"> + <object class="GtkLabel" id="label315"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Nickname:</property> - </widget> + </object> <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> @@ -189,22 +212,22 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label325"> + <object class="GtkLabel" id="label325"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Title:</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="title_entry"> - <property name="sensitive">False</property> + <object class="GtkEntry" id="title_entry"> <property name="visible">True</property> + <property name="sensitive">False</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -212,11 +235,11 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label326"> + <object class="GtkLabel" id="label326"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Print status:</property> - </widget> + </object> <packing> <property name="top_attach">6</property> <property name="bottom_attach">7</property> @@ -225,12 +248,18 @@ </packing> </child> <child> - <widget class="GtkComboBox" id="print_status_combobox"> - <property name="sensitive">False</property> + <object class="GtkComboBox" id="print_status_combobox"> <property name="visible">True</property> - <property name="items" translatable="yes"></property> + <property name="sensitive">False</property> + <property name="model">liststore1</property> <signal name="changed" handler="on_print_status_combobox_changed"/> - </widget> + <child> + <object class="GtkCellRendererText" id="cellrenderertext1"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -241,86 +270,103 @@ </packing> </child> <child> - <widget class="GtkHBox" id="hbox1"> + <object class="GtkHBox" id="hbox1"> <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> <child> - <widget class="GtkCheckButton" id="autojoin_checkbutton"> - <property name="sensitive">False</property> + <object class="GtkCheckButton" id="autojoin_checkbutton"> + <property name="label" translatable="yes">Auto join</property> <property name="visible">True</property> + <property name="sensitive">False</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">If checked, Gajim will join this group chat on startup</property> - <property name="label" translatable="yes">Auto join</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">If checked, Gajim will join this group chat on startup</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_autojoin_checkbutton_toggled"/> - </widget> + </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkCheckButton" id="minimize_checkbutton"> - <property name="sensitive">False</property> + <object class="GtkCheckButton" id="minimize_checkbutton"> + <property name="label" translatable="yes">Minimize on Auto Join</property> <property name="visible">True</property> + <property name="sensitive">False</property> <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Minimize on Auto Join</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_minimize_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="right_attach">2</property> <property name="top_attach">5</property> <property name="bottom_attach">6</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkHButtonBox" id="hbuttonbox20"> + <object class="GtkHButtonBox" id="hbuttonbox20"> <property name="visible">True</property> <property name="spacing">12</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> + <property name="layout_style">end</property> <child> - <widget class="GtkButton" id="cancel_button"> + <object class="GtkButton" id="cancel_button"> + <property name="label">gtk-cancel</property> <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="receives_default">False</property> <property name="use_stock">True</property> <signal name="clicked" handler="on_cancel_button_clicked"/> - </widget> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkButton" id="ok_button"> + <object class="GtkButton" id="ok_button"> + <property name="label">gtk-ok</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> - <property name="label">gtk-ok</property> + <property name="receives_default">False</property> <property name="use_stock">True</property> <signal name="clicked" handler="on_ok_button_clicked"/> - </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">1</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> +</interface> diff --git a/data/glade/manage_pep_services_window.glade b/data/gui/manage_pep_services_window.ui index ff3002455..34969b5d5 100644 --- a/data/glade/manage_pep_services_window.glade +++ b/data/gui/manage_pep_services_window.ui @@ -1,108 +1,122 @@ -<?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="manage_pep_services_window"> +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkWindow" id="manage_pep_services_window"> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="title" translatable="yes">PEP Service Configuration</property> <property name="default_width">350</property> <property name="default_height">150</property> <signal name="destroy" handler="on_manage_pep_services_window_destroy"/> <child> - <widget class="GtkVBox" id="vbox1"> + <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> + <property name="orientation">vertical</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="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="shadow_type">GTK_SHADOW_IN</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> <child> - <widget class="GtkTreeView" id="services_treeview"> + <object class="GtkTreeView" id="services_treeview"> <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> - </widget> + </object> </child> - </widget> + </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkHButtonBox" id="hbuttonbox1"> + <object class="GtkHButtonBox" id="hbuttonbox1"> <property name="visible">True</property> <property name="spacing">6</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> + <property name="layout_style">end</property> <child> - <widget class="GtkButton" id="delete_button"> + <object class="GtkButton" id="delete_button"> + <property name="label">gtk-delete</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">gtk-delete</property> <property name="use_stock">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_delete_button_clicked"/> - </widget> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkButton" id="configure_button"> + <object class="GtkButton" id="configure_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="response_id">0</property> <signal name="clicked" handler="on_configure_button_clicked"/> <child> - <widget class="GtkHBox" id="hbox1"> + <object class="GtkHBox" id="hbox1"> <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> <child> - <widget class="GtkImage" id="image1"> + <object class="GtkImage" id="image1"> <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="stock">gtk-preferences</property> - </widget> + </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkLabel" id="label1"> + <object class="GtkLabel" id="label1"> <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="label" translatable="yes">_Configure</property> <property name="use_underline">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="fill">False</property> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkButton" id="close_button"> + <object class="GtkButton" id="close_button"> + <property name="label">gtk-close</property> <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="receives_default">False</property> <property name="use_stock">True</property> - <property name="response_id">-6</property> <signal name="clicked" handler="on_close_button_clicked"/> - </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="expand">False</property> <property name="padding">6</property> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> +</interface> diff --git a/data/glade/manage_proxies_window.glade b/data/gui/manage_proxies_window.ui index 7a0029d2f..9804cbd6e 100644 --- a/data/glade/manage_proxies_window.glade +++ b/data/gui/manage_proxies_window.ui @@ -1,51 +1,70 @@ <?xml version="1.0"?> -<glade-interface> - <!-- interface-requires gtk+ 2.12 --> +<interface> + <requires lib="gtk+" version="2.16"/> <!-- interface-naming-policy toplevel-contextual --> - <widget class="GtkWindow" id="manage_proxies_window"> + <object class="GtkListStore" id="liststore1"> + <columns> + <!-- column-name item text --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">HTTP Connect</col> + </row> + <row> + <col id="0" translatable="yes">SOCKS5</col> + </row> + <row> + <col id="0" translatable="yes">BOSH</col> + </row> + </data> + </object> + <object class="GtkWindow" id="manage_proxies_window"> <property name="border_width">12</property> <property name="title" translatable="yes">Manage Proxy Profiles</property> <signal name="destroy" handler="on_manage_proxies_window_destroy"/> <child> - <widget class="GtkVBox" id="vbox87"> + <object class="GtkVBox" id="vbox87"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <widget class="GtkHBox" id="hbox2966"> + <object class="GtkHBox" id="hbox2966"> <property name="visible">True</property> <property name="spacing">12</property> <child> - <widget class="GtkVBox" id="vbox89"> + <object class="GtkVBox" id="vbox89"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow38"> + <object class="GtkScrolledWindow" id="scrolledwindow38"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">automatic</property> <property name="vscrollbar_policy">automatic</property> <property name="shadow_type">in</property> <child> - <widget class="GtkTreeView" id="proxies_treeview"> + <object class="GtkTreeView" id="proxies_treeview"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="headers_visible">False</property> <signal name="key_press_event" handler="on_proxies_treeview_key_press_event"/> <signal name="cursor_changed" handler="on_proxies_treeview_cursor_changed"/> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkHButtonBox" id="hbuttonbox21"> + <object class="GtkHButtonBox" id="hbuttonbox21"> <property name="visible">True</property> <property name="spacing">6</property> <property name="layout_style">end</property> <child> - <widget class="GtkButton" id="add_proxy_button"> + <object class="GtkButton" id="add_proxy_button"> <property name="label">gtk-add</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -53,7 +72,7 @@ <property name="receives_default">False</property> <property name="use_stock">True</property> <signal name="clicked" handler="on_add_proxy_button_clicked"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -61,7 +80,7 @@ </packing> </child> <child> - <widget class="GtkButton" id="remove_proxy_button"> + <object class="GtkButton" id="remove_proxy_button"> <property name="label">gtk-remove</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -69,38 +88,39 @@ <property name="receives_default">False</property> <property name="use_stock">True</property> <signal name="clicked" handler="on_remove_proxy_button_clicked"/> - </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">1</property> </packing> </child> - </widget> + </object> <packing> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkVBox" id="vbox90"> + <object class="GtkVBox" id="vbox90"> <property name="visible">True</property> + <property name="orientation">vertical</property> <child> - <widget class="GtkFrame" id="frame34"> + <object class="GtkFrame" id="frame34"> <property name="visible">True</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <widget class="GtkAlignment" id="alignment72"> + <object class="GtkAlignment" id="alignment72"> <property name="visible">True</property> <property name="left_padding">12</property> <child> - <widget class="GtkTable" id="table34"> + <object class="GtkTable" id="table34"> <property name="visible">True</property> <property name="border_width">6</property> <property name="n_rows">2</property> @@ -108,11 +128,11 @@ <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkEntry" id="proxyname_entry"> + <object class="GtkEntry" id="proxyname_entry"> <property name="visible">True</property> <property name="can_focus">True</property> <signal name="changed" handler="on_proxyname_entry_changed"/> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -120,13 +140,17 @@ </packing> </child> <child> - <widget class="GtkComboBox" id="proxytype_combobox"> + <object class="GtkComboBox" id="proxytype_combobox"> <property name="visible">True</property> - <property name="items" translatable="yes">HTTP Connect -SOCKS5 -BOSH</property> + <property name="model">liststore1</property> <signal name="changed" handler="on_proxytype_combobox_changed"/> - </widget> + <child> + <object class="GtkCellRendererText" id="cellrenderertext1"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -136,13 +160,13 @@ BOSH</property> </packing> </child> <child> - <widget class="GtkLabel" id="label321"> + <object class="GtkLabel" id="label321"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Type:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">proxytype_combobox</property> - </widget> + </object> <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> @@ -151,49 +175,46 @@ BOSH</property> </packing> </child> <child> - <widget class="GtkLabel" id="label320"> + <object class="GtkLabel" id="label320"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Name:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">proxyname_entry</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label319"> + <child type="label"> + <object class="GtkLabel" id="label319"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Properties</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">0</property> </packing> </child> <child> - <widget class="GtkFrame" id="frame23"> + <object class="GtkFrame" id="frame23"> <property name="visible">True</property> <property name="border_width">6</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <widget class="GtkAlignment" id="alignment51"> + <object class="GtkAlignment" id="alignment51"> <property name="visible">True</property> <property name="left_padding">12</property> <child> - <widget class="GtkTable" id="proxy_table"> + <object class="GtkTable" id="proxy_table"> <property name="visible">True</property> <property name="sensitive">False</property> <property name="n_rows">7</property> @@ -201,7 +222,7 @@ BOSH</property> <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkCheckButton" id="boshuseproxy_checkbutton"> + <object class="GtkCheckButton" id="boshuseproxy_checkbutton"> <property name="label" translatable="yes">Use HTTP prox_y</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -209,7 +230,7 @@ BOSH</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_boshuseproxy_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="right_attach">2</property> <property name="top_attach">1</property> @@ -219,11 +240,11 @@ BOSH</property> </packing> </child> <child> - <widget class="GtkEntry" id="boshuri_entry"> + <object class="GtkEntry" id="boshuri_entry"> <property name="visible">True</property> <property name="can_focus">True</property> <signal name="changed" handler="on_boshuri_entry_changed"/> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -231,20 +252,20 @@ BOSH</property> </packing> </child> <child> - <widget class="GtkLabel" id="boshuri_label"> + <object class="GtkLabel" id="boshuri_label"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">_BOSH URL:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">boshuri_entry</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkCheckButton" id="useauth_checkbutton"> + <object class="GtkCheckButton" id="useauth_checkbutton"> <property name="label" translatable="yes">Use proxy auth_entication</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -252,7 +273,7 @@ BOSH</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_useauth_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="right_attach">2</property> <property name="top_attach">4</property> @@ -262,11 +283,11 @@ BOSH</property> </packing> </child> <child> - <widget class="GtkEntry" id="proxyuser_entry"> + <object class="GtkEntry" id="proxyuser_entry"> <property name="visible">True</property> <property name="can_focus">True</property> <signal name="changed" handler="on_proxyuser_entry_changed"/> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -276,12 +297,12 @@ BOSH</property> </packing> </child> <child> - <widget class="GtkEntry" id="proxypass_entry"> + <object class="GtkEntry" id="proxypass_entry"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="visibility">False</property> <signal name="changed" handler="on_proxypass_entry_changed"/> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -291,13 +312,13 @@ BOSH</property> </packing> </child> <child> - <widget class="GtkLabel" id="label253"> + <object class="GtkLabel" id="label253"> <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">proxyuser_entry</property> - </widget> + </object> <packing> <property name="top_attach">5</property> <property name="bottom_attach">6</property> @@ -306,13 +327,13 @@ BOSH</property> </packing> </child> <child> - <widget class="GtkLabel" id="label254"> + <object class="GtkLabel" id="label254"> <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">proxypass_entry</property> - </widget> + </object> <packing> <property name="top_attach">6</property> <property name="bottom_attach">7</property> @@ -321,13 +342,13 @@ BOSH</property> </packing> </child> <child> - <widget class="GtkLabel" id="label135"> + <object class="GtkLabel" id="label135"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Proxy _Host:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">proxyhost_entry</property> - </widget> + </object> <packing> <property name="top_attach">2</property> <property name="bottom_attach">3</property> @@ -336,11 +357,11 @@ BOSH</property> </packing> </child> <child> - <widget class="GtkEntry" id="proxyport_entry"> + <object class="GtkEntry" id="proxyport_entry"> <property name="visible">True</property> <property name="can_focus">True</property> <signal name="changed" handler="on_proxyport_entry_changed"/> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -350,11 +371,11 @@ BOSH</property> </packing> </child> <child> - <widget class="GtkEntry" id="proxyhost_entry"> + <object class="GtkEntry" id="proxyhost_entry"> <property name="visible">True</property> <property name="can_focus">True</property> <signal name="changed" handler="on_proxyhost_entry_changed"/> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -364,13 +385,13 @@ BOSH</property> </packing> </child> <child> - <widget class="GtkLabel" id="label136"> + <object class="GtkLabel" id="label136"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Proxy _Port:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">proxyport_entry</property> - </widget> + </object> <packing> <property name="top_attach">3</property> <property name="bottom_attach">4</property> @@ -378,43 +399,40 @@ BOSH</property> <property name="y_options"></property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label216"> + <child type="label"> + <object class="GtkLabel" id="label216"> <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> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkHButtonBox" id="hbuttonbox22"> + <object class="GtkHButtonBox" id="hbuttonbox22"> <property name="visible">True</property> <property name="border_width">7</property> <property name="spacing">12</property> <property name="layout_style">end</property> <child> - <widget class="GtkButton" id="close_button"> + <object class="GtkButton" id="close_button"> <property name="label">gtk-close</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -422,19 +440,19 @@ BOSH</property> <property name="receives_default">False</property> <property name="use_stock">True</property> <signal name="clicked" handler="on_close_button_clicked"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">0</property> </packing> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> +</interface> diff --git a/data/glade/manage_sounds_window.glade b/data/gui/manage_sounds_window.ui index 44cd23977..2fc3a4f6f 100644 --- a/data/glade/manage_sounds_window.glade +++ b/data/gui/manage_sounds_window.ui @@ -1,52 +1,59 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> -<!--Generated with glade3 3.4.5 on Sat Jan 24 14:54:22 2009 --> -<glade-interface> - <widget class="GtkWindow" id="manage_sounds_window"> +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkWindow" id="manage_sounds_window"> <property name="width_request">400</property> <property name="height_request">350</property> <property name="border_width">6</property> <signal name="delete_event" handler="on_manage_sounds_window_delete_event"/> <child> - <widget class="GtkVBox" id="vbox1"> + <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkScrolledWindow" id="sounds_scrolledwindow"> + <object class="GtkScrolledWindow" id="sounds_scrolledwindow"> <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> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> <child> - <widget class="GtkTreeView" id="sounds_treeview"> + <object class="GtkTreeView" id="sounds_treeview"> <property name="visible">True</property> <property name="can_focus">True</property> <signal name="cursor_changed" handler="on_treeview_sounds_cursor_changed"/> - </widget> + </object> </child> - </widget> + </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkHBox" id="browse_sounds_hbox"> + <object class="GtkHBox" id="browse_sounds_hbox"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkEntry" id="sounds_entry"> + <object class="GtkEntry" id="sounds_entry"> <property name="visible">True</property> <property name="can_focus">True</property> <signal name="changed" handler="on_sounds_entry_changed"/> - </widget> + </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkButton" id="browse_for_sounds_button"> + <object class="GtkButton" id="browse_for_sounds_button"> + <property name="label">...</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label">...</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_browse_for_sounds_button_clicked"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -54,53 +61,57 @@ </packing> </child> <child> - <widget class="GtkButton" id="play_button"> + <object class="GtkButton" id="play_button"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="response_id">0</property> + <property name="receives_default">False</property> <signal name="clicked" handler="on_play_button_clicked"/> <child> - <widget class="GtkImage" id="image1370"> + <object class="GtkImage" id="image1370"> <property name="visible">True</property> <property name="stock">gtk-media-play</property> - </widget> + </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="expand">False</property> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkHButtonBox" id="hbuttonbox1"> + <object class="GtkHButtonBox" id="hbuttonbox1"> <property name="visible">True</property> <property name="spacing">6</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> + <property name="layout_style">end</property> <child> - <widget class="GtkButton" id="close_button"> + <object class="GtkButton" id="close_button"> + <property name="label">gtk-close</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="label" translatable="yes">gtk-close</property> <property name="use_stock">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_close_button_clicked"/> - </widget> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">2</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> +</interface> diff --git a/data/glade/message_window.glade b/data/gui/message_window.ui index e58931f0d..4caa87728 100644 --- a/data/glade/message_window.glade +++ b/data/gui/message_window.ui @@ -1,49 +1,49 @@ <?xml version="1.0"?> -<glade-interface> - <!-- interface-requires gtk+ 2.16 --> +<interface> + <requires lib="gtk+" version="2.16"/> <!-- interface-naming-policy toplevel-contextual --> - <widget class="GtkWindow" id="message_window"> + <object class="GtkWindow" id="message_window"> <property name="default_width">480</property> <property name="default_height">440</property> <child> - <widget class="GtkAlignment" id="msg_window_alignment"> + <object class="GtkAlignment" id="msg_window_alignment"> <property name="visible">True</property> <property name="top_padding">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="scrollable">True</property> <child> - <widget class="GtkVBox" id="chat_child_vbox"> + <object class="GtkVBox" id="chat_child_vbox"> <property name="can_focus">True</property> <property name="border_width">3</property> <property name="orientation">vertical</property> <property name="spacing">1</property> <child> - <widget class="GtkHBox" id="hbox3"> + <object class="GtkHBox" id="hbox3"> <property name="visible">True</property> <child> - <widget class="GtkVBox" id="vbox2"> + <object class="GtkVBox" id="vbox2"> <property name="visible">True</property> <property name="orientation">vertical</property> <child> - <widget class="GtkAlignment" id="alignment"> + <object class="GtkAlignment" id="alignment"> <property name="visible">True</property> <property name="left_padding">3</property> <property name="right_padding">3</property> <child> - <widget class="GtkEventBox" id="banner_eventbox"> + <object class="GtkEventBox" id="banner_eventbox"> <property name="visible">True</property> <child> - <widget class="GtkHBox" id="hbox3004"> + <object class="GtkHBox" id="hbox3004"> <property name="visible">True</property> <child> - <widget class="GtkImage" id="banner_status_image"> + <object class="GtkImage" id="banner_status_image"> <property name="visible">True</property> <property name="ypad">5</property> <property name="stock">gtk-missing-image</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -52,86 +52,86 @@ </packing> </child> <child> - <widget class="GtkVBox" id="banner_vbox"> + <object class="GtkVBox" id="banner_vbox"> <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="border_width">5</property> <property name="orientation">vertical</property> <child> - <widget class="GtkLabel" id="banner_name_label"> + <object class="GtkLabel" id="banner_name_label"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label"><span weight="heavy" size="large">Contact name</span></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkLabel" id="banner_label"> + <object class="GtkLabel" id="banner_label"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">label</property> <property name="use_markup">True</property> <property name="selectable">True</property> <signal name="populate_popup" handler="on_banner_label_populate_popup"/> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox2"> + <object class="GtkHBox" id="hbox2"> <property name="visible">True</property> <property name="spacing">4</property> <child> - <widget class="GtkImage" id="mood_image"> + <object class="GtkImage" id="mood_image"> <property name="no_show_all">True</property> <property name="stock">None</property> <property name="icon-size">1</property> - </widget> + </object> <packing> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkImage" id="activity_image"> + <object class="GtkImage" id="activity_image"> <property name="no_show_all">True</property> <property name="stock">None</property> <property name="icon-size">1</property> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkImage" id="tune_image"> + <object class="GtkImage" id="tune_image"> <property name="no_show_all">True</property> <property name="stock">None</property> <property name="icon-size">1</property> - </widget> + </object> <packing> <property name="position">2</property> </packing> </child> <child> - <widget class="GtkEventBox" id="location_eventbox"> + <object class="GtkEventBox" id="location_eventbox"> <property name="visible">True</property> <property name="visible_window">False</property> <child> - <widget class="GtkImage" id="location_image"> + <object class="GtkImage" id="location_image"> <property name="no_show_all">True</property> <property name="stock">None</property> <property name="icon-size">1</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -139,38 +139,38 @@ </packing> </child> <child> - <widget class="GtkImage" id="audio_banner_image"> + <object class="GtkImage" id="audio_banner_image"> <property name="visible">True</property> <property name="stock">None</property> <property name="icon-size">1</property> - </widget> + </object> <packing> <property name="position">4</property> </packing> </child> <child> - <widget class="GtkImage" id="video_banner_image"> + <object class="GtkImage" id="video_banner_image"> <property name="visible">True</property> <property name="stock">None</property> <property name="icon-size">1</property> - </widget> + </object> <packing> <property name="position">5</property> </packing> </child> <child> - <widget class="GtkAlignment" id="alignment3"> + <object class="GtkAlignment" id="alignment3"> <property name="width_request">11</property> <property name="visible">True</property> <child> <placeholder/> </child> - </widget> + </object> <packing> <property name="position">6</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -178,27 +178,27 @@ </packing> </child> <child> - <widget class="GtkEventBox" id="avatar_eventbox"> + <object class="GtkEventBox" id="avatar_eventbox"> <property name="visible">True</property> <property name="visible_window">False</property> <child> - <widget class="GtkImage" id="avatar_image"> + <object class="GtkImage" id="avatar_image"> <property name="visible">True</property> <property name="stock">None</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> </child> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -206,11 +206,11 @@ </packing> </child> <child> - <widget class="GtkVBox" id="vbox106"> + <object class="GtkVBox" id="vbox106"> <property name="visible">True</property> <property name="orientation">vertical</property> <child> - <widget class="GtkScrolledWindow" id="conversation_scrolledwindow"> + <object class="GtkScrolledWindow" id="conversation_scrolledwindow"> <property name="height_request">60</property> <property name="can_focus">True</property> <property name="border_width">3</property> @@ -220,17 +220,17 @@ <child> <placeholder/> </child> - </widget> + </object> <packing> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox"> + <object class="GtkHBox" id="hbox"> <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> <child> - <widget class="GtkButton" id="authentication_button"> + <object class="GtkButton" id="authentication_button"> <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> @@ -238,20 +238,20 @@ <property name="relief">none</property> <property name="focus_on_click">False</property> <child> - <widget class="GtkImage" id="lock_image"> + <object class="GtkImage" id="lock_image"> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="stock">gtk-dialog-authentication</property> <property name="icon-size">1</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkScrolledWindow" id="message_scrolledwindow"> + <object class="GtkScrolledWindow" id="message_scrolledwindow"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="border_width">3</property> @@ -261,101 +261,101 @@ <child> <placeholder/> </child> - </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="position">1</property> </packing> </child> <child> - <widget class="GtkHBox" id="actions_hbox"> + <object class="GtkHBox" id="actions_hbox"> <property name="visible">True</property> <child> - <widget class="GtkButton" id="emoticons_button"> + <object class="GtkButton" id="emoticons_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="has_tooltip">True</property> - <property name="tooltip" translatable="yes">Show a list of emoticons (Alt+M)</property> + <property name="tooltip_text" translatable="yes">Show a list of emoticons (Alt+M)</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <child> - <widget class="GtkImage" id="emoticons_button_image"> + <object class="GtkImage" id="emoticons_button_image"> <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="stock">gtk-missing-image</property> <property name="icon-size">1</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkButton" id="formattings_button"> + <object class="GtkButton" id="formattings_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="has_tooltip">True</property> - <property name="tooltip" translatable="yes">Show a list of formattings</property> + <property name="tooltip_text" translatable="yes">Show a list of formattings</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <child> - <widget class="GtkImage" id="image10"> + <object class="GtkImage" id="image10"> <property name="visible">True</property> <property name="stock">gtk-bold</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> <child> - <widget class="GtkVSeparator" id="vseparator1"> + <object class="GtkVSeparator" id="vseparator1"> <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="orientation">vertical</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">2</property> </packing> </child> <child> - <widget class="GtkButton" id="add_to_roster_button"> + <object class="GtkButton" id="add_to_roster_button"> <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="no_show_all">True</property> <property name="has_tooltip">True</property> - <property name="tooltip" translatable="yes">Add this contact to roster (Ctrl+D)</property> + <property name="tooltip_text" translatable="yes">Add this contact to roster (Ctrl+D)</property> <property name="relief">none</property> <child> - <widget class="GtkImage" id="image9"> + <object class="GtkImage" id="image9"> <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="stock">gtk-add</property> <property name="icon-size">1</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -363,206 +363,206 @@ </packing> </child> <child> - <widget class="GtkButton" id="send_file_button"> + <object class="GtkButton" id="send_file_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="has_tooltip">True</property> - <property name="tooltip" translatable="yes">Send a file (Ctrl+F)</property> + <property name="tooltip_text" translatable="yes">Send a file (Ctrl+F)</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <child> - <widget class="GtkImage" id="image3"> + <object class="GtkImage" id="image3"> <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="icon-size">1</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">4</property> </packing> </child> <child> - <widget class="GtkToggleButton" id="audio_togglebutton"> + <object class="GtkToggleButton" id="audio_togglebutton"> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="has_tooltip">True</property> - <property name="tooltip" translatable="yes">Toggle audio session</property> + <property name="tooltip_text" translatable="yes">Toggle audio session</property> <property name="relief">none</property> <child> - <widget class="GtkImage" id="audio_image"> + <object class="GtkImage" id="audio_image"> <property name="visible">True</property> <property name="stock">gtk-missing-image</property> <property name="icon-size">1</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">5</property> </packing> </child> <child> - <widget class="GtkToggleButton" id="video_togglebutton"> + <object class="GtkToggleButton" id="video_togglebutton"> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="has_tooltip">True</property> - <property name="tooltip" translatable="yes">Toggle video session</property> + <property name="tooltip_text" translatable="yes">Toggle video session</property> <property name="relief">none</property> <child> - <widget class="GtkImage" id="video_image"> + <object class="GtkImage" id="video_image"> <property name="visible">True</property> <property name="stock">gtk-missing-image</property> <property name="icon-size">1</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">6</property> </packing> </child> <child> - <widget class="GtkButton" id="convert_to_gc_button"> + <object class="GtkButton" id="convert_to_gc_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="has_tooltip">True</property> - <property name="tooltip" translatable="yes">Invite contacts to the conversation (Ctrl+G)</property> + <property name="tooltip_text" translatable="yes">Invite contacts to the conversation (Ctrl+G)</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <child> - <widget class="GtkImage" id="convert_to_gc_button_image"> + <object class="GtkImage" id="convert_to_gc_button_image"> <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="stock">gtk-missing-image</property> <property name="icon-size">1</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">7</property> </packing> </child> <child> - <widget class="GtkButton" id="contact_information_button"> + <object class="GtkButton" id="contact_information_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="has_tooltip">True</property> - <property name="tooltip" translatable="yes">Show the contact's profile (Ctrl+I)</property> + <property name="tooltip_text" translatable="yes">Show the contact's profile (Ctrl+I)</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <child> - <widget class="GtkImage" id="image2"> + <object class="GtkImage" id="image2"> <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="stock">gtk-info</property> <property name="icon-size">2</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">8</property> </packing> </child> <child> - <widget class="GtkButton" id="history_button"> + <object class="GtkButton" id="history_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="has_tooltip">True</property> - <property name="tooltip" translatable="yes">Browse the chat history (Ctrl+H)</property> + <property name="tooltip_text" translatable="yes">Browse the chat history (Ctrl+H)</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <child> - <widget class="GtkImage" id="image5"> + <object class="GtkImage" id="image5"> <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="stock">gtk-justify-fill</property> <property name="icon-size">1</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">9</property> </packing> </child> <child> - <widget class="GtkVSeparator" id="vseparator3"> + <object class="GtkVSeparator" id="vseparator3"> <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="orientation">vertical</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">10</property> </packing> </child> <child> - <widget class="GtkButton" id="message_window_actions_button"> + <object class="GtkButton" id="message_window_actions_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="has_tooltip">True</property> - <property name="tooltip" translatable="yes">Show a menu of advanced functions (Alt+D)</property> + <property name="tooltip_text" translatable="yes">Show a menu of advanced functions (Alt+D)</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <child> - <widget class="GtkImage" id="image1"> + <object class="GtkImage" id="image1"> <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="stock">gtk-execute</property> <property name="icon-size">1</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">11</property> </packing> </child> <child> - <widget class="GtkAlignment" id="alignment1"> + <object class="GtkAlignment" id="alignment1"> <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> <child> <placeholder/> </child> - </widget> + </object> <packing> <property name="position">12</property> </packing> </child> <child> - <widget class="GtkButton" id="send_button"> + <object class="GtkButton" id="send_button"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <child> - <widget class="GtkAlignment" id="alignment102"> + <object class="GtkAlignment" id="alignment102"> <property name="visible">True</property> <property name="xscale">0</property> <property name="yscale">0</property> <child> - <widget class="GtkHBox" id="hbox3010"> + <object class="GtkHBox" id="hbox3010"> <property name="visible">True</property> <property name="spacing">2</property> <child> - <widget class="GtkImage" id="image1339"> + <object class="GtkImage" id="image1339"> <property name="visible">True</property> <property name="stock">gtk-jump-to</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -570,109 +570,109 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label373"> + <object class="GtkLabel" id="label373"> <property name="visible">True</property> <property name="label" translatable="yes" comments="Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)">_Send</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="position">13</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">2</property> </packing> </child> - </widget> + </object> <packing> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkVBox" id="audio_vbox"> + <object class="GtkVBox" id="audio_vbox"> <property name="no_show_all">True</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label3"> + <object class="GtkLabel" id="label3"> <property name="visible">True</property> - </widget> + </object> <packing> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkTable" id="table1"> + <object class="GtkTable" id="table1"> <property name="visible">True</property> <property name="n_rows">4</property> <property name="n_columns">3</property> <property name="column_spacing">6</property> <property name="row_spacing">6</property> <child> - <widget class="GtkButton" id="1_button"> + <object class="GtkButton" id="1_button"> <property name="label" translatable="yes">1</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - </widget> + </object> </child> <child> - <widget class="GtkButton" id="2_button"> + <object class="GtkButton" id="2_button"> <property name="label" translatable="yes">2</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> </packing> </child> <child> - <widget class="GtkButton" id="3_button"> + <object class="GtkButton" id="3_button"> <property name="label" translatable="yes">3</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> </packing> </child> <child> - <widget class="GtkButton" id="4_button"> + <object class="GtkButton" id="4_button"> <property name="label" translatable="yes">4</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - </widget> + </object> <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> </packing> </child> <child> - <widget class="GtkButton" id="5_button"> + <object class="GtkButton" id="5_button"> <property name="label" translatable="yes">5</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -681,12 +681,12 @@ </packing> </child> <child> - <widget class="GtkButton" id="6_button"> + <object class="GtkButton" id="6_button"> <property name="label" translatable="yes">6</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> @@ -695,24 +695,24 @@ </packing> </child> <child> - <widget class="GtkButton" id="7_button"> + <object class="GtkButton" id="7_button"> <property name="label" translatable="yes">7</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - </widget> + </object> <packing> <property name="top_attach">2</property> <property name="bottom_attach">3</property> </packing> </child> <child> - <widget class="GtkButton" id="8_button"> + <object class="GtkButton" id="8_button"> <property name="label" translatable="yes">8</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -721,12 +721,12 @@ </packing> </child> <child> - <widget class="GtkButton" id="9_button"> + <object class="GtkButton" id="9_button"> <property name="label" translatable="yes">9</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> @@ -735,24 +735,24 @@ </packing> </child> <child> - <widget class="GtkButton" id="*_button"> + <object class="GtkButton" id="*_button"> <property name="label" translatable="yes">*</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - </widget> + </object> <packing> <property name="top_attach">3</property> <property name="bottom_attach">4</property> </packing> </child> <child> - <widget class="GtkButton" id="0_button"> + <object class="GtkButton" id="0_button"> <property name="label" translatable="yes">0</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -761,12 +761,12 @@ </packing> </child> <child> - <widget class="GtkButton" id="#_button"> + <object class="GtkButton" id="#_button"> <property name="label" translatable="yes">#</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> @@ -774,95 +774,95 @@ <property name="bottom_attach">4</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">1</property> </packing> </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">Sound volume:</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">2</property> </packing> </child> <child> - <widget class="GtkHScale" id="sound_hscale"> + <object class="GtkHScale" id="sound_hscale"> <property name="width_request">110</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="adjustment">0 0 110 1 10 10</property> + <property name="adjustment">adjustment2</property> <property name="digits">0</property> <property name="value_pos">bottom</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">3</property> </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">Mic volume:</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">4</property> </packing> </child> <child> - <widget class="GtkHScale" id="mic_hscale"> + <object class="GtkHScale" id="mic_hscale"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="adjustment">0 0 110 1 10 10</property> + <property name="adjustment">adjustment1</property> <property name="digits">0</property> <property name="value_pos">bottom</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">5</property> </packing> </child> <child> - <widget class="GtkLabel" id="label4"> + <object class="GtkLabel" id="label4"> <property name="visible">True</property> - </widget> + </object> <packing> <property name="position">6</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="position">0</property> </packing> </child> - </widget> + </object> </child> - <child> - <widget class="GtkEventBox" id="chat_tab_ebox"> + <child type="tab"> + <object class="GtkEventBox" id="chat_tab_ebox"> <property name="visible">True</property> <property name="visible_window">False</property> <child> - <widget class="GtkHBox" id="tab_hbox"> + <object class="GtkHBox" id="tab_hbox"> <property name="visible">True</property> <property name="spacing">4</property> <child> - <widget class="GtkImage" id="tab_image"> + <object class="GtkImage" id="tab_image"> <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> @@ -870,18 +870,18 @@ </packing> </child> <child> - <widget class="GtkLabel" id="tab_label"> + <object class="GtkLabel" id="tab_label"> <property name="visible">True</property> <property name="xalign">0</property> <property name="use_markup">True</property> <property name="ellipsize">end</property> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkButton" id="tab_close_button"> + <object class="GtkButton" id="tab_close_button"> <property name="width_request">20</property> <property name="height_request">20</property> <property name="visible">True</property> @@ -889,50 +889,49 @@ <property name="receives_default">False</property> <property name="relief">none</property> <child> - <widget class="GtkImage" id="image1329"> + <object class="GtkImage" id="image1329"> <property name="visible">True</property> <property name="ypad">6</property> <property name="stock">gtk-close</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">2</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="tab_fill">False</property> - <property name="type">tab</property> </packing> </child> <child> - <widget class="GtkVBox" id="muc_child_vbox"> + <object class="GtkVBox" id="muc_child_vbox"> <property name="can_focus">True</property> <property name="border_width">3</property> <property name="orientation">vertical</property> <child> - <widget class="GtkAlignment" id="alignment103"> + <object class="GtkAlignment" id="alignment103"> <property name="visible">True</property> <property name="bottom_padding">1</property> <property name="left_padding">3</property> <property name="right_padding">3</property> <child> - <widget class="GtkEventBox" id="banner_eventbox"> + <object class="GtkEventBox" id="banner_eventbox1"> <property name="visible">True</property> <child> - <widget class="GtkHBox" id="hbox3024"> + <object class="GtkHBox" id="hbox3024"> <property name="visible">True</property> <child> - <widget class="GtkImage" id="gc_banner_status_image"> + <object class="GtkImage" id="gc_banner_status_image"> <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> @@ -941,44 +940,44 @@ </packing> </child> <child> - <widget class="GtkVBox" id="banner_vbox"> + <object class="GtkVBox" id="banner_vbox1"> <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="border_width">5</property> <property name="orientation">vertical</property> <child> - <widget class="GtkLabel" id="banner_name_label"> + <object class="GtkLabel" id="banner_name_label1"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label"><span weight="heavy" size="large">room jid</span></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkLabel" id="banner_label"> + <object class="GtkLabel" id="banner_label1"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">label</property> <property name="use_markup">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> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -986,24 +985,24 @@ </packing> </child> <child> - <widget class="GtkHPaned" id="hpaned"> + <object class="GtkHPaned" id="hpaned"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="border_width">3</property> <property name="position">495</property> <child> - <widget class="GtkVBox" id="vbox108"> + <object class="GtkVBox" id="vbox108"> <property name="width_request">0</property> <property name="visible">True</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkVBox" id="vbox109"> + <object class="GtkVBox" id="vbox109"> <property name="visible">True</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkScrolledWindow" id="conversation_scrolledwindow"> + <object class="GtkScrolledWindow" id="conversation_scrolledwindow1"> <property name="width_request">200</property> <property name="height_request">60</property> <property name="visible">True</property> @@ -1014,13 +1013,13 @@ <child> <placeholder/> </child> - </widget> + </object> <packing> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkScrolledWindow" id="message_scrolledwindow"> + <object class="GtkScrolledWindow" id="message_scrolledwindow1"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">never</property> @@ -1029,25 +1028,25 @@ <child> <placeholder/> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="position">0</property> </packing> </child> - </widget> + </object> <packing> <property name="resize">False</property> <property name="shrink">False</property> </packing> </child> <child> - <widget class="GtkScrolledWindow" id="list_scrolledwindow"> + <object class="GtkScrolledWindow" id="list_scrolledwindow"> <property name="width_request">100</property> <property name="visible">True</property> <property name="can_focus">False</property> @@ -1055,107 +1054,107 @@ <property name="vscrollbar_policy">automatic</property> <property name="shadow_type">in</property> <child> - <widget class="GtkTreeView" id="list_treeview"> + <object class="GtkTreeView" id="list_treeview"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="border_width">1</property> <property name="headers_visible">False</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="resize">False</property> <property name="shrink">False</property> </packing> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkHBox" id="actions_hbox"> + <object class="GtkHBox" id="actions_hbox1"> <property name="visible">True</property> <child> - <widget class="GtkHBox" id="hbox3023"> + <object class="GtkHBox" id="hbox3023"> <property name="visible">True</property> <child> - <widget class="GtkButton" id="emoticons_button"> + <object class="GtkButton" id="emoticons_button1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</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">Show a list of emoticons (Alt+M)</property> + <property name="tooltip_text" translatable="yes">Show a list of emoticons (Alt+M)</property> <property name="relief">none</property> <child> - <widget class="GtkImage" id="emoticons_button_image"> + <object class="GtkImage" id="emoticons_button_image1"> <property name="visible">True</property> <property name="stock">gtk-missing-image</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">0</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkButton" id="formattings_button"> + <object class="GtkButton" id="formattings_button1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</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">Show a list of formattings</property> + <property name="tooltip_text" translatable="yes">Show a list of formattings</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <child> - <widget class="GtkImage" id="image11"> + <object class="GtkImage" id="image11"> <property name="visible">True</property> <property name="stock">gtk-bold</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> <child> - <widget class="GtkVSeparator" id="vseparator2"> + <object class="GtkVSeparator" id="vseparator2"> <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> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">2</property> </packing> </child> <child> - <widget class="GtkButton" id="change_nick_button"> + <object class="GtkButton" id="change_nick_button"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</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">Change your nickname (Ctrl+N)</property> + <property name="tooltip_text" translatable="yes">Change your nickname (Ctrl+N)</property> <property name="relief">none</property> <child> - <widget class="GtkImage" id="image4"> + <object class="GtkImage" id="image4"> <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="stock">gtk-edit</property> <property name="icon-size">1</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -1163,22 +1162,22 @@ </packing> </child> <child> - <widget class="GtkButton" id="change_subject_button"> + <object class="GtkButton" id="change_subject_button"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</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">Change the room's subject (Alt+T)</property> + <property name="tooltip_text" translatable="yes">Change the room's subject (Alt+T)</property> <property name="relief">none</property> <child> - <widget class="GtkImage" id="image6"> + <object class="GtkImage" id="image6"> <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="stock">gtk-properties</property> <property name="icon-size">1</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -1186,23 +1185,23 @@ </packing> </child> <child> - <widget class="GtkButton" id="bookmark_button"> + <object class="GtkButton" id="bookmark_button"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="no_show_all">True</property> - <property name="tooltip" translatable="yes">Bookmark this room (Ctrl+B)</property> + <property name="tooltip_text" translatable="yes">Bookmark this room (Ctrl+B)</property> <property name="relief">none</property> <child> - <widget class="GtkImage" id="image7"> + <object class="GtkImage" id="image7"> <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="stock">gtk-add</property> <property name="icon-size">1</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -1210,22 +1209,22 @@ </packing> </child> <child> - <widget class="GtkButton" id="history_button"> + <object class="GtkButton" id="history_button1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</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">Browse the chat history (Ctrl+H)</property> + <property name="tooltip_text" translatable="yes">Browse the chat history (Ctrl+H)</property> <property name="relief">none</property> <child> - <widget class="GtkImage" id="image8"> + <object class="GtkImage" id="image8"> <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="stock">gtk-justify-fill</property> <property name="icon-size">1</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -1233,39 +1232,39 @@ </packing> </child> <child> - <widget class="GtkVSeparator" id="vseparator4"> + <object class="GtkVSeparator" id="vseparator4"> <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> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">7</property> </packing> </child> <child> - <widget class="GtkButton" id="muc_window_actions_button"> + <object class="GtkButton" id="muc_window_actions_button"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</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">Show a menu of advanced functions (Alt+D)</property> + <property name="tooltip_text" translatable="yes">Show a menu of advanced functions (Alt+D)</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <child> - <widget class="GtkAlignment" id="alignment104"> + <object class="GtkAlignment" id="alignment104"> <property name="visible">True</property> <property name="xscale">0</property> <property name="yscale">0</property> <child> - <widget class="GtkImage" id="image1344"> + <object class="GtkImage" id="image1344"> <property name="visible">True</property> <property name="stock">gtk-execute</property> <property name="icon-size">1</property> - </widget> + </object> </child> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -1273,36 +1272,36 @@ </packing> </child> <child> - <widget class="GtkAlignment" id="alignment2"> + <object class="GtkAlignment" id="alignment2"> <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> <child> <placeholder/> </child> - </widget> + </object> <packing> <property name="position">9</property> </packing> </child> <child> - <widget class="GtkButton" id="send_button"> + <object class="GtkButton" id="send_button1"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <child> - <widget class="GtkAlignment" id="alignment105"> + <object class="GtkAlignment" id="alignment105"> <property name="visible">True</property> <property name="xscale">0</property> <property name="yscale">0</property> <child> - <widget class="GtkHBox" id="hbox3016"> + <object class="GtkHBox" id="hbox3016"> <property name="visible">True</property> <property name="spacing">2</property> <child> - <widget class="GtkImage" id="image1345"> + <object class="GtkImage" id="image1345"> <property name="visible">True</property> <property name="stock">gtk-jump-to</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -1310,52 +1309,52 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label377"> + <object class="GtkLabel" id="label377"> <property name="visible">True</property> <property name="label" translatable="yes" comments="Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)">_Send</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> <property name="position">10</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">2</property> </packing> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - <child> - <widget class="GtkEventBox" id="muc_tab_ebox"> + <child type="tab"> + <object class="GtkEventBox" id="muc_tab_ebox"> <property name="visible">True</property> <property name="visible_window">False</property> <child> - <widget class="GtkHBox" id="hbox3017"> + <object class="GtkHBox" id="hbox3017"> <property name="visible">True</property> <property name="spacing">4</property> <child> - <widget class="GtkImage" id="image1346"> + <object class="GtkImage" id="image1346"> <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> @@ -1363,10 +1362,10 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label378"> + <object class="GtkLabel" id="label378"> <property name="visible">True</property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -1374,7 +1373,7 @@ </packing> </child> <child> - <widget class="GtkButton" id="button34"> + <object class="GtkButton" id="button34"> <property name="width_request">20</property> <property name="height_request">20</property> <property name="visible">True</property> @@ -1382,32 +1381,43 @@ <property name="receives_default">False</property> <property name="relief">none</property> <child> - <widget class="GtkImage" id="image1347"> + <object class="GtkImage" id="image1347"> <property name="visible">True</property> <property name="ypad">6</property> <property name="stock">gtk-close</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">2</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="position">1</property> <property name="tab_fill">False</property> - <property name="type">tab</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> + <object class="GtkAdjustment" id="adjustment1"> + <property name="upper">110</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + <property name="page_size">10</property> + </object> + <object class="GtkAdjustment" id="adjustment2"> + <property name="upper">110</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + <property name="page_size">10</property> + </object> +</interface> diff --git a/data/glade/passphrase_dialog.glade b/data/gui/passphrase_dialog.ui index 104349b9f..7bf6f7061 100644 --- a/data/glade/passphrase_dialog.glade +++ b/data/gui/passphrase_dialog.ui @@ -1,40 +1,43 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> -<!--*- mode: xml -*--> -<glade-interface> - <widget class="GtkDialog" id="passphrase_dialog"> +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkDialog" id="passphrase_dialog"> <property name="border_width">12</property> <property name="title" translatable="yes">Passphrase</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> + <property name="type_hint">dialog</property> <signal name="destroy" handler="on_passphrase_dialog_destroy"/> <child internal-child="vbox"> - <widget class="GtkVBox" id="dialog-vbox4"> + <object class="GtkVBox" id="dialog-vbox4"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkVBox" id="vbox30"> + <object class="GtkVBox" id="vbox30"> <property name="visible">True</property> <property name="border_width">6</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="message_label"> + <object class="GtkLabel" id="message_label"> <property name="visible">True</property> <property name="wrap">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="padding">5</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkEntry" id="passphrase_entry"> + <object class="GtkEntry" id="passphrase_entry"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="has_focus">True</property> <property name="visibility">False</property> <property name="activates_default">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -42,59 +45,71 @@ </packing> </child> <child> - <widget class="GtkCheckButton" id="save_passphrase_checkbutton"> + <object class="GtkCheckButton" id="save_passphrase_checkbutton"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</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> <packing> <property name="position">2</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> + <property name="layout_style">end</property> <child> - <widget class="GtkButton" id="cancel_button"> + <object class="GtkButton" id="cancel_button"> + <property name="label">gtk-cancel</property> <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="receives_default">False</property> <property name="use_stock">True</property> - <property name="response_id">-6</property> - </widget> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkButton" id="ok_button"> + <object class="GtkButton" id="ok_button"> + <property name="label">gtk-ok</property> <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-ok</property> + <property name="receives_default">False</property> <property name="use_stock">True</property> - <property name="response_id">-5</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="pack_type">GTK_PACK_END</property> + <property name="pack_type">end</property> + <property name="position">0</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + <action-widgets> + <action-widget response="-6">cancel_button</action-widget> + <action-widget response="-5">ok_button</action-widget> + </action-widgets> + </object> +</interface> diff --git a/data/gui/popup_notification_window.ui b/data/gui/popup_notification_window.ui new file mode 100644 index 000000000..ab6e4ec05 --- /dev/null +++ b/data/gui/popup_notification_window.ui @@ -0,0 +1,105 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkWindow" id="popup_notification_window"> + <property name="width_request">312</property> + <property name="height_request">95</property> + <property name="border_width">1</property> + <property name="type">popup</property> + <property name="resizable">False</property> + <property name="skip_taskbar_hint">True</property> + <property name="skip_pager_hint">True</property> + <property name="decorated">False</property> + <property name="gravity">south-east</property> + <signal name="button_press_event" handler="on_popup_notification_window_button_press_event"/> + <child> + <object class="GtkEventBox" id="eventbox"> + <property name="visible">True</property> + <child> + <object class="GtkHBox" id="hbox3019"> + <property name="visible">True</property> + <property name="border_width">4</property> + <property name="spacing">6</property> + <child> + <object class="GtkImage" id="notification_image"> + <property name="width_request">68</property> + <property name="height_request">86</property> + <property name="visible">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="vbox111"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkHBox" id="hbox3020"> + <property name="visible">True</property> + <child> + <object class="GtkLabel" id="event_type_label"> + <property name="width_request">196</property> + <property name="visible">True</property> + <property name="label">Event Type</property> + <property name="use_markup">True</property> + <property name="wrap">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="close_button"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="receives_default">False</property> + <property name="relief">none</property> + <signal name="clicked" handler="on_close_button_clicked"/> + <child> + <object class="GtkImage" id="image496"> + <property name="visible">True</property> + <property name="stock">gtk-close</property> + <property name="icon-size">1</property> + </object> + </child> + </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="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="event_description_label"> + <property name="width_request">218</property> + <property name="height_request">64</property> + <property name="visible">True</property> + <property name="label">Event desc</property> + <property name="wrap">True</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> + </object> +</interface> diff --git a/data/glade/preferences_window.glade b/data/gui/preferences_window.ui index fe877da9d..5b2d97aba 100644 --- a/data/glade/preferences_window.glade +++ b/data/gui/preferences_window.ui @@ -1,58 +1,172 @@ <?xml version="1.0"?> -<glade-interface> - <!-- interface-requires gtk+ 2.12 --> +<interface> + <requires lib="gtk+" version="2.16"/> <!-- interface-naming-policy toplevel-contextual --> - <widget class="GtkWindow" id="preferences_window"> + <object class="GtkListStore" id="liststore1"> + <columns> + <!-- column-name item text --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">Autodetect on every Gajim startup</col> + </row> + <row> + <col id="0" translatable="yes">Always use GNOME default applications</col> + </row> + <row> + <col id="0" translatable="yes">Always use KDE default applications</col> + </row> + <row> + <col id="0" translatable="yes">Always use Xfce default applications</col> + </row> + <row> + <col id="0" translatable="yes">Custom</col> + </row> + </data> + </object> + <object class="GtkListStore" id="liststore2"> + <columns> + <!-- column-name item text --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">All chat states</col> + </row> + <row> + <col id="0" translatable="yes">Composing only</col> + </row> + <row> + <col id="0" translatable="yes">Disabled</col> + </row> + </data> + </object> + <object class="GtkListStore" id="liststore3"> + <columns> + <!-- column-name item text --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">All chat states</col> + </row> + <row> + <col id="0" translatable="yes">Composing only</col> + </row> + <row> + <col id="0" translatable="yes">Disabled</col> + </row> + </data> + </object> + <object class="GtkListStore" id="liststore4"> + <columns> + <!-- column-name item text --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">Never</col> + </row> + <row> + <col id="0" translatable="yes">Only when pending events</col> + </row> + <row> + <col id="0" translatable="yes">Always</col> + </row> + </data> + </object> + <object class="GtkListStore" id="liststore5"> + <columns> + <!-- column-name item text --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">Pop it up</col> + </row> + <row> + <col id="0" translatable="yes">Notify me about it</col> + </row> + <row> + <col id="0" translatable="yes">Show only in roster</col> + </row> + </data> + </object> + <object class="GtkListStore" id="liststore6"> + <columns> + <!-- column-name item text --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">Detached roster with detached chats</col> + </row> + <row> + <col id="0" translatable="yes">Detached roster with single chat</col> + </row> + <row> + <col id="0" translatable="yes">Single window for everything</col> + </row> + <row> + <col id="0" translatable="yes">Detached roster with chat grouped by account</col> + </row> + <row> + <col id="0" translatable="yes">Detached roster with chat grouped by type</col> + </row> + </data> + </object> + <object class="GtkWindow" id="preferences_window"> <property name="border_width">6</property> <property name="title" translatable="yes">Preferences</property> <property name="role">preferences</property> <signal name="destroy" handler="on_preferences_window_destroy"/> <signal name="key_press_event" handler="on_preferences_window_key_press_event"/> <child> - <widget class="GtkVBox" id="vbox13"> + <object class="GtkVBox" id="vbox13"> <property name="visible">True</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkNotebook" id="preferences_notebook"> + <object class="GtkNotebook" id="preferences_notebook"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="show_border">False</property> <child> - <widget class="GtkVBox" id="vbox41"> + <object class="GtkVBox" id="vbox41"> <property name="visible">True</property> <property name="border_width">12</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <widget class="GtkFrame" id="frame1"> + <object class="GtkFrame" id="frame1"> <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="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <widget class="GtkAlignment" id="alignment1"> + <object class="GtkAlignment" id="alignment1"> <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="border_width">6</property> <property name="left_padding">12</property> <child> - <widget class="GtkVBox" id="vbox1"> + <object class="GtkVBox" id="vbox1"> <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="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkCheckButton" id="show_avatars_in_roster_checkbutton"> + <object class="GtkCheckButton" id="show_avatars_in_roster_checkbutton"> <property name="label" translatable="yes">Display a_vatars of contacts in roster</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip" translatable="yes">If checked, Gajim will display avatars of contacts in roster window and in group chats</property> + <property name="tooltip_text" translatable="yes">If checked, Gajim will display avatars of contacts in roster window and in group chats</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_show_avatars_in_roster_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -60,16 +174,16 @@ </packing> </child> <child> - <widget class="GtkCheckButton" id="show_status_msgs_in_roster_checkbutton"> + <object class="GtkCheckButton" id="show_status_msgs_in_roster_checkbutton"> <property name="label" translatable="yes">Display status _messages of contacts in roster</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip" translatable="yes">If checked, Gajim will display status messages of contacts under the contact name in roster window and in group chats</property> + <property name="tooltip_text" translatable="yes">If checked, Gajim will display status messages of contacts under the contact name in roster window and in group chats</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_show_status_msgs_in_roster_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -77,16 +191,16 @@ </packing> </child> <child> - <widget class="GtkCheckButton" id="show_mood_in_roster_checkbutton"> + <object class="GtkCheckButton" id="show_mood_in_roster_checkbutton"> <property name="label" translatable="yes">Display m_ood of contacts in roster</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip" translatable="yes">If checked, Gajim will display the mood of contacts in the roster window</property> + <property name="tooltip_text" translatable="yes">If checked, Gajim will display the mood of contacts in the roster window</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_show_mood_in_roster_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -94,16 +208,16 @@ </packing> </child> <child> - <widget class="GtkCheckButton" id="show_activity_in_roster_checkbutton"> + <object class="GtkCheckButton" id="show_activity_in_roster_checkbutton"> <property name="label" translatable="yes">Display _activity of contacts in roster</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip" translatable="yes">If checked, Gajim will display the activity of contacts in the roster window</property> + <property name="tooltip_text" translatable="yes">If checked, Gajim will display the activity of contacts in the roster window</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_show_activity_in_roster_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -111,16 +225,16 @@ </packing> </child> <child> - <widget class="GtkCheckButton" id="show_tunes_in_roster_checkbutton"> + <object class="GtkCheckButton" id="show_tunes_in_roster_checkbutton"> <property name="label" translatable="yes">Display _tunes of contacts in roster</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip" translatable="yes">If checked, Gajim will display the tunes of contacts in the roster window</property> + <property name="tooltip_text" translatable="yes">If checked, Gajim will display the tunes of contacts in the roster window</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_show_tunes_in_roster_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -128,17 +242,17 @@ </packing> </child> <child> - <widget class="GtkCheckButton" id="show_location_in_roster_checkbutton"> + <object class="GtkCheckButton" id="show_location_in_roster_checkbutton"> <property name="label" translatable="yes">Display _location of contacts in roster</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="has_tooltip">True</property> - <property name="tooltip" translatable="yes">If checked, Gajim will display the location of contacts in the roster window</property> + <property name="tooltip_text" translatable="yes">If checked, Gajim will display the location of contacts in the roster window</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_show_location_in_roster_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -146,21 +260,21 @@ </packing> </child> <child> - <widget class="GtkHBox" id="hbox3"> + <object class="GtkHBox" id="hbox3"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label10"> + <object class="GtkLabel" id="label10"> <property name="visible">True</property> <property name="label" translatable="yes">Sort contacts by status</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="sort_by_show_in_roster_checkbutton"> + <object class="GtkCheckButton" id="sort_by_show_in_roster_checkbutton"> <property name="label" translatable="yes">in _roster</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -168,14 +282,14 @@ <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_sort_by_show_in_roster_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="sort_by_show_in_muc_checkbutton"> + <object class="GtkCheckButton" id="sort_by_show_in_muc_checkbutton"> <property name="label" translatable="yes">in _group chats</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -183,51 +297,48 @@ <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_sort_by_show_in_muc_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="position">2</property> </packing> </child> - </widget> + </object> <packing> <property name="position">6</property> </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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes"><b>Roster 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="position">0</property> </packing> </child> <child> - <widget class="GtkFrame" id="frame2"> + <object class="GtkFrame" id="frame2"> <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="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <widget class="GtkAlignment" id="alignment2"> + <object class="GtkAlignment" id="alignment2"> <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="border_width">6</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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="n_rows">5</property> @@ -235,14 +346,14 @@ <property name="column_spacing">6</property> <property name="row_spacing">6</property> <child> - <widget class="GtkLabel" id="label379"> + <object class="GtkLabel" id="label379"> <property name="visible">True</property> <property name="xalign">0</property> <property name="xpad">1</property> <property name="label" translatable="yes">_Window behavior:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">one_window_type_combobox</property> - </widget> + </object> <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> @@ -250,43 +361,43 @@ </packing> </child> <child> - <widget class="GtkComboBox" id="emoticons_combobox"> + <object class="GtkComboBox" id="emoticons_combobox"> <property name="visible">True</property> <signal name="changed" handler="on_emoticons_combobox_changed"/> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> </packing> </child> <child> - <widget class="GtkEventBox" id="eventbox5"> + <object class="GtkEventBox" id="eventbox5"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons</property> + <property name="tooltip_text" translatable="yes">If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons</property> <child> - <widget class="GtkLabel" id="label381"> + <object class="GtkLabel" id="label381"> <property name="visible">True</property> <property name="xalign">0</property> <property name="xpad">1</property> <property name="label" translatable="yes">_Emoticons:</property> <property name="use_underline">True</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="compact_view_checkbutton"> + <object class="GtkCheckButton" id="compact_view_checkbutton"> <property name="label" translatable="yes">Ma_ke message windows compact</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip" translatable="yes">Hide all buttons in chat windows</property> + <property name="tooltip_text" translatable="yes">Hide all buttons in chat windows</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_compact_view_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="right_attach">2</property> <property name="top_attach">2</property> @@ -295,16 +406,16 @@ </packing> </child> <child> - <widget class="GtkCheckButton" id="xhtml_checkbutton"> + <object class="GtkCheckButton" id="xhtml_checkbutton"> <property name="label" translatable="yes">_Ignore rich content in incoming messages</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip" translatable="yes">Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text.</property> + <property name="tooltip_text" translatable="yes">Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text.</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_xhtml_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="right_attach">2</property> <property name="top_attach">3</property> @@ -313,15 +424,15 @@ </packing> </child> <child> - <widget class="GtkCheckButton" id="speller_checkbutton"> + <object class="GtkCheckButton" id="speller_checkbutton"> <property name="label" translatable="yes">_Highlight misspelled words</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip" translatable="yes">If checked, Gajim will highlight spelling errors in input fields of chat windows. If no language is explicitly set via right click on the input field, the default language will be used for this contact or group chat.</property> + <property name="tooltip_text" translatable="yes">If checked, Gajim will highlight spelling errors in input fields of chat windows. If no language is explicitly set via right click on the input field, the default language will be used for this contact or group chat.</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_speller_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="right_attach">2</property> <property name="top_attach">4</property> @@ -330,16 +441,18 @@ </packing> </child> <child> - <widget class="GtkComboBox" id="one_window_type_combobox"> + <object class="GtkComboBox" id="one_window_type_combobox"> <property name="width_request">50</property> <property name="visible">True</property> - <property name="items" translatable="yes">Detached roster with detached chats -Detached roster with single chat -Single window for everything -Detached roster with chat grouped by account -Detached roster with chat grouped by type</property> + <property name="model">liststore6</property> <signal name="changed" handler="on_one_window_type_combo_changed"/> - </widget> + <child> + <object class="GtkCellRendererText" id="cellrenderertext6"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -347,97 +460,97 @@ Detached roster with chat grouped by type</property> <property name="bottom_attach">2</property> </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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes"><b>Chat 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="position">1</property> </packing> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label74"> + <child type="tab"> + <object class="GtkLabel" id="label74"> <property name="visible">True</property> <property name="label" translatable="yes">General</property> - </widget> + </object> <packing> <property name="tab_fill">False</property> - <property name="type">tab</property> </packing> </child> <child> - <widget class="GtkVBox" id="vbox42"> + <object class="GtkVBox" id="vbox42"> <property name="visible">True</property> <property name="border_width">12</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkFrame" id="frame29"> + <object class="GtkFrame" id="frame29"> <property name="visible">True</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <widget class="GtkAlignment" id="alignment58"> + <object class="GtkAlignment" id="alignment58"> <property name="visible">True</property> <property name="border_width">6</property> <property name="left_padding">12</property> <child> - <widget class="GtkVBox" id="vbox67"> + <object class="GtkVBox" id="vbox67"> <property name="visible">True</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkHBox" id="hbox1"> + <object class="GtkHBox" id="hbox1"> <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="spacing">6</property> <child> - <widget class="GtkLabel" id="label7"> + <object class="GtkLabel" id="label7"> <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="xalign">0</property> <property name="label" translatable="yes">When new event is received:</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkComboBox" id="on_event_combobox"> + <object class="GtkComboBox" id="on_event_combobox"> <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="items" translatable="yes">Pop it up -Notify me about it -Show only in roster</property> + <property name="model">liststore5</property> <signal name="changed" handler="on_on_event_combobox_changed"/> - </widget> + <child> + <object class="GtkCellRendererText" id="cellrenderertext5"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="notify_on_signin_checkbutton"> + <object class="GtkCheckButton" id="notify_on_signin_checkbutton"> <property name="label" translatable="yes">Notify me about contacts that sign _in</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -446,22 +559,22 @@ Show only in roster</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_notify_on_signin_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="notify_on_signout_checkbutton"> + <object class="GtkCheckButton" id="notify_on_signout_checkbutton"> <property name="label" translatable="yes">Notify me about contacts that sign _out</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip" translatable="yes">Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed out</property> + <property name="tooltip_text" translatable="yes">Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed out</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_notify_on_signout_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -469,7 +582,7 @@ Show only in roster</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="auto_popup_away_checkbutton"> + <object class="GtkCheckButton" id="auto_popup_away_checkbutton"> <property name="label" translatable="yes">Allow popup/notifications when I'm _away/na/busy/invisible</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -477,7 +590,7 @@ Show only in roster</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_auto_popup_away_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -485,32 +598,32 @@ Show only in roster</property> </packing> </child> <child> - <widget class="GtkFrame" id="frame_gmail"> + <object class="GtkFrame" id="frame_gmail"> <property name="visible">True</property> <property name="sensitive">False</property> <property name="no_show_all">True</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <widget class="GtkAlignment" id="alignment_gmail"> + <object class="GtkAlignment" id="alignment_gmail"> <property name="visible">True</property> <property name="left_padding">12</property> <child> - <widget class="GtkVBox" id="vbox_gmail"> + <object class="GtkVBox" id="vbox_gmail"> <property name="visible">True</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkCheckButton" id="notify_gmail_checkbutton"> + <object class="GtkCheckButton" id="notify_gmail_checkbutton"> <property name="label" translatable="yes">Notify on new _GMail email</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip" translatable="yes">If checked, Gajim will show a notification when a new e-mail is received via GMail</property> + <property name="tooltip_text" translatable="yes">If checked, Gajim will show a notification when a new e-mail is received via GMail</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_notify_gmail_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -518,37 +631,34 @@ Show only in roster</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="notify_gmail_extra_checkbutton"> + <object class="GtkCheckButton" id="notify_gmail_extra_checkbutton"> <property name="label" translatable="yes">Display _extra email details</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip" translatable="yes">If checked, Gajim will also include information about the sender of the new emails</property> + <property name="tooltip_text" translatable="yes">If checked, Gajim will also include information about the sender of the new emails</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_notify_gmail_extra_checkbutton_toggled"/> - </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="gmail_options_label"> + <child type="label"> + <object class="GtkLabel" id="gmail_options_label"> <property name="visible">True</property> <property name="label" translatable="yes"><b>GMail Options</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> @@ -556,51 +666,55 @@ Show only in roster</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox5"> + <object class="GtkHBox" id="hbox5"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label11"> + <object class="GtkLabel" id="label11"> <property name="visible">True</property> <property name="label" translatable="yes">Show systray:</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkComboBox" id="systray_combobox"> + <object class="GtkComboBox" id="systray_combobox"> <property name="visible">True</property> - <property name="items" translatable="yes">Never -Only when pending events -Always</property> + <property name="model">liststore4</property> <signal name="changed" handler="on_systray_combobox_changed"/> - </widget> + <child> + <object class="GtkCellRendererText" id="cellrenderertext4"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> <packing> <property name="expand">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">5</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox2"> + <object class="GtkHBox" id="hbox2"> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="no_show_all">True</property> <child> - <widget class="GtkButton" id="advanced_notifications_button"> + <object class="GtkButton" id="advanced_notifications_button"> <property name="label" translatable="yes">Advanced...</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <signal name="clicked" handler="on_advanced_notifications_button_clicked"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -610,54 +724,51 @@ Always</property> <child> <placeholder/> </child> - </widget> + </object> <packing> <property name="position">6</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label240"> + <child type="label"> + <object class="GtkLabel" id="label240"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Visual Notifications</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">0</property> </packing> </child> <child> - <widget class="GtkFrame" id="frame5"> + <object class="GtkFrame" id="frame5"> <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="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <widget class="GtkAlignment" id="alignment5"> + <object class="GtkAlignment" id="alignment5"> <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="border_width">6</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="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkHBox" id="hbox4"> + <object class="GtkHBox" id="hbox4"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkCheckButton" id="play_sounds_checkbutton"> + <object class="GtkCheckButton" id="play_sounds_checkbutton"> <property name="label" translatable="yes">Play _sounds</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -665,33 +776,33 @@ Always</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_play_sounds_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkButton" id="manage_sounds_button"> + <object class="GtkButton" id="manage_sounds_button"> <property name="label" translatable="yes">Ma_nage...</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="use_underline">True</property> <signal name="clicked" handler="on_manage_sounds_button_clicked"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="sound_dnd_checkbutton"> + <object class="GtkCheckButton" id="sound_dnd_checkbutton"> <property name="label" translatable="yes">Allow sound when I'm _busy</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -699,69 +810,65 @@ Always</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_sound_dnd_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label8"> + <child type="label"> + <object class="GtkLabel" id="label8"> <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="label" translatable="yes"><b>Sounds</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> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - <child> - <widget class="GtkLabel" id="label76"> + <child type="tab"> + <object class="GtkLabel" id="label76"> <property name="visible">True</property> <property name="no_show_all">True</property> <property name="label" translatable="yes">Notifications</property> - </widget> + </object> <packing> <property name="position">1</property> <property name="tab_fill">False</property> - <property name="type">tab</property> </packing> </child> <child> - <widget class="GtkVBox" id="vbox11"> + <object class="GtkVBox" id="vbox11"> <property name="visible">True</property> <property name="border_width">12</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <widget class="GtkFrame" id="frame13"> + <object class="GtkFrame" id="frame13"> <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="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <widget class="GtkAlignment" id="alignment19"> + <object class="GtkAlignment" id="alignment19"> <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="border_width">6</property> <property name="left_padding">12</property> <child> - <widget class="GtkTable" id="table7"> + <object class="GtkTable" id="table7"> <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="n_rows">2</property> @@ -769,13 +876,17 @@ Always</property> <property name="column_spacing">6</property> <property name="row_spacing">6</property> <child> - <widget class="GtkComboBox" id="displayed_chat_states_combobox"> + <object class="GtkComboBox" id="displayed_chat_states_combobox"> <property name="visible">True</property> - <property name="items" translatable="yes">All chat states -Composing only -Disabled</property> + <property name="model">liststore3</property> <signal name="changed" handler="on_displayed_chat_states_combobox_changed"/> - </widget> + <child> + <object class="GtkCellRendererText" id="cellrenderertext3"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -784,18 +895,18 @@ Disabled</property> </packing> </child> <child> - <widget class="GtkEventBox" id="eventbox8"> + <object class="GtkEventBox" id="eventbox8"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to display in chat windows.</property> + <property name="tooltip_text" translatable="yes">Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to display in chat windows.</property> <child> - <widget class="GtkLabel" id="label33"> + <object class="GtkLabel" id="label33"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Display chat state notifications:</property> <property name="use_underline">True</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> @@ -803,124 +914,124 @@ Disabled</property> </packing> </child> <child> - <widget class="GtkEventBox" id="eventbox9"> + <object class="GtkEventBox" id="eventbox9"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to send to the other party.</property> + <property name="tooltip_text" translatable="yes">Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to send to the other party.</property> <child> - <widget class="GtkLabel" id="label34"> + <object class="GtkLabel" id="label34"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Send chat state notifications:</property> <property name="use_underline">True</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkComboBox" id="outgoing_chat_states_combobox"> + <object class="GtkComboBox" id="outgoing_chat_states_combobox"> <property name="visible">True</property> - <property name="items" translatable="yes">All chat states -Composing only -Disabled</property> + <property name="model">liststore2</property> <signal name="changed" handler="on_outgoing_chat_states_combobox_changed"/> - </widget> + <child> + <object class="GtkCellRendererText" id="cellrenderertext2"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label35"> + <child type="label"> + <object class="GtkLabel" id="label35"> <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="label" translatable="yes"><b>Chat state notifications</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">0</property> </packing> </child> - </widget> + </object> <packing> <property name="position">2</property> </packing> </child> - <child> - <widget class="GtkLabel" id="label9"> + <child type="tab"> + <object class="GtkLabel" id="label9"> <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="label" translatable="yes">Personal Events</property> - </widget> + </object> <packing> <property name="position">2</property> <property name="tab_fill">False</property> - <property name="type">tab</property> </packing> </child> <child> - <widget class="GtkVBox" id="status_vbox"> + <object class="GtkVBox" id="status_vbox"> <property name="visible">True</property> <property name="border_width">12</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <widget class="GtkFrame" id="frame81"> + <object class="GtkFrame" id="frame81"> <property name="visible">True</property> <property name="no_show_all">True</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <widget class="GtkAlignment" id="alignment_gmail1"> + <object class="GtkAlignment" id="alignment_gmail1"> <property name="visible">True</property> <property name="border_width">6</property> <property name="left_padding">12</property> <child> - <widget class="GtkTable" id="autoaway_table"> + <object class="GtkTable" id="autoaway_table"> <property name="visible">True</property> <property name="n_rows">2</property> <property name="n_columns">4</property> <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkCheckButton" id="auto_away_checkbutton"> + <object class="GtkCheckButton" id="auto_away_checkbutton"> <property name="label" translatable="yes">_Away after:</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip" translatable="yes">If checked, Gajim will change status to Away when the computer is unused.</property> + <property name="tooltip_text" translatable="yes">If checked, Gajim will change status to Away when the computer is unused.</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_auto_away_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkCheckButton" id="auto_xa_checkbutton"> + <object class="GtkCheckButton" id="auto_xa_checkbutton"> <property name="label" translatable="yes">_Not available after:</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip" translatable="yes">If checked, Gajim will change status to Not Available when the computer has not been used even longer</property> + <property name="tooltip_text" translatable="yes">If checked, Gajim will change status to Not Available when the computer has not been used even longer</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_auto_xa_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> @@ -929,11 +1040,11 @@ Disabled</property> </packing> </child> <child> - <widget class="GtkLabel" id="label77"> + <object class="GtkLabel" id="label77"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">minutes</property> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> @@ -942,11 +1053,11 @@ Disabled</property> </packing> </child> <child> - <widget class="GtkLabel" id="label78"> + <object class="GtkLabel" id="label78"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">minutes</property> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> @@ -957,21 +1068,21 @@ Disabled</property> </packing> </child> <child> - <widget class="GtkAlignment" id="alignment33"> + <object class="GtkAlignment" id="alignment33"> <property name="visible">True</property> <property name="xalign">1</property> <property name="xscale">0</property> <child> - <widget class="GtkSpinButton" id="auto_away_time_spinbutton"> + <object class="GtkSpinButton" id="auto_away_time_spinbutton"> <property name="width_request">50</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="adjustment">12 1 720 1 10 0</property> + <property name="adjustment">adjustment2</property> <property name="climb_rate">1</property> <signal name="value_changed" handler="on_auto_away_time_spinbutton_value_changed"/> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -980,21 +1091,21 @@ Disabled</property> </packing> </child> <child> - <widget class="GtkAlignment" id="alignment34"> + <object class="GtkAlignment" id="alignment34"> <property name="visible">True</property> <property name="xalign">1</property> <property name="xscale">0</property> <child> - <widget class="GtkSpinButton" id="auto_xa_time_spinbutton"> + <object class="GtkSpinButton" id="auto_xa_time_spinbutton"> <property name="width_request">50</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="adjustment">20 1 1440 1 10 0</property> + <property name="adjustment">adjustment1</property> <property name="climb_rate">1</property> <signal name="value_changed" handler="on_auto_xa_time_spinbutton_value_changed"/> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -1005,14 +1116,14 @@ Disabled</property> </packing> </child> <child> - <widget class="GtkEntry" id="auto_away_message_entry"> + <object class="GtkEntry" id="auto_away_message_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">The auto away status message. If empty, Gajim will not change the current status message + <property name="tooltip_text" translatable="yes">The auto away status message. If empty, Gajim will not change the current status message $S will be replaced by previous status message $T will be replaced by auto-away timeout</property> <signal name="changed" handler="on_auto_away_message_entry_changed"/> - </widget> + </object> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> @@ -1020,14 +1131,14 @@ $T will be replaced by auto-away timeout</property> </packing> </child> <child> - <widget class="GtkEntry" id="auto_xa_message_entry"> + <object class="GtkEntry" id="auto_xa_message_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">The auto not available status message. If empty, Gajim will not change the current status message + <property name="tooltip_text" translatable="yes">The auto not available status message. If empty, Gajim will not change the current status message $S will be replaced by previous status message $T will be replaced by auto-not-available timeout</property> <signal name="changed" handler="on_auto_xa_message_entry_changed"/> - </widget> + </object> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> @@ -1036,21 +1147,18 @@ $T will be replaced by auto-not-available timeout</property> <property name="y_options"></property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label81"> + <child type="label"> + <object class="GtkLabel" id="label81"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Auto Status</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> @@ -1058,30 +1166,30 @@ $T will be replaced by auto-not-available timeout</property> </packing> </child> <child> - <widget class="GtkFrame" id="frame8"> + <object class="GtkFrame" id="frame8"> <property name="visible">True</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <widget class="GtkAlignment" id="alignment8"> + <object class="GtkAlignment" id="alignment8"> <property name="visible">True</property> <property name="border_width">6</property> <property name="left_padding">12</property> <child> - <widget class="GtkVBox" id="vbox2"> + <object class="GtkVBox" id="vbox2"> <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="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkHBox" id="hbox2934"> + <object class="GtkHBox" id="hbox2934"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label214"> + <object class="GtkLabel" id="label214"> <property name="visible">True</property> <property name="label" translatable="yes">Ask status message when I:</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -1089,11 +1197,11 @@ $T will be replaced by auto-not-available timeout</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox6"> + <object class="GtkHBox" id="hbox6"> <property name="visible">True</property> <property name="spacing">14</property> <child> - <widget class="GtkCheckButton" id="prompt_online_status_message_checkbutton"> + <object class="GtkCheckButton" id="prompt_online_status_message_checkbutton"> <property name="label" translatable="yes">Sign _in</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -1101,7 +1209,7 @@ $T will be replaced by auto-not-available timeout</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_prompt_online_status_message_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -1109,7 +1217,7 @@ $T will be replaced by auto-not-available timeout</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="prompt_offline_status_message_checkbutton"> + <object class="GtkCheckButton" id="prompt_offline_status_message_checkbutton"> <property name="label" translatable="yes">Sign _out</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -1117,21 +1225,21 @@ $T will be replaced by auto-not-available timeout</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_prompt_offline_status_message_checkbutton_toggled"/> - </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> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -1139,55 +1247,52 @@ $T will be replaced by auto-not-available timeout</property> </packing> </child> <child> - <widget class="GtkScrolledWindow" id="default_message_scrolledwindow"> + <object class="GtkScrolledWindow" id="default_message_scrolledwindow"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">If enabled, Gajim will not ask for a status message. The specified default message will be used instead.</property> + <property name="tooltip_text" translatable="yes">If enabled, Gajim will not ask for a status message. The specified default message will be used instead.</property> <property name="hscrollbar_policy">automatic</property> <property name="vscrollbar_policy">automatic</property> <property name="shadow_type">in</property> <child> - <widget class="GtkTreeView" id="default_msg_treeview"> + <object class="GtkTreeView" id="default_msg_treeview"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label12"> + <child type="label"> + <object class="GtkLabel" id="label12"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Status Messages</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="frame22"> + <object class="GtkFrame" id="frame22"> <property name="visible">True</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <widget class="GtkAlignment" id="alignment49"> + <object class="GtkAlignment" id="alignment49"> <property name="visible">True</property> <property name="border_width">6</property> <property name="left_padding">12</property> <child> - <widget class="GtkTable" id="table4"> + <object class="GtkTable" id="table4"> <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="n_rows">2</property> @@ -1195,12 +1300,12 @@ $T will be replaced by auto-not-available timeout</property> <property name="column_spacing">6</property> <property name="row_spacing">6</property> <child> - <widget class="GtkVButtonBox" id="vbuttonbox3"> + <object class="GtkVButtonBox" id="vbuttonbox3"> <property name="visible">True</property> <property name="spacing">5</property> <property name="layout_style">start</property> <child> - <widget class="GtkButton" id="new_msg_button"> + <object class="GtkButton" id="new_msg_button"> <property name="label">gtk-new</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -1208,7 +1313,7 @@ $T will be replaced by auto-not-available timeout</property> <property name="receives_default">False</property> <property name="use_stock">True</property> <signal name="clicked" handler="on_new_msg_button_clicked"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -1216,7 +1321,7 @@ $T will be replaced by auto-not-available timeout</property> </packing> </child> <child> - <widget class="GtkButton" id="delete_msg_button"> + <object class="GtkButton" id="delete_msg_button"> <property name="label">gtk-delete</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -1224,14 +1329,14 @@ $T will be replaced by auto-not-available timeout</property> <property name="receives_default">False</property> <property name="use_stock">True</property> <signal name="clicked" handler="on_delete_msg_button_clicked"/> - </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> @@ -1240,39 +1345,39 @@ $T will be replaced by auto-not-available timeout</property> </packing> </child> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow22"> + <object class="GtkScrolledWindow" id="scrolledwindow22"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">automatic</property> <property name="vscrollbar_policy">automatic</property> <property name="shadow_type">in</property> <child> - <widget class="GtkTreeView" id="msg_treeview"> + <object class="GtkTreeView" id="msg_treeview"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="headers_visible">False</property> <signal name="key_press_event" handler="on_msg_treeview_key_press_event"/> <signal name="cursor_changed" handler="on_msg_treeview_cursor_changed"/> - </widget> + </object> </child> - </widget> + </object> </child> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow23"> + <object class="GtkScrolledWindow" id="scrolledwindow23"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">never</property> <property name="vscrollbar_policy">never</property> <property name="shadow_type">in</property> <child> - <widget class="GtkTextView" id="msg_textview"> + <object class="GtkTextView" id="msg_textview"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="border_width">3</property> <property name="wrap_mode">word</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> @@ -1282,59 +1387,55 @@ $T will be replaced by auto-not-available timeout</property> <child> <placeholder/> </child> - </widget> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label213"> + <child type="label"> + <object class="GtkLabel" id="label213"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Preset Status Messages</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> <packing> <property name="position">3</property> </packing> </child> - <child> - <widget class="GtkLabel" id="label80"> + <child type="tab"> + <object class="GtkLabel" id="label80"> <property name="visible">True</property> <property name="label" translatable="yes">Status</property> - </widget> + </object> <packing> <property name="position">3</property> <property name="tab_fill">False</property> - <property name="type">tab</property> </packing> </child> <child> - <widget class="GtkVBox" id="vbox58"> + <object class="GtkVBox" id="vbox58"> <property name="visible">True</property> <property name="border_width">12</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <widget class="GtkFrame" id="frame9"> + <object class="GtkFrame" id="frame9"> <property name="visible">True</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <widget class="GtkAlignment" id="alignment10"> + <object class="GtkAlignment" id="alignment10"> <property name="visible">True</property> <property name="border_width">6</property> <property name="left_padding">12</property> <child> - <widget class="GtkTable" id="table5"> + <object class="GtkTable" id="table5"> <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="n_rows">2</property> @@ -1342,19 +1443,19 @@ $T will be replaced by auto-not-available timeout</property> <property name="column_spacing">6</property> <property name="row_spacing">6</property> <child> - <widget class="GtkFontButton" id="conversation_fontbutton"> + <object class="GtkFontButton" id="conversation_fontbutton"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <signal name="font_set" handler="on_conversation_fontbutton_font_set"/> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="default_chat_font"> + <object class="GtkCheckButton" id="default_chat_font"> <property name="label" translatable="yes">Use system _default</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -1362,7 +1463,7 @@ $T will be replaced by auto-not-available timeout</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_default_chat_font_toggled"/> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -1371,11 +1472,11 @@ $T will be replaced by auto-not-available timeout</property> </packing> </child> <child> - <widget class="GtkLabel" id="label4"> + <object class="GtkLabel" id="label4"> <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="label" translatable="yes">Chat message:</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> <property name="y_options">GTK_FILL</property> @@ -1384,21 +1485,18 @@ $T will be replaced by auto-not-available timeout</property> <child> <placeholder/> </child> - </widget> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label23"> + <child type="label"> + <object class="GtkLabel" id="label23"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Font</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> @@ -1406,19 +1504,19 @@ $T will be replaced by auto-not-available timeout</property> </packing> </child> <child> - <widget class="GtkFrame" id="frame3"> + <object class="GtkFrame" id="frame3"> <property name="visible">True</property> <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <widget class="GtkAlignment" id="alignment3"> + <object class="GtkAlignment" id="alignment3"> <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="border_width">6</property> <property name="left_padding">12</property> <child> - <widget class="GtkTable" id="table2"> + <object class="GtkTable" id="table2"> <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="n_rows">3</property> @@ -1426,16 +1524,16 @@ $T will be replaced by auto-not-available timeout</property> <property name="column_spacing">6</property> <property name="row_spacing">6</property> <child> - <widget class="GtkCheckButton" id="transports_iconsets_checkbutton"> + <object class="GtkCheckButton" id="transports_iconsets_checkbutton"> <property name="label" translatable="yes">Use _transports icons</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip" translatable="yes">If checked, Gajim will use protocol-specific status icons. (eg. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...)</property> + <property name="tooltip_text" translatable="yes">If checked, Gajim will use protocol-specific status icons. (eg. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...)</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_transports_iconsets_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">3</property> @@ -1444,10 +1542,10 @@ $T will be replaced by auto-not-available timeout</property> </packing> </child> <child> - <widget class="GtkComboBox" id="iconset_combobox"> + <object class="GtkComboBox" id="iconset_combobox"> <property name="visible">True</property> <signal name="changed" handler="on_iconset_combobox_changed"/> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -1458,13 +1556,13 @@ $T will be replaced by auto-not-available timeout</property> </packing> </child> <child> - <widget class="GtkLabel" id="label174"> + <object class="GtkLabel" id="label174"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Status _iconset:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">iconset_combobox</property> - </widget> + </object> <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> @@ -1473,25 +1571,25 @@ $T will be replaced by auto-not-available timeout</property> </packing> </child> <child> - <widget class="GtkComboBox" id="theme_combobox"> + <object class="GtkComboBox" id="theme_combobox"> <property name="visible">True</property> <signal name="changed" handler="on_theme_combobox_changed"/> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> </packing> </child> <child> - <widget class="GtkButton" id="manage_theme_button"> + <object class="GtkButton" id="manage_theme_button"> <property name="label" translatable="yes">Ma_nage...</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip" translatable="yes">Configure color and font of the interface</property> + <property name="tooltip_text" translatable="yes">Configure color and font of the interface</property> <property name="use_underline">True</property> <signal name="clicked" handler="on_manage_theme_button_clicked"/> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> @@ -1500,13 +1598,13 @@ $T will be replaced by auto-not-available timeout</property> </packing> </child> <child> - <widget class="GtkLabel" id="label249"> + <object class="GtkLabel" id="label249"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">T_heme:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">theme_combobox</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> <property name="y_options">GTK_FILL</property> @@ -1518,65 +1616,62 @@ $T will be replaced by auto-not-available timeout</property> <child> <placeholder/> </child> - </widget> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label3"> + <child type="label"> + <object class="GtkLabel" id="label3"> <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="label" translatable="yes"><b>Themes</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="frame24"> + <object class="GtkFrame" id="frame24"> <property name="visible">True</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <widget class="GtkAlignment" id="alignment53"> + <object class="GtkAlignment" id="alignment53"> <property name="visible">True</property> <property name="border_width">6</property> <property name="left_padding">12</property> <child> - <widget class="GtkTable" id="table25"> + <object class="GtkTable" id="table25"> <property name="visible">True</property> <property name="n_rows">4</property> <property name="n_columns">4</property> <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkLabel" id="label72"> + <object class="GtkLabel" id="label72"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Contact's nickname:</property> <property name="use_underline">True</property> <property name="justify">center</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label70"> + <object class="GtkLabel" id="label70"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Your nickname:</property> <property name="use_underline">True</property> <property name="justify">center</property> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> @@ -1585,13 +1680,13 @@ $T will be replaced by auto-not-available timeout</property> </packing> </child> <child> - <widget class="GtkLabel" id="label71"> + <object class="GtkLabel" id="label71"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Status message:</property> <property name="use_underline">True</property> <property name="justify">center</property> - </widget> + </object> <packing> <property name="top_attach">2</property> <property name="bottom_attach">3</property> @@ -1600,12 +1695,12 @@ $T will be replaced by auto-not-available timeout</property> </packing> </child> <child> - <widget class="GtkLabel" id="label371"> + <object class="GtkLabel" id="label371"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">_URL highlight:</property> <property name="use_underline">True</property> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> @@ -1616,38 +1711,38 @@ $T will be replaced by auto-not-available timeout</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox3022"> + <object class="GtkHBox" id="hbox3022"> <property name="visible">True</property> <child> - <widget class="GtkLabel" id="label383"> + <object class="GtkLabel" id="label383"> <property name="visible">True</property> - </widget> + </object> <packing> <property name="fill">False</property> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkButton" id="reset_colors_button"> + <object class="GtkButton" id="reset_colors_button"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="focus_on_click">False</property> <signal name="clicked" handler="on_reset_colors_button_clicked"/> <child> - <widget class="GtkAlignment" id="alignment52"> + <object class="GtkAlignment" id="alignment52"> <property name="visible">True</property> <property name="xscale">0</property> <property name="yscale">0</property> <child> - <widget class="GtkHBox" id="hbox2936"> + <object class="GtkHBox" id="hbox2936"> <property name="visible">True</property> <property name="spacing">2</property> <child> - <widget class="GtkImage" id="image439"> + <object class="GtkImage" id="image439"> <property name="visible">True</property> <property name="stock">gtk-revert-to-saved</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -1655,29 +1750,29 @@ $T will be replaced by auto-not-available timeout</property> </packing> </child> <child> - <widget class="GtkLabel" id="label217"> + <object class="GtkLabel" id="label217"> <property name="visible">True</property> <property name="label" translatable="yes">_Reset to Default Colors</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> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="right_attach">4</property> <property name="top_attach">3</property> @@ -1686,11 +1781,11 @@ $T will be replaced by auto-not-available timeout</property> </packing> </child> <child> - <widget class="GtkLabel" id="label13"> + <object class="GtkLabel" id="label13"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Contact's message:</property> - </widget> + </object> <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> @@ -1699,11 +1794,11 @@ $T will be replaced by auto-not-available timeout</property> </packing> </child> <child> - <widget class="GtkLabel" id="label14"> + <object class="GtkLabel" id="label14"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Your message:</property> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> @@ -1714,36 +1809,36 @@ $T will be replaced by auto-not-available timeout</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox8"> + <object class="GtkHBox" id="hbox8"> <property name="visible">True</property> <child> - <widget class="GtkCheckButton" id="incoming_msg_checkbutton"> + <object class="GtkCheckButton" id="incoming_msg_checkbutton"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_incoming_msg_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkColorButton" id="incoming_msg_colorbutton"> + <object class="GtkColorButton" id="incoming_msg_colorbutton"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="xalign">0</property> <property name="color">#000000000000</property> <signal name="color_set" handler="on_incoming_msg_colorbutton_color_set"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="pack_type">end</property> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -1754,36 +1849,36 @@ $T will be replaced by auto-not-available timeout</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox9"> + <object class="GtkHBox" id="hbox9"> <property name="visible">True</property> <child> - <widget class="GtkCheckButton" id="outgoing_msg_checkbutton"> + <object class="GtkCheckButton" id="outgoing_msg_checkbutton"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_outgoing_msg_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkColorButton" id="outgoing_msg_colorbutton"> + <object class="GtkColorButton" id="outgoing_msg_colorbutton"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="xalign">0</property> <property name="color">#000000000000</property> <signal name="color_set" handler="on_outgoing_msg_colorbutton_color_set"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="pack_type">end</property> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> @@ -1794,27 +1889,27 @@ $T will be replaced by auto-not-available timeout</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox10"> + <object class="GtkHBox" id="hbox10"> <property name="visible">True</property> <child> <placeholder/> </child> <child> - <widget class="GtkColorButton" id="incoming_nick_colorbutton"> + <object class="GtkColorButton" id="incoming_nick_colorbutton"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="xalign">0</property> <property name="color">#000000000000</property> <signal name="color_set" handler="on_incoming_nick_colorbutton_color_set"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="pack_type">end</property> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -1823,27 +1918,27 @@ $T will be replaced by auto-not-available timeout</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox11"> + <object class="GtkHBox" id="hbox11"> <property name="visible">True</property> <child> <placeholder/> </child> <child> - <widget class="GtkColorButton" id="status_msg_colorbutton"> + <object class="GtkColorButton" id="status_msg_colorbutton"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="xalign">0</property> <property name="color">#000000000000</property> <signal name="color_set" handler="on_status_msg_colorbutton_color_set"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="pack_type">end</property> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -1854,27 +1949,27 @@ $T will be replaced by auto-not-available timeout</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox12"> + <object class="GtkHBox" id="hbox12"> <property name="visible">True</property> <child> <placeholder/> </child> <child> - <widget class="GtkColorButton" id="outgoing_nick_colorbutton"> + <object class="GtkColorButton" id="outgoing_nick_colorbutton"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="xalign">0</property> <property name="color">#000000000000</property> <signal name="color_set" handler="on_outgoing_nick_colorbutton_color_set"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="pack_type">end</property> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> @@ -1883,27 +1978,27 @@ $T will be replaced by auto-not-available timeout</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox13"> + <object class="GtkHBox" id="hbox13"> <property name="visible">True</property> <child> <placeholder/> </child> <child> - <widget class="GtkColorButton" id="url_msg_colorbutton"> + <object class="GtkColorButton" id="url_msg_colorbutton"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="xalign">0</property> <property name="color">#000000000000</property> <signal name="color_set" handler="on_url_msg_colorbutton_color_set"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="pack_type">end</property> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> @@ -1913,80 +2008,76 @@ $T will be replaced by auto-not-available timeout</property> <property name="y_options"></property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label228"> + <child type="label"> + <object class="GtkLabel" id="label228"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Chat Line Colors</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">4</property> </packing> </child> - <child> - <widget class="GtkLabel" id="label218"> + <child type="tab"> + <object class="GtkLabel" id="label218"> <property name="visible">True</property> <property name="label" translatable="yes">Style</property> - </widget> + </object> <packing> <property name="position">4</property> <property name="tab_fill">False</property> - <property name="type">tab</property> </packing> </child> <child> - <widget class="GtkVBox" id="vbox4"> + <object class="GtkVBox" id="vbox4"> <property name="visible">True</property> <property name="border_width">12</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <widget class="GtkFrame" id="audio_frame"> + <object class="GtkFrame" id="audio_frame"> <property name="visible">True</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <widget class="GtkAlignment" id="alignment6"> + <object class="GtkAlignment" id="alignment6"> <property name="visible">True</property> <property name="left_padding">12</property> <child> - <widget class="GtkTable" id="table6"> + <object class="GtkTable" id="table6"> <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="GtkComboBox" id="audio_input_combobox"> + <object class="GtkComboBox" id="audio_input_combobox"> <property name="visible">True</property> <signal name="changed" handler="on_audio_input_combobox_changed"/> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> </packing> </child> <child> - <widget class="GtkComboBox" id="audio_output_combobox"> + <object class="GtkComboBox" id="audio_output_combobox"> <property name="visible">True</property> <signal name="changed" handler="on_audio_output_combobox_changed"/> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -1995,79 +2086,76 @@ $T will be replaced by auto-not-available timeout</property> </packing> </child> <child> - <widget class="GtkLabel" id="label18"> + <object class="GtkLabel" id="label18"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Audio input device</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="label19"> + <object class="GtkLabel" id="label19"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Audio output device</property> - </widget> + </object> <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label16"> + <child type="label"> + <object class="GtkLabel" id="label16"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Audio</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">0</property> </packing> </child> <child> - <widget class="GtkFrame" id="frame6"> + <object class="GtkFrame" id="frame6"> <property name="visible">True</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <widget class="GtkAlignment" id="alignment7"> + <object class="GtkAlignment" id="alignment7"> <property name="visible">True</property> <property name="left_padding">12</property> <child> - <widget class="GtkTable" id="table8"> + <object class="GtkTable" id="table8"> <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="label20"> + <object class="GtkLabel" id="label20"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Video input device</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="label21"> + <object class="GtkLabel" id="label21"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Video output device</property> - </widget> + </object> <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> @@ -2075,20 +2163,20 @@ $T will be replaced by auto-not-available timeout</property> </packing> </child> <child> - <widget class="GtkComboBox" id="video_input_combobox"> + <object class="GtkComboBox" id="video_input_combobox"> <property name="visible">True</property> <signal name="changed" handler="on_video_input_combobox_changed"/> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> </packing> </child> <child> - <widget class="GtkComboBox" id="video_output_combobox"> + <object class="GtkComboBox" id="video_output_combobox"> <property name="visible">True</property> <signal name="changed" handler="on_video_output_combobox_changed"/> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -2096,57 +2184,54 @@ $T will be replaced by auto-not-available timeout</property> <property name="bottom_attach">2</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label17"> + <child type="label"> + <object class="GtkLabel" id="label17"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Video</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="frame7"> + <object class="GtkFrame" id="frame7"> <property name="visible">True</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <widget class="GtkAlignment" id="alignment9"> + <object class="GtkAlignment" id="alignment9"> <property name="visible">True</property> <property name="left_padding">12</property> <child> - <widget class="GtkTable" id="table9"> + <object class="GtkTable" id="table9"> <property name="visible">True</property> <property name="n_columns">4</property> <property name="column_spacing">6</property> <property name="row_spacing">6</property> <child> - <widget class="GtkLabel" id="label24"> + <object class="GtkLabel" id="label24"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">STUN server:</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="label25"> + <object class="GtkLabel" id="label25"> <property name="visible">True</property> <property name="label" translatable="yes"><i>(example: stunserver.org)</i></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> @@ -2154,126 +2239,124 @@ $T will be replaced by auto-not-available timeout</property> </packing> </child> <child> - <widget class="GtkEntry" id="stun_server_entry"> + <object class="GtkEntry" id="stun_server_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">STUN server hostname. If none given, Gajim will try + <property name="tooltip_text" translatable="yes">STUN server hostname. If none given, Gajim will try to discover one from server.</property> <property name="invisible_char">●</property> <signal name="changed" handler="stun_server_entry_changed"/> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="stun_checkbutton"> + <object class="GtkCheckButton" id="stun_checkbutton"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_stun_checkbutton_toggled"/> - </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="label22"> + <child type="label"> + <object class="GtkLabel" id="label22"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Connection</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">2</property> </packing> </child> - </widget> + </object> <packing> <property name="position">5</property> </packing> </child> - <child> - <widget class="GtkLabel" id="label15"> + <child type="tab"> + <object class="GtkLabel" id="label15"> <property name="visible">True</property> <property name="label" translatable="yes">Audio / Video</property> - </widget> + </object> <packing> <property name="position">5</property> <property name="tab_fill">False</property> - <property name="type">tab</property> </packing> </child> <child> - <widget class="GtkVBox" id="vbox45"> + <object class="GtkVBox" id="vbox45"> <property name="visible">True</property> <property name="border_width">12</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <widget class="GtkFrame" id="applications_frame"> + <object class="GtkFrame" id="applications_frame"> <property name="visible">True</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <widget class="GtkAlignment" id="alignment89"> + <object class="GtkAlignment" id="alignment89"> <property name="visible">True</property> <property name="border_width">6</property> <property name="left_padding">12</property> <child> - <widget class="GtkVBox" id="vbox50"> + <object class="GtkVBox" id="vbox50"> <property name="visible">True</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkComboBox" id="applications_combobox"> + <object class="GtkComboBox" id="applications_combobox"> <property name="visible">True</property> - <property name="items" translatable="yes">Autodetect on every Gajim startup -Always use GNOME default applications -Always use KDE default applications -Always use Xfce default applications -Custom</property> + <property name="model">liststore1</property> <signal name="changed" handler="on_applications_combobox_changed"/> - </widget> + <child> + <object class="GtkCellRendererText" id="cellrenderertext1"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> <packing> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkFrame" id="custom_apps_frame"> + <object class="GtkFrame" id="custom_apps_frame"> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <widget class="GtkAlignment" id="alignment43"> + <object class="GtkAlignment" id="alignment43"> <property name="visible">True</property> <property name="border_width">6</property> <property name="left_padding">12</property> <child> - <widget class="GtkTable" id="table22"> + <object class="GtkTable" id="table22"> <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="GtkEntry" id="custom_file_manager_entry"> + <object class="GtkEntry" id="custom_file_manager_entry"> <property name="visible">True</property> <property name="can_focus">True</property> <signal name="changed" handler="on_custom_file_manager_entry_changed"/> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -2283,13 +2366,13 @@ Custom</property> </packing> </child> <child> - <widget class="GtkLabel" id="label355"> + <object class="GtkLabel" id="label355"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">_File manager:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">custom_file_manager_entry</property> - </widget> + </object> <packing> <property name="top_attach">2</property> <property name="bottom_attach">3</property> @@ -2298,11 +2381,11 @@ Custom</property> </packing> </child> <child> - <widget class="GtkEntry" id="custom_browser_entry"> + <object class="GtkEntry" id="custom_browser_entry"> <property name="visible">True</property> <property name="can_focus">True</property> <signal name="changed" handler="on_custom_browser_entry_changed"/> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -2310,11 +2393,11 @@ Custom</property> </packing> </child> <child> - <widget class="GtkEntry" id="custom_mail_client_entry"> + <object class="GtkEntry" id="custom_mail_client_entry"> <property name="visible">True</property> <property name="can_focus">True</property> <signal name="changed" handler="on_custom_mail_client_entry_changed"/> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -2324,13 +2407,13 @@ Custom</property> </packing> </child> <child> - <widget class="GtkLabel" id="label200"> + <object class="GtkLabel" id="label200"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Mail client:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">custom_mail_client_entry</property> - </widget> + </object> <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> @@ -2339,52 +2422,46 @@ Custom</property> </packing> </child> <child> - <widget class="GtkLabel" id="label199"> + <object class="GtkLabel" id="label199"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Browser:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">custom_browser_entry</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label198"> + <child type="label"> + <object class="GtkLabel" id="label198"> <property name="visible">True</property> <property name="label" translatable="yes" comments="a header for custom browser/client/file manager. so translate sth like: Custom Settings"><b>Custom</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> + </object> </child> - <child> - <widget class="GtkLabel" id="label5"> + <child type="label"> + <object class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Applications</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> @@ -2392,73 +2469,73 @@ Custom</property> </packing> </child> <child> - <widget class="GtkFrame" id="frame4"> + <object class="GtkFrame" id="frame4"> <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="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <widget class="GtkAlignment" id="alignment4"> + <object class="GtkAlignment" id="alignment4"> <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="border_width">6</property> <property name="left_padding">12</property> <child> - <widget class="GtkTable" id="table3"> + <object class="GtkTable" id="table3"> <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="n_rows">4</property> <property name="column_spacing">6</property> <property name="row_spacing">6</property> <child> - <widget class="GtkCheckButton" id="ignore_events_from_unknown_contacts_checkbutton"> + <object class="GtkCheckButton" id="ignore_events_from_unknown_contacts_checkbutton"> <property name="label" translatable="yes">_Ignore events from contacts not in the roster</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip" translatable="yes">If checked, Gajim will ignore incoming events from unauthorized contacts. Use with caution, because it blocks all messages from any contact that is not in the roster</property> + <property name="tooltip_text" translatable="yes">If checked, Gajim will ignore incoming events from unauthorized contacts. Use with caution, because it blocks all messages from any contact that is not in the roster</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_ignore_events_from_unknown_contacts_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="send_os_info_checkbutton"> + <object class="GtkCheckButton" id="send_os_info_checkbutton"> <property name="label" translatable="yes">Allow _OS information to be sent</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip" translatable="yes">If checked, Gajim will allow others to detect the operation system you are using</property> + <property name="tooltip_text" translatable="yes">If checked, Gajim will allow others to detect the operation system you are using</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_send_os_info_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="log_encrypted_chats_checkbutton"> + <object class="GtkCheckButton" id="log_encrypted_chats_checkbutton"> <property name="label" translatable="yes">Log _encrypted chat session</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip" translatable="yes">If checked, Gajim will keep logs for encrypted messages. Please note that when using E2E encryption the remote party has to agree on logging, else the messages will not be logged.</property> + <property name="tooltip_text" translatable="yes">If checked, Gajim will keep logs for encrypted messages. Please note that when using E2E encryption the remote party has to agree on logging, else the messages will not be logged.</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_log_encrypted_chats_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="top_attach">2</property> <property name="bottom_attach">3</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="send_idle_time_checkbutton"> + <object class="GtkCheckButton" id="send_idle_time_checkbutton"> <property name="label" translatable="yes">Allow my _idle time to be sent</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -2466,50 +2543,47 @@ Custom</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_allow_idle_time_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="top_attach">3</property> <property name="bottom_attach">4</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label6"> + <child type="label"> + <object class="GtkLabel" id="label6"> <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="label" translatable="yes"><b>Privacy</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="frame27"> + <object class="GtkFrame" id="frame27"> <property name="visible">True</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <widget class="GtkAlignment" id="alignment56"> + <object class="GtkAlignment" id="alignment56"> <property name="visible">True</property> <property name="border_width">6</property> <property name="left_padding">12</property> <child> - <widget class="GtkVBox" id="vbox66"> + <object class="GtkVBox" id="vbox66"> <property name="visible">True</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkCheckButton" id="log_show_changes_checkbutton"> + <object class="GtkCheckButton" id="log_show_changes_checkbutton"> <property name="label" translatable="yes">_Log status changes of contacts</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -2517,7 +2591,7 @@ Custom</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_log_show_changes_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -2525,7 +2599,7 @@ Custom</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="check_default_client_checkbutton"> + <object class="GtkCheckButton" id="check_default_client_checkbutton"> <property name="label" translatable="yes">Check on startup if Gajim is the _default Jabber client</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -2533,28 +2607,25 @@ Custom</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_check_default_client_checkbutton_toggled"/> - </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="label235"> + <child type="label"> + <object class="GtkLabel" id="label235"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Miscellaneous</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> @@ -2562,37 +2633,37 @@ Custom</property> </packing> </child> <child> - <widget class="GtkFrame" id="frame31"> + <object class="GtkFrame" id="frame31"> <property name="visible">True</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <widget class="GtkAlignment" id="alignment64"> + <object class="GtkAlignment" id="alignment64"> <property name="visible">True</property> <property name="border_width">6</property> <property name="yscale">0</property> <property name="left_padding">12</property> <property name="right_padding">335</property> <child> - <widget class="GtkButton" id="open_advanced_editor_button"> + <object class="GtkButton" id="open_advanced_editor_button"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <signal name="clicked" handler="on_open_advanced_editor_button_clicked"/> <child> - <widget class="GtkAlignment" id="alignment70"> + <object class="GtkAlignment" id="alignment70"> <property name="visible">True</property> <property name="xscale">0</property> <property name="yscale">0</property> <child> - <widget class="GtkHBox" id="hbox2962"> + <object class="GtkHBox" id="hbox2962"> <property name="visible">True</property> <property name="spacing">2</property> <child> - <widget class="GtkImage" id="image597"> + <object class="GtkImage" id="image597"> <property name="visible">True</property> <property name="stock">gtk-open</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -2600,70 +2671,66 @@ Custom</property> </packing> </child> <child> - <widget class="GtkLabel" id="label296"> + <object class="GtkLabel" id="label296"> <property name="visible">True</property> <property name="label" translatable="yes">_Open...</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> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label247"> + <child type="label"> + <object class="GtkLabel" id="label247"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Advanced Configuration Editor</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">3</property> </packing> </child> - </widget> + </object> <packing> <property name="position">6</property> </packing> </child> - <child> - <widget class="GtkLabel" id="label169"> + <child type="tab"> + <object class="GtkLabel" id="label169"> <property name="visible">True</property> <property name="label" translatable="yes">Advanced</property> - </widget> + </object> <packing> <property name="position">6</property> <property name="tab_fill">False</property> - <property name="type">tab</property> </packing> </child> - </widget> + </object> <packing> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkHButtonBox" id="hbuttonbox7"> + <object class="GtkHButtonBox" id="hbuttonbox7"> <property name="visible">True</property> <property name="spacing">15</property> <property name="layout_style">end</property> <child> - <widget class="GtkButton" id="close_button"> + <object class="GtkButton" id="close_button"> <property name="label">gtk-close</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -2671,20 +2738,34 @@ Custom</property> <property name="receives_default">False</property> <property name="use_stock">True</property> <signal name="clicked" handler="on_close_button_clicked"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">0</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> + <object class="GtkAdjustment" id="adjustment1"> + <property name="value">20</property> + <property name="lower">1</property> + <property name="upper">1440</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> + <object class="GtkAdjustment" id="adjustment2"> + <property name="value">12</property> + <property name="lower">1</property> + <property name="upper">720</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> +</interface> diff --git a/data/glade/privacy_list_window.glade b/data/gui/privacy_list_window.ui index 78704da07..4160f7de1 100644 --- a/data/glade/privacy_list_window.glade +++ b/data/gui/privacy_list_window.ui @@ -1,41 +1,43 @@ -<?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="privacy_list_edit_window"> +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkWindow" id="privacy_list_edit_window"> <property name="visible">True</property> <property name="border_width">6</property> <property name="title" translatable="yes">Privacy List</property> <signal name="destroy" handler="on_privacy_list_edit_window_destroy"/> <child> - <widget class="GtkVBox" id="main_vbox"> + <object class="GtkVBox" id="main_vbox"> <property name="width_request">600</property> <property name="visible">True</property> + <property name="orientation">vertical</property> <child> - <widget class="GtkHBox" id="title_hbox"> + <object class="GtkHBox" id="title_hbox"> <property name="visible">True</property> <property name="homogeneous">True</property> <child> - <widget class="GtkLabel" id="privacy_lists_title_label"> + <object class="GtkLabel" id="privacy_lists_title_label"> <property name="visible">True</property> <property name="label" translatable="yes"><i>Privacy List</i></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="privacy_list_active_checkbutton"> + <object class="GtkCheckButton" id="privacy_list_active_checkbutton"> + <property name="label" translatable="yes">Active for this session</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Active for this session</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_privacy_list_active_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -43,30 +45,31 @@ </packing> </child> <child> - <widget class="GtkCheckButton" id="privacy_list_default_checkbutton"> + <object class="GtkCheckButton" id="privacy_list_default_checkbutton"> + <property name="label" translatable="yes">Active on each startup</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Active on each startup</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_privacy_list_default_checkbutton_toggled"/> - </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="position">0</property> </packing> </child> <child> - <widget class="GtkHSeparator" id="title_hseparator"> + <object class="GtkHSeparator" id="title_hseparator"> <property name="visible">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -75,11 +78,11 @@ </packing> </child> <child> - <widget class="GtkLabel" id="list_of_rules_label"> + <object class="GtkLabel" id="list_of_rules_label"> <property name="visible">True</property> <property name="label" translatable="yes"><b>List of rules</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -88,11 +91,17 @@ </packing> </child> <child> - <widget class="GtkComboBox" id="list_of_rules_combobox"> + <object class="GtkComboBox" id="list_of_rules_combobox"> <property name="visible">True</property> - <property name="items" translatable="yes"></property> + <property name="model">liststore3</property> <signal name="changed" handler="on_list_of_rules_combobox_changed"/> - </widget> + <child> + <object class="GtkCellRendererText" id="cellrenderertext3"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> <packing> <property name="expand">False</property> <property name="padding">5</property> @@ -100,34 +109,35 @@ </packing> </child> <child> - <widget class="GtkHBox" id="delete_open_buttons_hbox"> + <object class="GtkHBox" id="delete_open_buttons_hbox"> <property name="visible">True</property> <property name="homogeneous">True</property> <child> - <widget class="GtkButton" id="new_rule_button"> + <object class="GtkButton" id="new_rule_button"> + <property name="label">gtk-add</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="border_width">5</property> - <property name="label">gtk-add</property> <property name="use_stock">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_new_rule_button_clicked"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkButton" id="delete_rule_button"> + <object class="GtkButton" id="delete_rule_button"> + <property name="label">gtk-remove</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="border_width">5</property> - <property name="label">gtk-remove</property> <property name="use_stock">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_delete_rule_button_clicked"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -135,46 +145,48 @@ </packing> </child> <child> - <widget class="GtkButton" id="open_rule_button"> + <object class="GtkButton" id="open_rule_button"> + <property name="label">gtk-edit</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="border_width">6</property> - <property name="label">gtk-edit</property> <property name="use_stock">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_open_rule_button_clicked"/> - </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="position">4</property> </packing> </child> <child> - <widget class="GtkVBox" id="add_edit_vbox"> + <object class="GtkVBox" id="add_edit_vbox"> <property name="no_show_all">True</property> <property name="border_width">5</property> + <property name="orientation">vertical</property> <child> - <widget class="GtkHSeparator" id="edit_between_list_edit_hseparator"> + <object class="GtkHSeparator" id="edit_between_list_edit_hseparator"> <property name="visible">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="padding">5</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkLabel" id="add_edit_rule_label"> + <object class="GtkLabel" id="add_edit_rule_label"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Add / Edit a rule</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -183,210 +195,234 @@ </packing> </child> <child> - <widget class="GtkHBox" id="edit_fields_hbox"> + <object class="GtkHBox" id="edit_fields_hbox"> <property name="visible">True</property> <child> - <widget class="GtkVBox" id="edit_allow_deny_vbox"> + <object class="GtkVBox" id="edit_allow_deny_vbox"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="homogeneous">True</property> <child> - <widget class="GtkRadioButton" id="edit_allow_radiobutton"> + <object class="GtkRadioButton" id="edit_allow_radiobutton"> + <property name="label" translatable="yes">Allow</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Allow</property> + <property name="receives_default">False</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> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkRadioButton" id="edit_deny_radiobutton"> + <object class="GtkRadioButton" id="edit_deny_radiobutton"> + <property name="label" translatable="yes">Deny</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Deny</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <property name="group">edit_allow_radiobutton</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="position">0</property> + </packing> </child> <child> - <widget class="GtkVBox" id="edit_type_vbox"> + <object class="GtkVBox" id="edit_type_vbox"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="homogeneous">True</property> <child> - <widget class="GtkHBox" id="edit_type_jabberid_hbox"> + <object class="GtkHBox" id="edit_type_jabberid_hbox"> <property name="visible">True</property> <property name="border_width">5</property> <child> - <widget class="GtkRadioButton" id="edit_type_jabberid_radiobutton"> + <object class="GtkRadioButton" id="edit_type_jabberid_radiobutton"> + <property name="label" translatable="yes">JabberID</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">JabberID</property> + <property name="receives_default">False</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> <property name="padding">5</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkEntry" id="edit_type_jabberid_entry"> + <object class="GtkEntry" id="edit_type_jabberid_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="padding">5</property> <property name="position">1</property> </packing> </child> - </widget> + </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkHBox" id="edit_type_group_hbox"> + <object class="GtkHBox" id="edit_type_group_hbox"> <property name="visible">True</property> <property name="border_width">5</property> <child> - <widget class="GtkRadioButton" id="edit_type_group_radiobutton"> + <object class="GtkRadioButton" id="edit_type_group_radiobutton"> + <property name="label" translatable="yes">all in the group</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">all in the group</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <property name="group">edit_type_jabberid_radiobutton</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="padding">5</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkComboBox" id="edit_type_group_combobox"> + <object class="GtkComboBox" id="edit_type_group_combobox"> <property name="visible">True</property> - <property name="items" translatable="yes"></property> - </widget> + <property name="model">liststore2</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext2"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> <packing> <property name="padding">5</property> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkHBox" id="edit_type_subscription_hbox"> + <object class="GtkHBox" id="edit_type_subscription_hbox"> <property name="visible">True</property> <property name="border_width">5</property> <child> - <widget class="GtkRadioButton" id="edit_type_subscription_radiobutton"> + <object class="GtkRadioButton" id="edit_type_subscription_radiobutton"> + <property name="label" translatable="yes">all by subscription</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">all by subscription</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <property name="group">edit_type_jabberid_radiobutton</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="padding">5</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkComboBox" id="edit_type_subscription_combobox"> + <object class="GtkComboBox" id="edit_type_subscription_combobox"> <property name="visible">True</property> - <property name="items" translatable="yes">none -both -from -to</property> - </widget> + <property name="model">liststore1</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext1"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> <packing> <property name="padding">5</property> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="position">2</property> </packing> </child> <child> - <widget class="GtkHBox" id="edit_type_select_all_hbox"> + <object class="GtkHBox" id="edit_type_select_all_hbox"> <property name="visible">True</property> <property name="border_width">10</property> <child> - <widget class="GtkRadioButton" id="edit_type_select_all_radiobutton"> + <object class="GtkRadioButton" id="edit_type_select_all_radiobutton"> + <property name="label" translatable="yes">All</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">All</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <property name="group">edit_type_jabberid_radiobutton</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </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="position">1</property> </packing> </child> <child> - <widget class="GtkVBox" id="edit_items_vbox"> + <object class="GtkVBox" id="edit_items_vbox"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="homogeneous">True</property> <child> - <widget class="GtkCheckButton" id="edit_send_messages_checkbutton"> + <object class="GtkCheckButton" id="edit_send_messages_checkbutton"> + <property name="label" translatable="yes">to send me messages</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">to send me messages</property> + <property name="receives_default">False</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> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="edit_queries_send_checkbutton"> + <object class="GtkCheckButton" id="edit_queries_send_checkbutton"> + <property name="label" translatable="yes">to send me queries</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">to send me queries</property> + <property name="receives_default">False</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> @@ -394,14 +430,14 @@ to</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="edit_send_status_checkbutton"> + <object class="GtkCheckButton" id="edit_send_status_checkbutton"> + <property name="label" translatable="yes">to view my status</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">to view my status</property> + <property name="receives_default">False</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> @@ -409,14 +445,14 @@ to</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="edit_view_status_checkbutton"> + <object class="GtkCheckButton" id="edit_view_status_checkbutton"> + <property name="label" translatable="yes">to send me status</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">to send me status</property> + <property name="receives_default">False</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> @@ -424,117 +460,165 @@ to</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="edit_all_checkbutton"> + <object class="GtkCheckButton" id="edit_all_checkbutton"> + <property name="label" translatable="yes">All (including subscription)</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">All (including subscription)</property> - <property name="response_id">0</property> + <property name="receives_default">False</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_edit_all_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="position">4</property> </packing> </child> - </widget> + </object> <packing> <property name="position">2</property> </packing> </child> - </widget> + </object> <packing> <property name="position">2</property> </packing> </child> <child> - <widget class="GtkHBox" id="edit_order_new_save_buttons_hbox"> + <object class="GtkHBox" id="edit_order_new_save_buttons_hbox"> <property name="visible">True</property> <property name="homogeneous">True</property> <child> - <widget class="GtkHBox" id="edit_order_hbox"> + <object class="GtkHBox" id="edit_order_hbox"> <property name="visible">True</property> <child> - <widget class="GtkLabel" id="edit_order_label"> + <object class="GtkLabel" id="edit_order_label"> <property name="visible">True</property> <property name="label" translatable="yes">Order:</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="padding">5</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkSpinButton" id="edit_order_spinbutton"> + <object class="GtkSpinButton" id="edit_order_spinbutton"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="adjustment">1 0 100 1 10 10</property> + <property name="adjustment">adjustment1</property> <property name="climb_rate">1</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkButton" id="save_rule_button"> + <object class="GtkButton" id="save_rule_button"> + <property name="label">gtk-save</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="border_width">5</property> - <property name="label">gtk-save</property> <property name="use_stock">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_save_rule_button_clicked"/> - </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="position">3</property> </packing> </child> - </widget> + </object> <packing> <property name="position">5</property> </packing> </child> <child> - <widget class="GtkHSeparator" id="edit_last_buttons_separator"> + <object class="GtkHSeparator" id="edit_last_buttons_separator"> <property name="visible">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">6</property> </packing> </child> <child> - <widget class="GtkHButtonBox" id="hbuttonbox1"> + <object class="GtkHButtonBox" id="hbuttonbox1"> <property name="visible">True</property> <property name="border_width">6</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> + <property name="layout_style">end</property> <child> - <widget class="GtkButton" id="close_button"> + <object class="GtkButton" id="close_button"> + <property name="label">gtk-close</property> <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="receives_default">False</property> <property name="use_stock">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_close_button_clicked"/> - </widget> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> </child> - </widget> + </object> <packing> <property name="position">7</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> + <object class="GtkAdjustment" id="adjustment1"> + <property name="value">1</property> + <property name="upper">100</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + <property name="page_size">10</property> + </object> + <object class="GtkListStore" id="liststore1"> + <columns> + <!-- column-name item text --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">none</col> + </row> + <row> + <col id="0" translatable="yes">both</col> + </row> + <row> + <col id="0" translatable="yes">from</col> + </row> + <row> + <col id="0" translatable="yes">to</col> + </row> + </data> + </object> + <object class="GtkListStore" id="liststore2"> + <columns> + <!-- column-name item text --> + <column type="gchararray"/> + </columns> + </object> + <object class="GtkListStore" id="liststore3"> + <columns> + <!-- column-name item text --> + <column type="gchararray"/> + </columns> + </object> +</interface> diff --git a/data/gui/privacy_lists_window.ui b/data/gui/privacy_lists_window.ui new file mode 100644 index 000000000..c1f9ba5e7 --- /dev/null +++ b/data/gui/privacy_lists_window.ui @@ -0,0 +1,174 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkWindow" id="privacy_lists_first_window"> + <property name="visible">True</property> + <property name="border_width">12</property> + <property name="title" translatable="yes">window1</property> + <signal name="destroy" handler="on_privacy_lists_first_window_destroy"/> + <child> + <object class="GtkVBox" id="vbox1"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkHBox" id="hbox1"> + <property name="visible">True</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Privacy Lists:</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="list_of_privacy_lists_combobox"> + <property name="visible">True</property> + <property name="model">liststore1</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext1"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="vbox2"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkHButtonBox" id="hbuttonbox2"> + <property name="visible">True</property> + <property name="layout_style">spread</property> + <child> + <object class="GtkButton" id="delete_privacy_list_button"> + <property name="label">gtk-delete</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="border_width">5</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_delete_privacy_list_button_clicked"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="open_privacy_list_button"> + <property name="label">gtk-edit</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="border_width">5</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_open_privacy_list_button_clicked"/> + </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">0</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <child> + <object class="GtkEntry" id="new_privacy_list_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="new_privacy_list_button"> + <property name="label">gtk-new</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="border_width">5</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_new_privacy_list_button_clicked"/> + </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> + <object class="GtkHButtonBox" id="hbuttonbox1"> + <property name="visible">True</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="close_privacy_lists_window_button"> + <property name="label">gtk-close</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="border_width">5</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_close_button_clicked"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="position">2</property> + </packing> + </child> + </object> + </child> + </object> + <object class="GtkListStore" id="liststore1"> + <columns> + <!-- column-name item text --> + <column type="gchararray"/> + </columns> + </object> +</interface> diff --git a/data/glade/profile_window.glade b/data/gui/profile_window.ui index 51c21a8d2..0147c7369 100644 --- a/data/glade/profile_window.glade +++ b/data/gui/profile_window.ui @@ -1,20 +1,21 @@ -<?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="profile_window"> +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkWindow" id="profile_window"> <property name="title" translatable="yes">Personal Information</property> - <signal name="key_press_event" handler="on_profile_window_key_press_event"/> <signal name="destroy" handler="on_profile_window_destroy"/> + <signal name="key_press_event" handler="on_profile_window_key_press_event"/> <child> - <widget class="GtkVBox" id="vbox1"> + <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> + <property name="orientation">vertical</property> <child> - <widget class="GtkNotebook" id="information_notebook"> + <object class="GtkNotebook" id="information_notebook"> <property name="visible">True</property> <property name="border_width">6</property> <child> - <widget class="GtkTable" id="table2"> + <object class="GtkTable" id="table2"> <property name="visible">True</property> <property name="border_width">12</property> <property name="n_rows">7</property> @@ -22,16 +23,10 @@ <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <widget class="GtkEntry" id="FN_entry"> + <object class="GtkEntry" id="FN_entry"> <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> @@ -39,10 +34,10 @@ </packing> </child> <child> - <widget class="GtkEntry" id="EMAIL_HOME_USERID_entry"> + <object class="GtkEntry" id="EMAIL_HOME_USERID_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">4</property> @@ -52,11 +47,11 @@ </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="table3"> + <object class="GtkTable" id="table3"> <property name="visible">True</property> <property name="border_width">6</property> <property name="n_rows">3</property> @@ -64,16 +59,10 @@ <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <widget class="GtkEntry" id="N_FAMILY_entry"> + <object class="GtkEntry" id="N_FAMILY_entry"> <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> @@ -81,10 +70,10 @@ </packing> </child> <child> - <widget class="GtkEntry" id="N_GIVEN_entry"> + <object class="GtkEntry" id="N_GIVEN_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> @@ -92,10 +81,10 @@ </packing> </child> <child> - <widget class="GtkEntry" id="N_MIDDLE_entry"> + <object class="GtkEntry" id="N_MIDDLE_entry"> <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> @@ -105,10 +94,10 @@ </packing> </child> <child> - <widget class="GtkEntry" id="N_PREFIX_entry"> + <object class="GtkEntry" id="N_PREFIX_entry"> <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> @@ -118,10 +107,10 @@ </packing> </child> <child> - <widget class="GtkEntry" id="N_SUFFIX_entry"> + <object class="GtkEntry" id="N_SUFFIX_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> @@ -131,27 +120,27 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label18"> + <object class="GtkLabel" id="label18"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes" comments="Family Name"><b>Family:</b></property> <property name="use_markup">True</property> - <property name="ellipsize">PANGO_ELLIPSIZE_MIDDLE</property> - </widget> + <property name="ellipsize">middle</property> + </object> <packing> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label16"> + <object class="GtkLabel" id="label16"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes" comments="Middle Name"><b>Middle:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> @@ -160,13 +149,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label15"> + <object class="GtkLabel" id="label15"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes" comments="Prefix in Name"><b>Prefix:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="top_attach">2</property> <property name="bottom_attach">3</property> @@ -175,13 +164,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label17"> + <object class="GtkLabel" id="label17"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes" comments="Given Name"><b>Given:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> @@ -190,13 +179,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label14"> + <object class="GtkLabel" id="label14"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes" comments="Suffix in Name"><b>Suffix:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> @@ -206,21 +195,24 @@ <property name="y_options"></property> </packing> </child> - </widget> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + </object> </child> - <child> - <widget class="GtkLabel" id="label19"> + <child type="label"> + <object class="GtkLabel" id="label19"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Full Name</b></property> <property name="use_markup">True</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> + </object> </child> - </widget> + </object> <packing> <property name="right_attach">4</property> <property name="top_attach">1</property> @@ -229,10 +221,10 @@ </packing> </child> <child> - <widget class="GtkEntry" id="NICKNAME_entry"> + <object class="GtkEntry" id="NICKNAME_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> @@ -240,11 +232,11 @@ </packing> </child> <child> - <widget class="GtkExpander" id="expander2"> + <object class="GtkExpander" id="expander2"> <property name="visible">True</property> <property name="can_focus">True</property> <child> - <widget class="GtkTable" id="table_ADR_STREET"> + <object class="GtkTable" id="table_ADR_STREET"> <property name="visible">True</property> <property name="border_width">6</property> <property name="n_rows">3</property> @@ -252,10 +244,10 @@ <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkEntry" id="ADR_HOME_STREET_entry"> + <object class="GtkEntry" id="ADR_HOME_STREET_entry"> <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> @@ -263,10 +255,10 @@ </packing> </child> <child> - <widget class="GtkEntry" id="ADR_HOME_EXTADR_entry"> + <object class="GtkEntry" id="ADR_HOME_EXTADR_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> @@ -274,10 +266,10 @@ </packing> </child> <child> - <widget class="GtkEntry" id="ADR_HOME_LOCALITY_entry"> + <object class="GtkEntry" id="ADR_HOME_LOCALITY_entry"> <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> @@ -287,10 +279,10 @@ </packing> </child> <child> - <widget class="GtkEntry" id="ADR_HOME_PCODE_entry"> + <object class="GtkEntry" id="ADR_HOME_PCODE_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> @@ -300,10 +292,10 @@ </packing> </child> <child> - <widget class="GtkEntry" id="ADR_HOME_REGION_entry"> + <object class="GtkEntry" id="ADR_HOME_REGION_entry"> <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> @@ -313,10 +305,10 @@ </packing> </child> <child> - <widget class="GtkEntry" id="ADR_HOME_CTRY_entry"> + <object class="GtkEntry" id="ADR_HOME_CTRY_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> @@ -326,26 +318,26 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label31"> + <object class="GtkLabel" id="label31"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Street:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label28"> + <object class="GtkLabel" id="label28"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>City:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> @@ -354,13 +346,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label27"> + <object class="GtkLabel" id="label27"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>State:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="top_attach">2</property> <property name="bottom_attach">3</property> @@ -369,13 +361,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label29"> + <object class="GtkLabel" id="label29"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Extra Address:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> @@ -384,13 +376,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label26"> + <object class="GtkLabel" id="label26"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Postal Code:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> @@ -401,13 +393,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label25"> + <object class="GtkLabel" id="label25"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Country:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> @@ -417,21 +409,18 @@ <property name="y_options"></property> </packing> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label30"> + <child type="label"> + <object class="GtkLabel" id="label30"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Address</b></property> <property name="use_markup">True</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> + </object> </child> - </widget> + </object> <packing> <property name="right_attach">4</property> <property name="top_attach">2</property> @@ -440,10 +429,10 @@ </packing> </child> <child> - <widget class="GtkEntry" id="BDAY_entry"> + <object class="GtkEntry" id="BDAY_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> @@ -453,13 +442,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label22"> + <object class="GtkLabel" id="label22"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Homepage:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="top_attach">3</property> <property name="bottom_attach">4</property> @@ -468,10 +457,10 @@ </packing> </child> <child> - <widget class="GtkEntry" id="URL_entry"> + <object class="GtkEntry" id="URL_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">4</property> @@ -481,10 +470,10 @@ </packing> </child> <child> - <widget class="GtkEntry" id="TEL_HOME_NUMBER_entry"> + <object class="GtkEntry" id="TEL_HOME_NUMBER_entry"> <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> @@ -494,26 +483,26 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label24"> + <object class="GtkLabel" id="label24"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Name:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label20"> + <object class="GtkLabel" id="label20"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Nickname:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> @@ -522,13 +511,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label23"> + <object class="GtkLabel" id="label23"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Phone No.:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="top_attach">5</property> <property name="bottom_attach">6</property> @@ -537,19 +526,19 @@ </packing> </child> <child> - <widget class="GtkEventBox" id="eventbox1"> + <object class="GtkEventBox" id="eventbox1"> <property name="visible">True</property> - <property name="tooltip" translatable="yes" comments="Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)">Format: YYYY-MM-DD</property> + <property name="tooltip_text" translatable="yes">Format: YYYY-MM-DD</property> <child> - <widget class="GtkLabel" id="label13"> + <object class="GtkLabel" id="label13"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Birthday:</b></property> <property name="use_markup">True</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> @@ -560,12 +549,12 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label57"> + <object class="GtkLabel" id="label57"> <property name="visible">True</property> <property name="xalign">1</property> <property name="label" translatable="yes"><b>E-Mail:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="top_attach">4</property> <property name="bottom_attach">5</property> @@ -574,13 +563,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label58"> + <object class="GtkLabel" id="label58"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Avatar:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="top_attach">6</property> <property name="bottom_attach">7</property> @@ -589,53 +578,54 @@ </packing> </child> <child> - <widget class="GtkHBox" id="hbox3"> + <object class="GtkHBox" id="hbox3"> <property name="visible">True</property> <child> - <widget class="GtkButton" id="PHOTO_button"> + <object class="GtkButton" id="PHOTO_button"> <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="response_id">0</property> <signal name="button_press_event" handler="on_PHOTO_button_press_event"/> <child> - <widget class="GtkEventBox" id="PHOTO_eventbox3"> + <object class="GtkEventBox" id="PHOTO_eventbox3"> <property name="visible">True</property> <property name="visible_window">False</property> <child> - <widget class="GtkImage" id="PHOTO_image"> + <object class="GtkImage" id="PHOTO_image"> <property name="visible">True</property> <property name="yalign">0</property> <property name="stock">gtk-missing-image</property> - </widget> + </object> </child> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkButton" id="NOPHOTO_button"> + <object class="GtkButton" id="NOPHOTO_button"> + <property name="label" translatable="yes">Click to set your avatar</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="no_show_all">True</property> - <property name="label" translatable="yes">Click to set your avatar</property> <property name="use_underline">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="response_id">0</property> <signal name="button_press_event" handler="on_PHOTO_button_press_event"/> - </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> @@ -645,22 +635,27 @@ <property name="y_options">GTK_FILL</property> </packing> </child> - </widget> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + </object> </child> - <child> - <widget class="GtkLabel" id="label4"> + <child type="tab"> + <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label" translatable="yes">Personal Info</property> - </widget> + </object> <packing> - <property name="type">tab</property> <property name="tab_fill">False</property> </packing> </child> <child> - <widget class="GtkTable" id="table5"> + <object class="GtkTable" id="table5"> <property name="visible">True</property> <property name="border_width">6</property> <property name="n_rows">5</property> @@ -668,16 +663,10 @@ <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <widget class="GtkEntry" id="ORG_ORGNAME_entry"> + <object class="GtkEntry" id="ORG_ORGNAME_entry"> <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> @@ -685,10 +674,10 @@ </packing> </child> <child> - <widget class="GtkEntry" id="ORG_ORGUNIT_entry"> + <object class="GtkEntry" id="ORG_ORGUNIT_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> @@ -696,10 +685,10 @@ </packing> </child> <child> - <widget class="GtkEntry" id="TITLE_entry"> + <object class="GtkEntry" id="TITLE_entry"> <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> @@ -709,10 +698,10 @@ </packing> </child> <child> - <widget class="GtkEntry" id="ROLE_entry"> + <object class="GtkEntry" id="ROLE_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> @@ -722,10 +711,10 @@ </packing> </child> <child> - <widget class="GtkEntry" id="EMAIL_WORK_USERID_entry"> + <object class="GtkEntry" id="EMAIL_WORK_USERID_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">4</property> @@ -735,11 +724,11 @@ </packing> </child> <child> - <widget class="GtkExpander" id="expander3"> + <object class="GtkExpander" id="expander3"> <property name="visible">True</property> <property name="can_focus">True</property> <child> - <widget class="GtkTable" id="table6"> + <object class="GtkTable" id="table6"> <property name="visible">True</property> <property name="border_width">6</property> <property name="n_rows">3</property> @@ -747,10 +736,10 @@ <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkEntry" id="ADR_WORK_STREET_entry"> + <object class="GtkEntry" id="ADR_WORK_STREET_entry"> <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> @@ -758,10 +747,10 @@ </packing> </child> <child> - <widget class="GtkEntry" id="ADR_WORK_EXTADR_entry"> + <object class="GtkEntry" id="ADR_WORK_EXTADR_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> @@ -769,10 +758,10 @@ </packing> </child> <child> - <widget class="GtkEntry" id="ADR_WORK_LOCALITY_entry"> + <object class="GtkEntry" id="ADR_WORK_LOCALITY_entry"> <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> @@ -782,10 +771,10 @@ </packing> </child> <child> - <widget class="GtkEntry" id="ADR_WORK_PCODE_entry"> + <object class="GtkEntry" id="ADR_WORK_PCODE_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> @@ -795,10 +784,10 @@ </packing> </child> <child> - <widget class="GtkEntry" id="ADR_WORK_REGION_entry"> + <object class="GtkEntry" id="ADR_WORK_REGION_entry"> <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> @@ -808,10 +797,10 @@ </packing> </child> <child> - <widget class="GtkEntry" id="ADR_WORK_CTRY_entry"> + <object class="GtkEntry" id="ADR_WORK_CTRY_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> @@ -821,26 +810,26 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label39"> + <object class="GtkLabel" id="label39"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Street:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label37"> + <object class="GtkLabel" id="label37"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>City:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> @@ -849,13 +838,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label36"> + <object class="GtkLabel" id="label36"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>State:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="top_attach">2</property> <property name="bottom_attach">3</property> @@ -864,13 +853,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label38"> + <object class="GtkLabel" id="label38"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Extra Address:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> @@ -879,13 +868,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label35"> + <object class="GtkLabel" id="label35"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Postal Code:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> @@ -896,13 +885,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label34"> + <object class="GtkLabel" id="label34"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Country:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> @@ -912,21 +901,18 @@ <property name="y_options"></property> </packing> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label40"> + <child type="label"> + <object class="GtkLabel" id="label40"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Address</b></property> <property name="use_markup">True</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> + </object> </child> - </widget> + </object> <packing> <property name="right_attach">4</property> <property name="top_attach">2</property> @@ -935,10 +921,10 @@ </packing> </child> <child> - <widget class="GtkEntry" id="TEL_WORK_NUMBER_entry"> + <object class="GtkEntry" id="TEL_WORK_NUMBER_entry"> <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> @@ -948,26 +934,26 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label44"> + <object class="GtkLabel" id="label44"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Company:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label42"> + <object class="GtkLabel" id="label42"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Position:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> @@ -976,13 +962,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label43"> + <object class="GtkLabel" id="label43"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Department:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> @@ -991,13 +977,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label41"> + <object class="GtkLabel" id="label41"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Role:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> @@ -1008,13 +994,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label32"> + <object class="GtkLabel" id="label32"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>E-Mail:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="top_attach">3</property> <property name="bottom_attach">4</property> @@ -1023,13 +1009,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label33"> + <object class="GtkLabel" id="label33"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Phone No.:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="top_attach">4</property> <property name="bottom_attach">5</property> @@ -1037,127 +1023,142 @@ <property name="y_options"></property> </packing> </child> - </widget> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + </object> <packing> <property name="position">1</property> </packing> </child> - <child> - <widget class="GtkLabel" id="label5"> + <child type="tab"> + <object class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label" translatable="yes">Work</property> - </widget> + </object> <packing> - <property name="type">tab</property> <property name="position">1</property> <property name="tab_fill">False</property> </packing> </child> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow"> + <object class="GtkScrolledWindow" id="scrolledwindow"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="border_width">6</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> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> <child> - <widget class="GtkTextView" id="DESC_textview"> + <object class="GtkTextView" id="DESC_textview"> <property name="height_request">70</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="wrap_mode">GTK_WRAP_WORD</property> - </widget> + <property name="wrap_mode">word</property> + </object> </child> - </widget> + </object> <packing> <property name="position">2</property> </packing> </child> - <child> - <widget class="GtkLabel" id="label6"> + <child type="tab"> + <object class="GtkLabel" id="label6"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label" translatable="yes" comments=""About" is the text of a tab of vcard window">About</property> - </widget> + </object> <packing> - <property name="type">tab</property> <property name="position">2</property> <property name="tab_fill">False</property> </packing> </child> - </widget> + </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkHBox" id="hbox2"> + <object class="GtkHBox" id="hbox2"> <property name="visible">True</property> <property name="border_width">6</property> <child> - <widget class="GtkProgressBar" id="progressbar"> + <object class="GtkProgressBar" id="progressbar"> <property name="visible">True</property> <property name="pulse_step">0.10000000149</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkHButtonBox" id="information_hbuttonbox"> + <object class="GtkHButtonBox" id="information_hbuttonbox"> <property name="visible">True</property> <property name="spacing">12</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> + <property name="layout_style">end</property> <child> - <widget class="GtkButton" id="cancel_button"> + <object class="GtkButton" id="cancel_button"> + <property name="label">gtk-cancel</property> <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="receives_default">False</property> <property name="use_stock">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_cancel_button_clicked"/> - </widget> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkButton" id="ok_button"> + <object class="GtkButton" id="ok_button"> + <property name="label">gtk-ok</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> - <property name="label">gtk-ok</property> + <property name="receives_default">False</property> <property name="use_stock">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_ok_button_clicked"/> - </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="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkStatusbar" id="statusbar"> + <object class="GtkStatusbar" id="statusbar"> <property name="visible">True</property> <property name="has_resize_grip">False</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> -</glade-interface> + </object> +</interface> diff --git a/data/gui/progress_dialog.ui b/data/gui/progress_dialog.ui new file mode 100644 index 000000000..80e1e5d62 --- /dev/null +++ b/data/gui/progress_dialog.ui @@ -0,0 +1,68 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkDialog" id="progress_dialog"> + <property name="type_hint">dialog</property> + <signal name="delete_event" handler="on_progress_dialog_delete_event"/> + <child internal-child="vbox"> + <object class="GtkVBox" id="dialog-vbox"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label"> + <property name="visible">True</property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkProgressBar" id="progressbar"> + <property name="visible">True</property> + <property name="pulse_step">0.10000000149</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">3</property> + </packing> + </child> + <child internal-child="action_area"> + <object class="GtkHButtonBox" id="dialog-action_area11"> + <property name="visible">True</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="close_button"> + <property name="label">gtk-close</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + </object> + </child> + <action-widgets> + <action-widget response="-7">close_button</action-widget> + </action-widgets> + </object> +</interface> diff --git a/data/gui/remove_account_window.ui b/data/gui/remove_account_window.ui new file mode 100644 index 000000000..f136c6b6d --- /dev/null +++ b/data/gui/remove_account_window.ui @@ -0,0 +1,183 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkWindow" id="remove_account_window"> + <property name="border_width">6</property> + <signal name="destroy" handler="on_remove_account_window_destroy"/> + <child> + <object class="GtkVBox" id="vbox69"> + <property name="visible">True</property> + <property name="border_width">3</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkHBox" id="hbox2951"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <object class="GtkImage" id="image498"> + <property name="visible">True</property> + <property name="stock">gtk-dialog-question</property> + <property name="icon-size">6</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="frame30"> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment59"> + <property name="visible">True</property> + <property name="left_padding">12</property> + <child> + <object class="GtkVBox" id="vbox1"> + <property name="visible">True</property> + <property name="border_width">6</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkRadioButton" id="remove_only_radiobutton"> + <property name="label" translatable="yes">Remove account _only from Gajim</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="remove_and_unregister_radiobutton"> + <property name="label" translatable="yes">Remove account from Gajim and from _server</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <property name="group">remove_only_radiobutton</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label242"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>What do you want to do?</b></property> + <property name="use_markup">True</property> + </object> + </child> + </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">0</property> + </packing> + </child> + <child> + <object class="GtkHButtonBox" id="hbuttonbox16"> + <property name="visible">True</property> + <property name="border_width">6</property> + <property name="spacing">12</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="cancel_button"> + <property name="label">gtk-cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_cancel_button_clicked"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="remove_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <signal name="clicked" handler="on_remove_button_clicked"/> + <child> + <object class="GtkAlignment" id="alignment62"> + <property name="visible">True</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <child> + <object class="GtkHBox" id="hbox2954"> + <property name="visible">True</property> + <property name="spacing">2</property> + <child> + <object class="GtkImage" id="image501"> + <property name="visible">True</property> + <property name="stock">gtk-delete</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label245"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Remove</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <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> + </child> + </object> +</interface> diff --git a/data/glade/roster_item_exchange_window.glade b/data/gui/roster_item_exchange_window.ui index 0bad50833..437ca3cab 100644 --- a/data/glade/roster_item_exchange_window.glade +++ b/data/gui/roster_item_exchange_window.ui @@ -1,23 +1,23 @@ <?xml version="1.0"?> -<glade-interface> - <!-- interface-requires gtk+ 2.16 --> +<interface> + <requires lib="gtk+" version="2.16"/> <!-- interface-naming-policy project-wide --> - <widget class="GtkWindow" id="roster_item_exchange_window"> + <object class="GtkWindow" id="roster_item_exchange_window"> <property name="title" translatable="yes">Roster Item Exchange</property> <child> - <widget class="GtkVBox" id="vbox1"> + <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> <property name="border_width">6</property> <property name="orientation">vertical</property> <property name="spacing">8</property> <child> - <widget class="GtkLabel" id="type_label"> + <object class="GtkLabel" id="type_label"> <property name="visible">True</property> <property name="label" translatable="yes"><b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in your roster.</property> <property name="use_markup">True</property> <property name="justify">center</property> <property name="selectable">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="padding">4</property> @@ -25,58 +25,58 @@ </packing> </child> <child> - <widget class="GtkScrolledWindow" id="body_scrolledwindow"> + <object class="GtkScrolledWindow" id="body_scrolledwindow"> <property name="can_focus">True</property> <property name="no_show_all">True</property> <property name="hscrollbar_policy">automatic</property> <property name="vscrollbar_policy">automatic</property> <child> - <widget class="GtkTextView" id="body_textview"> + <object class="GtkTextView" id="body_textview"> <property name="can_focus">True</property> <property name="no_show_all">True</property> <property name="editable">False</property> <property name="justification">center</property> <property name="cursor_visible">False</property> - <property name="text" translatable="yes">Message Body <currently unused, so it's hidden by default></property> - </widget> + <property name="buffer">textbuffer1</property> + </object> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow2"> + <object class="GtkScrolledWindow" id="scrolledwindow2"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">automatic</property> <property name="vscrollbar_policy">automatic</property> <child> - <widget class="GtkTreeView" id="items_list_treeview"> + <object class="GtkTreeView" id="items_list_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">2</property> </packing> </child> <child> - <widget class="GtkHButtonBox" id="hbuttonbox1"> + <object class="GtkHButtonBox" id="hbuttonbox1"> <property name="visible">True</property> <property name="spacing">12</property> <property name="layout_style">end</property> <child> - <widget class="GtkButton" id="cancel_button"> - <property name="label" translatable="yes">gtk-cancel</property> + <object class="GtkButton" id="cancel_button"> + <property name="label">gtk-cancel</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="use_stock">True</property> <signal name="clicked" handler="on_cancel_button_clicked"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -84,57 +84,60 @@ </packing> </child> <child> - <widget class="GtkButton" id="accept_button"> + <object class="GtkButton" id="accept_button"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <signal name="clicked" handler="on_accept_button_clicked"/> <child> - <widget class="GtkAlignment" id="alignment1"> + <object class="GtkAlignment" id="alignment1"> <property name="visible">True</property> <child> - <widget class="GtkHBox" id="hbox1"> + <object class="GtkHBox" id="hbox1"> <property name="visible">True</property> <property name="spacing">3</property> <child> - <widget class="GtkImage" id="image1"> + <object class="GtkImage" id="image1"> <property name="visible">True</property> <property name="xalign">1</property> <property name="stock">gtk-ok</property> - </widget> + </object> <packing> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkLabel" id="accept_button_label"> + <object class="GtkLabel" id="accept_button_label"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">_OK</property> <property name="use_underline">True</property> - </widget> + </object> <packing> <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> <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> + <object class="GtkTextBuffer" id="textbuffer1"> + <property name="text" translatable="yes">Message Body <currently unused, so it's hidden by default></property> + </object> +</interface> diff --git a/data/glade/roster_window.glade b/data/gui/roster_window.ui index 67a8a78f4..62bfacfda 100644 --- a/data/glade/roster_window.glade +++ b/data/gui/roster_window.ui @@ -1,415 +1,353 @@ -<?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="roster_window"> +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkWindow" id="roster_window"> <property name="width_request">85</property> <property name="height_request">200</property> <property name="title" translatable="yes">Gajim</property> <property name="role">roster</property> <property name="default_width">200</property> <property name="default_height">400</property> - <signal name="popup_menu" handler="on_roster_window_popup_menu"/> - <signal name="focus_out_event" handler="on_roster_window_focus_out_event"/> - <signal name="focus_in_event" handler="on_roster_window_focus_in_event"/> + <accel-groups> + <group name="accelgroup1"/> + </accel-groups> <signal name="key_press_event" handler="on_roster_window_key_press_event"/> + <signal name="focus_out_event" handler="on_roster_window_focus_out_event"/> + <signal name="popup_menu" handler="on_roster_window_popup_menu"/> <signal name="delete_event" handler="on_roster_window_delete_event"/> + <signal name="focus_in_event" handler="on_roster_window_focus_in_event"/> <child> - <widget class="GtkVBox" id="roster_vbox"> + <object class="GtkVBox" id="roster_vbox"> <property name="visible">True</property> + <property name="orientation">vertical</property> <child> - <widget class="GtkMenuBar" id="menubar"> + <object class="GtkMenuBar" id="menubar"> <property name="visible">True</property> <child> - <widget class="GtkMenuItem" id="actions_menu"> + <object class="GtkMenuItem" id="actions_menu"> <property name="visible">True</property> <property name="label" translatable="yes">_Actions</property> <property name="use_underline">True</property> <signal name="activate" handler="on_actions_menuitem_activate"/> - <child> - <widget class="GtkMenu" id="actions_menu_menu"> + <child type="submenu"> + <object class="GtkMenu" id="actions_menu_menu"> <child> - <widget class="GtkImageMenuItem" id="new_chat_menuitem"> + <object class="GtkImageMenuItem" id="new_chat_menuitem"> + <property name="label">_Start Chat...</property> <property name="visible">True</property> - <property name="label" translatable="yes">_Start Chat...</property> <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image1605"> - <property name="visible">True</property> - <property name="stock">gtk-jump-to</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> </child> <child> - <widget class="GtkImageMenuItem" id="send_single_message_menuitem"> - <property name="label" translatable="yes">_Send Single Message...</property> + <object class="GtkImageMenuItem" id="send_single_message_menuitem"> + <property name="label">_Send Single Message...</property> <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="menu-item-image5"> - <property name="visible">True</property> - <property name="stock">gtk-new</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> </child> <child> - <widget class="GtkImageMenuItem" id="join_gc_menuitem"> + <object class="GtkImageMenuItem" id="join_gc_menuitem"> + <property name="label">Join _Group Chat...</property> <property name="visible">True</property> - <property name="label" translatable="yes">Join _Group Chat...</property> <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image1606"> - <property name="visible">True</property> - <property name="stock">gtk-connect</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> </child> <child> - <widget class="GtkSeparatorMenuItem" id="separatormenuitem1"> + <object class="GtkSeparatorMenuItem" id="separatormenuitem1"> <property name="visible">True</property> - </widget> + </object> </child> <child> - <widget class="GtkImageMenuItem" id="add_new_contact_menuitem"> + <object class="GtkImageMenuItem" id="add_new_contact_menuitem"> + <property name="label">Add _Contact...</property> <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="image1607"> - <property name="visible">True</property> - <property name="stock">gtk-add</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> </child> <child> - <widget class="GtkImageMenuItem" id="service_disco_menuitem"> + <object class="GtkImageMenuItem" id="service_disco_menuitem"> + <property name="label">_Discover Services</property> <property name="visible">True</property> - <property name="label" translatable="yes">_Discover Services</property> <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image1608"> - <property name="visible">True</property> - <property name="stock">gtk-find</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> </child> <child> - <widget class="GtkMenuItem" id="advanced_menuitem"> + <object class="GtkMenuItem" id="advanced_menuitem"> <property name="visible">True</property> <property name="label" translatable="yes">_Advanced</property> <property name="use_underline">True</property> - </widget> + </object> </child> <child> - <widget class="GtkSeparatorMenuItem" id="separator1"> + <object class="GtkSeparatorMenuItem" id="separator1"> <property name="visible">True</property> - </widget> + </object> </child> <child> - <widget class="GtkImageMenuItem" id="quit_menuitem"> + <object class="GtkImageMenuItem" id="quit_menuitem"> + <property name="label">_Quit</property> <property name="visible">True</property> - <property name="label" translatable="yes">_Quit</property> <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + <accelerator key="Q" signal="activate" modifiers="GDK_CONTROL_MASK"/> <signal name="activate" handler="on_quit_request"/> - <accelerator key="Q" modifiers="GDK_CONTROL_MASK" signal="activate"/> - <child internal-child="image"> - <widget class="GtkImage" id="image1609"> - <property name="visible">True</property> - <property name="stock">gtk-quit</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> + </object> </child> - </widget> + </object> </child> - </widget> + </object> </child> <child> - <widget class="GtkMenuItem" id="edit_menu"> + <object class="GtkMenuItem" id="edit_menu"> <property name="visible">True</property> <property name="label" translatable="yes">_Edit</property> <property name="use_underline">True</property> <signal name="activate" handler="on_edit_menuitem_activate"/> - <child> - <widget class="GtkMenu" id="edit_menu_menu"> + <child type="submenu"> + <object class="GtkMenu" id="edit_menu_menu"> <child> - <widget class="GtkImageMenuItem" id="accounts_menuitem"> + <object class="GtkImageMenuItem" id="accounts_menuitem"> + <property name="label">_Accounts</property> <property name="visible">True</property> - <property name="label" translatable="yes">_Accounts</property> <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + <accelerator key="A" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/> <signal name="activate" handler="on_accounts_menuitem_activate"/> - <accelerator key="A" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK" signal="activate"/> - <child internal-child="image"> - <widget class="GtkImage" id="image1610"> - <property name="visible">True</property> - <property name="stock">gtk-network</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> + </object> </child> <child> - <widget class="GtkImageMenuItem" id="profile_avatar_menuitem"> + <object class="GtkImageMenuItem" id="profile_avatar_menuitem"> + <property name="label">Profile, A_vatar</property> <property name="visible">True</property> - <property name="label" translatable="yes">Profile, A_vatar</property> <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image1611"> - <property name="visible">True</property> - <property name="stock">gtk-properties</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> </child> <child> - <widget class="GtkSeparatorMenuItem" id="separator2"> + <object class="GtkSeparatorMenuItem" id="separator2"> <property name="visible">True</property> - </widget> + </object> </child> <child> - <widget class="GtkImageMenuItem" id="preferences_menuitem"> + <object class="GtkImageMenuItem" id="preferences_menuitem"> + <property name="label">_Preferences</property> <property name="visible">True</property> - <property name="label" translatable="yes">_Preferences</property> <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + <accelerator key="P" signal="activate" modifiers="GDK_CONTROL_MASK"/> <signal name="activate" handler="on_preferences_menuitem_activate"/> - <accelerator key="P" modifiers="GDK_CONTROL_MASK" signal="activate"/> - <child internal-child="image"> - <widget class="GtkImage" id="image1612"> - <property name="visible">True</property> - <property name="stock">gtk-preferences</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> + </object> </child> - </widget> + </object> </child> - </widget> + </object> </child> <child> - <widget class="GtkMenuItem" id="view_menu"> + <object class="GtkMenuItem" id="view_menu"> <property name="visible">True</property> <property name="label" translatable="yes">_View</property> <property name="use_underline">True</property> <signal name="activate" handler="on_view_menu_activate"/> - <child> - <widget class="GtkMenu" id="view_menu_menu"> + <child type="submenu"> + <object class="GtkMenu" id="view_menu_menu"> <child> - <widget class="GtkCheckMenuItem" id="show_offline_contacts_menuitem"> + <object class="GtkCheckMenuItem" id="show_offline_contacts_menuitem"> <property name="visible">True</property> <property name="label" translatable="yes">Show _Offline Contacts</property> <property name="use_underline">True</property> + <accelerator key="O" signal="activate" modifiers="GDK_CONTROL_MASK"/> <signal name="activate" handler="on_show_offline_contacts_menuitem_activate"/> - <accelerator key="O" modifiers="GDK_CONTROL_MASK" signal="activate"/> - </widget> + </object> </child> <child> - <widget class="GtkCheckMenuItem" id="show_only_active_contacts_menuitem"> + <object class="GtkCheckMenuItem" id="show_only_active_contacts_menuitem"> <property name="visible">True</property> <property name="label" translatable="yes">Show Only _Active Contacts</property> <property name="use_underline">True</property> + <accelerator key="Y" signal="activate" modifiers="GDK_CONTROL_MASK"/> <signal name="activate" handler="on_show_only_active_contacts_menuitem_activate"/> - <accelerator key="Y" modifiers="GDK_CONTROL_MASK" signal="activate"/> - </widget> + </object> </child> <child> - <widget class="GtkCheckMenuItem" id="show_transports_menuitem"> + <object class="GtkCheckMenuItem" id="show_transports_menuitem"> <property name="visible">True</property> <property name="label" translatable="yes">Show Trans_ports</property> <property name="use_underline">True</property> <signal name="activate" handler="on_show_transports_menuitem_activate"/> - </widget> + </object> </child> <child> - <widget class="GtkCheckMenuItem" id="show_roster_menuitem"> + <object class="GtkCheckMenuItem" id="show_roster_menuitem"> <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="label" translatable="yes">Show _Roster</property> <property name="use_underline">True</property> <property name="active">True</property> + <accelerator key="R" signal="activate" modifiers="GDK_CONTROL_MASK"/> <signal name="toggled" handler="on_show_roster_menuitem_toggled"/> - <accelerator key="R" modifiers="GDK_CONTROL_MASK" signal="activate"/> - </widget> + </object> </child> <child> - <widget class="GtkSeparatorMenuItem" id="separator3"> + <object class="GtkSeparatorMenuItem" id="separator3"> <property name="visible">True</property> - </widget> + </object> </child> <child> - <widget class="GtkImageMenuItem" id="file_transfers_menuitem"> + <object class="GtkImageMenuItem" id="file_transfers_menuitem"> + <property name="label">File _Transfers</property> <property name="visible">True</property> - <property name="label" translatable="yes">File _Transfers</property> <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + <accelerator key="T" signal="activate" modifiers="GDK_CONTROL_MASK"/> <signal name="activate" handler="on_file_transfers_menuitem_activate"/> - <accelerator key="T" modifiers="GDK_CONTROL_MASK" signal="activate"/> - <child internal-child="image"> - <widget class="GtkImage" id="image1613"> - <property name="visible">True</property> - <property name="stock">gtk-save</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> + </object> </child> <child> - <widget class="GtkImageMenuItem" id="history_menuitem"> + <object class="GtkImageMenuItem" id="history_menuitem"> + <property name="label">_History</property> <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="label" translatable="yes">_History</property> <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_history_menuitem_activate"/> - <child internal-child="image"> - <widget class="GtkImage" id="menu-item-image14"> - <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="stock">gtk-justify-fill</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> + </object> </child> - </widget> + </object> </child> - </widget> + </object> </child> <child> - <widget class="GtkMenuItem" id="help_menu"> + <object class="GtkMenuItem" id="help_menu"> <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_menu"> + <child type="submenu"> + <object class="GtkMenu" id="help_menu_menu"> <child> - <widget class="GtkImageMenuItem" id="contents_menuitem"> + <object class="GtkImageMenuItem" id="contents_menuitem"> + <property name="label">_Contents</property> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Help online</property> - <property name="label" translatable="yes">_Contents</property> + <property name="tooltip_text" translatable="yes">Help online</property> <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_contents_menuitem_activate"/> - <child internal-child="image"> - <widget class="GtkImage" id="image1614"> - <property name="visible">True</property> - <property name="stock">gtk-help</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> + </object> </child> <child> - <widget class="GtkImageMenuItem" id="faq_menuitem"> + <object class="GtkImageMenuItem" id="faq_menuitem"> + <property name="label">_FAQ</property> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Frequently Asked Questions (online)</property> - <property name="label" translatable="yes">_FAQ</property> + <property name="tooltip_text" translatable="yes">Frequently Asked Questions (online)</property> <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_faq_menuitem_activate"/> - <child internal-child="image"> - <widget class="GtkImage" id="image_faq"> - <property name="visible">True</property> - <property name="stock">gtk-dialog-question</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> + </object> </child> <child> - <widget class="GtkSeparatorMenuItem" id="menuitem1"> + <object class="GtkSeparatorMenuItem" id="menuitem1"> <property name="visible">True</property> - </widget> + </object> </child> <child> - <widget class="GtkImageMenuItem" id="features_menuitem"> + <object class="GtkImageMenuItem" id="features_menuitem"> + <property name="label">Fea_tures</property> <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="label" translatable="yes">Fea_tures</property> <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_features_menuitem_activate"/> - <child internal-child="image"> - <widget class="GtkImage" id="image_features"> - <property name="visible">True</property> - <property name="stock">gtk-properties</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> + </object> </child> <child> - <widget class="GtkImageMenuItem" id="about_menuitem"> - <property name="visible">True</property> + <object class="GtkImageMenuItem" id="about_menuitem"> <property name="label">gtk-about</property> + <property name="visible">True</property> <property name="use_underline">True</property> <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_about_menuitem_activate"/> - </widget> + </object> </child> - </widget> + </object> </child> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkHPaned" id="roster_hpaned"> + <object class="GtkHPaned" id="roster_hpaned"> <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> <child> - <widget class="GtkVBox" id="roster_vbox2"> + <object class="GtkVBox" id="roster_vbox2"> <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="orientation">vertical</property> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow"> + <object class="GtkScrolledWindow" id="scrolledwindow"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="border_width">0</property> - <property name="hscrollbar_policy">GTK_POLICY_NEVER</property> - <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="hscrollbar_policy">never</property> + <property name="vscrollbar_policy">automatic</property> <child> - <widget class="GtkTreeView" id="roster_treeview"> + <object class="GtkTreeView" id="roster_treeview"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="headers_visible">False</property> <property name="reorderable">True</property> - <signal name="leave_notify_event" handler="on_roster_treeview_leave_notify_event"/> + <signal name="style_set" handler="on_roster_treeview_style_set"/> + <signal name="row_collapsed" handler="on_roster_treeview_row_collapsed"/> <signal name="button_press_event" handler="on_roster_treeview_button_press_event"/> <signal name="motion_notify_event" handler="on_roster_treeview_motion_notify_event"/> - <signal name="row_collapsed" handler="on_roster_treeview_row_collapsed"/> - <signal name="row_expanded" handler="on_roster_treeview_row_expanded"/> - <signal name="key_press_event" handler="on_roster_treeview_key_press_event"/> <signal name="row_activated" handler="on_roster_treeview_row_activated"/> <signal name="button_release_event" handler="on_roster_treeview_button_release_event"/> + <signal name="row_expanded" handler="on_roster_treeview_row_expanded"/> + <signal name="key_press_event" handler="on_roster_treeview_key_press_event"/> <signal name="scroll_event" handler="on_roster_treeview_scroll_event"/> - <signal name="style_set" handler="on_roster_treeview_style_set"/> - </widget> + <signal name="leave_notify_event" handler="on_roster_treeview_leave_notify_event"/> + </object> </child> - </widget> + </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkComboBox" id="status_combobox"> + <object class="GtkComboBox" id="status_combobox"> <property name="visible">True</property> <signal name="changed" handler="on_status_combobox_changed"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="resize">False</property> <property name="shrink">True</property> @@ -418,12 +356,13 @@ <child> <placeholder/> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> + <object class="GtkAccelGroup" id="accelgroup1"/> +</interface> diff --git a/data/glade/search_window.glade b/data/gui/search_window.ui index efa3dd993..275d832c4 100644 --- a/data/glade/search_window.glade +++ b/data/gui/search_window.ui @@ -1,33 +1,36 @@ -<?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="search_window"> +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkWindow" id="search_window"> <property name="border_width">12</property> <property name="title" translatable="yes">Search</property> - <signal name="key_press_event" handler="on_search_window_key_press_event"/> <signal name="destroy" handler="on_search_window_destroy"/> + <signal name="key_press_event" handler="on_search_window_key_press_event"/> <child> - <widget class="GtkVBox" id="vbox1"> + <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkVBox" id="search_vbox"> + <object class="GtkVBox" id="search_vbox"> <property name="visible">True</property> + <property name="orientation">vertical</property> <child> - <widget class="GtkLabel" id="label"> + <object class="GtkLabel" id="label"> <property name="visible">True</property> <property name="label" translatable="yes">Please wait while retrieving search form...</property> - </widget> + </object> <packing> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkProgressBar" id="progressbar"> + <object class="GtkProgressBar" id="progressbar"> <property name="visible">True</property> <property name="pulse_step">0.10000000149</property> - </widget> + </object> <packing> <property name="fill">False</property> <property name="position">1</property> @@ -36,180 +39,195 @@ <child> <placeholder/> </child> - </widget> + </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkHButtonBox" id="hbuttonbox1"> + <object class="GtkHButtonBox" id="hbuttonbox1"> <property name="visible">True</property> <property name="spacing">6</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> + <property name="layout_style">end</property> <child> - <widget class="GtkButton" id="add_contact_button"> + <object class="GtkButton" id="add_contact_button"> <property name="sensitive">False</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="no_show_all">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_add_contact_button_clicked"/> <child> - <widget class="GtkAlignment" id="alignment2"> + <object class="GtkAlignment" id="alignment2"> <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> <child> - <widget class="GtkHBox" id="hbox1"> + <object class="GtkHBox" id="hbox1"> <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="spacing">2</property> <child> - <widget class="GtkImage" id="image2"> + <object class="GtkImage" id="image2"> <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="stock">gtk-add</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkLabel" id="label1"> + <object class="GtkLabel" id="label1"> <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="label" translatable="yes">_Add contact</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> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkButton" id="information_button"> + <object class="GtkButton" id="information_button"> <property name="sensitive">False</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="no_show_all">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_information_button_clicked"/> <child> - <widget class="GtkAlignment" id="alignment3"> + <object class="GtkAlignment" id="alignment3"> <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> <child> - <widget class="GtkHBox" id="hbox2"> + <object class="GtkHBox" id="hbox2"> <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="spacing">2</property> <child> - <widget class="GtkImage" id="image3"> + <object class="GtkImage" id="image3"> <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="stock">gtk-info</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkLabel" id="label2"> + <object class="GtkLabel" id="label2"> <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="label" translatable="yes">_Information</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> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkButton" id="search_button"> + <object class="GtkButton" id="search_button"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> - <property name="response_id">0</property> + <property name="receives_default">False</property> <signal name="clicked" handler="on_search_button_clicked"/> <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="hbox5"> + <object class="GtkHBox" id="hbox5"> <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-find</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkLabel" id="label58"> + <object class="GtkLabel" id="label58"> <property name="visible">True</property> <property name="label" translatable="yes">_Search</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> <property name="position">2</property> </packing> </child> <child> - <widget class="GtkButton" id="close_button"> + <object class="GtkButton" id="close_button"> + <property name="label">gtk-close</property> <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="receives_default">False</property> <property name="use_stock">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_close_button_clicked"/> - </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="expand">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> +</interface> diff --git a/data/glade/service_discovery_window.glade b/data/gui/service_discovery_window.ui index 176a94a27..6424b65e5 100644 --- a/data/glade/service_discovery_window.glade +++ b/data/gui/service_discovery_window.ui @@ -1,52 +1,59 @@ <?xml version="1.0"?> -<glade-interface> - <!-- interface-requires gtk+ 2.14 --> +<interface> + <requires lib="gtk+" version="2.16"/> <!-- interface-naming-policy toplevel-contextual --> - <widget class="GtkWindow" id="service_discovery_window"> + <object class="GtkListStore" id="liststore1"> + <columns> + <!-- column-name item text --> + <column type="gchararray"/> + </columns> + </object> + <object class="GtkWindow" id="service_discovery_window"> <property name="border_width">6</property> <property name="role">Service Discovery</property> <property name="default_width">550</property> <property name="default_height">420</property> <signal name="destroy" handler="on_service_discovery_window_destroy"/> <child> - <widget class="GtkVBox" id="vbox11"> + <object class="GtkVBox" id="vbox11"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkEventBox" id="banner_agent_eventbox"> + <object class="GtkEventBox" id="banner_agent_eventbox"> <property name="visible">True</property> <child> - <widget class="GtkHBox" id="banner_agent_hbox"> + <object class="GtkHBox" id="banner_agent_hbox"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="banner_agent_label"> + <object class="GtkLabel" id="banner_agent_label"> <property name="visible">True</property> <property name="xalign">0.05000000074505806</property> <property name="ypad">6</property> <property name="label"><span weight="heavy" size="large">Agent name</span> Agent JID - node</property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkImage" id="banner_agent_icon"> + <object class="GtkImage" id="banner_agent_icon"> <property name="visible">True</property> <property name="xpad">6</property> <property name="ypad">6</property> <property name="stock">gtk-missing-image</property> - </widget> + </object> <packing> <property name="expand">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> @@ -54,18 +61,24 @@ Agent JID - node</property> </packing> </child> <child> - <widget class="GtkTable" id="address_table"> + <object class="GtkTable" id="address_table"> <property name="visible">True</property> <property name="n_rows">3</property> <property name="n_columns">3</property> <property name="column_spacing">6</property> <child> - <widget class="GtkComboBoxEntry" id="address_comboboxentry"> + <object class="GtkComboBoxEntry" id="address_comboboxentry"> <property name="visible">True</property> - <property name="items" translatable="yes"></property> + <property name="model">liststore1</property> <signal name="changed" handler="on_address_comboboxentry_changed"/> <signal name="key_press_event" handler="on_address_comboboxentry_key_press_event"/> - </widget> + <child> + <object class="GtkCellRendererText" id="cellrenderertext1"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -75,7 +88,7 @@ Agent JID - node</property> </packing> </child> <child> - <widget class="GtkButton" id="browse_button"> + <object class="GtkButton" id="browse_button"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> @@ -83,19 +96,19 @@ Agent JID - node</property> <property name="receives_default">False</property> <signal name="clicked" handler="on_go_button_clicked"/> <child> - <widget class="GtkAlignment" id="alignment93"> + <object class="GtkAlignment" id="alignment93"> <property name="visible">True</property> <property name="xscale">0</property> <property name="yscale">0</property> <child> - <widget class="GtkHBox" id="hbox2995"> + <object class="GtkHBox" id="hbox2995"> <property name="visible">True</property> <property name="spacing">2</property> <child> - <widget class="GtkImage" id="image1148"> + <object class="GtkImage" id="image1148"> <property name="visible">True</property> <property name="stock">gtk-jump-to</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -103,22 +116,22 @@ Agent JID - node</property> </packing> </child> <child> - <widget class="GtkLabel" id="label362"> + <object class="GtkLabel" id="label362"> <property name="visible">True</property> <property name="label" translatable="yes">G_o</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="left_attach">2</property> <property name="right_attach">3</property> @@ -128,12 +141,12 @@ Agent JID - node</property> </packing> </child> <child> - <widget class="GtkLabel" id="label224"> + <object class="GtkLabel" id="label224"> <property name="visible">True</property> <property name="label" translatable="yes">_Address:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">address_comboboxentry</property> - </widget> + </object> <packing> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> @@ -146,42 +159,42 @@ Agent JID - node</property> <child> <placeholder/> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkScrolledWindow" id="services_scrollwin"> + <object class="GtkScrolledWindow" id="services_scrollwin"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">automatic</property> <property name="vscrollbar_policy">automatic</property> <property name="shadow_type">etched-in</property> <child> - <widget class="GtkTreeView" id="services_treeview"> + <object class="GtkTreeView" id="services_treeview"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="headers_visible">False</property> <signal name="row_activated" handler="on_services_treeview_row_activated"/> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="position">2</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox2994"> + <object class="GtkHBox" id="hbox2994"> <property name="visible">True</property> <property name="spacing">12</property> <child> - <widget class="GtkProgressBar" id="services_progressbar"> + <object class="GtkProgressBar" id="services_progressbar"> <property name="visible">True</property> <property name="no_show_all">True</property> <property name="pulse_step">0.10000000149</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -189,19 +202,19 @@ Agent JID - node</property> </packing> </child> <child> - <widget class="GtkLabel" id="label363"> + <object class="GtkLabel" id="label363"> <property name="visible">True</property> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkHBox" id="action_buttonbox"> + <object class="GtkHBox" id="action_buttonbox"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkButton" id="close_button"> + <object class="GtkButton" id="close_button"> <property name="label">gtk-close</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -210,7 +223,7 @@ Agent JID - node</property> <property name="receives_default">False</property> <property name="use_stock">True</property> <signal name="clicked" handler="on_close_button_clicked"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -218,20 +231,20 @@ Agent JID - node</property> <property name="position">0</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">2</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="padding">2</property> <property name="position">3</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> +</interface> diff --git a/data/glade/service_registration_window.glade b/data/gui/service_registration_window.ui index 6f8736537..fce939333 100644 --- a/data/glade/service_registration_window.glade +++ b/data/gui/service_registration_window.ui @@ -1,18 +1,18 @@ -<?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="service_registration_window"> +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkWindow" id="service_registration_window"> <property name="border_width">6</property> <property name="title" translatable="yes">Register to</property> <child> - <widget class="GtkVBox" id="vbox12"> + <object class="GtkVBox" id="vbox12"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkTable" id="table"> + <object class="GtkTable" id="table"> <property name="visible">True</property> - <property name="n_rows">1</property> <property name="n_columns">2</property> <property name="column_spacing">10</property> <property name="row_spacing">10</property> @@ -22,112 +22,124 @@ <child> <placeholder/> </child> - </widget> + </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkHButtonBox" id="hbuttonbox5"> + <object class="GtkHButtonBox" id="hbuttonbox5"> <property name="visible">True</property> <property name="spacing">12</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> + <property name="layout_style">end</property> <child> - <widget class="GtkButton" id="cancel_button"> + <object class="GtkButton" id="cancel_button"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> - <property name="response_id">0</property> + <property name="receives_default">False</property> <signal name="clicked" handler="on_cancel_button_clicked"/> <child> - <widget class="GtkAlignment" id="alignment18"> + <object class="GtkAlignment" id="alignment18"> <property name="visible">True</property> <property name="xscale">0</property> <property name="yscale">0</property> <child> - <widget class="GtkHBox" id="hbox22"> + <object class="GtkHBox" id="hbox22"> <property name="visible">True</property> <property name="spacing">2</property> <child> - <widget class="GtkImage" id="image107"> + <object class="GtkImage" id="image107"> <property name="visible">True</property> <property name="stock">gtk-cancel</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkLabel" id="label34"> + <object class="GtkLabel" id="label34"> <property name="visible">True</property> <property name="label" translatable="yes">_Cancel</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> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkButton" id="ok_button"> + <object class="GtkButton" id="ok_button"> <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">0</property> + <property name="receives_default">False</property> <signal name="clicked" handler="on_ok_button_clicked"/> <child> - <widget class="GtkAlignment" id="alignment17"> + <object class="GtkAlignment" id="alignment17"> <property name="visible">True</property> <property name="xscale">0</property> <property name="yscale">0</property> <child> - <widget class="GtkHBox" id="hbox21"> + <object class="GtkHBox" id="hbox21"> <property name="visible">True</property> <property name="spacing">2</property> <child> - <widget class="GtkImage" id="image106"> + <object class="GtkImage" id="image106"> <property name="visible">True</property> <property name="stock">gtk-ok</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkLabel" id="label33"> + <object class="GtkLabel" id="label33"> <property name="visible">True</property> <property name="label" translatable="yes">_OK</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> <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> -</glade-interface> + </object> +</interface> diff --git a/data/gui/single_message_window.ui b/data/gui/single_message_window.ui new file mode 100644 index 000000000..2df8db781 --- /dev/null +++ b/data/gui/single_message_window.ui @@ -0,0 +1,275 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkWindow" id="single_message_window"> + <property name="border_width">6</property> + <property name="default_width">550</property> + <property name="default_height">280</property> + <signal name="destroy" handler="on_single_message_window_destroy"/> + <signal name="key_press_event" handler="on_single_message_window_key_press_event"/> + <signal name="delete_event" handler="on_single_message_window_delete_event"/> + <child> + <object class="GtkVBox" id="vbox97"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkTable" id="headers_table"> + <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> + <object class="GtkLabel" id="to_label"> + <property name="visible">True</property> + <property name="no_show_all">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">To:</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> + </packing> + </child> + <child> + <object class="GtkLabel" id="from_label"> + <property name="visible">True</property> + <property name="no_show_all">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">From:</property> + </object> + <packing> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkEntry" id="to_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="no_show_all">True</property> + </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> + </packing> + </child> + <child> + <object class="GtkLabel" id="count_chars_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">0</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</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> + </packing> + </child> + <child> + <object class="GtkEntry" id="subject_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + </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> + </packing> + </child> + <child> + <object class="GtkEntry" id="from_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="no_show_all">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">3</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label335"> + <property name="visible">True</property> + <property name="label" translatable="yes">Subject:</property> + </object> + <packing> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="conversation_scrolledwindow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="no_show_all">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="message_scrolledwindow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="no_show_all">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTextView" id="message_textview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="wrap_mode">word</property> + </object> + </child> + </object> + <packing> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkHButtonBox" id="hbuttonbox26"> + <property name="visible">True</property> + <property name="spacing">12</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="close_button"> + <property name="label">gtk-close</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="no_show_all">True</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_close_button_clicked"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="cancel_button"> + <property name="label">gtk-cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="no_show_all">True</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_cancel_button_clicked"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="send_button"> + <property name="label" translatable="yes">Sen_d</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="no_show_all">True</property> + <property name="tooltip_text" translatable="yes">Send message</property> + <property name="image">image3</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="on_send_button_clicked"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="reply_button"> + <property name="label" translatable="yes">_Reply</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="no_show_all">True</property> + <property name="tooltip_text" translatable="yes">Reply to this message</property> + <property name="image">image1</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="on_reply_button_clicked"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkButton" id="send_and_close_button"> + <property name="label" translatable="yes">_Send & Close</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="no_show_all">True</property> + <property name="tooltip_text" translatable="yes">Send message and close window</property> + <property name="image">image2</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="on_send_and_close_button_clicked"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">4</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="padding">6</property> + <property name="position">3</property> + </packing> + </child> + </object> + </child> + </object> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-ok</property> + </object> + <object class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="stock">gtk-ok</property> + </object> + <object class="GtkImage" id="image3"> + <property name="visible">True</property> + <property name="stock">gtk-jump-to</property> + </object> +</interface> diff --git a/data/gui/subscription_request_popup_menu.ui b/data/gui/subscription_request_popup_menu.ui new file mode 100644 index 000000000..c61e203e5 --- /dev/null +++ b/data/gui/subscription_request_popup_menu.ui @@ -0,0 +1,28 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkMenu" id="subscription_request_popup_menu"> + <child> + <object class="GtkImageMenuItem" id="start_chat_menuitem"> + <property name="label">_Start Chat</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + <signal name="activate" handler="on_start_chat_activate"/> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="information_menuitem"> + <property name="label">gtk-info</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + <signal name="activate" handler="on_contact_info_activate"/> + </object> + </child> + </object> + <object class="GtkAccelGroup" id="accelgroup1"/> +</interface> diff --git a/data/gui/subscription_request_window.ui b/data/gui/subscription_request_window.ui new file mode 100644 index 000000000..dfc9f4004 --- /dev/null +++ b/data/gui/subscription_request_window.ui @@ -0,0 +1,184 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkWindow" id="subscription_request_window"> + <property name="border_width">12</property> + <property name="title" translatable="yes">Subscription Request</property> + <child> + <object class="GtkVBox" id="vbox10"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">5</property> + <child> + <object class="GtkLabel" id="from_label"> + <property name="visible">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow8"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="border_width">5</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTextView" id="message_textview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">False</property> + <property name="wrap_mode">word</property> + <property name="cursor_visible">False</property> + <property name="buffer">textbuffer1</property> + </object> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkHButtonBox" id="hbuttonbox3"> + <property name="visible">True</property> + <property name="border_width">5</property> + <property name="spacing">12</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="close_button"> + <property name="label">gtk-close</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_close_button_clicked"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="deny_button"> + <property name="label" translatable="yes">_Deny</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Deny authorization from contact so he or she cannot know when you're connected</property> + <property name="image">image2</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="on_deny_button_clicked"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="actions_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <signal name="clicked" handler="on_actions_button_clicked"/> + <child> + <object class="GtkAlignment" id="alignment101"> + <property name="visible">True</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <child> + <object class="GtkHBox" id="hbox3009"> + <property name="visible">True</property> + <property name="spacing">2</property> + <child> + <object class="GtkImage" id="image1338"> + <property name="visible">True</property> + <property name="stock">gtk-execute</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label372"> + <property name="visible">True</property> + <property name="label" translatable="yes" comments="Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)">_Actions</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkArrow" id="arrow4"> + <property name="visible">True</property> + <property name="arrow_type">down</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="authorize_button"> + <property name="label" translatable="yes">Au_thorize</property> + <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="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Authorize contact so he or she can know when you're connected</property> + <property name="image">image1</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="on_authorize_button_clicked"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">3</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + </object> + </child> + </object> + <object class="GtkTextBuffer" id="textbuffer1"/> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-add</property> + </object> + <object class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="stock">gtk-cancel</property> + </object> +</interface> diff --git a/data/gui/synchronise_select_account_dialog.ui b/data/gui/synchronise_select_account_dialog.ui new file mode 100644 index 000000000..c94b724b9 --- /dev/null +++ b/data/gui/synchronise_select_account_dialog.ui @@ -0,0 +1,94 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkDialog" id="synchronise_select_account_dialog"> + <property name="border_width">12</property> + <property name="title" translatable="yes">Synchronise contacts</property> + <property name="default_width">350</property> + <property name="default_height">300</property> + <property name="type_hint">normal</property> + <child internal-child="vbox"> + <object class="GtkVBox" id="dialog-vbox7"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label210"> + <property name="visible">True</property> + <property name="label" translatable="yes">Select the account with which you want to synchronise</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow"> + <property name="width_request">150</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTreeView" id="accounts_treeview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + </object> + </child> + </object> + <packing> + <property name="position">3</property> + </packing> + </child> + <child internal-child="action_area"> + <object class="GtkHButtonBox" id="dialog-action_area6"> + <property name="visible">True</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="cancel_button"> + <property name="label">gtk-cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_cancel_button_clicked"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="ok_button"> + <property name="label">gtk-ok</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_ok_button_clicked"/> + </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="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + </object> + </child> + <action-widgets> + <action-widget response="-6">cancel_button</action-widget> + <action-widget response="-5">ok_button</action-widget> + </action-widgets> + </object> +</interface> diff --git a/data/gui/synchronise_select_contacts_dialog.ui b/data/gui/synchronise_select_contacts_dialog.ui new file mode 100644 index 000000000..12bbd0af9 --- /dev/null +++ b/data/gui/synchronise_select_contacts_dialog.ui @@ -0,0 +1,96 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkDialog" id="synchronise_select_contacts_dialog"> + <property name="border_width">12</property> + <property name="title" translatable="yes">Synchronise : select contacts</property> + <property name="default_width">400</property> + <property name="default_height">300</property> + <property name="type_hint">normal</property> + <child internal-child="vbox"> + <object class="GtkVBox" id="dialog-vbox7"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label210"> + <property name="visible">True</property> + <property name="label" translatable="yes">Select the contacts you want to synchronise</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow"> + <property name="width_request">150</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTreeView" id="contacts_treeview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + </object> + </child> + </object> + <packing> + <property name="position">3</property> + </packing> + </child> + <child internal-child="action_area"> + <object class="GtkHButtonBox" id="dialog-action_area6"> + <property name="visible">True</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="cancel_button"> + <property name="label">gtk-cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_cancel_button_clicked"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="ok_button"> + <property name="label">gtk-ok</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_ok_button_clicked"/> + </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="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + </object> + </child> + <action-widgets> + <action-widget response="-6">cancel_button</action-widget> + <action-widget response="-5">ok_button</action-widget> + </action-widgets> + </object> +</interface> diff --git a/data/gui/systray_context_menu.ui b/data/gui/systray_context_menu.ui new file mode 100644 index 000000000..bbb54f1bf --- /dev/null +++ b/data/gui/systray_context_menu.ui @@ -0,0 +1,100 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkMenu" id="systray_context_menu"> + <child> + <object class="GtkImageMenuItem" id="status_menu"> + <property name="label">Sta_tus</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="chat_with_menuitem"> + <property name="label">_Start Chat</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="join_gc_menuitem"> + <property name="label">_Group Chat</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="single_message_menuitem"> + <property name="label">Send Single _Message</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separator12"> + <property name="visible">True</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="show_all_events_menuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">Show All Pending _Events</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_show_all_events_menuitem_activate"/> + </object> + </child> + <child> + <object class="GtkCheckMenuItem" id="sounds_mute_menuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">Mute Sounds</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_sounds_mute_menuitem_activate"/> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="show_roster_menuitem"> + <property name="label">Show _Roster</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + <signal name="activate" handler="on_show_roster_menuitem_activate"/> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="preferences_menuitem"> + <property name="label">gtk-preferences</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + <signal name="activate" handler="on_preferences_menuitem_activate"/> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separator"> + <property name="visible">True</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="quit_menuitem"> + <property name="label">gtk-quit</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + <signal name="activate" handler="on_quit_menuitem_activate"/> + </object> + </child> + </object> + <object class="GtkAccelGroup" id="accelgroup1"/> +</interface> diff --git a/data/glade/vcard_information_window.glade b/data/gui/vcard_information_window.ui index e0a9baa30..942c1db74 100644 --- a/data/glade/vcard_information_window.glade +++ b/data/gui/vcard_information_window.ui @@ -1,68 +1,71 @@ -<?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="vcard_information_window"> +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkWindow" id="vcard_information_window"> <property name="border_width">12</property> <property name="title" translatable="yes">Contact Information</property> - <signal name="key_press_event" handler="on_vcard_information_window_key_press_event"/> <signal name="destroy" handler="on_vcard_information_window_destroy"/> + <signal name="key_press_event" handler="on_vcard_information_window_key_press_event"/> <child> - <widget class="GtkVBox" id="vbox1"> + <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <widget class="GtkLabel" id="nickname_label"> + <object class="GtkLabel" id="nickname_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> <property name="selectable">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkNotebook" id="information_notebook"> + <object class="GtkNotebook" id="information_notebook"> <property name="visible">True</property> <child> - <widget class="GtkVBox" id="vbox2"> + <object class="GtkVBox" id="vbox2"> <property name="visible">True</property> <property name="border_width">12</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkHBox" id="hbox3"> + <object class="GtkHBox" id="hbox3"> <property name="visible">True</property> <property name="spacing">12</property> <child> - <widget class="GtkTable" id="table7"> + <object class="GtkTable" id="table7"> <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="GtkLabel" id="label51"> + <object class="GtkLabel" id="label51"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Jabber ID:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label53"> + <object class="GtkLabel" id="label53"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Resource:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> @@ -71,13 +74,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label54"> + <object class="GtkLabel" id="label54"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Status:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="top_attach">2</property> <property name="bottom_attach">3</property> @@ -86,13 +89,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label55"> + <object class="GtkLabel" id="label55"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Client:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="top_attach">3</property> <property name="bottom_attach">4</property> @@ -101,13 +104,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label56"> + <object class="GtkLabel" id="label56"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>System:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="top_attach">4</property> <property name="bottom_attach">5</property> @@ -116,7 +119,7 @@ </packing> </child> <child> - <widget class="GtkLabel" id="jid_label"> + <object class="GtkLabel" id="jid_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -124,7 +127,7 @@ <property name="xpad">5</property> <property name="ypad">5</property> <property name="selectable">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -132,11 +135,11 @@ </packing> </child> <child> - <widget class="GtkEventBox" id="resource_prio_label_eventbox"> + <object class="GtkEventBox" id="resource_prio_label_eventbox"> <property name="visible">True</property> <property name="visible_window">False</property> <child> - <widget class="GtkLabel" id="resource_prio_label"> + <object class="GtkLabel" id="resource_prio_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -144,9 +147,9 @@ <property name="xpad">5</property> <property name="ypad">5</property> <property name="selectable">True</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -156,7 +159,7 @@ </packing> </child> <child> - <widget class="GtkLabel" id="client_name_version_label"> + <object class="GtkLabel" id="client_name_version_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -164,8 +167,8 @@ <property name="xpad">5</property> <property name="ypad">5</property> <property name="selectable">True</property> - <property name="ellipsize">PANGO_ELLIPSIZE_END</property> - </widget> + <property name="ellipsize">end</property> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -175,7 +178,7 @@ </packing> </child> <child> - <widget class="GtkLabel" id="os_label"> + <object class="GtkLabel" id="os_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -184,8 +187,8 @@ <property name="ypad">5</property> <property name="wrap">True</property> <property name="selectable">True</property> - <property name="ellipsize">PANGO_ELLIPSIZE_END</property> - </widget> + <property name="ellipsize">end</property> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -195,10 +198,10 @@ </packing> </child> <child> - <widget class="GtkEventBox" id="status_label_eventbox"> + <object class="GtkEventBox" id="status_label_eventbox"> <property name="visible">True</property> <child> - <widget class="GtkLabel" id="status_label"> + <object class="GtkLabel" id="status_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -206,10 +209,10 @@ <property name="xpad">5</property> <property name="ypad">5</property> <property name="selectable">True</property> - <property name="ellipsize">PANGO_ELLIPSIZE_END</property> - </widget> + <property name="ellipsize">end</property> + </object> </child> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -220,13 +223,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label1"> + <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Contact time:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="top_attach">5</property> <property name="bottom_attach">6</property> @@ -235,7 +238,7 @@ </packing> </child> <child> - <widget class="GtkLabel" id="time_label"> + <object class="GtkLabel" id="time_label"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> @@ -243,8 +246,8 @@ <property name="ypad">5</property> <property name="wrap">True</property> <property name="selectable">True</property> - <property name="ellipsize">PANGO_ELLIPSIZE_END</property> - </widget> + <property name="ellipsize">end</property> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -253,36 +256,41 @@ <property name="y_options"></property> </packing> </child> - </widget> + </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkVBox" id="vbox2"> + <object class="GtkVBox" id="vbox3"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="user_avatar_label"> + <object class="GtkLabel" id="user_avatar_label"> <property name="no_show_all">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">User avatar:</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkEventBox" id="PHOTO_eventbox"> + <object class="GtkEventBox" id="PHOTO_eventbox"> <property name="visible">True</property> <property name="visible_window">False</property> <signal name="button_press_event" handler="on_PHOTO_eventbox_button_press_event"/> <child> - <widget class="GtkImage" id="PHOTO_image"> + <object class="GtkImage" id="PHOTO_image"> <property name="no_show_all">True</property> <property name="yalign">0</property> <property name="stock">gtk-missing-image</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -290,11 +298,11 @@ </packing> </child> <child> - <widget class="GtkLabel" id="custom_avatar_label"> + <object class="GtkLabel" id="custom_avatar_label"> <property name="no_show_all">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Configured avatar:</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -302,55 +310,55 @@ </packing> </child> <child> - <widget class="GtkImage" id="custom_avatar_image"> + <object class="GtkImage" id="custom_avatar_image"> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="no_show_all">True</property> <property name="stock">gtk-missing-image</property> - </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="expand">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkExpander" id="expander5"> + <object class="GtkExpander" id="expander5"> <property name="visible">True</property> <property name="can_focus">True</property> <child> - <widget class="GtkTable" id="table8"> + <object class="GtkTable" id="table8"> <property name="visible">True</property> <property name="border_width">6</property> - <property name="n_rows">1</property> <property name="n_columns">4</property> <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkEventBox" id="subscription_label_eventbox"> + <object class="GtkEventBox" id="subscription_label_eventbox"> <property name="visible">True</property> <property name="visible_window">False</property> <child> - <widget class="GtkLabel" id="subscription_label"> + <object class="GtkLabel" id="subscription_label"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="xpad">5</property> <property name="ypad">5</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -358,19 +366,19 @@ </packing> </child> <child> - <widget class="GtkEventBox" id="ask_label_eventbox"> + <object class="GtkEventBox" id="ask_label_eventbox"> <property name="visible">True</property> <property name="visible_window">False</property> <child> - <widget class="GtkLabel" id="ask_label"> + <object class="GtkLabel" id="ask_label"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="xpad">5</property> <property name="ypad">5</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> @@ -378,26 +386,26 @@ </packing> </child> <child> - <widget class="GtkLabel" id="subscription_title_label"> + <object class="GtkLabel" id="subscription_title_label"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label" translatable="yes" comments="Family Name"><b>Subscription:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="ask_title_label"> + <object class="GtkLabel" id="ask_title_label"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label" translatable="yes" comments="Given Name"><b>Ask:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> @@ -405,42 +413,38 @@ <property name="y_options"></property> </packing> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label47"> + <child type="label"> + <object class="GtkLabel" id="label47"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label" translatable="yes">More</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> - <child> - <widget class="GtkLabel" id="label3"> + <child type="tab"> + <object class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label" translatable="yes">Contact</property> - </widget> + </object> <packing> - <property name="type">tab</property> <property name="tab_fill">False</property> </packing> </child> <child> - <widget class="GtkTable" id="personal_info_table"> + <object class="GtkTable" id="personal_info_table"> <property name="visible">True</property> <property name="border_width">12</property> <property name="n_rows">6</property> @@ -448,20 +452,11 @@ <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </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="table3"> + <object class="GtkTable" id="table3"> <property name="visible">True</property> <property name="border_width">6</property> <property name="n_rows">3</property> @@ -469,13 +464,7 @@ <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <widget class="GtkLabel" id="N_FAMILY_label"> + <object class="GtkLabel" id="N_FAMILY_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -483,7 +472,7 @@ <property name="xpad">5</property> <property name="ypad">5</property> <property name="selectable">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -491,7 +480,7 @@ </packing> </child> <child> - <widget class="GtkLabel" id="N_GIVEN_label"> + <object class="GtkLabel" id="N_GIVEN_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -499,7 +488,7 @@ <property name="xpad">5</property> <property name="ypad">5</property> <property name="selectable">True</property> - </widget> + </object> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> @@ -507,7 +496,7 @@ </packing> </child> <child> - <widget class="GtkLabel" id="N_MIDDLE_label"> + <object class="GtkLabel" id="N_MIDDLE_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -515,7 +504,7 @@ <property name="xpad">5</property> <property name="ypad">5</property> <property name="selectable">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -525,7 +514,7 @@ </packing> </child> <child> - <widget class="GtkLabel" id="N_PREFIX_label"> + <object class="GtkLabel" id="N_PREFIX_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -533,7 +522,7 @@ <property name="xpad">5</property> <property name="ypad">5</property> <property name="selectable">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -543,7 +532,7 @@ </packing> </child> <child> - <widget class="GtkLabel" id="N_SUFFIX_label"> + <object class="GtkLabel" id="N_SUFFIX_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -551,7 +540,7 @@ <property name="xpad">5</property> <property name="ypad">5</property> <property name="selectable">True</property> - </widget> + </object> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> @@ -561,26 +550,26 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label18"> + <object class="GtkLabel" id="label18"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes" comments="Family Name"><b>Family:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label16"> + <object class="GtkLabel" id="label16"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes" comments="Middle Name"><b>Middle:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> @@ -589,13 +578,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label15"> + <object class="GtkLabel" id="label15"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes" comments="Prefix in Name"><b>Prefix:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="top_attach">2</property> <property name="bottom_attach">3</property> @@ -604,13 +593,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label17"> + <object class="GtkLabel" id="label17"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label" translatable="yes" comments="Given Name"><b>Given:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> @@ -619,13 +608,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label14"> + <object class="GtkLabel" id="label14"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label" translatable="yes" comments="Suffix in Name"><b>Suffix:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> @@ -635,21 +624,24 @@ <property name="y_options"></property> </packing> </child> - </widget> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + </object> </child> - <child> - <widget class="GtkLabel" id="label19"> + <child type="label"> + <object class="GtkLabel" id="label19"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Full Name</b></property> <property name="use_markup">True</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> + </object> </child> - </widget> + </object> <packing> <property name="right_attach">4</property> <property name="top_attach">1</property> @@ -658,11 +650,11 @@ </packing> </child> <child> - <widget class="GtkExpander" id="expander2"> + <object class="GtkExpander" id="expander2"> <property name="visible">True</property> <property name="can_focus">True</property> <child> - <widget class="GtkTable" id="table_ADR_STREET"> + <object class="GtkTable" id="table_ADR_STREET"> <property name="visible">True</property> <property name="border_width">6</property> <property name="n_rows">3</property> @@ -670,7 +662,7 @@ <property name="column_spacing">5</property> <property name="row_spacing">5</property> <child> - <widget class="GtkLabel" id="ADR_HOME_STREET_label"> + <object class="GtkLabel" id="ADR_HOME_STREET_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -678,7 +670,7 @@ <property name="xpad">5</property> <property name="ypad">5</property> <property name="selectable">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -686,7 +678,7 @@ </packing> </child> <child> - <widget class="GtkLabel" id="ADR_HOME_EXTADR_label"> + <object class="GtkLabel" id="ADR_HOME_EXTADR_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -694,7 +686,7 @@ <property name="xpad">5</property> <property name="ypad">5</property> <property name="selectable">True</property> - </widget> + </object> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> @@ -702,7 +694,7 @@ </packing> </child> <child> - <widget class="GtkLabel" id="ADR_HOME_LOCALITY_label"> + <object class="GtkLabel" id="ADR_HOME_LOCALITY_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -710,7 +702,7 @@ <property name="xpad">5</property> <property name="ypad">5</property> <property name="selectable">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -720,7 +712,7 @@ </packing> </child> <child> - <widget class="GtkLabel" id="ADR_HOME_PCODE_label"> + <object class="GtkLabel" id="ADR_HOME_PCODE_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -728,7 +720,7 @@ <property name="xpad">5</property> <property name="ypad">5</property> <property name="selectable">True</property> - </widget> + </object> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> @@ -738,7 +730,7 @@ </packing> </child> <child> - <widget class="GtkLabel" id="ADR_HOME_REGION_label"> + <object class="GtkLabel" id="ADR_HOME_REGION_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -746,7 +738,7 @@ <property name="xpad">5</property> <property name="ypad">5</property> <property name="selectable">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -756,7 +748,7 @@ </packing> </child> <child> - <widget class="GtkLabel" id="ADR_HOME_CTRY_label"> + <object class="GtkLabel" id="ADR_HOME_CTRY_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -764,7 +756,7 @@ <property name="xpad">5</property> <property name="ypad">5</property> <property name="selectable">True</property> - </widget> + </object> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> @@ -774,26 +766,26 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label31"> + <object class="GtkLabel" id="label31"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Street:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label28"> + <object class="GtkLabel" id="label28"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>City:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> @@ -802,13 +794,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label27"> + <object class="GtkLabel" id="label27"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>State:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="top_attach">2</property> <property name="bottom_attach">3</property> @@ -817,13 +809,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label29"> + <object class="GtkLabel" id="label29"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Extra Address:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> @@ -832,13 +824,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label26"> + <object class="GtkLabel" id="label26"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Postal Code:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> @@ -849,13 +841,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label25"> + <object class="GtkLabel" id="label25"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Country:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> @@ -865,21 +857,18 @@ <property name="y_options"></property> </packing> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label30"> + <child type="label"> + <object class="GtkLabel" id="label30"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Address</b></property> <property name="use_markup">True</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> + </object> </child> - </widget> + </object> <packing> <property name="right_attach">4</property> <property name="top_attach">2</property> @@ -888,13 +877,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label22"> + <object class="GtkLabel" id="label22"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Homepage:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="top_attach">3</property> <property name="bottom_attach">4</property> @@ -903,26 +892,26 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label24"> + <object class="GtkLabel" id="label24"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Name:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label20"> + <object class="GtkLabel" id="label20"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Nickname:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> @@ -931,13 +920,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label23"> + <object class="GtkLabel" id="label23"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Phone No.:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="top_attach">5</property> <property name="bottom_attach">6</property> @@ -946,19 +935,19 @@ </packing> </child> <child> - <widget class="GtkEventBox" id="eventbox1"> + <object class="GtkEventBox" id="eventbox1"> <property name="visible">True</property> - <property name="tooltip" translatable="yes" comments="Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)">Format: YYYY-MM-DD</property> + <property name="tooltip_text" translatable="yes">Format: YYYY-MM-DD</property> <child> - <widget class="GtkLabel" id="label13"> + <object class="GtkLabel" id="label13"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Birthday:</b></property> <property name="use_markup">True</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> @@ -969,12 +958,12 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label57"> + <object class="GtkLabel" id="label57"> <property name="visible">True</property> <property name="xalign">1</property> <property name="label" translatable="yes"><b>E-Mail:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="top_attach">4</property> <property name="bottom_attach">5</property> @@ -983,7 +972,7 @@ </packing> </child> <child> - <widget class="GtkLabel" id="NICKNAME_label"> + <object class="GtkLabel" id="NICKNAME_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -991,7 +980,7 @@ <property name="xpad">5</property> <property name="ypad">5</property> <property name="selectable">True</property> - </widget> + </object> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> @@ -999,7 +988,7 @@ </packing> </child> <child> - <widget class="GtkLabel" id="FN_label"> + <object class="GtkLabel" id="FN_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -1007,7 +996,7 @@ <property name="xpad">5</property> <property name="ypad">5</property> <property name="selectable">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -1015,7 +1004,7 @@ </packing> </child> <child> - <widget class="GtkLabel" id="EMAIL_HOME_USERID_label"> + <object class="GtkLabel" id="EMAIL_HOME_USERID_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -1023,7 +1012,7 @@ <property name="xpad">5</property> <property name="ypad">5</property> <property name="selectable">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">4</property> @@ -1033,7 +1022,7 @@ </packing> </child> <child> - <widget class="GtkLabel" id="TEL_HOME_NUMBER_label"> + <object class="GtkLabel" id="TEL_HOME_NUMBER_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -1041,7 +1030,7 @@ <property name="xpad">5</property> <property name="ypad">5</property> <property name="selectable">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -1051,7 +1040,7 @@ </packing> </child> <child> - <widget class="GtkLabel" id="BDAY_label"> + <object class="GtkLabel" id="BDAY_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -1059,7 +1048,7 @@ <property name="xpad">5</property> <property name="ypad">5</property> <property name="selectable">True</property> - </widget> + </object> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> @@ -1068,26 +1057,34 @@ <property name="y_options"></property> </packing> </child> - </widget> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + </object> <packing> <property name="position">1</property> </packing> </child> - <child> - <widget class="GtkLabel" id="label4"> + <child type="tab"> + <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label" translatable="yes">Personal Info</property> - </widget> + </object> <packing> - <property name="type">tab</property> <property name="position">1</property> <property name="tab_fill">False</property> </packing> </child> <child> - <widget class="GtkTable" id="table5"> + <object class="GtkTable" id="table5"> <property name="visible">True</property> <property name="border_width">12</property> <property name="n_rows">5</property> @@ -1095,13 +1092,7 @@ <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <widget class="GtkLabel" id="ORG_ORGNAME_label"> + <object class="GtkLabel" id="ORG_ORGNAME_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -1109,8 +1100,8 @@ <property name="xpad">5</property> <property name="ypad">5</property> <property name="selectable">True</property> - <property name="ellipsize">PANGO_ELLIPSIZE_END</property> - </widget> + <property name="ellipsize">end</property> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -1118,7 +1109,7 @@ </packing> </child> <child> - <widget class="GtkLabel" id="ORG_ORGUNIT_label"> + <object class="GtkLabel" id="ORG_ORGUNIT_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -1126,8 +1117,8 @@ <property name="xpad">5</property> <property name="ypad">5</property> <property name="selectable">True</property> - <property name="ellipsize">PANGO_ELLIPSIZE_END</property> - </widget> + <property name="ellipsize">end</property> + </object> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> @@ -1135,7 +1126,7 @@ </packing> </child> <child> - <widget class="GtkLabel" id="TITLE_label"> + <object class="GtkLabel" id="TITLE_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -1143,8 +1134,8 @@ <property name="xpad">5</property> <property name="ypad">5</property> <property name="selectable">True</property> - <property name="ellipsize">PANGO_ELLIPSIZE_END</property> - </widget> + <property name="ellipsize">end</property> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -1154,7 +1145,7 @@ </packing> </child> <child> - <widget class="GtkLabel" id="ROLE_label"> + <object class="GtkLabel" id="ROLE_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -1162,8 +1153,8 @@ <property name="xpad">5</property> <property name="ypad">5</property> <property name="selectable">True</property> - <property name="ellipsize">PANGO_ELLIPSIZE_END</property> - </widget> + <property name="ellipsize">end</property> + </object> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> @@ -1173,7 +1164,7 @@ </packing> </child> <child> - <widget class="GtkLabel" id="EMAIL_WORK_USERID_label"> + <object class="GtkLabel" id="EMAIL_WORK_USERID_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -1181,7 +1172,7 @@ <property name="xpad">5</property> <property name="ypad">5</property> <property name="selectable">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">4</property> @@ -1191,11 +1182,11 @@ </packing> </child> <child> - <widget class="GtkExpander" id="expander3"> + <object class="GtkExpander" id="expander3"> <property name="visible">True</property> <property name="can_focus">True</property> <child> - <widget class="GtkTable" id="table6"> + <object class="GtkTable" id="table6"> <property name="visible">True</property> <property name="border_width">6</property> <property name="n_rows">3</property> @@ -1203,7 +1194,7 @@ <property name="column_spacing">5</property> <property name="row_spacing">5</property> <child> - <widget class="GtkLabel" id="ADR_WORK_STREET_label"> + <object class="GtkLabel" id="ADR_WORK_STREET_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -1211,7 +1202,7 @@ <property name="xpad">5</property> <property name="ypad">5</property> <property name="selectable">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -1219,7 +1210,7 @@ </packing> </child> <child> - <widget class="GtkLabel" id="ADR_WORK_EXTADR_label"> + <object class="GtkLabel" id="ADR_WORK_EXTADR_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -1227,7 +1218,7 @@ <property name="xpad">5</property> <property name="ypad">5</property> <property name="selectable">True</property> - </widget> + </object> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> @@ -1235,7 +1226,7 @@ </packing> </child> <child> - <widget class="GtkLabel" id="ADR_WORK_LOCALITY_label"> + <object class="GtkLabel" id="ADR_WORK_LOCALITY_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -1243,7 +1234,7 @@ <property name="xpad">5</property> <property name="ypad">5</property> <property name="selectable">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -1253,7 +1244,7 @@ </packing> </child> <child> - <widget class="GtkLabel" id="ADR_WORK_PCODE_label"> + <object class="GtkLabel" id="ADR_WORK_PCODE_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -1261,7 +1252,7 @@ <property name="xpad">5</property> <property name="ypad">5</property> <property name="selectable">True</property> - </widget> + </object> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> @@ -1271,7 +1262,7 @@ </packing> </child> <child> - <widget class="GtkLabel" id="ADR_WORK_REGION_label"> + <object class="GtkLabel" id="ADR_WORK_REGION_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -1279,7 +1270,7 @@ <property name="xpad">5</property> <property name="ypad">5</property> <property name="selectable">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -1289,7 +1280,7 @@ </packing> </child> <child> - <widget class="GtkLabel" id="ADR_WORK_CTRY_label"> + <object class="GtkLabel" id="ADR_WORK_CTRY_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -1297,7 +1288,7 @@ <property name="xpad">5</property> <property name="ypad">5</property> <property name="selectable">True</property> - </widget> + </object> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> @@ -1307,26 +1298,26 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label39"> + <object class="GtkLabel" id="label39"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Street:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label37"> + <object class="GtkLabel" id="label37"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>City:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> @@ -1335,13 +1326,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label36"> + <object class="GtkLabel" id="label36"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>State:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="top_attach">2</property> <property name="bottom_attach">3</property> @@ -1350,14 +1341,14 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label38"> + <object class="GtkLabel" id="label38"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Extra Address:</b></property> <property name="use_markup">True</property> <property name="single_line_mode">True</property> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> @@ -1366,13 +1357,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label35"> + <object class="GtkLabel" id="label35"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Postal Code:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> @@ -1383,13 +1374,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label34"> + <object class="GtkLabel" id="label34"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Country:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> @@ -1399,21 +1390,18 @@ <property name="y_options"></property> </packing> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label40"> + <child type="label"> + <object class="GtkLabel" id="label40"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Address</b></property> <property name="use_markup">True</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> + </object> </child> - </widget> + </object> <packing> <property name="right_attach">4</property> <property name="top_attach">2</property> @@ -1422,7 +1410,7 @@ </packing> </child> <child> - <widget class="GtkLabel" id="TEL_WORK_NUMBER_label"> + <object class="GtkLabel" id="TEL_WORK_NUMBER_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -1430,7 +1418,7 @@ <property name="xpad">5</property> <property name="ypad">5</property> <property name="selectable">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -1440,26 +1428,26 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label44"> + <object class="GtkLabel" id="label44"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Company:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label42"> + <object class="GtkLabel" id="label42"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Position:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> @@ -1468,13 +1456,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label43"> + <object class="GtkLabel" id="label43"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Department:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> @@ -1483,13 +1471,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label41"> + <object class="GtkLabel" id="label41"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Role:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> @@ -1500,13 +1488,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label32"> + <object class="GtkLabel" id="label32"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>E-Mail:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="top_attach">3</property> <property name="bottom_attach">4</property> @@ -1515,13 +1503,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label33"> + <object class="GtkLabel" id="label33"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> <property name="label" translatable="yes"><b>Phone No.:</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="top_attach">4</property> <property name="bottom_attach">5</property> @@ -1529,137 +1517,146 @@ <property name="y_options"></property> </packing> </child> - </widget> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + </object> <packing> <property name="position">2</property> </packing> </child> - <child> - <widget class="GtkLabel" id="label5"> + <child type="tab"> + <object class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label" translatable="yes">Work</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="GtkScrolledWindow" id="scrolledwindow"> + <object class="GtkScrolledWindow" id="scrolledwindow"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="border_width">6</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> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> <child> - <widget class="GtkTextView" id="DESC_textview"> + <object class="GtkTextView" id="DESC_textview"> <property name="height_request">70</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="editable">False</property> - <property name="wrap_mode">GTK_WRAP_WORD</property> + <property name="wrap_mode">word</property> <property name="cursor_visible">False</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="position">3</property> </packing> </child> - <child> - <widget class="GtkLabel" id="label6"> + <child type="tab"> + <object class="GtkLabel" id="label6"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label" translatable="yes" comments=""About" is the text of a tab of vcard window">About</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="GtkScrolledWindow" id="scrolledwindow_annotation"> + <object class="GtkScrolledWindow" id="scrolledwindow_annotation"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="border_width">6</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> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> <child> - <widget class="GtkTextView" id="textview_annotation"> + <object class="GtkTextView" id="textview_annotation"> <property name="height_request">70</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="wrap_mode">GTK_WRAP_WORD</property> - </widget> + <property name="wrap_mode">word</property> + </object> </child> - </widget> + </object> <packing> <property name="position">4</property> </packing> </child> - <child> - <widget class="GtkLabel" id="label58"> + <child type="tab"> + <object class="GtkLabel" id="label58"> <property name="visible">True</property> <property name="label" translatable="yes">Comments</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> - <widget class="GtkHBox" id="hbox4"> + <object class="GtkHBox" id="hbox4"> <property name="visible">True</property> <child> - <widget class="GtkProgressBar" id="progressbar"> + <object class="GtkProgressBar" id="progressbar"> <property name="visible">True</property> <property name="pulse_step">0.10000000149</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkHButtonBox" id="hbuttonbox1"> + <object class="GtkHButtonBox" id="hbuttonbox1"> <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> + <property name="layout_style">end</property> <child> - <widget class="GtkButton" id="close_button"> + <object class="GtkButton" id="close_button"> + <property name="label">gtk-close</property> <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="receives_default">False</property> <property name="use_stock">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_close_button_clicked"/> - </widget> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">2</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> +</interface> diff --git a/data/glade/voip_call_received_dialog.glade b/data/gui/voip_call_received_dialog.ui index b4314fe22..8a906c7ce 100644 --- a/data/glade/voip_call_received_dialog.glade +++ b/data/gui/voip_call_received_dialog.ui @@ -1,8 +1,8 @@ <?xml version="1.0"?> -<glade-interface> - <!-- interface-requires gtk+ 2.14 --> +<interface> + <requires lib="gtk+" version="2.16"/> <!-- interface-naming-policy toplevel-contextual --> - <widget class="GtkMessageDialog" id="voip_call_received_messagedialog"> + <object class="GtkMessageDialog" id="voip_call_received_messagedialog"> <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="resizable">False</property> @@ -17,23 +17,24 @@ <signal name="close" handler="on_voip_call_received_messagedialog_close"/> <signal name="response" handler="on_voip_call_received_messagedialog_response"/> <child internal-child="vbox"> - <widget class="GtkVBox" id="dialog-vbox4"> + <object class="GtkVBox" id="dialog-vbox4"> <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="orientation">vertical</property> <property name="spacing">2</property> <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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="layout_style">end</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="pack_type">end</property> <property name="position">0</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> +</interface> diff --git a/data/glade/xml_console_window.glade b/data/gui/xml_console_window.ui index 4b3496d77..f544a0e43 100644 --- a/data/glade/xml_console_window.glade +++ b/data/gui/xml_console_window.ui @@ -1,23 +1,24 @@ <?xml version="1.0"?> -<glade-interface> - <!-- interface-requires gtk+ 2.6 --> +<interface> + <requires lib="gtk+" version="2.16"/> <!-- interface-naming-policy toplevel-contextual --> - <widget class="GtkWindow" id="xml_console_window"> + <object class="GtkWindow" id="xml_console_window"> <property name="border_width">12</property> <property name="default_width">550</property> <property name="default_height">450</property> <signal name="delete_event" handler="on_xml_console_window_delete_event"/> <child> - <widget class="GtkVBox" id="vbox"> + <object class="GtkVBox" id="vbox"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label342"> + <object class="GtkLabel" id="label342"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes"><b>Jabber Traffic</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -25,30 +26,30 @@ </packing> </child> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow43"> + <object class="GtkScrolledWindow" id="scrolledwindow43"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">automatic</property> <property name="vscrollbar_policy">automatic</property> <property name="shadow_type">in</property> <child> - <widget class="GtkTextView" id="stanzas_log_textview"> + <object class="GtkTextView" id="stanzas_log_textview"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="editable">False</property> <property name="wrap_mode">char</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox2988"> + <object class="GtkHBox" id="hbox2988"> <property name="visible">True</property> <child> - <widget class="GtkCheckButton" id="enable_checkbutton"> + <object class="GtkCheckButton" id="enable_checkbutton"> <property name="label" translatable="yes" comments="XML Console enable checkbutton">Enable</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -56,7 +57,7 @@ <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_enable_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -64,29 +65,29 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label351"> + <object class="GtkLabel" id="label351"> <property name="visible">True</property> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkButton" id="clear_button"> + <object class="GtkButton" id="clear_button"> <property name="label">gtk-clear</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_stock">True</property> <signal name="clicked" handler="on_clear_button_clicked"/> - </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> @@ -94,90 +95,90 @@ </packing> </child> <child> - <widget class="GtkExpander" id="expander1"> + <object class="GtkExpander" id="expander1"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="spacing">6</property> <child> - <widget class="GtkVBox" id="input_vbox1"> + <object class="GtkVBox" id="input_vbox1"> <property name="visible">True</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkHBox" id="hbox1"> + <object class="GtkHBox" id="hbox1"> <property name="visible">True</property> <child> - <widget class="GtkCheckButton" id="in_stanza_checkbutton"> + <object class="GtkCheckButton" id="in_stanza_checkbutton"> <property name="label" translatable="yes">Hide IN stanzas</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_in_stanza_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="out_stanza_checkbutton"> + <object class="GtkCheckButton" id="out_stanza_checkbutton"> <property name="label" translatable="yes">Hide OUT stanzas</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_out_stanza_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="presence_stanza_checkbutton"> + <object class="GtkCheckButton" id="presence_stanza_checkbutton"> <property name="label" translatable="yes">Hide Presence stanzas</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_presence_stanza_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="position">2</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="iq_stanza_checkbutton"> + <object class="GtkCheckButton" id="iq_stanza_checkbutton"> <property name="label" translatable="yes">Hide IQ stanzas</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_iq_stanza_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="position">3</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="message_stanza_checkbutton"> + <object class="GtkCheckButton" id="message_stanza_checkbutton"> <property name="label" translatable="yes">Hide Message stanzas</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_message_stanza_checkbutton_toggled"/> - </widget> + </object> <packing> <property name="position">4</property> </packing> </child> - </widget> + </object> <packing> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox2"> + <object class="GtkHBox" id="hbox2"> <property name="visible">True</property> <child> <placeholder/> @@ -185,74 +186,72 @@ <child> <placeholder/> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </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="xalign">0</property> <property name="label" translatable="yes"><b>Filter</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">3</property> </packing> </child> <child> - <widget class="GtkExpander" id="expander"> + <object class="GtkExpander" id="expander"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="spacing">6</property> <signal name="activate" handler="on_expander_activate"/> <child> - <widget class="GtkVBox" id="input_vbox"> + <object class="GtkVBox" id="input_vbox"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow42"> + <object class="GtkScrolledWindow" id="scrolledwindow42"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">never</property> <property name="vscrollbar_policy">never</property> <property name="shadow_type">in</property> <child> - <widget class="GtkTextView" id="input_textview"> + <object class="GtkTextView" id="input_textview"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="wrap_mode">char</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkHButtonBox" id="hbuttonbox31"> + <object class="GtkHButtonBox" id="hbuttonbox31"> <property name="visible">True</property> <property name="spacing">6</property> <property name="layout_style">end</property> <child> - <widget class="GtkButton" id="iq_button"> + <object class="GtkButton" id="iq_button"> <property name="label" translatable="yes" comments="Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))">_IQ</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip" translatable="yes" comments="Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)">Info/Query</property> + <property name="tooltip_text" translatable="yes">Info/Query</property> <property name="use_underline">True</property> <signal name="clicked" handler="on_iq_button_clicked"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -260,14 +259,14 @@ </packing> </child> <child> - <widget class="GtkButton" id="presence_button"> + <object class="GtkButton" id="presence_button"> <property name="label" translatable="yes">_Presence</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> <signal name="clicked" handler="on_presence_button_clicked"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -275,14 +274,14 @@ </packing> </child> <child> - <widget class="GtkButton" id="message_button"> + <object class="GtkButton" id="message_button"> <property name="label" translatable="yes">_Message</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> <signal name="clicked" handler="on_message_button_clicked"/> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -290,26 +289,26 @@ </packing> </child> <child> - <widget class="GtkButton" id="send_button"> + <object class="GtkButton" id="send_button"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> <signal name="clicked" handler="on_send_button_clicked"/> <child> - <widget class="GtkAlignment" id="alignment80"> + <object class="GtkAlignment" id="alignment80"> <property name="visible">True</property> <property name="xscale">0</property> <property name="yscale">0</property> <child> - <widget class="GtkHBox" id="hbox2980"> + <object class="GtkHBox" id="hbox2980"> <property name="visible">True</property> <property name="spacing">2</property> <child> - <widget class="GtkImage" id="image833"> + <object class="GtkImage" id="image833"> <property name="visible">True</property> <property name="stock">gtk-apply</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -317,55 +316,52 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label341"> + <object class="GtkLabel" id="label341"> <property name="visible">True</property> <property name="label" translatable="yes">_Send</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> <property name="position">3</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> - <child> - <widget class="GtkLabel" id="label343"> + <child type="label"> + <object class="GtkLabel" id="label343"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes"><b>XML Input</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">4</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> +</interface> diff --git a/data/gui/zeroconf_context_menu.ui b/data/gui/zeroconf_context_menu.ui new file mode 100644 index 000000000..b91ae3aee --- /dev/null +++ b/data/gui/zeroconf_context_menu.ui @@ -0,0 +1,32 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkMenu" id="zeroconf_context_menu"> + <child> + <object class="GtkImageMenuItem" id="status_menuitem"> + <property name="label">_Status</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separatormenuitem1"> + <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> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="zeroconf_properties_menuitem"> + <property name="label">_Modify Account...</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + <property name="accel_group">accelgroup1</property> + </object> + </child> + </object> + <object class="GtkAccelGroup" id="accelgroup1"/> +</interface> diff --git a/data/gui/zeroconf_information_window.ui b/data/gui/zeroconf_information_window.ui new file mode 100644 index 000000000..3996805a3 --- /dev/null +++ b/data/gui/zeroconf_information_window.ui @@ -0,0 +1,399 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkWindow" id="zeroconf_information_window"> + <property name="border_width">12</property> + <property name="title">Contact Information</property> + <property name="resizable">False</property> + <signal name="destroy" handler="on_zeroconf_information_window_destroy"/> + <signal name="key_press_event" handler="on_zeroconf_information_window_key_press_event"/> + <child> + <object class="GtkVBox" id="vbox1"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel" id="nickname_label"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="xalign">0</property> + <property name="selectable">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkNotebook" id="information_notebook"> + <property name="visible">True</property> + <child> + <object class="GtkHBox" id="hbox3"> + <property name="visible">True</property> + <property name="border_width">12</property> + <property name="spacing">12</property> + <child> + <object class="GtkTable" id="table7"> + <property name="visible">True</property> + <property name="n_rows">4</property> + <property name="n_columns">2</property> + <property name="column_spacing">12</property> + <property name="row_spacing">6</property> + <child> + <object class="GtkLabel" id="label51"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Local jid:</property> + </object> + <packing> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label53"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Resource:</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> + </packing> + </child> + <child> + <object class="GtkLabel" id="label54"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Status:</property> + </object> + <packing> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkLabel" id="local_jid_label"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkEventBox" id="resource_prio_label_eventbox"> + <property name="visible">True</property> + <property name="visible_window">False</property> + <child> + <object class="GtkLabel" id="resource_prio_label"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkEventBox" id="status_label_eventbox"> + <property name="visible">True</property> + <child> + <object class="GtkLabel" id="status_label"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="log_history_checkbutton"> + <property name="label" translatable="yes">_Log conversation history</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="right_attach">2</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="vbox2"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkEventBox" id="PHOTO_eventbox"> + <property name="visible">True</property> + <property name="visible_window">False</property> + <signal name="button_press_event" handler="on_PHOTO_eventbox_button_press_event"/> + <child> + <object class="GtkImage" id="PHOTO_image"> + <property name="visible">True</property> + <property name="yalign">0</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + <child type="tab"> + <object class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Contact</property> + </object> + <packing> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <object class="GtkTable" id="table8"> + <property name="visible">True</property> + <property name="border_width">16</property> + <property name="n_rows">4</property> + <property name="n_columns">2</property> + <property name="column_spacing">12</property> + <property name="row_spacing">6</property> + <child> + <object class="GtkLabel" id="label55"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Jabber ID:</property> + </object> + <packing> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkLabel" id="jabber_id_label"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> + </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="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label56"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">E-Mail:</property> + </object> + <packing> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkLabel" id="email_label"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="wrap">True</property> + <property name="selectable">True</property> + </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="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label58"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Last Name:</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> + </packing> + </child> + <child> + <object class="GtkLabel" id="label59"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">First Name:</property> + </object> + <packing> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkLabel" id="first_name_label"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="y_options">GTK_EXPAND</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="last_name_label"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> + </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="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + </object> + <packing> + <property name="position">1</property> + <property name="tab_expand">True</property> + </packing> + </child> + <child type="tab"> + <object class="GtkLabel" id="label57"> + <property name="visible">True</property> + <property name="label" translatable="yes">Personal</property> + </object> + <packing> + <property name="position">1</property> + <property name="tab_fill">False</property> + </packing> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkHButtonBox" id="hbuttonbox1"> + <property name="visible">True</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="close_button"> + <property name="label">gtk-close</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_close_button_clicked"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="position">2</property> + </packing> + </child> + </object> + </child> + </object> +</interface> @@ -160,10 +160,8 @@ Section "Gajim" SecGajim File "bin\bz2.pyd"
File "bin\OpenSSL.crypto.pyd"
File "bin\gajim.exe"
- File "bin\gtk.glade.pyd"
File "bin\history_manager.exe"
File "bin\libeay32.dll"
- File "bin\libglade-2.0-0.dll"
File "bin\library.zip"
File "bin\libxml2.dll"
File "bin\msvcr71.dll"
@@ -205,7 +203,7 @@ Section "Gajim" SecGajim !insertmacro MUI_STARTMENU_WRITE_END
SetOutPath "$INSTDIR\data"
- File /r "data\glade"
+ File /r "data\gui"
File /r "data\moods"
File /r "data\activities"
File /r "data\other"
@@ -653,10 +651,8 @@ Section "Uninstall" Delete "$INSTDIR\bin\gajim.exe"
Delete "$INSTDIR\bin\gobject._gobject.pyd"
Delete "$INSTDIR\bin\gtk._gtk.pyd"
- Delete "$INSTDIR\bin\gtk.glade.pyd"
Delete "$INSTDIR\bin\history_manager.exe"
Delete "$INSTDIR\bin\libeay32.dll"
- Delete "$INSTDIR\bin\libglade-2.0-0.dll"
Delete "$INSTDIR\bin\library.zip"
Delete "$INSTDIR\bin\libxml2.dll"
Delete "$INSTDIR\bin\msvcr71.dll"
@@ -679,7 +675,7 @@ Section "Uninstall" Delete "$INSTDIR\bin\zlib1.dll"
RMDir /r "$INSTDIR\bin\docutils"
RMDir "$INSTDIR\bin"
- RMDir /r "$INSTDIR\data\glade"
+ RMDir /r "$INSTDIR\data\gui"
RMDir /r "$INSTDIR\data\moods"
RMDir /r "$INSTDIR\data\activities"
RMDir /r "$INSTDIR\data\other"
diff --git a/src/adhoc_commands.py b/src/adhoc_commands.py index 01d34eee6..a657b8203 100644 --- a/src/adhoc_commands.py +++ b/src/adhoc_commands.py @@ -66,8 +66,8 @@ class CommandWindow: self.allow_stage3_close = False # retrieving widgets from xml - self.xml = gtkgui_helpers.get_glade('adhoc_commands_window.glade') - self.window = self.xml.get_widget('adhoc_commands_window') + self.xml = gtkgui_helpers.get_gtk_builder('adhoc_commands_window.ui') + self.window = self.xml.get_object('adhoc_commands_window') self.window.connect('delete-event', self.on_adhoc_commands_window_delete_event) for name in ('back_button', 'forward_button', 'execute_button','close_button','stages_notebook', @@ -76,7 +76,7 @@ class CommandWindow: 'sending_form_stage_vbox','sending_form_progressbar', 'notes_label','no_commands_stage_vbox','error_stage_vbox', 'error_description_label'): - self.__dict__[name] = self.xml.get_widget(name) + self.__dict__[name] = self.xml.get_object(name) # creating data forms widget self.data_form_widget = dataforms_widget.DataFormWidget() @@ -91,7 +91,7 @@ class CommandWindow: self.stage1() # displaying the window - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) self.window.show_all() # These functions are set up by appropriate stageX methods. @@ -162,7 +162,7 @@ class CommandWindow: # request command list self.request_command_list() self.setup_pulsing( - self.xml.get_widget('retrieving_commands_progressbar')) + self.xml.get_object('retrieving_commands_progressbar')) # setup the callbacks self.stage_finish = self.stage1_finish diff --git a/src/advanced_configuration_window.py b/src/advanced_configuration_window.py index b35461287..d97dac76c 100644 --- a/src/advanced_configuration_window.py +++ b/src/advanced_configuration_window.py @@ -40,7 +40,7 @@ C_VALUE, C_TYPE ) = range(3) -GTKGUI_GLADE = 'manage_accounts_window.glade' +GTKGUI_GLADE = 'manage_accounts_window.ui' def rate_limit(rate): """ @@ -74,13 +74,13 @@ def tree_model_pre_order(model, treeiter): class AdvancedConfigurationWindow(object): def __init__(self): - self.xml = gtkgui_helpers.get_glade('advanced_configuration_window.glade') - self.window = self.xml.get_widget('advanced_configuration_window') + self.xml = gtkgui_helpers.get_gtk_builder('advanced_configuration_window.ui') + self.window = self.xml.get_object('advanced_configuration_window') self.window.set_transient_for( gajim.interface.instances['preferences'].window) - self.entry = self.xml.get_widget('advanced_entry') - self.desc_label = self.xml.get_widget('advanced_desc_label') - self.restart_label = self.xml.get_widget('restart_label') + self.entry = self.xml.get_object('advanced_entry') + self.desc_label = self.xml.get_object('advanced_desc_label') + self.restart_label = self.xml.get_object('restart_label') # Format: # key = option name (root/subopt/opt separated by \n then) @@ -95,7 +95,7 @@ class AdvancedConfigurationWindow(object): 'string': _('Text'), 'color': _('Color')} - treeview = self.xml.get_widget('advanced_treeview') + treeview = self.xml.get_object('advanced_treeview') self.treeview = treeview self.model = gtk.TreeStore(str, str, str) self.fill_model() @@ -127,7 +127,7 @@ class AdvancedConfigurationWindow(object): treeview.get_selection().connect('changed', self.on_advanced_treeview_selection_changed) - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) self.window.show_all() self.restart_label.hide() gajim.interface.instances['advanced_config'] = self diff --git a/src/atom_window.py b/src/atom_window.py index 4712dfc41..394d4ac27 100644 --- a/src/atom_window.py +++ b/src/atom_window.py @@ -57,16 +57,16 @@ class AtomWindow: self.entry = None # the entry actually displayed - self.xml = gtkgui_helpers.get_glade('atom_entry_window.glade') - self.window = self.xml.get_widget('atom_entry_window') + self.xml = gtkgui_helpers.get_gtk_builder('atom_entry_window.ui') + self.window = self.xml.get_object('atom_entry_window') for name in ('new_entry_label', 'feed_title_label', 'feed_title_eventbox', 'feed_tagline_label', 'entry_title_label', 'entry_title_eventbox', 'last_modified_label', 'close_button', 'next_button'): - self.__dict__[name] = self.xml.get_widget(name) + self.__dict__[name] = self.xml.get_object(name) self.displayNextEntry() - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) self.window.show_all() self.entry_title_eventbox.add_events(gtk.gdk.BUTTON_PRESS_MASK) diff --git a/src/chat_control.py b/src/chat_control.py index 263e53df4..32c53fae6 100644 --- a/src/chat_control.py +++ b/src/chat_control.py @@ -242,17 +242,17 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): MessageControl.__init__(self, type_id, parent_win, widget_name, contact, acct, resource = resource) - widget = self.xml.get_widget('history_button') + widget = self.xml.get_object('history_button') id_ = widget.connect('clicked', self._on_history_menuitem_activate) self.handlers[id_] = widget # when/if we do XHTML we will put formatting buttons back - widget = self.xml.get_widget('emoticons_button') + widget = self.xml.get_object('emoticons_button') id_ = widget.connect('clicked', self.on_emoticons_button_clicked) self.handlers[id_] = widget # Create banner and connect signals - widget = self.xml.get_widget('banner_eventbox') + widget = self.xml.get_object('banner_eventbox') id_ = widget.connect('button-press-event', self._on_banner_eventbox_button_press_event) self.handlers[id_] = widget @@ -260,7 +260,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self.urlfinder = re.compile( r"(www\.(?!\.)|[a-z][a-z0-9+.-]*://)[^\s<>'\"]+[^!,\.\s<>\)'\"\]]") - self.banner_status_label = self.xml.get_widget('banner_label') + self.banner_status_label = self.xml.get_object('banner_label') id_ = self.banner_status_label.connect('populate_popup', self.on_banner_label_populate_popup) self.handlers[id_] = self.banner_status_label @@ -298,7 +298,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): gtk.DEST_DEFAULT_DROP, self.dnd_list, gtk.gdk.ACTION_COPY) - self.conv_scrolledwindow = self.xml.get_widget( + self.conv_scrolledwindow = self.xml.get_object( 'conversation_scrolledwindow') self.conv_scrolledwindow.add(self.conv_textview.tv) widget = self.conv_scrolledwindow.get_vadjustment() @@ -312,7 +312,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self.was_at_the_end = True # add MessageTextView to UI and connect signals - self.msg_scrolledwindow = self.xml.get_widget('message_scrolledwindow') + self.msg_scrolledwindow = self.xml.get_object('message_scrolledwindow') self.msg_textview = MessageTextView() id_ = self.msg_textview.connect('mykeypress', self._on_message_textview_mykeypress_event) @@ -337,11 +337,11 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self.update_font() # Hook up send button - widget = self.xml.get_widget('send_button') + widget = self.xml.get_object('send_button') id_ = widget.connect('clicked', self._on_send_button_clicked) self.handlers[id_] = widget - widget = self.xml.get_widget('formattings_button') + widget = self.xml.get_object('formattings_button') id_ = widget.connect('clicked', self.on_formattings_button_clicked) self.handlers[id_] = widget @@ -353,7 +353,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): # Emoticons menu # set image no matter if user wants at this time emoticons or not # (so toggle works ok) - img = self.xml.get_widget('emoticons_button_image') + img = self.xml.get_object('emoticons_button_image') img.set_from_file(os.path.join(gajim.DATA_DIR, 'emoticons', 'static', 'smile.png')) self.toggle_emoticons() @@ -488,8 +488,8 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): textcolor = gajim.config.get_per('themes', theme, 'bannertextcolor') # the backgrounds are colored by using an eventbox by # setting the bg color of the eventbox and the fg of the name_label - banner_eventbox = self.xml.get_widget('banner_eventbox') - banner_name_label = self.xml.get_widget('banner_name_label') + banner_eventbox = self.xml.get_object('banner_eventbox') + banner_name_label = self.xml.get_object('banner_name_label') self.disconnect_style_event(banner_name_label) self.disconnect_style_event(self.banner_status_label) if bgcolor: @@ -534,7 +534,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): opts[0] == True -> set fg color opts[1] == True -> set bg color """ - banner_eventbox = self.xml.get_widget('banner_eventbox') + banner_eventbox = self.xml.get_object('banner_eventbox') self.disconnect_style_event(widget) if opts[1]: bg_color = widget.style.bg[gtk.STATE_SELECTED] @@ -819,7 +819,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): Hide show emoticons_button and make sure emoticons_menu is always there when needed """ - emoticons_button = self.xml.get_widget('emoticons_button') + emoticons_button = self.xml.get_object('emoticons_button') if gajim.config.get('emoticons_theme'): emoticons_button.show() emoticons_button.set_no_show_all(False) @@ -1206,7 +1206,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): Toggle chat buttons """ MessageControl.chat_buttons_set_visible(self, state) - self.widget_set_visible(self.xml.get_widget('actions_hbox'), state) + self.widget_set_visible(self.xml.get_object('actions_hbox'), state) def got_connected(self): self.msg_textview.set_sensitive(True) @@ -1248,35 +1248,35 @@ class ChatControl(ChatControlBase): self.gpg_is_active = False # for muc use: - # widget = self.xml.get_widget('muc_window_actions_button') - self.actions_button = self.xml.get_widget('message_window_actions_button') + # widget = self.xml.get_object('muc_window_actions_button') + self.actions_button = self.xml.get_object('message_window_actions_button') id_ = self.actions_button.connect('clicked', self.on_actions_button_clicked) self.handlers[id_] = self.actions_button - self._formattings_button = self.xml.get_widget('formattings_button') + self._formattings_button = self.xml.get_object('formattings_button') - self._add_to_roster_button = self.xml.get_widget( + self._add_to_roster_button = self.xml.get_object( 'add_to_roster_button') id_ = self._add_to_roster_button.connect('clicked', self._on_add_to_roster_menuitem_activate) self.handlers[id_] = self._add_to_roster_button - self._audio_button = self.xml.get_widget('audio_togglebutton') + self._audio_button = self.xml.get_object('audio_togglebutton') id_ = self._audio_button.connect('toggled', self.on_audio_button_toggled) self.handlers[id_] = self._audio_button # add a special img gtkgui_helpers.add_image_to_button(self._audio_button, 'gajim-mic_inactive') - self._video_button = self.xml.get_widget('video_togglebutton') + self._video_button = self.xml.get_object('video_togglebutton') id_ = self._video_button.connect('toggled', self.on_video_button_toggled) self.handlers[id_] = self._video_button # add a special img gtkgui_helpers.add_image_to_button(self._video_button, 'gajim-cam_inactive') - self._send_file_button = self.xml.get_widget('send_file_button') + self._send_file_button = self.xml.get_object('send_file_button') # add a special img for send file button path_to_upload_img = gtkgui_helpers.get_icon_path('gajim-upload') img = gtk.Image() @@ -1286,13 +1286,13 @@ class ChatControl(ChatControlBase): self._on_send_file_menuitem_activate) self.handlers[id_] = self._send_file_button - self._convert_to_gc_button = self.xml.get_widget( + self._convert_to_gc_button = self.xml.get_object( 'convert_to_gc_button') id_ = self._convert_to_gc_button.connect('clicked', self._on_convert_to_gc_menuitem_activate) self.handlers[id_] = self._convert_to_gc_button - contact_information_button = self.xml.get_widget( + contact_information_button = self.xml.get_object( 'contact_information_button') id_ = contact_information_button.connect('clicked', self._on_contact_information_menuitem_activate) @@ -1300,25 +1300,25 @@ class ChatControl(ChatControlBase): compact_view = gajim.config.get('compact_view') self.chat_buttons_set_visible(compact_view) - self.widget_set_visible(self.xml.get_widget('banner_eventbox'), + self.widget_set_visible(self.xml.get_object('banner_eventbox'), gajim.config.get('hide_chat_banner')) - self.authentication_button = self.xml.get_widget( + self.authentication_button = self.xml.get_object( 'authentication_button') id_ = self.authentication_button.connect('clicked', self._on_authentication_button_clicked) self.handlers[id_] = self.authentication_button # Add lock image to show chat encryption - self.lock_image = self.xml.get_widget('lock_image') + self.lock_image = self.xml.get_object('lock_image') # Convert to GC icon - img = self.xml.get_widget('convert_to_gc_button_image') + img = self.xml.get_object('convert_to_gc_button_image') img.set_from_pixbuf(gtkgui_helpers.load_icon( 'muc_active').get_pixbuf()) - self._audio_banner_image = self.xml.get_widget('audio_banner_image') - self._video_banner_image = self.xml.get_widget('video_banner_image') + self._audio_banner_image = self.xml.get_object('audio_banner_image') + self._video_banner_image = self.xml.get_object('video_banner_image') self.audio_sid = None self.audio_state = self.JINGLE_STATE_NOT_AVAILABLE self.video_sid = None @@ -1327,10 +1327,10 @@ class ChatControl(ChatControlBase): self.update_toolbar() self._pep_images = {} - self._pep_images['mood'] = self.xml.get_widget('mood_image') - self._pep_images['activity'] = self.xml.get_widget('activity_image') - self._pep_images['tune'] = self.xml.get_widget('tune_image') - self._pep_images['location'] = self.xml.get_widget('location_image') + self._pep_images['mood'] = self.xml.get_object('mood_image') + self._pep_images['activity'] = self.xml.get_object('activity_image') + self._pep_images['tune'] = self.xml.get_object('tune_image') + self._pep_images['location'] = self.xml.get_object('location_image') self.update_all_pep_types() # keep timeout id and window obj for possible big avatar @@ -1353,7 +1353,7 @@ class ChatControl(ChatControlBase): self._on_message_tv_buffer_changed) self.handlers[id_] = message_tv_buffer - widget = self.xml.get_widget('avatar_eventbox') + widget = self.xml.get_object('avatar_eventbox') widget.set_property('height-request', gajim.config.get( 'chat_avatar_height')) id_ = widget.connect('enter-notify-event', @@ -1368,23 +1368,23 @@ class ChatControl(ChatControlBase): self.on_avatar_eventbox_button_press_event) self.handlers[id_] = widget - widget = self.xml.get_widget('location_eventbox') + widget = self.xml.get_object('location_eventbox') id_ = widget.connect('button-release-event', self.on_location_eventbox_button_release_event) self.handlers[id_] = widget for key in ('1', '2', '3', '4', '5', '6', '7', '8', '9', '*', '0', '#'): - widget = self.xml.get_widget(key + '_button') + widget = self.xml.get_object(key + '_button') id_ = widget.connect('pressed', self.on_num_button_pressed, key) self.handlers[id_] = widget id_ = widget.connect('released', self.on_num_button_released) self.handlers[id_] = widget - widget = self.xml.get_widget('mic_hscale') + widget = self.xml.get_object('mic_hscale') id_ = widget.connect('value_changed', self.on_mic_hscale_value_changed) self.handlers[id_] = widget - widget = self.xml.get_widget('sound_hscale') + widget = self.xml.get_object('sound_hscale') id_ = widget.connect('value_changed', self.on_sound_hscale_value_changed) self.handlers[id_] = widget @@ -1540,15 +1540,15 @@ class ChatControl(ChatControlBase): def update_audio(self): self._update_jingle('audio') - vbox = self.xml.get_widget('audio_vbox') + vbox = self.xml.get_object('audio_vbox') if self.audio_state == self.JINGLE_STATE_CONNECTED: # Set volume from config input_vol = gajim.config.get('audio_input_volume') output_vol = gajim.config.get('audio_output_volume') input_vol = max(min(input_vol, 100), 0) output_vol = max(min(output_vol, 100), 0) - self.xml.get_widget('mic_hscale').set_value(input_vol) - self.xml.get_widget('sound_hscale').set_value(output_vol) + self.xml.get_object('mic_hscale').set_value(input_vol) + self.xml.get_object('sound_hscale').set_value(output_vol) # Show vbox vbox.set_no_show_all(False) vbox.show_all() @@ -1656,7 +1656,7 @@ class ChatControl(ChatControlBase): avatar_w = avatar_pixbuf.get_width() avatar_h = avatar_pixbuf.get_height() - scaled_buf = self.xml.get_widget('avatar_image').get_pixbuf() + scaled_buf = self.xml.get_object('avatar_image').get_pixbuf() scaled_buf_w = scaled_buf.get_width() scaled_buf_h = scaled_buf.get_height() @@ -1744,7 +1744,7 @@ class ChatControl(ChatControlBase): banner_image = img_16[show] use_size_32 = False - banner_status_img = self.xml.get_widget('banner_status_image') + banner_status_img = self.xml.get_object('banner_status_image') if banner_image.get_storage_type() == gtk.IMAGE_ANIMATION: banner_status_img.set_from_animation(banner_image.get_animation()) else: @@ -1765,7 +1765,7 @@ class ChatControl(ChatControlBase): contact = self.contact jid = contact.jid - banner_name_label = self.xml.get_widget('banner_name_label') + banner_name_label = self.xml.get_object('banner_name_label') name = contact.get_shown_name() if self.resource: @@ -2490,7 +2490,7 @@ class ChatControl(ChatControlBase): else: scaled_pixbuf = None - image = self.xml.get_widget('avatar_image') + image = self.xml.get_object('avatar_image') image.set_from_pixbuf(scaled_pixbuf) image.show_all() @@ -2689,7 +2689,7 @@ class ChatControl(ChatControlBase): # the avatar has a transparency hole in the middle # so when we show the big one we avoid seeing the small one behind. # It's why I set it transparent. - image = self.xml.get_widget('avatar_image') + image = self.xml.get_object('avatar_image') pixbuf = image.get_pixbuf() pixbuf.fill(0xffffff00L) # RGBA image.queue_draw() diff --git a/src/config.py b/src/config.py index c908a9551..b5f39019f 100644 --- a/src/config.py +++ b/src/config.py @@ -88,69 +88,69 @@ class PreferencesWindow: """ Initialize Preferences window """ - self.xml = gtkgui_helpers.get_glade('preferences_window.glade') - self.window = self.xml.get_widget('preferences_window') + self.xml = gtkgui_helpers.get_gtk_builder('preferences_window.ui') + self.window = self.xml.get_object('preferences_window') self.window.set_transient_for(gajim.interface.roster.window) - self.notebook = self.xml.get_widget('preferences_notebook') + self.notebook = self.xml.get_object('preferences_notebook') self.one_window_type_combobox =\ - self.xml.get_widget('one_window_type_combobox') - self.iconset_combobox = self.xml.get_widget('iconset_combobox') - self.notify_on_signin_checkbutton = self.xml.get_widget( + self.xml.get_object('one_window_type_combobox') + self.iconset_combobox = self.xml.get_object('iconset_combobox') + self.notify_on_signin_checkbutton = self.xml.get_object( 'notify_on_signin_checkbutton') - self.notify_on_signout_checkbutton = self.xml.get_widget( + self.notify_on_signout_checkbutton = self.xml.get_object( 'notify_on_signout_checkbutton') - self.auto_popup_away_checkbutton = self.xml.get_widget( + self.auto_popup_away_checkbutton = self.xml.get_object( 'auto_popup_away_checkbutton') - self.sound_dnd_checkbutton = self.xml.get_widget('sound_dnd_checkbutton') - self.auto_away_checkbutton = self.xml.get_widget('auto_away_checkbutton') - self.auto_away_time_spinbutton = self.xml.get_widget( + self.sound_dnd_checkbutton = self.xml.get_object('sound_dnd_checkbutton') + self.auto_away_checkbutton = self.xml.get_object('auto_away_checkbutton') + self.auto_away_time_spinbutton = self.xml.get_object( 'auto_away_time_spinbutton') - self.auto_away_message_entry = self.xml.get_widget( + self.auto_away_message_entry = self.xml.get_object( 'auto_away_message_entry') - self.auto_xa_checkbutton = self.xml.get_widget('auto_xa_checkbutton') - self.auto_xa_time_spinbutton = self.xml.get_widget( + self.auto_xa_checkbutton = self.xml.get_object('auto_xa_checkbutton') + self.auto_xa_time_spinbutton = self.xml.get_object( 'auto_xa_time_spinbutton') - self.auto_xa_message_entry = self.xml.get_widget('auto_xa_message_entry') + self.auto_xa_message_entry = self.xml.get_object('auto_xa_message_entry') ### General tab ### # Display avatars in roster st = gajim.config.get('show_avatars_in_roster') - self.xml.get_widget('show_avatars_in_roster_checkbutton'). \ + self.xml.get_object('show_avatars_in_roster_checkbutton'). \ set_active(st) # Display status msg under contact name in roster st = gajim.config.get('show_status_msgs_in_roster') - self.xml.get_widget('show_status_msgs_in_roster_checkbutton'). \ + self.xml.get_object('show_status_msgs_in_roster_checkbutton'). \ set_active( st) # Display mood in roster st = gajim.config.get('show_mood_in_roster') - self.xml.get_widget('show_mood_in_roster_checkbutton'). \ + self.xml.get_object('show_mood_in_roster_checkbutton'). \ set_active(st) # Display activity in roster st = gajim.config.get('show_activity_in_roster') - self.xml.get_widget('show_activity_in_roster_checkbutton'). \ + self.xml.get_object('show_activity_in_roster_checkbutton'). \ set_active(st) # Display tunes in roster st = gajim.config.get('show_tunes_in_roster') - self.xml.get_widget('show_tunes_in_roster_checkbutton'). \ + self.xml.get_object('show_tunes_in_roster_checkbutton'). \ set_active(st) # Display location in roster st = gajim.config.get('show_location_in_roster') - self.xml.get_widget('show_location_in_roster_checkbutton'). \ + self.xml.get_object('show_location_in_roster_checkbutton'). \ set_active(st) # Sort contacts by show st = gajim.config.get('sort_by_show_in_roster') - self.xml.get_widget('sort_by_show_in_roster_checkbutton').set_active(st) + self.xml.get_object('sort_by_show_in_roster_checkbutton').set_active(st) st = gajim.config.get('sort_by_show_in_muc') - self.xml.get_widget('sort_by_show_in_muc_checkbutton').set_active(st) + self.xml.get_object('sort_by_show_in_muc_checkbutton').set_active(st) # emoticons - emoticons_combobox = self.xml.get_widget('emoticons_combobox') + emoticons_combobox = self.xml.get_object('emoticons_combobox') emoticons_list = os.listdir(os.path.join(gajim.DATA_DIR, 'emoticons')) # user themes if os.path.isdir(gajim.MY_EMOTS_PATH): @@ -185,22 +185,22 @@ class PreferencesWindow: # Compact View st = gajim.config.get('compact_view') - self.xml.get_widget('compact_view_checkbutton').set_active(st) + self.xml.get_object('compact_view_checkbutton').set_active(st) # Ignore XHTML st = gajim.config.get('ignore_incoming_xhtml') - self.xml.get_widget('xhtml_checkbutton').set_active(st) + self.xml.get_object('xhtml_checkbutton').set_active(st) # use speller if HAS_GTK_SPELL: st = gajim.config.get('use_speller') - self.xml.get_widget('speller_checkbutton').set_active(st) + self.xml.get_object('speller_checkbutton').set_active(st) else: - self.xml.get_widget('speller_checkbutton').set_sensitive(False) + self.xml.get_object('speller_checkbutton').set_sensitive(False) ### Style tab ### # Themes - theme_combobox = self.xml.get_widget('theme_combobox') + theme_combobox = self.xml.get_object('theme_combobox') cell = gtk.CellRendererText() theme_combobox.pack_start(cell, True) theme_combobox.add_attribute(cell, 'text', 0) @@ -245,7 +245,7 @@ class PreferencesWindow: # Use transports iconsets st = gajim.config.get('use_transports_iconsets') - self.xml.get_widget('transports_iconsets_checkbutton').set_active(st) + self.xml.get_object('transports_iconsets_checkbutton').set_active(st) # Color widgets self.draw_color_widgets() @@ -253,17 +253,17 @@ class PreferencesWindow: # Font for messages font = gajim.config.get('conversation_font') # try to set default font for the current desktop env - fontbutton = self.xml.get_widget('conversation_fontbutton') + fontbutton = self.xml.get_object('conversation_fontbutton') if font == '': fontbutton.set_sensitive(False) - self.xml.get_widget('default_chat_font').set_active(True) + self.xml.get_object('default_chat_font').set_active(True) else: fontbutton.set_font_name(font) ### Personal Events tab ### # outgoing send chat state notifications st = gajim.config.get('outgoing_chat_state_notifications') - combo = self.xml.get_widget('outgoing_chat_states_combobox') + combo = self.xml.get_object('outgoing_chat_states_combobox') if st == 'all': combo.set_active(0) elif st == 'composing_only': @@ -273,7 +273,7 @@ class PreferencesWindow: # displayed send chat state notifications st = gajim.config.get('displayed_chat_state_notifications') - combo = self.xml.get_widget('displayed_chat_states_combobox') + combo = self.xml.get_object('displayed_chat_states_combobox') if st == 'all': combo.set_active(0) elif st == 'composing_only': @@ -284,7 +284,7 @@ class PreferencesWindow: ### Notifications tab ### # On new event - on_event_combobox = self.xml.get_widget('on_event_combobox') + on_event_combobox = self.xml.get_object('on_event_combobox') if gajim.config.get('autopopup'): on_event_combobox.set_active(0) elif gajim.config.get('notify_on_new_message'): @@ -309,7 +309,7 @@ class PreferencesWindow: self.sound_dnd_checkbutton.set_active(st) # Systray - systray_combobox = self.xml.get_widget('systray_combobox') + systray_combobox = self.xml.get_object('systray_combobox') if gajim.config.get('trayicon') == 'never': systray_combobox.set_active(0) elif gajim.config.get('trayicon') == 'on_event': @@ -319,15 +319,15 @@ class PreferencesWindow: # sounds if gajim.config.get('sounds_on'): - self.xml.get_widget('play_sounds_checkbutton').set_active(True) + self.xml.get_object('play_sounds_checkbutton').set_active(True) else: - self.xml.get_widget('manage_sounds_button').set_sensitive(False) + self.xml.get_object('manage_sounds_button').set_sensitive(False) # Notify user of new gmail e-mail messages, # make checkbox sensitive if user has a gtalk account - frame_gmail = self.xml.get_widget('frame_gmail') - notify_gmail_checkbutton = self.xml.get_widget('notify_gmail_checkbutton') - notify_gmail_extra_checkbutton = self.xml.get_widget( + frame_gmail = self.xml.get_object('frame_gmail') + notify_gmail_checkbutton = self.xml.get_object('notify_gmail_checkbutton') + notify_gmail_extra_checkbutton = self.xml.get_object( 'notify_gmail_extra_checkbutton') for account in gajim.config.get_per('accounts'): @@ -371,18 +371,18 @@ class PreferencesWindow: from common import sleepy if not sleepy.SUPPORTED: - self.xml.get_widget('autoaway_table').set_sensitive(False) + self.xml.get_object('autoaway_table').set_sensitive(False) # ask_status when online / offline st = gajim.config.get('ask_online_status') - self.xml.get_widget('prompt_online_status_message_checkbutton').\ + self.xml.get_object('prompt_online_status_message_checkbutton').\ set_active(st) st = gajim.config.get('ask_offline_status') - self.xml.get_widget('prompt_offline_status_message_checkbutton').\ + self.xml.get_object('prompt_offline_status_message_checkbutton').\ set_active(st) # Default Status messages - self.default_msg_tree = self.xml.get_widget('default_msg_treeview') + self.default_msg_tree = self.xml.get_object('default_msg_treeview') col2 = self.default_msg_tree.rc_get_style().bg[gtk.STATE_ACTIVE].\ to_string() # (status, translated_status, message, enabled) @@ -414,7 +414,7 @@ class PreferencesWindow: self.fill_default_msg_treeview() # Status messages - self.msg_tree = self.xml.get_widget('msg_treeview') + self.msg_tree = self.xml.get_object('msg_treeview') model = gtk.ListStore(str, str) self.msg_tree.set_model(model) col = gtk.TreeViewColumn('name') @@ -425,12 +425,12 @@ class PreferencesWindow: renderer.connect('edited', self.on_msg_cell_edited) renderer.set_property('editable', True) self.fill_msg_treeview() - buf = self.xml.get_widget('msg_textview').get_buffer() + buf = self.xml.get_object('msg_textview').get_buffer() buf.connect('changed', self.on_msg_textview_changed) ### Audio / Video tab ### def create_av_combobox(opt_name, device_dict): - combobox = self.xml.get_widget(opt_name + '_combobox') + combobox = self.xml.get_object(opt_name + '_combobox') cell = gtk.CellRendererText() combobox.pack_start(cell, True) combobox.add_attribute(cell, 'text', 0) @@ -450,15 +450,15 @@ class PreferencesWindow: else: for opt_name in ('audio_input', 'audio_output', 'video_input', 'video_output'): - combobox = self.xml.get_widget(opt_name + '_combobox') + combobox = self.xml.get_object(opt_name + '_combobox') combobox.set_sensitive(False) # STUN - cb = self.xml.get_widget('stun_checkbutton') + cb = self.xml.get_object('stun_checkbutton') st = gajim.config.get('use_stun_server') cb.set_active(st) - entry = self.xml.get_widget('stun_server_entry') + entry = self.xml.get_object('stun_server_entry') entry.set_text(gajim.config.get('stun_server')) if not st: entry.set_sensitive(False) @@ -466,14 +466,14 @@ class PreferencesWindow: ### Advanced tab ### # open links with if os.name == 'nt': - applications_frame = self.xml.get_widget('applications_frame') + applications_frame = self.xml.get_object('applications_frame') applications_frame.set_no_show_all(True) applications_frame.hide() else: - self.applications_combobox = self.xml.get_widget( + self.applications_combobox = self.xml.get_object( 'applications_combobox') - self.xml.get_widget('custom_apps_frame').hide() - self.xml.get_widget('custom_apps_frame').set_no_show_all(True) + self.xml.get_object('custom_apps_frame').hide() + self.xml.get_object('custom_apps_frame').set_no_show_all(True) if gajim.config.get('autodetect_browser_mailer'): self.applications_combobox.set_active(0) @@ -487,21 +487,21 @@ class PreferencesWindow: self.applications_combobox.set_active(3) elif gajim.config.get('openwith') == 'custom': self.applications_combobox.set_active(4) - self.xml.get_widget('custom_apps_frame').show() + self.xml.get_object('custom_apps_frame').show() - self.xml.get_widget('custom_browser_entry').set_text( + self.xml.get_object('custom_browser_entry').set_text( gajim.config.get('custombrowser')) - self.xml.get_widget('custom_mail_client_entry').set_text( + self.xml.get_object('custom_mail_client_entry').set_text( gajim.config.get('custommailapp')) - self.xml.get_widget('custom_file_manager_entry').set_text( + self.xml.get_object('custom_file_manager_entry').set_text( gajim.config.get('custom_file_manager')) # log status changes of contacts st = gajim.config.get('log_contact_status_changes') - self.xml.get_widget('log_show_changes_checkbutton').set_active(st) + self.xml.get_object('log_show_changes_checkbutton').set_active(st) # log encrypted chat sessions - w = self.xml.get_widget('log_encrypted_chats_checkbutton') + w = self.xml.get_object('log_encrypted_chats_checkbutton') st = self.get_per_account_option('log_encrypted_sessions') if st == 'mixed': w.set_inconsistent(True) @@ -509,7 +509,7 @@ class PreferencesWindow: w.set_active(st) # send os info - w = self.xml.get_widget('send_os_info_checkbutton') + w = self.xml.get_object('send_os_info_checkbutton') st = self.get_per_account_option('send_os_info') if st == 'mixed': w.set_inconsistent(True) @@ -517,7 +517,7 @@ class PreferencesWindow: w.set_active(st) # send idle time - w = self.xml.get_widget('send_idle_time_checkbutton') + w = self.xml.get_object('send_idle_time_checkbutton') st = self.get_per_account_option('send_idle_time') if st == 'mixed': w.set_inconsistent(True) @@ -526,17 +526,17 @@ class PreferencesWindow: # check if gajm is default st = gajim.config.get('check_if_gajim_is_default') - self.xml.get_widget('check_default_client_checkbutton').set_active(st) + self.xml.get_object('check_default_client_checkbutton').set_active(st) # Ignore messages from unknown contacts - w = self.xml.get_widget('ignore_events_from_unknown_contacts_checkbutton') + w = self.xml.get_object('ignore_events_from_unknown_contacts_checkbutton') st = self.get_per_account_option('ignore_unknown_contacts') if st == 'mixed': w.set_inconsistent(True) else: w.set_active(st) - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) self.msg_tree.get_model().connect('row-changed', self.on_msg_treemodel_row_changed) @@ -743,7 +743,7 @@ class PreferencesWindow: gajim.interface.save_config() def update_theme_list(self): - theme_combobox = self.xml.get_widget('theme_combobox') + theme_combobox = self.xml.get_object('theme_combobox') model = gtk.ListStore(str) theme_combobox.set_model(model) i = 0 @@ -847,7 +847,7 @@ class PreferencesWindow: def on_play_sounds_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'sounds_on', - [self.xml.get_widget('manage_sounds_button')]) + [self.xml.get_object('manage_sounds_button')]) def on_manage_sounds_button_clicked(self, widget): if self.sounds_preferences is None: @@ -907,7 +907,7 @@ class PreferencesWindow: self.on_preference_widget_font_set(widget, 'conversation_font') def on_default_chat_font_toggled(self, widget): - font_widget = self.xml.get_widget('conversation_fontbutton') + font_widget = self.xml.get_object('conversation_fontbutton') if widget.get_active(): font_widget.set_sensitive(False) font_widget = None @@ -928,21 +928,21 @@ class PreferencesWindow: col = gajim.config.get(c) if col: if isinstance(col_to_widget[c], list): - self.xml.get_widget(col_to_widget[c][0]).set_color( + self.xml.get_object(col_to_widget[c][0]).set_color( gtk.gdk.color_parse(col)) - self.xml.get_widget(col_to_widget[c][0]).set_sensitive(True) - self.xml.get_widget(col_to_widget[c][1]).set_active(True) + self.xml.get_object(col_to_widget[c][0]).set_sensitive(True) + self.xml.get_object(col_to_widget[c][1]).set_active(True) else: - self.xml.get_widget(col_to_widget[c]).set_color( + self.xml.get_object(col_to_widget[c]).set_color( gtk.gdk.color_parse(col)) else: if isinstance(col_to_widget[c], list): - self.xml.get_widget(col_to_widget[c][0]).set_color( + self.xml.get_object(col_to_widget[c][0]).set_color( gtk.gdk.color_parse('#000000')) - self.xml.get_widget(col_to_widget[c][0]).set_sensitive(False) - self.xml.get_widget(col_to_widget[c][1]).set_active(False) + self.xml.get_object(col_to_widget[c][0]).set_sensitive(False) + self.xml.get_object(col_to_widget[c][1]).set_active(False) else: - self.xml.get_widget(col_to_widget[c]).set_color( + self.xml.get_object(col_to_widget[c]).set_color( gtk.gdk.color_parse('#000000')) def on_reset_colors_button_clicked(self, widget): @@ -964,7 +964,7 @@ class PreferencesWindow: Set color value in prefs and update the UI """ if state: - color = self.xml.get_widget(widget_name).get_color() + color = self.xml.get_object(widget_name).get_color() color_string = gtkgui_helpers.make_color_string(color) else: color_string = '' @@ -973,12 +973,12 @@ class PreferencesWindow: def on_incoming_msg_checkbutton_toggled(self, widget): state = widget.get_active() - self.xml.get_widget('incoming_msg_colorbutton').set_sensitive(state) + self.xml.get_object('incoming_msg_colorbutton').set_sensitive(state) self._set_color(state, 'incoming_msg_colorbutton', 'inmsgtxtcolor') def on_outgoing_msg_checkbutton_toggled(self, widget): state = widget.get_active() - self.xml.get_widget('outgoing_msg_colorbutton').set_sensitive(state) + self.xml.get_object('outgoing_msg_colorbutton').set_sensitive(state) self._set_color(state, 'outgoing_msg_colorbutton', 'outmsgtxtcolor') def on_auto_away_checkbutton_toggled(self, widget): @@ -1048,8 +1048,8 @@ class PreferencesWindow: gajim.config.set_per('defaultstatusmsg', status, 'message', message) def on_default_status_expander_activate(self, expander): - eventbox = self.xml.get_widget('default_status_eventbox') - vbox = self.xml.get_widget('status_vbox') + eventbox = self.xml.get_object('default_status_eventbox') + vbox = self.xml.get_object('status_vbox') vbox.set_child_packing(eventbox, not expander.get_expanded(), True, 0, gtk.PACK_START) @@ -1094,7 +1094,7 @@ class PreferencesWindow: def on_stun_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'use_stun_server', - [self.xml.get_widget('stun_server_entry')]) + [self.xml.get_object('stun_server_entry')]) def stun_server_entry_changed(self, widget): gajim.config.set('stun_server', widget.get_text().decode('utf-8')) @@ -1102,7 +1102,7 @@ class PreferencesWindow: def on_applications_combobox_changed(self, widget): gajim.config.set('autodetect_browser_mailer', False) if widget.get_active() == 4: - self.xml.get_widget('custom_apps_frame').show() + self.xml.get_object('custom_apps_frame').show() gajim.config.set('openwith', 'custom') else: if widget.get_active() == 0: @@ -1113,7 +1113,7 @@ class PreferencesWindow: gajim.config.set('openwith', 'kfmclient exec') elif widget.get_active() == 3: gajim.config.set('openwith', 'exo-open') - self.xml.get_widget('custom_apps_frame').hide() + self.xml.get_object('custom_apps_frame').hide() gajim.interface.save_config() def on_custom_browser_entry_changed(self, widget): @@ -1153,7 +1153,7 @@ class PreferencesWindow: self.on_checkbutton_toggled(widget, 'notify_on_new_gmail_email_extra') def fill_msg_treeview(self): - self.xml.get_widget('delete_msg_button').set_sensitive(False) + self.xml.get_object('delete_msg_button').set_sensitive(False) model = self.msg_tree.get_model() model.clear() preset_status = [] @@ -1177,8 +1177,8 @@ class PreferencesWindow: (model, iter_) = self.msg_tree.get_selection().get_selected() if not iter_: return - self.xml.get_widget('delete_msg_button').set_sensitive(True) - buf = self.xml.get_widget('msg_textview').get_buffer() + self.xml.get_object('delete_msg_button').set_sensitive(True) + buf = self.xml.get_object('msg_textview').get_buffer() msg = model[iter_][1] buf.set_text(msg) @@ -1192,16 +1192,16 @@ class PreferencesWindow: (model, iter_) = self.msg_tree.get_selection().get_selected() if not iter_: return - buf = self.xml.get_widget('msg_textview').get_buffer() + buf = self.xml.get_object('msg_textview').get_buffer() model.remove(iter_) buf.set_text('') - self.xml.get_widget('delete_msg_button').set_sensitive(False) + self.xml.get_object('delete_msg_button').set_sensitive(False) def on_msg_textview_changed(self, widget, data = None): (model, iter_) = self.msg_tree.get_selection().get_selected() if not iter_: return - buf = self.xml.get_widget('msg_textview').get_buffer() + buf = self.xml.get_object('msg_textview').get_buffer() first_iter, end_iter = buf.get_bounds() model.set_value(iter_, 1, buf.get_text(first_iter, end_iter)) @@ -1219,32 +1219,32 @@ class PreferencesWindow: #---------- ManageProxiesWindow class -------------# class ManageProxiesWindow: def __init__(self): - self.xml = gtkgui_helpers.get_glade('manage_proxies_window.glade') - self.window = self.xml.get_widget('manage_proxies_window') + self.xml = gtkgui_helpers.get_gtk_builder('manage_proxies_window.ui') + self.window = self.xml.get_object('manage_proxies_window') self.window.set_transient_for(gajim.interface.roster.window) - self.proxies_treeview = self.xml.get_widget('proxies_treeview') - self.proxyname_entry = self.xml.get_widget('proxyname_entry') - self.proxytype_combobox = self.xml.get_widget('proxytype_combobox') + self.proxies_treeview = self.xml.get_object('proxies_treeview') + self.proxyname_entry = self.xml.get_object('proxyname_entry') + self.proxytype_combobox = self.xml.get_object('proxytype_combobox') self.init_list() self.block_signal = False - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) self.window.show_all() # hide the BOSH fields by default self.show_bosh_fields() def show_bosh_fields(self, show=True): if show: - self.xml.get_widget('boshuri_entry').show() - self.xml.get_widget('boshuri_label').show() - self.xml.get_widget('boshuseproxy_checkbutton').show() + self.xml.get_object('boshuri_entry').show() + self.xml.get_object('boshuri_label').show() + self.xml.get_object('boshuseproxy_checkbutton').show() else: - cb = self.xml.get_widget('boshuseproxy_checkbutton') + cb = self.xml.get_object('boshuseproxy_checkbutton') cb.hide() cb.set_active(True) self.on_boshuseproxy_checkbutton_toggled(cb) - self.xml.get_widget('boshuri_entry').hide() - self.xml.get_widget('boshuri_label').hide() + self.xml.get_object('boshuri_entry').hide() + self.xml.get_object('boshuri_label').hide() def fill_proxies_treeview(self): @@ -1257,9 +1257,9 @@ class ManageProxiesWindow: model.set(iter_, 0, p) def init_list(self): - self.xml.get_widget('remove_proxy_button').set_sensitive(False) + self.xml.get_object('remove_proxy_button').set_sensitive(False) self.proxytype_combobox.set_sensitive(False) - self.xml.get_widget('proxy_table').set_sensitive(False) + self.xml.get_object('proxy_table').set_sensitive(False) model = gtk.ListStore(str) self.proxies_treeview.set_model(model) col = gtk.TreeViewColumn('Proxies') @@ -1268,7 +1268,7 @@ class ManageProxiesWindow: col.pack_start(renderer, True) col.set_attributes(renderer, text = 0) self.fill_proxies_treeview() - self.xml.get_widget('proxytype_combobox').set_active(0) + self.xml.get_object('proxytype_combobox').set_active(0) def on_manage_proxies_window_destroy(self, widget): if 'accounts' in gajim.interface.instances: @@ -1294,7 +1294,7 @@ class ManageProxiesWindow: proxy = model[iter_][0].decode('utf-8') model.remove(iter_) gajim.config.del_per('proxies', proxy) - self.xml.get_widget('remove_proxy_button').set_sensitive(False) + self.xml.get_object('remove_proxy_button').set_sensitive(False) self.block_signal = True self.on_proxies_treeview_cursor_changed(self.proxies_treeview) self.block_signal = False @@ -1308,8 +1308,8 @@ class ManageProxiesWindow: act = widget.get_active() proxy = self.proxyname_entry.get_text().decode('utf-8') gajim.config.set_per('proxies', proxy, 'useauth', act) - self.xml.get_widget('proxyuser_entry').set_sensitive(act) - self.xml.get_widget('proxypass_entry').set_sensitive(act) + self.xml.get_object('proxyuser_entry').set_sensitive(act) + self.xml.get_object('proxypass_entry').set_sensitive(act) def on_boshuseproxy_checkbutton_toggled(self, widget): if self.block_signal: @@ -1317,19 +1317,19 @@ class ManageProxiesWindow: act = widget.get_active() proxy = self.proxyname_entry.get_text().decode('utf-8') gajim.config.set_per('proxies', proxy, 'bosh_useproxy', act) - self.xml.get_widget('proxyhost_entry').set_sensitive(act) - self.xml.get_widget('proxyport_entry').set_sensitive(act) + self.xml.get_object('proxyhost_entry').set_sensitive(act) + self.xml.get_object('proxyport_entry').set_sensitive(act) def on_proxies_treeview_cursor_changed(self, widget): #FIXME: check if off proxy settings are correct (see # http://trac.gajim.org/changeset/1921#file2 line 1221 - proxyhost_entry = self.xml.get_widget('proxyhost_entry') - proxyport_entry = self.xml.get_widget('proxyport_entry') - proxyuser_entry = self.xml.get_widget('proxyuser_entry') - proxypass_entry = self.xml.get_widget('proxypass_entry') - boshuri_entry = self.xml.get_widget('boshuri_entry') - useauth_checkbutton = self.xml.get_widget('useauth_checkbutton') - boshuseproxy_checkbutton = self.xml.get_widget('boshuseproxy_checkbutton') + proxyhost_entry = self.xml.get_object('proxyhost_entry') + proxyport_entry = self.xml.get_object('proxyport_entry') + proxyuser_entry = self.xml.get_object('proxyuser_entry') + proxypass_entry = self.xml.get_object('proxypass_entry') + boshuri_entry = self.xml.get_object('boshuri_entry') + useauth_checkbutton = self.xml.get_object('useauth_checkbutton') + boshuseproxy_checkbutton = self.xml.get_object('boshuseproxy_checkbutton') self.block_signal = True proxyhost_entry.set_text('') proxyport_entry.set_text('') @@ -1345,30 +1345,30 @@ class ManageProxiesWindow: (model, iter_) = widget.get_selection().get_selected() if not iter_: - self.xml.get_widget('proxyname_entry').set_text('') - self.xml.get_widget('proxytype_combobox').set_sensitive(False) - self.xml.get_widget('proxy_table').set_sensitive(False) + self.xml.get_object('proxyname_entry').set_text('') + self.xml.get_object('proxytype_combobox').set_sensitive(False) + self.xml.get_object('proxy_table').set_sensitive(False) self.block_signal = False return proxy = model[iter_][0] - self.xml.get_widget('proxyname_entry').set_text(proxy) + self.xml.get_object('proxyname_entry').set_text(proxy) if proxy == _('None'): # special proxy None self.show_bosh_fields(False) self.proxyname_entry.set_editable(False) - self.xml.get_widget('remove_proxy_button').set_sensitive(False) - self.xml.get_widget('proxytype_combobox').set_sensitive(False) - self.xml.get_widget('proxy_table').set_sensitive(False) + self.xml.get_object('remove_proxy_button').set_sensitive(False) + self.xml.get_object('proxytype_combobox').set_sensitive(False) + self.xml.get_object('proxy_table').set_sensitive(False) else: proxytype = gajim.config.get_per('proxies', proxy, 'type') self.show_bosh_fields(proxytype=='bosh') self.proxyname_entry.set_editable(True) - self.xml.get_widget('remove_proxy_button').set_sensitive(True) - self.xml.get_widget('proxytype_combobox').set_sensitive(True) - self.xml.get_widget('proxy_table').set_sensitive(True) + self.xml.get_object('remove_proxy_button').set_sensitive(True) + self.xml.get_object('proxytype_combobox').set_sensitive(True) + self.xml.get_object('proxy_table').set_sensitive(True) proxyhost_entry.set_text(gajim.config.get_per('proxies', proxy, 'host')) proxyport_entry.set_text(unicode(gajim.config.get_per('proxies', @@ -1470,16 +1470,16 @@ class AccountsWindow: self.window.destroy() def __init__(self): - self.xml = gtkgui_helpers.get_glade('accounts_window.glade') - self.window = self.xml.get_widget('accounts_window') + self.xml = gtkgui_helpers.get_gtk_builder('accounts_window.ui') + self.window = self.xml.get_object('accounts_window') self.window.set_transient_for(gajim.interface.roster.window) - self.accounts_treeview = self.xml.get_widget('accounts_treeview') - self.remove_button = self.xml.get_widget('remove_button') - self.rename_button = self.xml.get_widget('rename_button') + self.accounts_treeview = self.xml.get_object('accounts_treeview') + self.remove_button = self.xml.get_object('remove_button') + self.rename_button = self.xml.get_object('rename_button') path_to_kbd_input_img = gtkgui_helpers.get_icon_path('gajim-kbd_input') - img = self.xml.get_widget('rename_image') + img = self.xml.get_object('rename_image') img.set_from_file(path_to_kbd_input_img) - self.notebook = self.xml.get_widget('notebook') + self.notebook = self.xml.get_object('notebook') # Name model = gtk.ListStore(str) self.accounts_treeview.set_model(model) @@ -1495,13 +1495,13 @@ class AccountsWindow: self.resend_presence = False self.update_proxy_list() - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) self.init_accounts() self.window.show_all() # Merge accounts st = gajim.config.get('mergeaccounts') - checkbutton = self.xml.get_widget('merge_checkbutton') + checkbutton = self.xml.get_object('merge_checkbutton') checkbutton.set_active(st) # prevent roster redraws by connecting the signal after button state is set checkbutton.connect('toggled', self.on_merge_checkbutton_toggled) @@ -1643,7 +1643,7 @@ class AccountsWindow: if not our_proxy: our_proxy = _('None') - proxy_combobox = self.xml.get_widget('proxies_combobox1') + proxy_combobox = self.xml.get_object('proxies_combobox1') model = gtk.ListStore(str) proxy_combobox.set_model(model) l = gajim.config.get_per('proxies') @@ -1671,31 +1671,31 @@ class AccountsWindow: def init_zeroconf_account(self): active = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'active') - self.xml.get_widget('enable_zeroconf_checkbutton2').set_active(active) + self.xml.get_object('enable_zeroconf_checkbutton2').set_active(active) if not gajim.HAVE_ZEROCONF: - self.xml.get_widget('enable_zeroconf_checkbutton2').set_sensitive( + self.xml.get_object('enable_zeroconf_checkbutton2').set_sensitive( False) - self.xml.get_widget('zeroconf_notebook').set_sensitive(active) + self.xml.get_object('zeroconf_notebook').set_sensitive(active) # General tab st = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'autoconnect') - self.xml.get_widget('autoconnect_checkbutton2').set_active(st) + self.xml.get_object('autoconnect_checkbutton2').set_active(st) list_no_log_for = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'no_log_for').split() if gajim.ZEROCONF_ACC_NAME in list_no_log_for: - self.xml.get_widget('log_history_checkbutton2').set_active(0) + self.xml.get_object('log_history_checkbutton2').set_active(0) else: - self.xml.get_widget('log_history_checkbutton2').set_active(1) + self.xml.get_object('log_history_checkbutton2').set_active(1) st = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'sync_with_global_status') - self.xml.get_widget('sync_with_global_status_checkbutton2').set_active(st) + self.xml.get_object('sync_with_global_status_checkbutton2').set_active(st) st = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'use_custom_host') - self.xml.get_widget('custom_port_checkbutton2').set_active(st) - self.xml.get_widget('custom_port_entry2').set_sensitive(st) + self.xml.get_object('custom_port_checkbutton2').set_active(st) + self.xml.get_object('custom_port_entry2').set_sensitive(st) st = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'custom_port') @@ -1703,22 +1703,22 @@ class AccountsWindow: gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME, 'custom_port', '5298') st = '5298' - self.xml.get_widget('custom_port_entry2').set_text(str(st)) + self.xml.get_object('custom_port_entry2').set_text(str(st)) # Personal tab - gpg_key_label = self.xml.get_widget('gpg_key_label2') + gpg_key_label = self.xml.get_object('gpg_key_label2') if gajim.ZEROCONF_ACC_NAME in gajim.connections and \ gajim.connections[gajim.ZEROCONF_ACC_NAME].gpg: - self.xml.get_widget('gpg_choose_button2').set_sensitive(True) + self.xml.get_object('gpg_choose_button2').set_sensitive(True) self.init_account_gpg() else: gpg_key_label.set_text(_('OpenPGP is not usable on this computer')) - self.xml.get_widget('gpg_choose_button2').set_sensitive(False) + self.xml.get_object('gpg_choose_button2').set_sensitive(False) for opt in ('first_name', 'last_name', 'jabber_id', 'email'): st = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'zeroconf_' + opt) - self.xml.get_widget(opt + '_entry2').set_text(st) + self.xml.get_object(opt + '_entry2').set_text(st) def init_account_gpg(self): account = self.current_account @@ -1731,9 +1731,9 @@ class AccountsWindow: else: widget_name_add = '1' - gpg_key_label = self.xml.get_widget('gpg_key_label' + widget_name_add) - gpg_name_label = self.xml.get_widget('gpg_name_label' + widget_name_add) - use_gpg_agent_checkbutton = self.xml.get_widget( + gpg_key_label = self.xml.get_object('gpg_key_label' + widget_name_add) + gpg_name_label = self.xml.get_object('gpg_name_label' + widget_name_add) + use_gpg_agent_checkbutton = self.xml.get_object( 'use_gpg_agent_checkbutton' + widget_name_add) if not keyid: @@ -1751,26 +1751,26 @@ class AccountsWindow: account = self.current_account self.ignore_events = True active = gajim.config.get_per('accounts', account, 'active') - self.xml.get_widget('enable_checkbutton1').set_active(active) - self.xml.get_widget('normal_notebook1').set_sensitive(active) + self.xml.get_object('enable_checkbutton1').set_active(active) + self.xml.get_object('normal_notebook1').set_sensitive(active) if gajim.config.get_per('accounts', account, 'anonymous_auth'): - self.xml.get_widget('anonymous_checkbutton1').set_active(True) - self.xml.get_widget('jid_label1').set_text(_('Server:')) - save_password = self.xml.get_widget('save_password_checkbutton1') + self.xml.get_object('anonymous_checkbutton1').set_active(True) + self.xml.get_object('jid_label1').set_text(_('Server:')) + save_password = self.xml.get_object('save_password_checkbutton1') save_password.set_active(False) save_password.set_sensitive(False) - password_entry = self.xml.get_widget('password_entry1') + password_entry = self.xml.get_object('password_entry1') password_entry.set_text('') password_entry.set_sensitive(False) jid = gajim.config.get_per('accounts', account, 'hostname') else: - self.xml.get_widget('anonymous_checkbutton1').set_active(False) - self.xml.get_widget('jid_label1').set_text(_('Jabber ID:')) + self.xml.get_object('anonymous_checkbutton1').set_active(False) + self.xml.get_object('jid_label1').set_text(_('Jabber ID:')) savepass = gajim.config.get_per('accounts', account, 'savepass') - save_password = self.xml.get_widget('save_password_checkbutton1') + save_password = self.xml.get_object('save_password_checkbutton1') save_password.set_sensitive(True) save_password.set_active(savepass) - password_entry = self.xml.get_widget('password_entry1') + password_entry = self.xml.get_object('password_entry1') if savepass: passstr = passwords.get_password(account) or '' password_entry.set_sensitive(True) @@ -1781,19 +1781,19 @@ class AccountsWindow: jid = gajim.config.get_per('accounts', account, 'name') \ + '@' + gajim.config.get_per('accounts', account, 'hostname') - self.xml.get_widget('jid_entry1').set_text(jid) + self.xml.get_object('jid_entry1').set_text(jid) self.ignore_events = False def init_normal_account(self): account = self.current_account # Account tab self.draw_normal_jid() - self.xml.get_widget('resource_entry1').set_text(gajim.config.get_per( + self.xml.get_object('resource_entry1').set_text(gajim.config.get_per( 'accounts', account, 'resource')) - self.xml.get_widget('adjust_priority_with_status_checkbutton1').\ + self.xml.get_object('adjust_priority_with_status_checkbutton1').\ set_active(gajim.config.get_per('accounts', account, 'adjust_priority_with_status')) - spinbutton = self.xml.get_widget('priority_spinbutton1') + spinbutton = self.xml.get_object('priority_spinbutton1') if gajim.config.get('enable_negative_priority'): spinbutton.set_range(-128, 127) else: @@ -1804,58 +1804,58 @@ class AccountsWindow: # Connection tab use_env_http_proxy = gajim.config.get_per('accounts', account, 'use_env_http_proxy') - self.xml.get_widget('use_env_http_proxy_checkbutton1').set_active( + self.xml.get_object('use_env_http_proxy_checkbutton1').set_active( use_env_http_proxy) - self.xml.get_widget('proxy_hbox1').set_sensitive(not use_env_http_proxy) + self.xml.get_object('proxy_hbox1').set_sensitive(not use_env_http_proxy) warn_when_insecure_ssl = gajim.config.get_per('accounts', account, 'warn_when_insecure_ssl_connection') - self.xml.get_widget('warn_when_insecure_connection_checkbutton1').\ + self.xml.get_object('warn_when_insecure_connection_checkbutton1').\ set_active(warn_when_insecure_ssl) - self.xml.get_widget('send_keepalive_checkbutton1').set_active( + self.xml.get_object('send_keepalive_checkbutton1').set_active( gajim.config.get_per('accounts', account, 'keep_alives_enabled')) use_custom_host = gajim.config.get_per('accounts', account, 'use_custom_host') - self.xml.get_widget('custom_host_port_checkbutton1').set_active( + self.xml.get_object('custom_host_port_checkbutton1').set_active( use_custom_host) custom_host = gajim.config.get_per('accounts', account, 'custom_host') if not custom_host: custom_host = gajim.config.get_per('accounts', account, 'hostname') gajim.config.set_per('accounts', account, 'custom_host', custom_host) - self.xml.get_widget('custom_host_entry1').set_text(custom_host) + self.xml.get_object('custom_host_entry1').set_text(custom_host) custom_port = gajim.config.get_per('accounts', account, 'custom_port') if not custom_port: custom_port = 5222 gajim.config.set_per('accounts', account, 'custom_port', custom_port) - self.xml.get_widget('custom_port_entry1').set_text(unicode(custom_port)) + self.xml.get_object('custom_port_entry1').set_text(unicode(custom_port)) # Personal tab - gpg_key_label = self.xml.get_widget('gpg_key_label1') + gpg_key_label = self.xml.get_object('gpg_key_label1') if gajim.HAVE_GPG: - self.xml.get_widget('gpg_choose_button1').set_sensitive(True) + self.xml.get_object('gpg_choose_button1').set_sensitive(True) self.init_account_gpg() else: gpg_key_label.set_text(_('OpenPGP is not usable on this computer')) - self.xml.get_widget('gpg_choose_button1').set_sensitive(False) + self.xml.get_object('gpg_choose_button1').set_sensitive(False) # General tab - self.xml.get_widget('autoconnect_checkbutton1').set_active(gajim.config.\ + self.xml.get_object('autoconnect_checkbutton1').set_active(gajim.config.\ get_per('accounts', account, 'autoconnect')) - self.xml.get_widget('autoreconnect_checkbutton1').set_active(gajim. + self.xml.get_object('autoreconnect_checkbutton1').set_active(gajim. config.get_per('accounts', account, 'autoreconnect')) list_no_log_for = gajim.config.get_per('accounts', account, 'no_log_for').split() if account in list_no_log_for: - self.xml.get_widget('log_history_checkbutton1').set_active(False) + self.xml.get_object('log_history_checkbutton1').set_active(False) else: - self.xml.get_widget('log_history_checkbutton1').set_active(True) + self.xml.get_object('log_history_checkbutton1').set_active(True) - self.xml.get_widget('sync_with_global_status_checkbutton1').set_active( + self.xml.get_object('sync_with_global_status_checkbutton1').set_active( gajim.config.get_per('accounts', account, 'sync_with_global_status')) - self.xml.get_widget('use_ft_proxies_checkbutton1').set_active( + self.xml.get_object('use_ft_proxies_checkbutton1').set_active( gajim.config.get_per('accounts', account, 'use_ft_proxies')) def on_add_button_clicked(self, widget): @@ -2082,7 +2082,7 @@ class AccountsWindow: if self.ignore_events: return active = widget.get_active() - password_entry = self.xml.get_widget('password_entry1') + password_entry = self.xml.get_object('password_entry1') password_entry.set_sensitive(active) gajim.config.set_per('accounts', self.current_account, 'savepass', active) if active: @@ -2094,7 +2094,7 @@ class AccountsWindow: def on_resource_entry1_focus_out_event(self, widget, event): if self.ignore_events: return - resource = self.xml.get_widget('resource_entry1').get_text().decode( + resource = self.xml.get_object('resource_entry1').get_text().decode( 'utf-8') try: resource = helpers.parse_resource(resource) @@ -2112,7 +2112,7 @@ class AccountsWindow: resource) def on_adjust_priority_with_status_checkbutton1_toggled(self, widget): - self.xml.get_widget('priority_spinbutton1').set_sensitive( + self.xml.get_object('priority_spinbutton1').set_sensitive( not widget.get_active()) self.on_checkbutton_toggled(widget, 'adjust_priority_with_status', account = self.current_account) @@ -2137,8 +2137,8 @@ class AccountsWindow: if new_password is not None: gajim.connections[self.current_account].change_password( new_password) - if self.xml.get_widget('save_password_checkbutton1').get_active(): - self.xml.get_widget('password_entry1').set_text(new_password) + if self.xml.get_object('save_password_checkbutton1').get_active(): + self.xml.get_object('password_entry1').set_text(new_password) try: dialogs.ChangePasswordDialog(self.current_account, on_changed) @@ -2189,7 +2189,7 @@ class AccountsWindow: return self.on_checkbutton_toggled(widget, 'use_env_http_proxy', account=self.current_account) - hbox = self.xml.get_widget('proxy_hbox1') + hbox = self.xml.get_object('proxy_hbox1') hbox.set_sensitive(not widget.get_active()) def on_proxies_combobox1_changed(self, widget): @@ -2231,7 +2231,7 @@ class AccountsWindow: self.on_checkbutton_toggled(widget, 'use_custom_host', account=self.current_account) active = widget.get_active() - self.xml.get_widget('custom_host_port_hbox1').set_sensitive(active) + self.xml.get_object('custom_host_port_hbox1').set_sensitive(active) def on_custom_host_entry1_changed(self, widget): if self.ignore_events: @@ -2283,9 +2283,9 @@ class AccountsWindow: wiget_name_ext = '2' else: wiget_name_ext = '1' - gpg_key_label = self.xml.get_widget('gpg_key_label' + wiget_name_ext) - gpg_name_label = self.xml.get_widget('gpg_name_label' + wiget_name_ext) - use_gpg_agent_checkbutton = self.xml.get_widget( + gpg_key_label = self.xml.get_object('gpg_key_label' + wiget_name_ext) + gpg_name_label = self.xml.get_object('gpg_name_label' + wiget_name_ext) + use_gpg_agent_checkbutton = self.xml.get_object( 'use_gpg_agent_checkbutton' + wiget_name_ext) if keyID[0] == _('None'): gpg_key_label.set_text(_('No key selected')) @@ -2390,11 +2390,11 @@ class AccountsWindow: gajim.connections[account] = connection_zeroconf.ConnectionZeroconf( account) if gajim.connections[account].gpg: - self.xml.get_widget('gpg_choose_button2').set_sensitive(True) + self.xml.get_object('gpg_choose_button2').set_sensitive(True) else: gajim.connections[account] = common.connection.Connection(account) if gajim.connections[account].gpg: - self.xml.get_widget('gpg_choose_button1').set_sensitive(True) + self.xml.get_object('gpg_choose_button1').set_sensitive(True) self.init_account_gpg() # update variables gajim.interface.instances[account] = {'infos': {}, @@ -2437,7 +2437,7 @@ class AccountsWindow: return if gajim.connections[self.current_account].connected > 0: self.ignore_events = True - self.xml.get_widget('enable_zeroconf_checkbutton2').set_active(True) + self.xml.get_object('enable_zeroconf_checkbutton2').set_active(True) self.ignore_events = False dialogs.ErrorDialog( _('You are currently connected to the server'), @@ -2453,13 +2453,13 @@ class AccountsWindow: if gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'active') \ and not widget.get_active(): - self.xml.get_widget('zeroconf_notebook').set_sensitive(False) + self.xml.get_object('zeroconf_notebook').set_sensitive(False) # disable self._disable_account(gajim.ZEROCONF_ACC_NAME) elif not gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'active') and widget.get_active(): - self.xml.get_widget('zeroconf_notebook').set_sensitive(True) + self.xml.get_object('zeroconf_notebook').set_sensitive(True) # enable (will create new account if not present) self._enable_account(gajim.ZEROCONF_ACC_NAME) @@ -2473,7 +2473,7 @@ class AccountsWindow: gajim.connections[self.current_account].connected > 0: # connecting or connected self.ignore_events = True - self.xml.get_widget('enable_checkbutton1').set_active(True) + self.xml.get_object('enable_checkbutton1').set_active(True) self.ignore_events = False dialogs.ErrorDialog( _('You are currently connected to the server'), @@ -2488,15 +2488,15 @@ class AccountsWindow: self._disable_account(self.current_account) self.on_checkbutton_toggled(widget, 'active', account=self.current_account, change_sensitivity_widgets=[ - self.xml.get_widget('normal_notebook1')]) + self.xml.get_object('normal_notebook1')]) def on_custom_port_checkbutton2_toggled(self, widget): - self.xml.get_widget('custom_port_entry2').set_sensitive( + self.xml.get_object('custom_port_entry2').set_sensitive( widget.get_active()) self.on_checkbutton_toggled(widget, 'use_custom_host', account = self.current_account) if not widget.get_active(): - self.xml.get_widget('custom_port_entry2').set_text('5298') + self.xml.get_object('custom_port_entry2').set_text('5298') def on_first_name_entry2_changed(self, widget): if self.ignore_events: @@ -2592,15 +2592,15 @@ class ServiceRegistrationWindow: self.service = service self.account = account self.is_form = is_form - self.xml = gtkgui_helpers.get_glade('service_registration_window.glade') - self.window = self.xml.get_widget('service_registration_window') + self.xml = gtkgui_helpers.get_gtk_builder('service_registration_window.ui') + self.window = self.xml.get_object('service_registration_window') self.window.set_transient_for(gajim.interface.roster.window) if self.is_form: dataform = dataforms.ExtendForm(node = infos) self.data_form_widget = dataforms_widget.DataFormWidget(dataform) if self.data_form_widget.title: self.window.set_title('%s - Gajim' % self.data_form_widget.title) - table = self.xml.get_widget('table') + table = self.xml.get_object('table') table.attach(self.data_form_widget, 0, 2, 0, 1) else: if 'registered' in infos: @@ -2608,10 +2608,10 @@ class ServiceRegistrationWindow: else: self.window.set_title(_('Register to %s') % service) self.data_form_widget = FakeDataForm(infos) - table = self.xml.get_widget('table') + table = self.xml.get_object('table') table.attach(self.data_form_widget, 0, 2, 0, 1) - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) self.window.show_all() def on_cancel_button_clicked(self, widget): @@ -2647,24 +2647,24 @@ class GroupchatConfigWindow: 'owner': _('Owner List'), 'admin':_('Administrator List')} - self.xml = gtkgui_helpers.get_glade('data_form_window.glade', 'data_form_window') - self.window = self.xml.get_widget('data_form_window') + self.xml = gtkgui_helpers.get_gtk_builder('data_form_window.ui', 'data_form_window') + self.window = self.xml.get_object('data_form_window') self.window.set_transient_for(gajim.interface.roster.window) if self.form: - config_vbox = self.xml.get_widget('config_vbox') + config_vbox = self.xml.get_object('config_vbox') dataform = dataforms.ExtendForm(node = self.form) self.data_form_widget = dataforms_widget.DataFormWidget(dataform) # hide scrollbar of this data_form_widget, we already have in this # widget - sw = self.data_form_widget.xml.get_widget('single_form_scrolledwindow') + sw = self.data_form_widget.xml.get_object('single_form_scrolledwindow') sw.set_policy(gtk.POLICY_NEVER, gtk.POLICY_NEVER) self.data_form_widget.show() config_vbox.pack_start(self.data_form_widget) # Draw the edit affiliation list things - add_on_vbox = self.xml.get_widget('add_on_vbox') + add_on_vbox = self.xml.get_object('add_on_vbox') for affiliation in self.affiliation_labels.keys(): self.start_users_dict[affiliation] = {} @@ -2730,7 +2730,7 @@ class GroupchatConfigWindow: gajim.connections[self.account].get_affiliation_list(self.room_jid, affiliation) - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) self.window.show_all() def on_cancel_button_clicked(self, widget): @@ -2852,13 +2852,13 @@ class RemoveAccountWindow: def __init__(self, account): self.account = account - xml = gtkgui_helpers.get_glade('remove_account_window.glade') - self.window = xml.get_widget('remove_account_window') + xml = gtkgui_helpers.get_gtk_builder('remove_account_window.ui') + self.window = xml.get_object('remove_account_window') self.window.set_transient_for(gajim.interface.roster.window) - self.remove_and_unregister_radiobutton = xml.get_widget( + self.remove_and_unregister_radiobutton = xml.get_object( 'remove_and_unregister_radiobutton') self.window.set_title(_('Removing %s account') % self.account) - xml.signal_autoconnect(self) + xml.connect_signals(self) self.window.show_all() def on_remove_button_clicked(self, widget): @@ -2939,8 +2939,8 @@ class RemoveAccountWindow: #---------- ManageBookmarksWindow class -------------# class ManageBookmarksWindow: def __init__(self): - self.xml = gtkgui_helpers.get_glade('manage_bookmarks_window.glade') - self.window = self.xml.get_widget('manage_bookmarks_window') + self.xml = gtkgui_helpers.get_gtk_builder('manage_bookmarks_window.ui') + self.window = self.xml.get_object('manage_bookmarks_window') self.window.set_transient_for(gajim.interface.roster.window) # Account-JID, RoomName, Room-JID, Autojoin, Minimize, Passowrd, Nick, @@ -2986,7 +2986,7 @@ class ManageBookmarksWindow: bookmark['nick'], print_status ]) - self.print_status_combobox = self.xml.get_widget('print_status_combobox') + self.print_status_combobox = self.xml.get_object('print_status_combobox') model = gtk.ListStore(str, str) self.option_list = {'': _('Default'), 'all': Q_('?print_status:All'), @@ -2999,7 +2999,7 @@ class ManageBookmarksWindow: self.print_status_combobox.set_model(model) self.print_status_combobox.set_active(1) - self.view = self.xml.get_widget('bookmarks_treeview') + self.view = self.xml.get_object('bookmarks_treeview') self.view.set_model(self.treestore) self.view.expand_all() @@ -3011,20 +3011,20 @@ class ManageBookmarksWindow: self.selection.connect('changed', self.bookmark_selected) #Prepare input fields - self.title_entry = self.xml.get_widget('title_entry') + self.title_entry = self.xml.get_object('title_entry') self.title_entry.connect('changed', self.on_title_entry_changed) - self.nick_entry = self.xml.get_widget('nick_entry') + self.nick_entry = self.xml.get_object('nick_entry') self.nick_entry.connect('changed', self.on_nick_entry_changed) - self.server_entry = self.xml.get_widget('server_entry') + self.server_entry = self.xml.get_object('server_entry') self.server_entry.connect('changed', self.on_server_entry_changed) - self.room_entry = self.xml.get_widget('room_entry') + self.room_entry = self.xml.get_object('room_entry') self.room_entry.connect('changed', self.on_room_entry_changed) - self.pass_entry = self.xml.get_widget('pass_entry') + self.pass_entry = self.xml.get_object('pass_entry') self.pass_entry.connect('changed', self.on_pass_entry_changed) - self.autojoin_checkbutton = self.xml.get_widget('autojoin_checkbutton') - self.minimize_checkbutton = self.xml.get_widget('minimize_checkbutton') + self.autojoin_checkbutton = self.xml.get_object('autojoin_checkbutton') + self.minimize_checkbutton = self.xml.get_object('minimize_checkbutton') - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) self.window.show_all() def on_bookmarks_treeview_button_press_event(self, widget, event): @@ -3282,20 +3282,20 @@ class ManageBookmarksWindow: class AccountCreationWizardWindow: def __init__(self): - self.xml = gtkgui_helpers.get_glade( - 'account_creation_wizard_window.glade') - self.window = self.xml.get_widget('account_creation_wizard_window') + self.xml = gtkgui_helpers.get_gtk_builder( + 'account_creation_wizard_window.ui') + self.window = self.xml.get_object('account_creation_wizard_window') self.window.set_transient_for(gajim.interface.roster.window) completion = gtk.EntryCompletion() # Connect events from comboboxentry.child - server_comboboxentry = self.xml.get_widget('server_comboboxentry') + server_comboboxentry = self.xml.get_object('server_comboboxentry') entry = server_comboboxentry.child entry.connect('key_press_event', self.on_server_comboboxentry_key_press_event, server_comboboxentry) entry.set_completion(completion) # Do the same for the other server comboboxentry - server_comboboxentry1 = self.xml.get_widget('server_comboboxentry1') + server_comboboxentry1 = self.xml.get_object('server_comboboxentry1') entry = server_comboboxentry1.child entry.connect('key_press_event', self.on_server_comboboxentry_key_press_event, server_comboboxentry1) @@ -3321,24 +3321,24 @@ class AccountCreationWizardWindow: server_comboboxentry1.set_text_column(0) # Generic widgets - self.notebook = self.xml.get_widget('notebook') - self.cancel_button = self.xml.get_widget('cancel_button') - self.back_button = self.xml.get_widget('back_button') - self.forward_button = self.xml.get_widget('forward_button') - self.finish_button = self.xml.get_widget('finish_button') - self.advanced_button = self.xml.get_widget('advanced_button') - self.finish_label = self.xml.get_widget('finish_label') - self.go_online_checkbutton = self.xml.get_widget( + self.notebook = self.xml.get_object('notebook') + self.cancel_button = self.xml.get_object('cancel_button') + self.back_button = self.xml.get_object('back_button') + self.forward_button = self.xml.get_object('forward_button') + self.finish_button = self.xml.get_object('finish_button') + self.advanced_button = self.xml.get_object('advanced_button') + self.finish_label = self.xml.get_object('finish_label') + self.go_online_checkbutton = self.xml.get_object( 'go_online_checkbutton') - self.show_vcard_checkbutton = self.xml.get_widget( + self.show_vcard_checkbutton = self.xml.get_object( 'show_vcard_checkbutton') - self.progressbar = self.xml.get_widget('progressbar') + self.progressbar = self.xml.get_object('progressbar') # some vars self.update_progressbar_timeout_id = None self.notebook.set_current_page(0) - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) self.window.show_all() gajim.ged.register_event_handler('NEW_ACC_CONNECTED', ged.CORE, self.new_acc_connected) @@ -3370,7 +3370,7 @@ class AccountCreationWizardWindow: 'http://www.jabber.org/network/oldnetwork.shtml') def on_save_password_checkbutton_toggled(self, widget): - self.xml.get_widget('password_entry').grab_focus() + self.xml.get_object('password_entry').grab_focus() def on_cancel_button_clicked(self, widget): self.window.destroy() @@ -3381,13 +3381,13 @@ class AccountCreationWizardWindow: self.notebook.set_current_page(0) self.back_button.set_sensitive(False) elif cur_page == 3: - self.xml.get_widget('form_vbox').remove(self.data_form_widget) + self.xml.get_object('form_vbox').remove(self.data_form_widget) self.notebook.set_current_page(2) # show server page elif cur_page == 4: if self.account in gajim.connections: del gajim.connections[self.account] self.notebook.set_current_page(2) - self.xml.get_widget('form_vbox').remove(self.data_form_widget) + self.xml.get_object('form_vbox').remove(self.data_form_widget) elif cur_page == 6: # finish page self.forward_button.show() if self.modify: @@ -3397,9 +3397,9 @@ class AccountCreationWizardWindow: def on_anonymous_checkbutton1_toggled(self, widget): active = widget.get_active() - self.xml.get_widget('username_entry').set_sensitive(not active) - self.xml.get_widget('password_entry').set_sensitive(not active) - self.xml.get_widget('save_password_checkbutton').set_sensitive(not active) + self.xml.get_object('username_entry').set_sensitive(not active) + self.xml.get_object('password_entry').set_sensitive(not active) + self.xml.get_object('save_password_checkbutton').set_sensitive(not active) def show_finish_page(self): self.cancel_button.hide() @@ -3422,7 +3422,7 @@ class AccountCreationWizardWindow: self.finish_button.set_property('has-default', True) self.advanced_button.show() self.go_online_checkbutton.show() - img = self.xml.get_widget('finish_image') + img = self.xml.get_object('finish_image') if self.modify: img.set_from_stock(gtk.STOCK_APPLY, gtk.ICON_SIZE_DIALOG) else: @@ -3435,7 +3435,7 @@ class AccountCreationWizardWindow: cur_page = self.notebook.get_current_page() if cur_page == 0: - widget = self.xml.get_widget('use_existing_account_radiobutton') + widget = self.xml.get_object('use_existing_account_radiobutton') if widget.get_active(): self.modify = True self.notebook.set_current_page(1) @@ -3447,8 +3447,8 @@ class AccountCreationWizardWindow: elif cur_page == 1: # We are adding an existing account - anonymous = self.xml.get_widget('anonymous_checkbutton1').get_active() - username = self.xml.get_widget('username_entry').get_text().decode( + anonymous = self.xml.get_object('anonymous_checkbutton1').get_active() + username = self.xml.get_object('username_entry').get_text().decode( 'utf-8').strip() if not username and not anonymous: pritext = _('Invalid username') @@ -3456,11 +3456,11 @@ class AccountCreationWizardWindow: 'You must provide a username to configure this account.') dialogs.ErrorDialog(pritext, sectext) return - server = self.xml.get_widget('server_comboboxentry').child.get_text().\ + server = self.xml.get_object('server_comboboxentry').child.get_text().\ decode('utf-8').strip() - savepass = self.xml.get_widget('save_password_checkbutton').\ + savepass = self.xml.get_object('save_password_checkbutton').\ get_active() - password = self.xml.get_widget('password_entry').get_text().decode( + password = self.xml.get_object('password_entry').get_text().decode( 'utf-8') jid = username + '@' + server @@ -3479,14 +3479,14 @@ class AccountCreationWizardWindow: i += 1 username, server = gajim.get_name_and_server_from_jid(jid) - if self.xml.get_widget('anonymous_checkbutton1').get_active(): + if self.xml.get_object('anonymous_checkbutton1').get_active(): self.save_account('', server, False, '', anonymous=True) else: self.save_account(username, server, savepass, password) self.show_finish_page() elif cur_page == 2: # We are creating a new account - server = self.xml.get_widget('server_comboboxentry1').child.get_text()\ + server = self.xml.get_object('server_comboboxentry1').child.get_text()\ .decode('utf-8') if not server: @@ -3501,16 +3501,16 @@ class AccountCreationWizardWindow: config = self.get_config('', server, '', '') # Get advanced options - proxies_combobox = self.xml.get_widget('proxies_combobox') + proxies_combobox = self.xml.get_object('proxies_combobox') active = proxies_combobox.get_active() proxy = proxies_combobox.get_model()[active][0].decode('utf-8') if proxy == _('None'): proxy = '' config['proxy'] = proxy - config['use_custom_host'] = self.xml.get_widget( + config['use_custom_host'] = self.xml.get_object( 'custom_host_port_checkbutton').get_active() - custom_port = self.xml.get_widget('custom_port_entry').get_text() + custom_port = self.xml.get_object('custom_port_entry').get_text() try: custom_port = int(custom_port) except Exception: @@ -3518,10 +3518,10 @@ class AccountCreationWizardWindow: _('Custom port must be a port number.')) return config['custom_port'] = custom_port - config['custom_host'] = self.xml.get_widget( + config['custom_host'] = self.xml.get_object( 'custom_host_entry').get_text().decode('utf-8') - if self.xml.get_widget('anonymous_checkbutton2').get_active(): + if self.xml.get_object('anonymous_checkbutton2').get_active(): self.modify = True self.save_account('', server, False, '', anonymous=True) self.show_finish_page() @@ -3536,7 +3536,7 @@ class AccountCreationWizardWindow: gajim.connections[self.account] = con con.new_account(self.account, config) elif cur_page == 3: - checked = self.xml.get_widget('ssl_checkbutton').get_active() + checked = self.xml.get_object('ssl_checkbutton').get_active() if checked: hostname = gajim.connections[self.account].new_account_info[ 'hostname'] @@ -3564,8 +3564,8 @@ class AccountCreationWizardWindow: form = self.data_form_widget.get_infos() gajim.connections[self.account].send_new_account_infos(form, self.is_form) - self.xml.get_widget('form_vbox').remove(self.data_form_widget) - self.xml.get_widget('progressbar_label').set_markup('<b>Account is being created</b>\n\nPlease wait...') + self.xml.get_object('form_vbox').remove(self.data_form_widget) + self.xml.get_object('progressbar_label').set_markup('<b>Account is being created</b>\n\nPlease wait...') self.notebook.set_current_page(5) # show creating page self.back_button.hide() self.forward_button.hide() @@ -3573,7 +3573,7 @@ class AccountCreationWizardWindow: self.update_progressbar) def update_proxy_list(self): - proxies_combobox = self.xml.get_widget('proxies_combobox') + proxies_combobox = self.xml.get_object('proxies_combobox') model = gtk.ListStore(str) proxies_combobox.set_model(model) l = gajim.config.get_per('proxies') @@ -3590,7 +3590,7 @@ class AccountCreationWizardWindow: ManageProxiesWindow() def on_custom_host_port_checkbutton_toggled(self, widget): - self.xml.get_widget('custom_host_hbox').set_sensitive(widget.get_active()) + self.xml.get_object('custom_host_hbox').set_sensitive(widget.get_active()) def update_progressbar(self): self.progressbar.pulse() @@ -3615,23 +3615,23 @@ class AccountCreationWizardWindow: else: self.data_form_widget = FakeDataForm(form) self.data_form_widget.show_all() - self.xml.get_widget('form_vbox').pack_start(self.data_form_widget) + self.xml.get_object('form_vbox').pack_start(self.data_form_widget) self.ssl_fingerprint = ssl_fingerprint self.ssl_cert = ssl_cert if ssl_msg: # An SSL warning occured, show it hostname = gajim.connections[self.account].new_account_info['hostname'] - self.xml.get_widget('ssl_label').set_markup(_('<b>Security Warning</b>' + self.xml.get_object('ssl_label').set_markup(_('<b>Security Warning</b>' '\n\nThe authenticity of the %(hostname)s SSL certificate could be ' 'invalid.\nSSL Error: %(error)s\n' 'Do you still want to connect to this server?') % { 'hostname': hostname, 'error': ssl_msg}) if ssl_err in (18, 27): text = _('Add this certificate to the list of trusted certificates.\nSHA1 fingerprint of the certificate:\n%s') % ssl_fingerprint - self.xml.get_widget('ssl_checkbutton').set_label(text) + self.xml.get_object('ssl_checkbutton').set_label(text) else: - self.xml.get_widget('ssl_checkbutton').set_no_show_all(True) - self.xml.get_widget('ssl_checkbutton').hide() + self.xml.get_object('ssl_checkbutton').set_no_show_all(True) + self.xml.get_object('ssl_checkbutton').hide() self.notebook.set_current_page(3) # show SSL page else: self.notebook.set_current_page(4) # show form page @@ -3654,7 +3654,7 @@ class AccountCreationWizardWindow: self.cancel_button.show() self.go_online_checkbutton.hide() self.show_vcard_checkbutton.hide() - img = self.xml.get_widget('finish_image') + img = self.xml.get_object('finish_image') img.set_from_stock(gtk.STOCK_DIALOG_ERROR, gtk.ICON_SIZE_DIALOG) finish_text = '<big><b>%s</b></big>\n\n%s' % ( _('An error occurred during account creation') , reason) @@ -3688,7 +3688,7 @@ class AccountCreationWizardWindow: del gajim.connections[self.account] if self.account in gajim.config.get_per('accounts'): gajim.config.del_per('accounts', self.account) - img = self.xml.get_widget('finish_image') + img = self.xml.get_object('finish_image') img.set_from_stock(gtk.STOCK_DIALOG_ERROR, gtk.ICON_SIZE_DIALOG) finish_text = '<big><b>%s</b></big>\n\n%s' % (_('An error occurred during ' 'account creation') , reason) @@ -3708,8 +3708,8 @@ class AccountCreationWizardWindow: self.window.destroy() def on_finish_button_clicked(self, widget): - go_online = self.xml.get_widget('go_online_checkbutton').get_active() - show_vcard = self.xml.get_widget('show_vcard_checkbutton').get_active() + go_online = self.xml.get_object('go_online_checkbutton').get_active() + show_vcard = self.xml.get_object('show_vcard_checkbutton').get_active() self.window.destroy() if show_vcard: gajim.interface.show_vcard_when_connect.append(self.account) @@ -3719,7 +3719,7 @@ class AccountCreationWizardWindow: def on_username_entry_key_press_event(self, widget, event): # Check for pressed @ and jump to combobox if found if event.keyval == gtk.keysyms.at: - combobox = self.xml.get_widget('server_comboboxentry') + combobox = self.xml.get_object('server_comboboxentry') combobox.grab_focus() combobox.child.set_position(-1) return True @@ -3729,7 +3729,7 @@ class AccountCreationWizardWindow: backspace = event.keyval == gtk.keysyms.BackSpace empty = len(combobox.get_active_text()) == 0 if backspace and empty and self.modify: - username_entry = self.xml.get_widget('username_entry') + username_entry = self.xml.get_object('username_entry') username_entry.grab_focus() username_entry.set_position(-1) return True @@ -3816,16 +3816,16 @@ class AccountCreationWizardWindow: class ManagePEPServicesWindow: def __init__(self, account): - self.xml = gtkgui_helpers.get_glade('manage_pep_services_window.glade') - self.window = self.xml.get_widget('manage_pep_services_window') + self.xml = gtkgui_helpers.get_gtk_builder('manage_pep_services_window.ui') + self.window = self.xml.get_object('manage_pep_services_window') self.window.set_transient_for(gajim.interface.roster.window) - self.xml.get_widget('configure_button').set_sensitive(False) - self.xml.get_widget('delete_button').set_sensitive(False) - self.xml.signal_autoconnect(self) + self.xml.get_object('configure_button').set_sensitive(False) + self.xml.get_object('delete_button').set_sensitive(False) + self.xml.connect_signals(self) self.account = account self.init_services() - self.xml.get_widget('services_treeview').get_selection().connect( + self.xml.get_object('services_treeview').get_selection().connect( 'changed', self.on_services_selection_changed) self.window.show_all() @@ -3837,11 +3837,11 @@ class ManagePEPServicesWindow: self.window.destroy() def on_services_selection_changed(self, sel): - self.xml.get_widget('configure_button').set_sensitive(True) - self.xml.get_widget('delete_button').set_sensitive(True) + self.xml.get_object('configure_button').set_sensitive(True) + self.xml.get_object('delete_button').set_sensitive(True) def init_services(self): - self.treeview = self.xml.get_widget('services_treeview') + self.treeview = self.xml.get_object('services_treeview') # service, access_model, group self.treestore = gtk.ListStore(str) self.treeview.set_model(self.treestore) @@ -3901,11 +3901,11 @@ class ManagePEPServicesWindow: class ManageSoundsWindow: def __init__(self): - self.xml = gtkgui_helpers.get_glade('manage_sounds_window.glade') - self.window = self.xml.get_widget('manage_sounds_window') + self.xml = gtkgui_helpers.get_gtk_builder('manage_sounds_window.ui') + self.window = self.xml.get_object('manage_sounds_window') # sounds treeview - self.sound_tree = self.xml.get_widget('sounds_treeview') + self.sound_tree = self.xml.get_object('sounds_treeview') # active, event ui name, path to sound file, event_config_name model = gtk.ListStore(bool, str, str, str) @@ -3927,7 +3927,7 @@ class ManageSoundsWindow: self.fill_sound_treeview() - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) self.sound_tree.get_model().connect('row-changed', self.on_sounds_treemodel_row_changed) @@ -3975,7 +3975,7 @@ class ManageSoundsWindow: def on_treeview_sounds_cursor_changed(self, widget, data = None): (model, iter_) = self.sound_tree.get_selection().get_selected() - sounds_entry = self.xml.get_widget('sounds_entry') + sounds_entry = self.xml.get_object('sounds_entry') if not iter_: sounds_entry.set_text('') return @@ -3991,13 +3991,13 @@ class ManageSoundsWindow: model, iter_ = self.sound_tree.get_selection().get_selected() if not path_to_snd_file: model[iter_][2] = '' - self.xml.get_widget('sounds_entry').set_text('') + self.xml.get_object('sounds_entry').set_text('') model[iter_][0] = False return directory = os.path.dirname(path_to_snd_file) gajim.config.set('last_sounds_dir', directory) path_to_snd_file = helpers.strip_soundfile_path(path_to_snd_file) - self.xml.get_widget('sounds_entry').set_text(path_to_snd_file) + self.xml.get_object('sounds_entry').set_text(path_to_snd_file) model[iter_][2] = path_to_snd_file # set new path to sounds_model model[iter_][0] = True # set the sound to enabled diff --git a/src/conversation_textview.py b/src/conversation_textview.py index 02f949376..1af6f354a 100644 --- a/src/conversation_textview.py +++ b/src/conversation_textview.py @@ -860,7 +860,7 @@ class ConversationTextview(gobject.GObject): def on_join_group_chat_menuitem_activate(self, widget, room_jid): if 'join_gc' in gajim.interface.instances[self.account]: instance = gajim.interface.instances[self.account]['join_gc'] - instance.xml.get_widget('room_jid_entry').set_text(room_jid) + instance.xml.get_object('room_jid_entry').set_text(room_jid) gajim.interface.instances[self.account]['join_gc'].window.present() else: try: @@ -872,8 +872,8 @@ class ConversationTextview(gobject.GObject): dialogs.AddNewContactWindow(self.account, jid) def make_link_menu(self, event, kind, text): - xml = gtkgui_helpers.get_glade('chat_context_menu.glade') - menu = xml.get_widget('chat_context_menu') + xml = gtkgui_helpers.get_gtk_builder('chat_context_menu.ui') + menu = xml.get_object('chat_context_menu') childs = menu.get_children() if kind == 'url': id_ = childs[0].connect('activate', self.on_copy_link_activate, text) @@ -889,7 +889,7 @@ class ConversationTextview(gobject.GObject): childs[7].hide() # add to roster else: # It's a mail or a JID # load muc icon - join_group_chat_menuitem = xml.get_widget('join_group_chat_menuitem') + join_group_chat_menuitem = xml.get_object('join_group_chat_menuitem') muc_icon = gtkgui_helpers.load_icon('muc_active') if muc_icon: join_group_chat_menuitem.set_image(muc_icon) diff --git a/src/dataforms_widget.py b/src/dataforms_widget.py index 4a9681dab..34ae77a68 100644 --- a/src/dataforms_widget.py +++ b/src/dataforms_widget.py @@ -48,17 +48,17 @@ class DataFormWidget(gtk.Alignment, object): self._data_form = None - self.xml = gtkgui_helpers.get_glade('data_form_window.glade', + self.xml = gtkgui_helpers.get_gtk_builder('data_form_window.ui', 'data_form_vbox') - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) for name in ('instructions_label', 'instructions_hseparator', 'single_form_viewport', 'data_form_types_notebook', 'single_form_scrolledwindow', 'multiple_form_hbox', 'records_treeview', 'buttons_vbox', 'add_button', 'remove_button', 'edit_button', 'up_button', 'down_button', 'clear_button'): - self.__dict__[name] = self.xml.get_widget(name) + self.__dict__[name] = self.xml.get_object(name) - self.add(self.xml.get_widget('data_form_vbox')) + self.add(self.xml.get_object('data_form_vbox')) if dataformnode is not None: self.set_data_form(dataformnode) @@ -427,10 +427,10 @@ class SingleForm(gtk.Table, object): elif field.type == 'jid-multi': commonwidget = False - xml = gtkgui_helpers.get_glade('data_form_window.glade', + xml = gtkgui_helpers.get_gtk_builder('data_form_window.ui', 'item_list_table') - widget = xml.get_widget('item_list_table') - treeview = xml.get_widget('item_treeview') + widget = xml.get_object('item_list_table') + treeview = xml.get_object('item_treeview') listmodel = gtk.ListStore(str) for value in field.iter_values(): @@ -450,16 +450,16 @@ class SingleForm(gtk.Table, object): decorate_with_tooltip(treeview, field) - add_button=xml.get_widget('add_button') + add_button=xml.get_object('add_button') add_button.connect('clicked', self.on_jid_multi_add_button_clicked, treeview, listmodel, field) - edit_button=xml.get_widget('edit_button') + edit_button=xml.get_object('edit_button') edit_button.connect('clicked', self.on_jid_multi_edit_button_clicked, treeview) - remove_button=xml.get_widget('remove_button') + remove_button=xml.get_object('remove_button') remove_button.connect('clicked', self.on_jid_multi_remove_button_clicked, treeview, field) - clear_button=xml.get_widget('clear_button') + clear_button=xml.get_object('clear_button') clear_button.connect('clicked', self.on_jid_multi_clean_button_clicked, listmodel, field) if not readwrite: diff --git a/src/dialogs.py b/src/dialogs.py index 4f1799a33..f3ff79f18 100644 --- a/src/dialogs.py +++ b/src/dialogs.py @@ -68,25 +68,25 @@ class EditGroupsDialog: """ list_ is a list of (contact, account) tuples """ - self.xml = gtkgui_helpers.get_glade('edit_groups_dialog.glade') - self.dialog = self.xml.get_widget('edit_groups_dialog') + self.xml = gtkgui_helpers.get_gtk_builder('edit_groups_dialog.ui') + self.dialog = self.xml.get_object('edit_groups_dialog') self.dialog.set_transient_for(gajim.interface.roster.window) self.list_ = list_ self.changes_made = False - self.treeview = self.xml.get_widget('groups_treeview') + self.treeview = self.xml.get_object('groups_treeview') if len(list_) == 1: contact = list_[0][0] - self.xml.get_widget('nickname_label').set_markup( + self.xml.get_object('nickname_label').set_markup( _('Contact name: <i>%s</i>') % contact.get_shown_name()) - self.xml.get_widget('jid_label').set_markup( + self.xml.get_object('jid_label').set_markup( _('Jabber ID: <i>%s</i>') % contact.jid) else: - self.xml.get_widget('nickname_label').set_no_show_all(True) - self.xml.get_widget('nickname_label').hide() - self.xml.get_widget('jid_label').set_no_show_all(True) - self.xml.get_widget('jid_label').hide() + self.xml.get_object('nickname_label').set_no_show_all(True) + self.xml.get_object('nickname_label').hide() + self.xml.get_object('jid_label').set_no_show_all(True) + self.xml.get_object('jid_label').hide() - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) self.init_list() self.dialog.show_all() @@ -120,7 +120,7 @@ class EditGroupsDialog: gajim.interface.roster.draw_group(_('General'), account) def on_add_button_clicked(self, widget): - group = self.xml.get_widget('group_entry').get_text().decode('utf-8') + group = self.xml.get_object('group_entry').get_text().decode('utf-8') if not group: return # Do not allow special groups @@ -212,28 +212,28 @@ class PassphraseDialog: """ def __init__(self, titletext, labeltext, checkbuttontext=None, ok_handler=None, cancel_handler=None): - self.xml = gtkgui_helpers.get_glade('passphrase_dialog.glade') - self.window = self.xml.get_widget('passphrase_dialog') - self.passphrase_entry = self.xml.get_widget('passphrase_entry') + self.xml = gtkgui_helpers.get_gtk_builder('passphrase_dialog.ui') + self.window = self.xml.get_object('passphrase_dialog') + self.passphrase_entry = self.xml.get_object('passphrase_entry') self.passphrase = -1 self.window.set_title(titletext) - self.xml.get_widget('message_label').set_text(labeltext) + self.xml.get_object('message_label').set_text(labeltext) self.ok = False self.cancel_handler = cancel_handler self.ok_handler = ok_handler - okbutton = self.xml.get_widget('ok_button') + okbutton = self.xml.get_object('ok_button') okbutton.connect('clicked', self.on_okbutton_clicked) - cancelbutton = self.xml.get_widget('cancel_button') + cancelbutton = self.xml.get_object('cancel_button') cancelbutton.connect('clicked', self.on_cancelbutton_clicked) - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) self.window.set_position(gtk.WIN_POS_CENTER_ON_PARENT) self.window.show_all() self.check = bool(checkbuttontext) - checkbutton = self.xml.get_widget('save_passphrase_checkbutton') + checkbutton = self.xml.get_object('save_passphrase_checkbutton') if self.check: checkbutton.set_label(checkbuttontext) else: @@ -246,7 +246,7 @@ class PassphraseDialog: passph = self.passphrase_entry.get_text().decode('utf-8') if self.check: - checked = self.xml.get_widget('save_passphrase_checkbutton').\ + checked = self.xml.get_object('save_passphrase_checkbutton').\ get_active() else: checked = False @@ -276,11 +276,11 @@ class ChooseGPGKeyDialog: selected=None): '''secret_keys : {keyID: userName, ...}''' self.on_response = on_response - xml = gtkgui_helpers.get_glade('choose_gpg_key_dialog.glade') - self.window = xml.get_widget('choose_gpg_key_dialog') + xml = gtkgui_helpers.get_gtk_builder('choose_gpg_key_dialog.ui') + self.window = xml.get_object('choose_gpg_key_dialog') self.window.set_title(title_text) - self.keys_treeview = xml.get_widget('keys_treeview') - prompt_label = xml.get_widget('prompt_label') + self.keys_treeview = xml.get_object('keys_treeview') + prompt_label = xml.get_object('prompt_label') prompt_label.set_text(prompt_text) model = gtk.ListStore(str, str) model.set_sort_func(1, self.sort_keys) @@ -342,25 +342,25 @@ class ChangeActivityDialog: self.activity = activity self.subactivity = subactivity self.text = text - self.xml = gtkgui_helpers.get_glade( - 'change_activity_dialog.glade') - self.window = self.xml.get_widget('change_activity_dialog') + self.xml = gtkgui_helpers.get_gtk_builder( + 'change_activity_dialog.ui') + self.window = self.xml.get_object('change_activity_dialog') self.window.set_transient_for(gajim.interface.roster.window) - self.checkbutton = self.xml.get_widget('enable_checkbutton') - self.notebook = self.xml.get_widget('notebook') - self.entry = self.xml.get_widget('description_entry') + self.checkbutton = self.xml.get_object('enable_checkbutton') + self.notebook = self.xml.get_object('notebook') + self.entry = self.xml.get_object('description_entry') rbtns = {} group = None for category in pep.ACTIVITIES: - item = self.xml.get_widget(category + '_image') + item = self.xml.get_object(category + '_image') item.set_from_pixbuf( gtkgui_helpers.load_activity_icon(category).get_pixbuf()) item.set_tooltip_text(pep.ACTIVITIES[category]['category']) - vbox = self.xml.get_widget(category + '_vbox') + vbox = self.xml.get_object(category + '_vbox') vbox.set_border_width(5) # Other @@ -427,7 +427,7 @@ class ChangeActivityDialog: else: self.checkbutton.set_active(False) - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) self.window.set_position(gtk.WIN_POS_CENTER_ON_PARENT) self.window.show_all() @@ -461,17 +461,17 @@ class ChangeMoodDialog: self.on_response = on_response self.mood = mood self.text = text - self.xml = gtkgui_helpers.get_glade('change_mood_dialog.glade') + self.xml = gtkgui_helpers.get_gtk_builder('change_mood_dialog.ui') - self.window = self.xml.get_widget('change_mood_dialog') + self.window = self.xml.get_object('change_mood_dialog') self.window.set_transient_for(gajim.interface.roster.window) self.window.set_title(_('Set Mood')) - table = self.xml.get_widget('mood_icons_table') - self.label = self.xml.get_widget('mood_label') - self.entry = self.xml.get_widget('description_entry') + table = self.xml.get_object('mood_icons_table') + self.label = self.xml.get_object('mood_label') + self.entry = self.xml.get_object('description_entry') - no_mood_button = self.xml.get_widget('no_mood_button') + no_mood_button = self.xml.get_object('no_mood_button') no_mood_button.set_mode(False) no_mood_button.connect('clicked', self.on_mood_button_clicked, None) @@ -513,7 +513,7 @@ class ChangeMoodDialog: self.entry.set_text('') self.entry.set_sensitive(False) - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) self.window.set_position(gtk.WIN_POS_CENTER_ON_PARENT) self.window.show_all() @@ -579,8 +579,8 @@ class ChangeStatusMessageDialog(TimeoutDialog): self.pep_dict = {} self.show_pep = show_pep self.on_response = on_response - self.xml = gtkgui_helpers.get_glade('change_status_message_dialog.glade') - self.dialog = self.xml.get_widget('change_status_message_dialog') + self.xml = gtkgui_helpers.get_gtk_builder('change_status_message_dialog.ui') + self.dialog = self.xml.get_object('change_status_message_dialog') self.dialog.set_transient_for(gajim.interface.roster.window) msg = None if show: @@ -602,7 +602,7 @@ class ChangeStatusMessageDialog(TimeoutDialog): self.title_text = _('Status Message') self.dialog.set_title(self.title_text) - message_textview = self.xml.get_widget('message_textview') + message_textview = self.xml.get_object('message_textview') self.message_buffer = message_textview.get_buffer() self.message_buffer.connect('changed', self.on_message_buffer_changed) if not msg: @@ -624,7 +624,7 @@ class ChangeStatusMessageDialog(TimeoutDialog): sorted_keys_list = helpers.get_sorted_keys(self.preset_messages_dict) self.message_liststore = gtk.ListStore(str) # msg_name - self.message_combobox = self.xml.get_widget('message_combobox') + self.message_combobox = self.xml.get_object('message_combobox') self.message_combobox.set_model(self.message_liststore) cellrenderertext = gtk.CellRendererText() self.message_combobox.pack_start(cellrenderertext, True) @@ -637,16 +637,16 @@ class ChangeStatusMessageDialog(TimeoutDialog): self.draw_mood() else: # remove acvtivity / mood lines - self.xml.get_widget('activity_label').set_no_show_all(True) - self.xml.get_widget('activity_button').set_no_show_all(True) - self.xml.get_widget('mood_label').set_no_show_all(True) - self.xml.get_widget('mood_button').set_no_show_all(True) - self.xml.get_widget('activity_label').hide() - self.xml.get_widget('activity_button').hide() - self.xml.get_widget('mood_label').hide() - self.xml.get_widget('mood_button').hide() - - self.xml.signal_autoconnect(self) + self.xml.get_object('activity_label').set_no_show_all(True) + self.xml.get_object('activity_button').set_no_show_all(True) + self.xml.get_object('mood_label').set_no_show_all(True) + self.xml.get_object('mood_button').set_no_show_all(True) + self.xml.get_object('activity_label').hide() + self.xml.get_object('activity_button').hide() + self.xml.get_object('mood_label').hide() + self.xml.get_object('mood_button').hide() + + self.xml.connect_signals(self) self.run_timeout() self.dialog.connect('response', self.on_dialog_response) self.dialog.set_position(gtk.WIN_POS_CENTER_ON_PARENT) @@ -656,8 +656,8 @@ class ChangeStatusMessageDialog(TimeoutDialog): """ Set activity button """ - img = self.xml.get_widget('activity_image') - label = self.xml.get_widget('activity_button_label') + img = self.xml.get_object('activity_image') + label = self.xml.get_object('activity_button_label') if 'activity' in self.pep_dict and self.pep_dict['activity'] in \ pep.ACTIVITIES: if 'subactivity' in self.pep_dict and self.pep_dict['subactivity'] in \ @@ -681,8 +681,8 @@ class ChangeStatusMessageDialog(TimeoutDialog): """ Set mood button """ - img = self.xml.get_widget('mood_image') - label = self.xml.get_widget('mood_button_label') + img = self.xml.get_object('mood_image') + label = self.xml.get_object('mood_button_label') if self.pep_dict['mood'] in pep.MOODS: img.set_from_pixbuf(gtkgui_helpers.load_mood_icon( self.pep_dict['mood']).get_pixbuf()) @@ -755,7 +755,7 @@ class ChangeStatusMessageDialog(TimeoutDialog): self.toggle_sensitiviy_of_save_as_preset() def toggle_sensitiviy_of_save_as_preset(self): - btn = self.xml.get_widget('save_as_preset_button') + btn = self.xml.get_object('save_as_preset_button') if self.message_buffer.get_char_count() == 0: btn.set_sensitive(False) else: @@ -856,22 +856,22 @@ class AddNewContactWindow: # An instance is already opened return location['add_contact'] = self - self.xml = gtkgui_helpers.get_glade('add_new_contact_window.glade') - self.xml.signal_autoconnect(self) - self.window = self.xml.get_widget('add_new_contact_window') + self.xml = gtkgui_helpers.get_gtk_builder('add_new_contact_window.ui') + self.xml.connect_signals(self) + self.window = self.xml.get_object('add_new_contact_window') for w in ('account_combobox', 'account_hbox', 'account_label', 'uid_label', 'uid_entry', 'protocol_combobox', 'protocol_jid_combobox', 'protocol_hbox', 'nickname_entry', 'message_scrolledwindow', 'register_hbox', 'subscription_table', 'add_button', 'message_textview', 'connected_label', 'group_comboboxentry', 'auto_authorize_checkbutton'): - self.__dict__[w] = self.xml.get_widget(w) + self.__dict__[w] = self.xml.get_object(w) if account and len(gajim.connections) >= 2: prompt_text =\ _('Please fill in the data of the contact you want to add in account %s') %account else: prompt_text = _('Please fill in the data of the contact you want to add') - self.xml.get_widget('prompt_label').set_text(prompt_text) + self.xml.get_object('prompt_label').set_text(prompt_text) self.agents = {'jabber': []} # types to which we are not subscribed but account has an agent for it self.available_types = [] @@ -1668,19 +1668,19 @@ class CommonInputDialog: """ def __init__(self, title, label_str, is_modal, ok_handler, cancel_handler): - self.dialog = self.xml.get_widget('input_dialog') - label = self.xml.get_widget('label') + self.dialog = self.xml.get_object('input_dialog') + label = self.xml.get_object('label') self.dialog.set_title(title) label.set_markup(label_str) self.cancel_handler = cancel_handler - self.vbox = self.xml.get_widget('vbox') + self.vbox = self.xml.get_object('vbox') self.ok_handler = ok_handler - okbutton = self.xml.get_widget('okbutton') + okbutton = self.xml.get_object('okbutton') okbutton.connect('clicked', self.on_okbutton_clicked) - cancelbutton = self.xml.get_widget('cancelbutton') + cancelbutton = self.xml.get_object('cancelbutton') cancelbutton.connect('clicked', self.on_cancelbutton_clicked) - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) self.dialog.show_all() def on_input_dialog_delete_event(self, widget, event): @@ -1708,10 +1708,10 @@ class InputDialog(CommonInputDialog): def __init__(self, title, label_str, input_str=None, is_modal=True, ok_handler=None, cancel_handler=None): - self.xml = gtkgui_helpers.get_glade('input_dialog.glade') + self.xml = gtkgui_helpers.get_gtk_builder('input_dialog.ui') CommonInputDialog.__init__(self, title, label_str, is_modal, ok_handler, cancel_handler) - self.input_entry = self.xml.get_widget('input_entry') + self.input_entry = self.xml.get_object('input_entry') if input_str: self.set_entry(input_str) @@ -1729,11 +1729,11 @@ class InputDialogCheck(InputDialog): def __init__(self, title, label_str, checktext='', input_str=None, is_modal=True, ok_handler=None, cancel_handler=None): - self.xml = gtkgui_helpers.get_glade('input_dialog.glade') + self.xml = gtkgui_helpers.get_gtk_builder('input_dialog.ui') InputDialog.__init__(self, title, label_str, input_str=input_str, is_modal=is_modal, ok_handler=ok_handler, cancel_handler=cancel_handler) - self.input_entry = self.xml.get_widget('input_entry') + self.input_entry = self.xml.get_object('input_entry') if input_str: self.input_entry.set_text(input_str) self.input_entry.select_region(0, -1) # select all @@ -1792,7 +1792,7 @@ class ChangeNickDialog(InputDialogCheck): if not self.gc_control: self.check_next() return - label = self.xml.get_widget('label') + label = self.xml.get_object('label') label.set_markup(self.prompt) self.set_entry(self.gc_control.nick + \ gajim.config.get('gc_proposed_nick_char')) @@ -1859,10 +1859,10 @@ class InputTextDialog(CommonInputDialog): def __init__(self, title, label_str, input_str=None, is_modal=True, ok_handler=None, cancel_handler=None): - self.xml = gtkgui_helpers.get_glade('input_text_dialog.glade') + self.xml = gtkgui_helpers.get_gtk_builder('input_text_dialog.ui') CommonInputDialog.__init__(self, title, label_str, is_modal, ok_handler, cancel_handler) - self.input_buffer = self.xml.get_widget('input_textview').get_buffer() + self.input_buffer = self.xml.get_object('input_textview').get_buffer() if input_str: self.input_buffer.set_text(input_str) start_iter, end_iter = self.input_buffer.get_bounds() @@ -1879,12 +1879,12 @@ class DubbleInputDialog: def __init__(self, title, label_str1, label_str2, input_str1=None, input_str2=None, is_modal=True, ok_handler=None, cancel_handler=None): - self.xml = gtkgui_helpers.get_glade('dubbleinput_dialog.glade') - self.dialog = self.xml.get_widget('dubbleinput_dialog') - label1 = self.xml.get_widget('label1') - self.input_entry1 = self.xml.get_widget('input_entry1') - label2 = self.xml.get_widget('label2') - self.input_entry2 = self.xml.get_widget('input_entry2') + self.xml = gtkgui_helpers.get_gtk_builder('dubbleinput_dialog.ui') + self.dialog = self.xml.get_object('dubbleinput_dialog') + label1 = self.xml.get_object('label1') + self.input_entry1 = self.xml.get_object('input_entry1') + label2 = self.xml.get_object('label2') + self.input_entry2 = self.xml.get_object('input_entry2') self.dialog.set_title(title) label1.set_markup(label_str1) label2.set_markup(label_str2) @@ -1899,11 +1899,11 @@ class DubbleInputDialog: self.dialog.set_modal(is_modal) self.ok_handler = ok_handler - okbutton = self.xml.get_widget('okbutton') + okbutton = self.xml.get_object('okbutton') okbutton.connect('clicked', self.on_okbutton_clicked) - cancelbutton = self.xml.get_widget('cancelbutton') + cancelbutton = self.xml.get_object('cancelbutton') cancelbutton.connect('clicked', self.on_cancelbutton_clicked) - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) self.dialog.show_all() def on_dubbleinput_dialog_destroy(self, widget): @@ -1936,8 +1936,8 @@ class DubbleInputDialog: class SubscriptionRequestWindow: def __init__(self, jid, text, account, user_nick=None): - xml = gtkgui_helpers.get_glade('subscription_request_window.glade') - self.window = xml.get_widget('subscription_request_window') + xml = gtkgui_helpers.get_gtk_builder('subscription_request_window.ui') + self.window = xml.get_object('subscription_request_window') self.jid = jid self.account = account self.user_nick = user_nick @@ -1947,15 +1947,15 @@ class SubscriptionRequestWindow: % {'account': account, 'jid': self.jid} else: prompt_text = _('Subscription request from %s') % self.jid - xml.get_widget('from_label').set_text(prompt_text) - xml.get_widget('message_textview').get_buffer().set_text(text) - xml.signal_autoconnect(self) + xml.get_object('from_label').set_text(prompt_text) + xml.get_object('message_textview').get_buffer().set_text(text) + xml.connect_signals(self) self.window.show_all() def prepare_popup_menu(self): - xml = gtkgui_helpers.get_glade('subscription_request_popup_menu.glade') - menu = xml.get_widget('subscription_request_popup_menu') - xml.signal_autoconnect(self) + xml = gtkgui_helpers.get_gtk_builder('subscription_request_popup_menu.ui') + menu = xml.get_object('subscription_request_popup_menu') + xml.connect_signals(self) return menu def on_close_button_clicked(self, widget): @@ -1983,7 +1983,7 @@ class SubscriptionRequestWindow: vcard.VcardWindow(contact, self.account) # Remove jabber page gajim.interface.instances[self.account]['infos'][self.jid].xml.\ - get_widget('information_notebook').remove_page(0) + get_object('information_notebook').remove_page(0) def on_start_chat_activate(self, widget): """ @@ -2030,10 +2030,10 @@ class JoinGroupchatWindow: _('You can not join a group chat unless you are connected.')) raise GajimGeneralException, 'You must be connected to join a groupchat' - self.xml = gtkgui_helpers.get_glade('join_groupchat_window.glade') + self.xml = gtkgui_helpers.get_gtk_builder('join_groupchat_window.ui') - account_label = self.xml.get_widget('account_label') - account_combobox = self.xml.get_widget('account_combobox') + account_label = self.xml.get_object('account_label') + account_combobox = self.xml.get_object('account_combobox') account_label.set_no_show_all(False) account_combobox.set_no_show_all(False) liststore = gtk.ListStore(str) @@ -2054,16 +2054,16 @@ class JoinGroupchatWindow: self.automatic = automatic self._empty_required_widgets = [] - self.window = self.xml.get_widget('join_groupchat_window') - self._room_jid_entry = self.xml.get_widget('room_jid_entry') - self._nickname_entry = self.xml.get_widget('nickname_entry') - self._password_entry = self.xml.get_widget('password_entry') + self.window = self.xml.get_object('join_groupchat_window') + self._room_jid_entry = self.xml.get_object('room_jid_entry') + self._nickname_entry = self.xml.get_object('nickname_entry') + self._password_entry = self.xml.get_object('password_entry') self._room_jid_entry.set_text(room_jid) self._nickname_entry.set_text(nick) if password: self._password_entry.set_text(password) - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) title = None if account: # now add us to open windows @@ -2074,7 +2074,7 @@ class JoinGroupchatWindow: title = _('Join Group Chat') self.window.set_title(title) - self.recently_combobox = self.xml.get_widget('recently_combobox') + self.recently_combobox = self.xml.get_object('recently_combobox') liststore = gtk.ListStore(str) self.recently_combobox.set_model(liststore) cell = gtk.CellRendererText() @@ -2089,17 +2089,17 @@ class JoinGroupchatWindow: self.recently_combobox.set_active(0) self._room_jid_entry.select_region(0, -1) elif room_jid != '': - self.xml.get_widget('join_button').grab_focus() + self.xml.get_object('join_button').grab_focus() if not self._room_jid_entry.get_text(): self._empty_required_widgets.append(self._room_jid_entry) if not self._nickname_entry.get_text(): self._empty_required_widgets.append(self._nickname_entry) if len(self._empty_required_widgets): - self.xml.get_widget('join_button').set_sensitive(False) + self.xml.get_object('join_button').set_sensitive(False) if account and not gajim.connections[account].private_storage_supported: - self.xml.get_widget('bookmark_checkbutton').set_sensitive(False) + self.xml.get_object('bookmark_checkbutton').set_sensitive(False) self.window.show_all() @@ -2119,12 +2119,12 @@ class JoinGroupchatWindow: def on_required_entry_changed(self, widget): if not widget.get_text(): self._empty_required_widgets.append(widget) - self.xml.get_widget('join_button').set_sensitive(False) + self.xml.get_object('join_button').set_sensitive(False) else: if widget in self._empty_required_widgets: self._empty_required_widgets.remove(widget) if len(self._empty_required_widgets) == 0 and self.account: - self.xml.get_widget('join_button').set_sensitive(True) + self.xml.get_object('join_button').set_sensitive(True) def on_account_combobox_changed(self, widget): model = widget.get_model() @@ -2145,7 +2145,7 @@ class JoinGroupchatWindow: self.window.destroy() def on_bookmark_checkbutton_toggled(self, widget): - auto_join_checkbutton = self.xml.get_widget('auto_join_checkbutton') + auto_join_checkbutton = self.xml.get_object('auto_join_checkbutton') if widget.get_active(): auto_join_checkbutton.set_sensitive(True) else: @@ -2196,8 +2196,8 @@ class JoinGroupchatWindow: gajim.config.set('recently_groupchat', ' '.join(self.recently_groupchat)) - if self.xml.get_widget('bookmark_checkbutton').get_active(): - if self.xml.get_widget('auto_join_checkbutton').get_active(): + if self.xml.get_object('bookmark_checkbutton').get_active(): + if self.xml.get_object('auto_join_checkbutton').get_active(): autojoin = '1' else: autojoin = '0' @@ -2220,9 +2220,9 @@ class SynchroniseSelectAccountDialog: _('Without a connection, you can not synchronise your contacts.')) raise GajimGeneralException, 'You are not connected to the server' self.account = account - self.xml = gtkgui_helpers.get_glade('synchronise_select_account_dialog.glade') - self.dialog = self.xml.get_widget('synchronise_select_account_dialog') - self.accounts_treeview = self.xml.get_widget('accounts_treeview') + self.xml = gtkgui_helpers.get_gtk_builder('synchronise_select_account_dialog.ui') + self.dialog = self.xml.get_object('synchronise_select_account_dialog') + self.accounts_treeview = self.xml.get_object('accounts_treeview') model = gtk.ListStore(str, str, bool) self.accounts_treeview.set_model(model) # columns @@ -2233,7 +2233,7 @@ class SynchroniseSelectAccountDialog: self.accounts_treeview.insert_column_with_attributes(-1, _('Server'), renderer, text=1) - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) self.init_accounts() self.dialog.show_all() @@ -2281,9 +2281,9 @@ class SynchroniseSelectContactsDialog: def __init__(self, account, remote_account): self.local_account = account self.remote_account = remote_account - self.xml = gtkgui_helpers.get_glade('synchronise_select_contacts_dialog.glade') - self.dialog = self.xml.get_widget('synchronise_select_contacts_dialog') - self.contacts_treeview = self.xml.get_widget('contacts_treeview') + self.xml = gtkgui_helpers.get_gtk_builder('synchronise_select_contacts_dialog.ui') + self.dialog = self.xml.get_object('synchronise_select_contacts_dialog') + self.contacts_treeview = self.xml.get_object('contacts_treeview') model = gtk.ListStore(bool, str) self.contacts_treeview.set_model(model) # columns @@ -2296,7 +2296,7 @@ class SynchroniseSelectContactsDialog: self.contacts_treeview.insert_column_with_attributes(-1, _('Name'), renderer2, text=1) - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) self.init_contacts() self.dialog.show_all() @@ -2368,9 +2368,9 @@ class NewChatDialog(InputDialog): liststore.append((img.get_pixbuf(), jid)) self.ok_handler = self.new_chat_response - okbutton = self.xml.get_widget('okbutton') + okbutton = self.xml.get_object('okbutton') okbutton.connect('clicked', self.on_okbutton_clicked) - cancelbutton = self.xml.get_widget('cancelbutton') + cancelbutton = self.xml.get_object('cancelbutton') cancelbutton.connect('clicked', self.on_cancelbutton_clicked) self.dialog.show_all() @@ -2406,10 +2406,10 @@ class ChangePasswordDialog: raise GajimGeneralException, 'You are not connected to the server' self.account = account self.on_response = on_response - self.xml = gtkgui_helpers.get_glade('change_password_dialog.glade') - self.dialog = self.xml.get_widget('change_password_dialog') - self.password1_entry = self.xml.get_widget('password1_entry') - self.password2_entry = self.xml.get_widget('password2_entry') + self.xml = gtkgui_helpers.get_gtk_builder('change_password_dialog.ui') + self.dialog = self.xml.get_object('change_password_dialog') + self.password1_entry = self.xml.get_object('password1_entry') + self.password2_entry = self.xml.get_object('password2_entry') self.dialog.connect('response', self.on_dialog_response) self.dialog.show_all() @@ -2438,14 +2438,14 @@ class PopupNotificationWindow: self.jid = jid self.msg_type = msg_type - xml = gtkgui_helpers.get_glade('popup_notification_window.glade') - self.window = xml.get_widget('popup_notification_window') + xml = gtkgui_helpers.get_gtk_builder('popup_notification_window.ui') + self.window = xml.get_object('popup_notification_window') self.window.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_TOOLTIP) - close_button = xml.get_widget('close_button') - event_type_label = xml.get_widget('event_type_label') - event_description_label = xml.get_widget('event_description_label') - eventbox = xml.get_widget('eventbox') - image = xml.get_widget('notification_image') + close_button = xml.get_object('close_button') + event_type_label = xml.get_object('event_type_label') + event_description_label = xml.get_object('event_description_label') + eventbox = xml.get_object('eventbox') + image = xml.get_object('notification_image') if not text: text = gajim.get_name_from_jid(account, jid) # default value of text @@ -2504,7 +2504,7 @@ class PopupNotificationWindow: gajim.interface.roster.popups_notification_height + pos_y + 1 self.window.move(pos_x, pos_y) - xml.signal_autoconnect(self) + xml.connect_signals(self) self.window.show_all() timeout = gajim.config.get('notification_timeout') gobject.timeout_add_seconds(timeout, self.on_timeout) @@ -2560,29 +2560,29 @@ class SingleMessageWindow: self.resource = resource self.session = session - self.xml = gtkgui_helpers.get_glade('single_message_window.glade') - self.window = self.xml.get_widget('single_message_window') - self.count_chars_label = self.xml.get_widget('count_chars_label') - self.from_label = self.xml.get_widget('from_label') - self.from_entry = self.xml.get_widget('from_entry') - self.to_label = self.xml.get_widget('to_label') - self.to_entry = self.xml.get_widget('to_entry') - self.subject_entry = self.xml.get_widget('subject_entry') - self.message_scrolledwindow = self.xml.get_widget( + self.xml = gtkgui_helpers.get_gtk_builder('single_message_window.ui') + self.window = self.xml.get_object('single_message_window') + self.count_chars_label = self.xml.get_object('count_chars_label') + self.from_label = self.xml.get_object('from_label') + self.from_entry = self.xml.get_object('from_entry') + self.to_label = self.xml.get_object('to_label') + self.to_entry = self.xml.get_object('to_entry') + self.subject_entry = self.xml.get_object('subject_entry') + self.message_scrolledwindow = self.xml.get_object( 'message_scrolledwindow') - self.message_textview = self.xml.get_widget('message_textview') + self.message_textview = self.xml.get_object('message_textview') self.message_tv_buffer = self.message_textview.get_buffer() - self.conversation_scrolledwindow = self.xml.get_widget( + self.conversation_scrolledwindow = self.xml.get_object( 'conversation_scrolledwindow') self.conversation_textview = conversation_textview.ConversationTextview( account) self.conversation_textview.tv.show() self.conversation_tv_buffer = self.conversation_textview.tv.get_buffer() - self.xml.get_widget('conversation_scrolledwindow').add( + self.xml.get_object('conversation_scrolledwindow').add( self.conversation_textview.tv) self.form_widget = None - parent_box = self.xml.get_widget('conversation_scrolledwindow').\ + parent_box = self.xml.get_object('conversation_scrolledwindow').\ get_parent() if form_node: dataform = dataforms.ExtendForm(node=form_node) @@ -2590,15 +2590,15 @@ class SingleMessageWindow: self.form_widget.show_all() parent_box.add(self.form_widget) parent_box.child_set_property(self.form_widget, 'position', - parent_box.child_get_property(self.xml.get_widget( + parent_box.child_get_property(self.xml.get_object( 'conversation_scrolledwindow'), 'position')) self.action = 'form' - self.send_button = self.xml.get_widget('send_button') - self.reply_button = self.xml.get_widget('reply_button') - self.send_and_close_button = self.xml.get_widget('send_and_close_button') - self.cancel_button = self.xml.get_widget('cancel_button') - self.close_button = self.xml.get_widget('close_button') + self.send_button = self.xml.get_object('send_button') + self.reply_button = self.xml.get_object('reply_button') + self.send_and_close_button = self.xml.get_object('send_and_close_button') + self.cancel_button = self.xml.get_object('cancel_button') + self.close_button = self.xml.get_object('close_button') self.message_tv_buffer.connect('changed', self.update_char_counter) if isinstance(to, list): jid = ', '.join( [i[0].jid + '/' + i[0].resource for i in to]) @@ -2635,7 +2635,7 @@ class SingleMessageWindow: liststore.append((img.get_pixbuf(), jid)) else: self.completion_dict = {} - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) # get window position and size from config gtkgui_helpers.resize_window(self.window, @@ -2835,10 +2835,10 @@ class XMLConsoleWindow: def __init__(self, account): self.account = account - self.xml = gtkgui_helpers.get_glade('xml_console_window.glade') - self.window = self.xml.get_widget('xml_console_window') - self.input_textview = self.xml.get_widget('input_textview') - self.stanzas_log_textview = self.xml.get_widget('stanzas_log_textview') + self.xml = gtkgui_helpers.get_gtk_builder('xml_console_window.ui') + self.window = self.xml.get_object('xml_console_window') + self.input_textview = self.xml.get_object('input_textview') + self.stanzas_log_textview = self.xml.get_object('stanzas_log_textview') self.input_tv_buffer = self.input_textview.get_buffer() buffer_ = self.stanzas_log_textview.get_buffer() end_iter = buffer_.get_end_iter() @@ -2878,7 +2878,7 @@ class XMLConsoleWindow: self.window.set_title(title) self.window.show_all() - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) def on_xml_console_window_delete_event(self, widget, event): self.window.hide() @@ -3021,14 +3021,14 @@ class RosterItemExchangeWindow: show_dialog = False - # Connect to glade - self.xml = gtkgui_helpers.get_glade('roster_item_exchange_window.glade') - self.window = self.xml.get_widget('roster_item_exchange_window') + # Connect to gtk builder + self.xml = gtkgui_helpers.get_gtk_builder('roster_item_exchange_window.ui') + self.window = self.xml.get_object('roster_item_exchange_window') # Add Widgets. for widget_to_add in ['accept_button_label', 'type_label', 'body_scrolledwindow', 'body_textview', 'items_list_treeview']: - self.__dict__[widget_to_add] = self.xml.get_widget(widget_to_add) + self.__dict__[widget_to_add] = self.xml.get_object(widget_to_add) # Set labels # self.action can be 'add', 'modify' or 'remove' @@ -3154,7 +3154,7 @@ class RosterItemExchangeWindow: if show_dialog: self.window.show_all() - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) def toggled_callback(self, cell, path): model = self.items_list_treeview.get_model() @@ -3251,9 +3251,9 @@ class PrivacyListWindow: self.edit_rule_type = 'jid' self.allow_deny = 'allow' - # Connect to glade - self.xml = gtkgui_helpers.get_glade('privacy_list_window.glade') - self.window = self.xml.get_widget('privacy_list_edit_window') + # Connect to gtk builder + self.xml = gtkgui_helpers.get_gtk_builder('privacy_list_window.ui') + self.window = self.xml.get_object('privacy_list_edit_window') # Add Widgets @@ -3272,7 +3272,7 @@ class PrivacyListWindow: 'privacy_list_refresh_button', 'privacy_list_close_button', 'edit_send_status_checkbutton', 'add_edit_vbox', 'privacy_list_active_checkbutton', 'privacy_list_default_checkbutton'): - self.__dict__[widget_to_add] = self.xml.get_widget(widget_to_add) + self.__dict__[widget_to_add] = self.xml.get_object(widget_to_add) self.privacy_lists_title_label.set_label( _('Privacy List <b><i>%s</i></b>') % \ @@ -3313,7 +3313,7 @@ class PrivacyListWindow: self.window.show_all() self.add_edit_vbox.hide() - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) def on_privacy_list_edit_window_destroy(self, widget): key_name = 'privacy_list_%s' % self.privacy_list_name @@ -3579,14 +3579,14 @@ class PrivacyListsWindow: self.account = account self.privacy_lists_save = [] - self.xml = gtkgui_helpers.get_glade('privacy_lists_window.glade') + self.xml = gtkgui_helpers.get_gtk_builder('privacy_lists_window.ui') - self.window = self.xml.get_widget('privacy_lists_first_window') + self.window = self.xml.get_object('privacy_lists_first_window') for widget_to_add in ('list_of_privacy_lists_combobox', 'delete_privacy_list_button', 'open_privacy_list_button', 'new_privacy_list_button', 'new_privacy_list_entry', 'privacy_lists_refresh_button', 'close_privacy_lists_window_button'): - self.__dict__[widget_to_add] = self.xml.get_widget( + self.__dict__[widget_to_add] = self.xml.get_object( widget_to_add) self.draw_privacy_lists_in_combobox([]) @@ -3603,7 +3603,7 @@ class PrivacyListsWindow: self.window.show_all() - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) def on_privacy_lists_first_window_destroy(self, widget): if 'privacy_lists' in gajim.interface.instances[self.account]: @@ -3735,16 +3735,16 @@ class ProgressDialog: During text is what to show during the procedure, messages_queue has the message to show in the textview """ - self.xml = gtkgui_helpers.get_glade('progress_dialog.glade') - self.dialog = self.xml.get_widget('progress_dialog') - self.label = self.xml.get_widget('label') + self.xml = gtkgui_helpers.get_gtk_builder('progress_dialog.ui') + self.dialog = self.xml.get_object('progress_dialog') + self.label = self.xml.get_object('label') self.label.set_markup('<big>' + during_text + '</big>') - self.progressbar = self.xml.get_widget('progressbar') + self.progressbar = self.xml.get_object('progressbar') self.dialog.set_title(title_text) self.dialog.set_default_size(450, 250) self.window.set_position(gtk.WIN_POS_CENTER_ON_PARENT) self.dialog.show_all() - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) self.update_progressbar_timeout_id = gobject.timeout_add(100, self.update_progressbar) @@ -3902,23 +3902,23 @@ class AddSpecialNotificationDialog: jid is the jid for which we want to add special notification (sound and notification popups) """ - self.xml = gtkgui_helpers.get_glade('add_special_notification_window.glade') - self.window = self.xml.get_widget('add_special_notification_window') - self.condition_combobox = self.xml.get_widget('condition_combobox') + self.xml = gtkgui_helpers.get_gtk_builder('add_special_notification_window.ui') + self.window = self.xml.get_object('add_special_notification_window') + self.condition_combobox = self.xml.get_object('condition_combobox') self.condition_combobox.set_active(0) - self.notification_popup_yes_no_combobox = self.xml.get_widget( + self.notification_popup_yes_no_combobox = self.xml.get_object( 'notification_popup_yes_no_combobox') self.notification_popup_yes_no_combobox.set_active(0) - self.listen_sound_combobox = self.xml.get_widget('listen_sound_combobox') + self.listen_sound_combobox = self.xml.get_object('listen_sound_combobox') self.listen_sound_combobox.set_active(0) self.jid = jid - self.xml.get_widget('when_foo_becomes_label').set_text( + self.xml.get_object('when_foo_becomes_label').set_text( _('When %s becomes:') % self.jid) self.window.set_title(_('Adding Special Notification for %s') % jid) self.window.show_all() - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) def on_cancel_button_clicked(self, widget): self.window.destroy() @@ -3956,8 +3956,8 @@ class AdvancedNotificationsWindow: 'tab_opened', 'sound', 'sound_file', 'popup', 'auto_open', 'run_command', 'command', 'systray', 'roster', 'urgency_hint'] def __init__(self): - self.xml = gtkgui_helpers.get_glade('advanced_notifications_window.glade') - self.window = self.xml.get_widget('advanced_notifications_window') + self.xml = gtkgui_helpers.get_gtk_builder('advanced_notifications_window.ui') + self.window = self.xml.get_object('advanced_notifications_window') for w in ('conditions_treeview', 'config_vbox', 'event_combobox', 'recipient_type_combobox', 'recipient_list_entry', 'delete_button', 'status_hbox', 'use_sound_cb', 'disable_sound_cb', 'use_popup_cb', @@ -3966,7 +3966,7 @@ class AdvancedNotificationsWindow: 'disable_roster_cb', 'tab_opened_cb', 'not_tab_opened_cb', 'sound_entry', 'sound_file_hbox', 'up_button', 'down_button', 'run_command_cb', 'command_entry', 'urgency_hint_cb'): - self.__dict__[w] = self.xml.get_widget(w) + self.__dict__[w] = self.xml.get_object(w) # Contains status checkboxes childs = self.status_hbox.get_children() @@ -3997,7 +3997,7 @@ class AdvancedNotificationsWindow: col.pack_start(renderer, expand=True) col.set_attributes(renderer, text=1) - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) # Fill conditions_treeview num = 0 @@ -4424,13 +4424,13 @@ class TransformChatToMUC: self.auto_jids = jids self.preselected_jids = preselected - self.xml = gtkgui_helpers.get_glade('chat_to_muc_window.glade') - self.window = self.xml.get_widget('chat_to_muc_window') + self.xml = gtkgui_helpers.get_gtk_builder('chat_to_muc_window.ui') + self.window = self.xml.get_object('chat_to_muc_window') for widget_to_add in ('invite_button', 'cancel_button', 'server_list_comboboxentry', 'guests_treeview', 'server_and_guests_hseparator', 'server_select_label'): - self.__dict__[widget_to_add] = self.xml.get_widget(widget_to_add) + self.__dict__[widget_to_add] = self.xml.get_object(widget_to_add) server_list = [] self.servers = gtk.ListStore(str) @@ -4505,7 +4505,7 @@ class TransformChatToMUC: # show all self.window.show_all() - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) def on_chat_to_muc_window_destroy(self, widget): self.instances.remove(self) @@ -4574,13 +4574,13 @@ class ESessionInfoWindow: def __init__(self, session): self.session = session - self.xml = gtkgui_helpers.get_glade('esession_info_window.glade') - self.xml.signal_autoconnect(self) + self.xml = gtkgui_helpers.get_gtk_builder('esession_info_window.ui') + self.xml.connect_signals(self) - self.security_image = self.xml.get_widget('security_image') - self.verify_now_button = self.xml.get_widget('verify_now_button') - self.button_label = self.xml.get_widget('button_label') - self.window = self.xml.get_widget('esession_info_window') + self.security_image = self.xml.get_object('security_image') + self.verify_now_button = self.xml.get_object('verify_now_button') + self.button_label = self.xml.get_object('button_label') + self.window = self.xml.get_object('esession_info_window') self.update_info() @@ -4598,10 +4598,10 @@ class ESessionInfoWindow: verification_status = _('''Contact's identity verified''') self.window.set_title(verification_status) - self.xml.get_widget('verification_status_label').set_markup( + self.xml.get_object('verification_status_label').set_markup( '<b><span size="x-large">%s</span></b>' % verification_status) - self.xml.get_widget('dialog-action_area1').set_no_show_all(True) + self.xml.get_object('dialog-action_area1').set_no_show_all(True) self.button_label.set_text(_('Verify again...')) else: if self.session.control: @@ -4612,7 +4612,7 @@ class ESessionInfoWindow: verification_status = _('''Contact's identity NOT verified''') self.window.set_title(verification_status) - self.xml.get_widget('verification_status_label').set_markup( + self.xml.get_object('verification_status_label').set_markup( '<b><span size="x-large">%s</span></b>' % verification_status) self.button_label.set_text(_('Verify...')) @@ -4620,7 +4620,7 @@ class ESessionInfoWindow: path = gtkgui_helpers.get_icon_path(security_image, 32) self.security_image.set_from_file(path) - self.xml.get_widget('info_display').set_markup(labeltext) + self.xml.get_object('info_display').set_markup(labeltext) def on_close_button_clicked(self, widget): self.window.destroy() @@ -4647,12 +4647,12 @@ class GPGInfoWindow: Class for displaying information about a XEP-0116 encrypted session """ def __init__(self, control): - xml = gtkgui_helpers.get_glade('esession_info_window.glade') - security_image = xml.get_widget('security_image') - status_label = xml.get_widget('verification_status_label') - info_label = xml.get_widget('info_display') - verify_now_button = xml.get_widget('verify_now_button') - self.window = xml.get_widget('esession_info_window') + xml = gtkgui_helpers.get_gtk_builder('esession_info_window.ui') + security_image = xml.get_object('security_image') + status_label = xml.get_object('verification_status_label') + info_label = xml.get_object('info_display') + verify_now_button = xml.get_object('verify_now_button') + self.window = xml.get_object('esession_info_window') account = control.account keyID = control.contact.keyID error = None @@ -4692,7 +4692,7 @@ class GPGInfoWindow: path = gtkgui_helpers.get_icon_path(image, 32) security_image.set_from_file(path) - xml.signal_autoconnect(self) + xml.connect_signals(self) self.window.show_all() def on_close_button_clicked(self, widget): @@ -4722,8 +4722,8 @@ class VoIPCallReceivedDialog(object): self.sid = sid self.content_types = content_types - xml = gtkgui_helpers.get_glade('voip_call_received_dialog.glade') - xml.signal_autoconnect(self) + xml = gtkgui_helpers.get_gtk_builder('voip_call_received_dialog.ui') + xml.connect_signals(self) jid = gajim.get_jid_without_resource(self.fjid) contact = gajim.contacts.get_first_contact_from_jid(account, jid) @@ -4732,7 +4732,7 @@ class VoIPCallReceivedDialog(object): else: self.contact_text = contact_jid - self.dialog = xml.get_widget('voip_call_received_messagedialog') + self.dialog = xml.get_object('voip_call_received_messagedialog') self.set_secondary_text() self.dialog.show_all() diff --git a/src/disco.py b/src/disco.py index 0eac6c1f5..c557e5777 100644 --- a/src/disco.py +++ b/src/disco.py @@ -519,29 +519,29 @@ _('Without a connection, you can not browse available services')) self.cache = ServicesCache(account) gajim.connections[account].services_cache = self.cache - self.xml = gtkgui_helpers.get_glade('service_discovery_window.glade') - self.window = self.xml.get_widget('service_discovery_window') - self.services_treeview = self.xml.get_widget('services_treeview') + self.xml = gtkgui_helpers.get_gtk_builder('service_discovery_window.ui') + self.window = self.xml.get_object('service_discovery_window') + self.services_treeview = self.xml.get_object('services_treeview') self.model = None # This is more reliable than the cursor-changed signal. selection = self.services_treeview.get_selection() selection.connect_after('changed', self.on_services_treeview_selection_changed) - self.services_scrollwin = self.xml.get_widget('services_scrollwin') - self.progressbar = self.xml.get_widget('services_progressbar') - self.banner = self.xml.get_widget('banner_agent_label') - self.banner_icon = self.xml.get_widget('banner_agent_icon') - self.banner_eventbox = self.xml.get_widget('banner_agent_eventbox') + self.services_scrollwin = self.xml.get_object('services_scrollwin') + self.progressbar = self.xml.get_object('services_progressbar') + self.banner = self.xml.get_object('banner_agent_label') + self.banner_icon = self.xml.get_object('banner_agent_icon') + self.banner_eventbox = self.xml.get_object('banner_agent_eventbox') self.style_event_id = 0 self.banner.realize() self.paint_banner() - self.action_buttonbox = self.xml.get_widget('action_buttonbox') + self.action_buttonbox = self.xml.get_object('action_buttonbox') # Address combobox self.address_comboboxentry = None - address_table = self.xml.get_widget('address_table') + address_table = self.xml.get_object('address_table') if address_entry: - self.address_comboboxentry = self.xml.get_widget( + self.address_comboboxentry = self.xml.get_object( 'address_comboboxentry') self.address_comboboxentry_entry = self.address_comboboxentry.child self.address_comboboxentry_entry.set_activates_default(True) @@ -564,7 +564,7 @@ _('Without a connection, you can not browse available services')) address_table.hide() self._initial_state() - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) self.travel(jid, node) self.window.show_all() @@ -941,7 +941,7 @@ class AgentBrowser: # This is a hack. The buttonbox apparently doesn't care about pack_start # or pack_end, so we repack the close button here to make sure it's last - close_button = self.window.xml.get_widget('close_button') + close_button = self.window.xml.get_object('close_button') self.window.action_buttonbox.remove(close_button) self.window.action_buttonbox.pack_end(close_button) close_button.show_all() diff --git a/src/features_window.py b/src/features_window.py index 336bbd467..b737d4e37 100644 --- a/src/features_window.py +++ b/src/features_window.py @@ -38,10 +38,10 @@ class FeaturesWindow: """ def __init__(self): - self.xml = gtkgui_helpers.get_glade('features_window.glade') - self.window = self.xml.get_widget('features_window') - treeview = self.xml.get_widget('features_treeview') - self.desc_label = self.xml.get_widget('feature_desc_label') + self.xml = gtkgui_helpers.get_gtk_builder('features_window.ui') + self.window = self.xml.get_object('features_window') + treeview = self.xml.get_object('features_treeview') + self.desc_label = self.xml.get_object('feature_desc_label') # {name: (available_function, unix_text, windows_text)} self.features = { @@ -132,9 +132,9 @@ class FeaturesWindow: self.model.set_sort_column_id(0, gtk.SORT_ASCENDING) - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) self.window.show_all() - self.xml.get_widget('close_button').grab_focus() + self.xml.get_object('close_button').grab_focus() def on_close_button_clicked(self, widget): self.window.destroy() diff --git a/src/filetransfers_window.py b/src/filetransfers_window.py index 55cb90281..b1ec59f1d 100644 --- a/src/filetransfers_window.py +++ b/src/filetransfers_window.py @@ -49,13 +49,13 @@ class FileTransfersWindow: def __init__(self): self.files_props = {'r' : {}, 's': {}} self.height_diff = 0 - self.xml = gtkgui_helpers.get_glade('filetransfers.glade') - self.window = self.xml.get_widget('file_transfers_window') - self.tree = self.xml.get_widget('transfers_list') - self.cancel_button = self.xml.get_widget('cancel_button') - self.pause_button = self.xml.get_widget('pause_restore_button') - self.cleanup_button = self.xml.get_widget('cleanup_button') - self.notify_ft_checkbox = self.xml.get_widget( + self.xml = gtkgui_helpers.get_gtk_builder('filetransfers.ui') + self.window = self.xml.get_object('file_transfers_window') + self.tree = self.xml.get_object('transfers_list') + self.cancel_button = self.xml.get_object('cancel_button') + self.pause_button = self.xml.get_object('pause_restore_button') + self.cleanup_button = self.xml.get_object('cleanup_button') + self.notify_ft_checkbox = self.xml.get_object( 'notify_ft_complete_checkbox') shall_notify = gajim.config.get('notify_on_file_complete') @@ -126,13 +126,13 @@ class FileTransfersWindow: self.tree.get_selection().set_mode(gtk.SELECTION_SINGLE) self.tree.get_selection().connect('changed', self.selection_changed) self.tooltip = tooltips.FileTransfersTooltip() - self.file_transfers_menu = self.xml.get_widget('file_transfers_menu') - self.open_folder_menuitem = self.xml.get_widget('open_folder_menuitem') - self.cancel_menuitem = self.xml.get_widget('cancel_menuitem') - self.pause_menuitem = self.xml.get_widget('pause_menuitem') - self.continue_menuitem = self.xml.get_widget('continue_menuitem') - self.remove_menuitem = self.xml.get_widget('remove_menuitem') - self.xml.signal_autoconnect(self) + self.file_transfers_menu = self.xml.get_object('file_transfers_menu') + self.open_folder_menuitem = self.xml.get_object('open_folder_menuitem') + self.cancel_menuitem = self.xml.get_object('cancel_menuitem') + self.pause_menuitem = self.xml.get_object('pause_menuitem') + self.continue_menuitem = self.xml.get_object('continue_menuitem') + self.remove_menuitem = self.xml.get_object('remove_menuitem') + self.xml.connect_signals(self) def find_transfer_by_jid(self, account, jid): """ diff --git a/src/gajim.py b/src/gajim.py index 285ad249d..30f0504eb 100644 --- a/src/gajim.py +++ b/src/gajim.py @@ -184,15 +184,6 @@ else: sectext = _('Gajim needs GTK 2.16 or above to run. Quiting...') try: - import gtk.glade # check if user has libglade (in pygtk and in gtk) - except ImportError: - pritext = _('GTK+ runtime is missing libglade support') - if os.name == 'nt': - sectext = _('Please remove your current GTK+ runtime and install the latest stable version from %s') % 'http://gladewin32.sourceforge.net' - else: - sectext = _('Please make sure that GTK+ and PyGTK have libglade support in your system.') - - try: from common import check_paths except exceptions.PysqliteNotAvailable, e: pritext = _('Gajim needs PySQLite2 to run') diff --git a/src/gajim_themes_window.py b/src/gajim_themes_window.py index e6c23929a..b754b7226 100644 --- a/src/gajim_themes_window.py +++ b/src/gajim_themes_window.py @@ -32,27 +32,27 @@ from common import gajim class GajimThemesWindow: def __init__(self): - self.xml = gtkgui_helpers.get_glade('gajim_themes_window.glade') - self.window = self.xml.get_widget('gajim_themes_window') + self.xml = gtkgui_helpers.get_gtk_builder('gajim_themes_window.ui') + self.window = self.xml.get_object('gajim_themes_window') self.window.set_transient_for(gajim.interface.roster.window) self.options = ['account', 'group', 'contact', 'banner'] - self.options_combobox = self.xml.get_widget('options_combobox') - self.textcolor_checkbutton = self.xml.get_widget('textcolor_checkbutton') - self.background_checkbutton = self.xml.get_widget('background_checkbutton') - self.textfont_checkbutton = self.xml.get_widget('textfont_checkbutton') - self.text_colorbutton = self.xml.get_widget('text_colorbutton') - self.background_colorbutton = self.xml.get_widget('background_colorbutton') - self.text_fontbutton = self.xml.get_widget('text_fontbutton') - self.bold_togglebutton = self.xml.get_widget('bold_togglebutton') - self.italic_togglebutton = self.xml.get_widget('italic_togglebutton') - self.themes_tree = self.xml.get_widget('themes_treeview') - self.theme_options_vbox = self.xml.get_widget('theme_options_vbox') - self.theme_options_table = self.xml.get_widget('theme_options_table') + self.options_combobox = self.xml.get_object('options_combobox') + self.textcolor_checkbutton = self.xml.get_object('textcolor_checkbutton') + self.background_checkbutton = self.xml.get_object('background_checkbutton') + self.textfont_checkbutton = self.xml.get_object('textfont_checkbutton') + self.text_colorbutton = self.xml.get_object('text_colorbutton') + self.background_colorbutton = self.xml.get_object('background_colorbutton') + self.text_fontbutton = self.xml.get_object('text_fontbutton') + self.bold_togglebutton = self.xml.get_object('bold_togglebutton') + self.italic_togglebutton = self.xml.get_object('italic_togglebutton') + self.themes_tree = self.xml.get_object('themes_treeview') + self.theme_options_vbox = self.xml.get_object('theme_options_vbox') + self.theme_options_table = self.xml.get_object('theme_options_table') self.colorbuttons = {} for chatstate in ('inactive', 'composing', 'paused', 'gone', 'muc_msg', 'muc_directed_msg'): - self.colorbuttons[chatstate] = self.xml.get_widget(chatstate + \ + self.colorbuttons[chatstate] = self.xml.get_object(chatstate + \ '_colorbutton') model = gtk.ListStore(str) self.themes_tree.set_model(model) @@ -70,7 +70,7 @@ class GajimThemesWindow: self.current_option = self.options[0] self.set_theme_options(self.current_theme, self.current_option) - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) self.window.connect('delete-event', self.on_themese_window_delete_event) self.themes_tree.get_selection().connect('changed', self.selection_changed) @@ -132,11 +132,11 @@ class GajimThemesWindow: if theme == active_theme: self.themes_tree.get_selection().select_iter(iter_) if active_theme == 'default': - self.xml.get_widget('remove_button').set_sensitive(False) + self.xml.get_object('remove_button').set_sensitive(False) self.theme_options_vbox.set_sensitive(False) self.theme_options_table.set_sensitive(False) else: - self.xml.get_widget('remove_button').set_sensitive(True) + self.xml.get_object('remove_button').set_sensitive(True) self.theme_options_vbox.set_sensitive(True) self.theme_options_table.set_sensitive(True) break @@ -153,11 +153,11 @@ class GajimThemesWindow: self.current_theme = self.current_theme.replace(' ', '_') self.set_theme_options(self.current_theme) if self.current_theme == 'default': - self.xml.get_widget('remove_button').set_sensitive(False) + self.xml.get_object('remove_button').set_sensitive(False) self.theme_options_vbox.set_sensitive(False) self.theme_options_table.set_sensitive(False) else: - self.xml.get_widget('remove_button').set_sensitive(True) + self.xml.get_object('remove_button').set_sensitive(True) self.theme_options_vbox.set_sensitive(True) self.theme_options_table.set_sensitive(True) @@ -188,7 +188,7 @@ class GajimThemesWindow: return self.theme_options_vbox.set_sensitive(False) self.theme_options_table.set_sensitive(False) - self.xml.get_widget('remove_button').set_sensitive(False) + self.xml.get_object('remove_button').set_sensitive(False) gajim.config.del_per('themes', self.current_theme) model.remove(iter_) diff --git a/src/groupchat_control.py b/src/groupchat_control.py index e5ebd439e..c13f22732 100644 --- a/src/groupchat_control.py +++ b/src/groupchat_control.py @@ -212,20 +212,20 @@ class GroupchatControl(ChatControlBase): # state in got_connected()). self.autorejoin = None - self.actions_button = self.xml.get_widget('muc_window_actions_button') + self.actions_button = self.xml.get_object('muc_window_actions_button') id_ = self.actions_button.connect('clicked', self.on_actions_button_clicked) self.handlers[id_] = self.actions_button - widget = self.xml.get_widget('change_nick_button') + widget = self.xml.get_object('change_nick_button') id_ = widget.connect('clicked', self._on_change_nick_menuitem_activate) self.handlers[id_] = widget - widget = self.xml.get_widget('change_subject_button') + widget = self.xml.get_object('change_subject_button') id_ = widget.connect('clicked', self._on_change_subject_menuitem_activate) self.handlers[id_] = widget - widget = self.xml.get_widget('bookmark_button') + widget = self.xml.get_object('bookmark_button') for bm in gajim.connections[self.account].bookmarks: if bm['jid'] == self.contact.jid: widget.hide() @@ -236,7 +236,7 @@ class GroupchatControl(ChatControlBase): self.handlers[id_] = widget widget.show() - widget = self.xml.get_widget('list_treeview') + widget = self.xml.get_object('list_treeview') id_ = widget.connect('row_expanded', self.on_list_treeview_row_expanded) self.handlers[id_] = widget @@ -276,9 +276,9 @@ class GroupchatControl(ChatControlBase): compact_view = gajim.config.get('compact_view') self.chat_buttons_set_visible(compact_view) - self.widget_set_visible(self.xml.get_widget('banner_eventbox'), + self.widget_set_visible(self.xml.get_object('banner_eventbox'), gajim.config.get('hide_groupchat_banner')) - self.widget_set_visible(self.xml.get_widget('list_scrolledwindow'), + self.widget_set_visible(self.xml.get_object('list_scrolledwindow'), gajim.config.get('hide_groupchat_occupants_list')) self._last_selected_contact = None # None or holds jid, account tuple @@ -303,15 +303,15 @@ class GroupchatControl(ChatControlBase): self.number_of_colors = len(gajim.config.get('gc_nicknames_colors').\ split(':')) - self.name_label = self.xml.get_widget('banner_name_label') - self.event_box = self.xml.get_widget('banner_eventbox') + self.name_label = self.xml.get_object('banner_name_label') + self.event_box = self.xml.get_object('banner_eventbox') # set the position of the current hpaned hpaned_position = gajim.config.get('gc-hpaned-position') - self.hpaned = self.xml.get_widget('hpaned') + self.hpaned = self.xml.get_object('hpaned') self.hpaned.set_position(hpaned_position) - self.list_treeview = self.xml.get_widget('list_treeview') + self.list_treeview = self.xml.get_object('list_treeview') selection = self.list_treeview.get_selection() id_ = selection.connect('changed', self.on_list_treeview_selection_changed) @@ -580,7 +580,7 @@ class GroupchatControl(ChatControlBase): self.change_roster_style() def _update_banner_state_image(self): - banner_status_img = self.xml.get_widget('gc_banner_status_image') + banner_status_img = self.xml.get_object('gc_banner_status_image') images = gajim.interface.jabber_state_images if self.room_jid in gajim.gc_connected[self.account] and \ gajim.gc_connected[self.account][self.room_jid]: @@ -653,18 +653,18 @@ class GroupchatControl(ChatControlBase): """ Set sensitivity state for configure_room """ - xml = gtkgui_helpers.get_glade('gc_control_popup_menu.glade') - menu = xml.get_widget('gc_control_popup_menu') + xml = gtkgui_helpers.get_gtk_builder('gc_control_popup_menu.ui') + menu = xml.get_object('gc_control_popup_menu') - bookmark_room_menuitem = xml.get_widget('bookmark_room_menuitem') - change_nick_menuitem = xml.get_widget('change_nick_menuitem') - configure_room_menuitem = xml.get_widget('configure_room_menuitem') - destroy_room_menuitem = xml.get_widget('destroy_room_menuitem') - change_subject_menuitem = xml.get_widget('change_subject_menuitem') - history_menuitem = xml.get_widget('history_menuitem') - minimize_menuitem = xml.get_widget('minimize_menuitem') - bookmark_separator = xml.get_widget('bookmark_separator') - separatormenuitem2 = xml.get_widget('separatormenuitem2') + bookmark_room_menuitem = xml.get_object('bookmark_room_menuitem') + change_nick_menuitem = xml.get_object('change_nick_menuitem') + configure_room_menuitem = xml.get_object('configure_room_menuitem') + destroy_room_menuitem = xml.get_object('destroy_room_menuitem') + change_subject_menuitem = xml.get_object('change_subject_menuitem') + history_menuitem = xml.get_object('history_menuitem') + minimize_menuitem = xml.get_object('minimize_menuitem') + bookmark_separator = xml.get_object('bookmark_separator') + separatormenuitem2 = xml.get_object('separatormenuitem2') if hide_buttonbar_items: change_nick_menuitem.hide() @@ -1970,11 +1970,11 @@ class GroupchatControl(ChatControlBase): self.room_jid, user_nick).affiliation user_role = self.get_role(user_nick) - # making menu from glade - xml = gtkgui_helpers.get_glade('gc_occupants_menu.glade') + # making menu from gtk builder + xml = gtkgui_helpers.get_gtk_builder('gc_occupants_menu.ui') # these conditions were taken from JEP 0045 - item = xml.get_widget('kick_menuitem') + item = xml.get_object('kick_menuitem') if user_role != 'moderator' or \ (user_affiliation == 'admin' and target_affiliation == 'owner') or \ (user_affiliation == 'member' and target_affiliation in ('admin', @@ -1984,7 +1984,7 @@ class GroupchatControl(ChatControlBase): id_ = item.connect('activate', self.kick, nick) self.handlers[id_] = item - item = xml.get_widget('voice_checkmenuitem') + item = xml.get_object('voice_checkmenuitem') item.set_active(target_role != 'visitor') if user_role != 'moderator' or \ user_affiliation == 'none' or \ @@ -1995,7 +1995,7 @@ class GroupchatControl(ChatControlBase): nick) self.handlers[id_] = item - item = xml.get_widget('moderator_checkmenuitem') + item = xml.get_object('moderator_checkmenuitem') item.set_active(target_role == 'moderator') if not user_affiliation in ('admin', 'owner') or \ target_affiliation in ('admin', 'owner'): @@ -2004,7 +2004,7 @@ class GroupchatControl(ChatControlBase): nick) self.handlers[id_] = item - item = xml.get_widget('ban_menuitem') + item = xml.get_object('ban_menuitem') if not user_affiliation in ('admin', 'owner') or \ (target_affiliation in ('admin', 'owner') and\ user_affiliation != 'owner'): @@ -2012,7 +2012,7 @@ class GroupchatControl(ChatControlBase): id_ = item.connect('activate', self.ban, jid) self.handlers[id_] = item - item = xml.get_widget('member_checkmenuitem') + item = xml.get_object('member_checkmenuitem') item.set_active(target_affiliation != 'none') if not user_affiliation in ('admin', 'owner') or \ (user_affiliation != 'owner' and target_affiliation in ('admin','owner')): @@ -2020,29 +2020,29 @@ class GroupchatControl(ChatControlBase): id_ = item.connect('activate', self.on_member_checkmenuitem_activate, jid) self.handlers[id_] = item - item = xml.get_widget('admin_checkmenuitem') + item = xml.get_object('admin_checkmenuitem') item.set_active(target_affiliation in ('admin', 'owner')) if not user_affiliation == 'owner': item.set_sensitive(False) id_ = item.connect('activate', self.on_admin_checkmenuitem_activate, jid) self.handlers[id_] = item - item = xml.get_widget('owner_checkmenuitem') + item = xml.get_object('owner_checkmenuitem') item.set_active(target_affiliation == 'owner') if not user_affiliation == 'owner': item.set_sensitive(False) id_ = item.connect('activate', self.on_owner_checkmenuitem_activate, jid) self.handlers[id_] = item - item = xml.get_widget('information_menuitem') + item = xml.get_object('information_menuitem') id_ = item.connect('activate', self.on_info, nick) self.handlers[id_] = item - item = xml.get_widget('history_menuitem') + item = xml.get_object('history_menuitem') id_ = item.connect('activate', self.on_history, nick) self.handlers[id_] = item - item = xml.get_widget('add_to_roster_menuitem') + item = xml.get_object('add_to_roster_menuitem') our_jid = gajim.get_jid_from_account(self.account) if not jid or jid == our_jid: item.set_sensitive(False) @@ -2050,8 +2050,8 @@ class GroupchatControl(ChatControlBase): id_ = item.connect('activate', self.on_add_to_roster, jid) self.handlers[id_] = item - item = xml.get_widget('block_menuitem') - item2 = xml.get_widget('unblock_menuitem') + item = xml.get_object('block_menuitem') + item2 = xml.get_object('unblock_menuitem') if helpers.jid_is_blocked(self.account, fjid): item.set_no_show_all(True) item.hide() @@ -2063,11 +2063,11 @@ class GroupchatControl(ChatControlBase): item2.set_no_show_all(True) item2.hide() - item = xml.get_widget('send_private_message_menuitem') + item = xml.get_object('send_private_message_menuitem') id_ = item.connect('activate', self.on_send_pm, model, iter_) self.handlers[id_] = item - item = xml.get_widget('send_file_menuitem') + item = xml.get_object('send_file_menuitem') # add a special img for send file menuitem path_to_upload_img = gtkgui_helpers.get_icon_path('gajim-upload') img = gtk.Image() @@ -2081,7 +2081,7 @@ class GroupchatControl(ChatControlBase): self.handlers[id_] = item # show the popup now! - menu = xml.get_widget('gc_occupants_menu') + menu = xml.get_object('gc_occupants_menu') menu.show_all() menu.popup(None, None, None, event.button, event.time) diff --git a/src/groups.py b/src/groups.py index 2588b11a4..26e4e36b1 100644 --- a/src/groups.py +++ b/src/groups.py @@ -37,12 +37,12 @@ class GroupsPostWindow: self.servicejid = servicejid self.groupid = groupid - self.xml = gtkgui_helpers.get_glade('groups_post_window.glade') - self.window = self.xml.get_widget('groups_post_window') + self.xml = gtkgui_helpers.get_gtk_builder('groups_post_window.ui') + self.window = self.xml.get_object('groups_post_window') for name in ('from_entry', 'subject_entry', 'contents_textview'): - self.__dict__[name] = self.xml.get_widget(name) + self.__dict__[name] = self.xml.get_object(name) - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) self.window.show_all() def on_cancel_button_clicked(self, w): diff --git a/src/gtkgui_helpers.py b/src/gtkgui_helpers.py index 1e01829cf..7f3ab1f57 100644 --- a/src/gtkgui_helpers.py +++ b/src/gtkgui_helpers.py @@ -29,7 +29,6 @@ import xml.sax.saxutils import gtk -import gtk.glade import glib import gobject import pango @@ -77,9 +76,6 @@ if os.name == 'nt': from common import helpers -gtk.glade.bindtextdomain(i18n.APP, i18n.DIR) -gtk.glade.textdomain(i18n.APP) - screen_w = gtk.gdk.screen_width() screen_h = gtk.gdk.screen_height() @@ -92,10 +88,16 @@ def add_image_to_menuitem(menuitem, icon_name): def add_image_to_button(button, icon_name): add_image_to_menuitem(button, icon_name) -GLADE_DIR = os.path.join(gajim.DATA_DIR, 'glade') -def get_glade(file_name, root = None): - file_path = os.path.join(GLADE_DIR, file_name) - return gtk.glade.XML(file_path, root=root, domain=i18n.APP) +GUI_DIR = os.path.join(gajim.DATA_DIR, 'gui') +def get_gtk_builder(file_name, widget=None): + file_path = os.path.join(GUI_DIR, file_name) + builder = gtk.Builder() + builder.set_translation_domain(i18n.APP) + if widget: + builder.add_objects_from_file(file_path, [widget]) + else: + builder.add_from_file(file_path) + return builder def get_completion_liststore(entry): """ diff --git a/src/gui_menu_builder.py b/src/gui_menu_builder.py index 5fd799a99..3e9bbb181 100644 --- a/src/gui_menu_builder.py +++ b/src/gui_menu_builder.py @@ -162,40 +162,40 @@ def get_contact_menu(contact, account, use_multiple_contacts=True, our_jid = jid == gajim.get_jid_from_account(account) roster = gajim.interface.roster - xml = gtkgui_helpers.get_glade('contact_context_menu.glade') - contact_context_menu = xml.get_widget('contact_context_menu') - - start_chat_menuitem = xml.get_widget('start_chat_menuitem') - execute_command_menuitem = xml.get_widget('execute_command_menuitem') - rename_menuitem = xml.get_widget('rename_menuitem') - edit_groups_menuitem = xml.get_widget('edit_groups_menuitem') - send_file_menuitem = xml.get_widget('send_file_menuitem') - assign_openpgp_key_menuitem = xml.get_widget('assign_openpgp_key_menuitem') - add_special_notification_menuitem = xml.get_widget( + xml = gtkgui_helpers.get_gtk_builder('contact_context_menu.ui') + contact_context_menu = xml.get_object('contact_context_menu') + + start_chat_menuitem = xml.get_object('start_chat_menuitem') + execute_command_menuitem = xml.get_object('execute_command_menuitem') + rename_menuitem = xml.get_object('rename_menuitem') + edit_groups_menuitem = xml.get_object('edit_groups_menuitem') + send_file_menuitem = xml.get_object('send_file_menuitem') + assign_openpgp_key_menuitem = xml.get_object('assign_openpgp_key_menuitem') + add_special_notification_menuitem = xml.get_object( 'add_special_notification_menuitem') - information_menuitem = xml.get_widget('information_menuitem') - history_menuitem = xml.get_widget('history_menuitem') - send_custom_status_menuitem = xml.get_widget('send_custom_status_menuitem') - send_single_message_menuitem = xml.get_widget('send_single_message_menuitem') - invite_menuitem = xml.get_widget('invite_menuitem') - block_menuitem = xml.get_widget('block_menuitem') - unblock_menuitem = xml.get_widget('unblock_menuitem') - ignore_menuitem = xml.get_widget('ignore_menuitem') - unignore_menuitem = xml.get_widget('unignore_menuitem') - set_custom_avatar_menuitem = xml.get_widget('set_custom_avatar_menuitem') + information_menuitem = xml.get_object('information_menuitem') + history_menuitem = xml.get_object('history_menuitem') + send_custom_status_menuitem = xml.get_object('send_custom_status_menuitem') + send_single_message_menuitem = xml.get_object('send_single_message_menuitem') + invite_menuitem = xml.get_object('invite_menuitem') + block_menuitem = xml.get_object('block_menuitem') + unblock_menuitem = xml.get_object('unblock_menuitem') + ignore_menuitem = xml.get_object('ignore_menuitem') + unignore_menuitem = xml.get_object('unignore_menuitem') + set_custom_avatar_menuitem = xml.get_object('set_custom_avatar_menuitem') # Subscription submenu - subscription_menuitem = xml.get_widget('subscription_menuitem') + subscription_menuitem = xml.get_object('subscription_menuitem') send_auth_menuitem, ask_auth_menuitem, revoke_auth_menuitem = \ subscription_menuitem.get_submenu().get_children() - add_to_roster_menuitem = xml.get_widget('add_to_roster_menuitem') - remove_from_roster_menuitem = xml.get_widget( + add_to_roster_menuitem = xml.get_object('add_to_roster_menuitem') + remove_from_roster_menuitem = xml.get_object( 'remove_from_roster_menuitem') - manage_contact_menuitem = xml.get_widget('manage_contact') - convert_to_gc_menuitem = xml.get_widget('convert_to_groupchat_menuitem') - encryption_separator = xml.get_widget('encryption_separator') - toggle_gpg_menuitem = xml.get_widget('toggle_gpg_menuitem') - toggle_e2e_menuitem = xml.get_widget('toggle_e2e_menuitem') - last_separator = xml.get_widget('last_separator') + manage_contact_menuitem = xml.get_object('manage_contact') + convert_to_gc_menuitem = xml.get_object('convert_to_groupchat_menuitem') + encryption_separator = xml.get_object('encryption_separator') + toggle_gpg_menuitem = xml.get_object('toggle_gpg_menuitem') + toggle_e2e_menuitem = xml.get_object('toggle_e2e_menuitem') + last_separator = xml.get_object('last_separator') items_to_hide = [] diff --git a/src/history_manager.py b/src/history_manager.py index 82c8e1475..21c46ca0d 100644 --- a/src/history_manager.py +++ b/src/history_manager.py @@ -115,16 +115,16 @@ class HistoryManager: '%s does not exist.' % LOG_DB_PATH) sys.exit() - xml = gtkgui_helpers.get_glade('history_manager.glade') - self.window = xml.get_widget('history_manager_window') - self.jids_listview = xml.get_widget('jids_listview') - self.logs_listview = xml.get_widget('logs_listview') - self.search_results_listview = xml.get_widget('search_results_listview') - self.search_entry = xml.get_widget('search_entry') - self.logs_scrolledwindow = xml.get_widget('logs_scrolledwindow') - self.search_results_scrolledwindow = xml.get_widget( + xml = gtkgui_helpers.get_gtk_builder('history_manager.ui') + self.window = xml.get_object('history_manager_window') + self.jids_listview = xml.get_object('jids_listview') + self.logs_listview = xml.get_object('logs_listview') + self.search_results_listview = xml.get_object('search_results_listview') + self.search_entry = xml.get_object('search_entry') + self.logs_scrolledwindow = xml.get_object('logs_scrolledwindow') + self.search_results_scrolledwindow = xml.get_object( 'search_results_scrolledwindow') - self.welcome_vbox = xml.get_widget('welcome_vbox') + self.welcome_vbox = xml.get_object('welcome_vbox') self.jids_already_in = [] # holds jids that we already have in DB self.AT_LEAST_ONE_DELETION_DONE = False @@ -143,7 +143,7 @@ class HistoryManager: self.window.show_all() - xml.signal_autoconnect(self) + xml.connect_signals(self) def _init_jids_listview(self): self.jids_liststore = gtk.ListStore(str, str) # jid, jid_id @@ -441,22 +441,22 @@ class HistoryManager: def on_listview_button_press_event(self, widget, event): if event.button == 3: # right click - xml = gtkgui_helpers.get_glade('history_manager.glade', 'context_menu') + xml = gtkgui_helpers.get_gtk_builder('history_manager.ui', 'context_menu') if widget.name != 'jids_listview': - xml.get_widget('export_menuitem').hide() - xml.get_widget('delete_menuitem').connect('activate', + xml.get_object('export_menuitem').hide() + xml.get_object('delete_menuitem').connect('activate', self.on_delete_menuitem_activate, widget) - xml.signal_autoconnect(self) - xml.get_widget('context_menu').popup(None, None, None, + xml.connect_signals(self) + xml.get_object('context_menu').popup(None, None, None, event.button, event.time) return True def on_export_menuitem_activate(self, widget): - xml = gtkgui_helpers.get_glade('history_manager.glade', 'filechooserdialog') - xml.signal_autoconnect(self) + xml = gtkgui_helpers.get_gtk_builder('history_manager.ui', 'filechooserdialog') + xml.connect_signals(self) - dlg = xml.get_widget('filechooserdialog') + dlg = xml.get_object('filechooserdialog') dlg.set_title(_('Exporting History Logs...')) dlg.set_current_folder(gajim.HOME_DIR) dlg.props.do_overwrite_confirmation = True diff --git a/src/history_window.py b/src/history_window.py index 1478720be..5e8157122 100644 --- a/src/history_window.py +++ b/src/history_window.py @@ -64,24 +64,24 @@ class HistoryWindow: """ def __init__(self, jid = None, account = None): - xml = gtkgui_helpers.get_glade('history_window.glade') - self.window = xml.get_widget('history_window') - self.jid_entry = xml.get_widget('jid_entry') - self.calendar = xml.get_widget('calendar') - scrolledwindow = xml.get_widget('scrolledwindow') + xml = gtkgui_helpers.get_gtk_builder('history_window.ui') + self.window = xml.get_object('history_window') + self.jid_entry = xml.get_object('jid_entry') + self.calendar = xml.get_object('calendar') + scrolledwindow = xml.get_object('scrolledwindow') self.history_textview = conversation_textview.ConversationTextview( account, used_in_history_window = True) scrolledwindow.add(self.history_textview.tv) self.history_buffer = self.history_textview.tv.get_buffer() self.history_buffer.create_tag('highlight', background = 'yellow') - self.checkbutton = xml.get_widget('log_history_checkbutton') + self.checkbutton = xml.get_object('log_history_checkbutton') self.checkbutton.connect('toggled', self.on_log_history_checkbutton_toggled) - self.query_entry = xml.get_widget('query_entry') - self.query_combobox = xml.get_widget('query_combobox') + self.query_entry = xml.get_object('query_entry') + self.query_combobox = xml.get_object('query_combobox') self.query_combobox.set_active(0) - self.results_treeview = xml.get_widget('results_treeview') - self.results_window = xml.get_widget('results_scrolledwindow') + self.results_treeview = xml.get_object('results_treeview') + self.results_window = xml.get_object('results_scrolledwindow') # contact_name, date, message, time model = gtk.ListStore(str, str, str, str, str) @@ -130,7 +130,7 @@ class HistoryWindow: gajim.config.get('history_window_x-position'), gajim.config.get('history_window_y-position')) - xml.signal_autoconnect(self) + xml.connect_signals(self) self.window.show_all() def _fill_completion_dict(self): diff --git a/src/message_control.py b/src/message_control.py index 40d4beb07..2cc1b3b4a 100644 --- a/src/message_control.py +++ b/src/message_control.py @@ -60,8 +60,8 @@ class MessageControl: gajim.last_message_time[self.account][self.get_full_jid()] = 0 - self.xml = gtkgui_helpers.get_glade('message_window.glade', widget_name) - self.widget = self.xml.get_widget(widget_name) + self.xml = gtkgui_helpers.get_gtk_builder('message_window.ui', widget_name) + self.widget = self.xml.get_object(widget_name) def get_full_jid(self): fjid = self.contact.jid diff --git a/src/message_window.py b/src/message_window.py index 7c97f3fb0..079798f66 100644 --- a/src/message_window.py +++ b/src/message_window.py @@ -73,9 +73,9 @@ class MessageWindow(object): self.dont_warn_on_delete = False self.widget_name = 'message_window' - self.xml = gtkgui_helpers.get_glade('%s.glade' % self.widget_name) - self.window = self.xml.get_widget(self.widget_name) - self.notebook = self.xml.get_widget('notebook') + self.xml = gtkgui_helpers.get_gtk_builder('%s.ui' % self.widget_name) + self.window = self.xml.get_object(self.widget_name) + self.notebook = self.xml.get_object('notebook') self.parent_paned = None if parent_window: @@ -116,7 +116,7 @@ class MessageWindow(object): # gtk+ doesn't make use of the motion notify on gtkwindow by default # so this line adds that self.window.add_events(gtk.gdk.POINTER_MOTION_MASK) - self.alignment = self.xml.get_widget('alignment') + self.alignment = self.xml.get_object('alignment') id_ = self.notebook.connect('switch-page', self._on_notebook_switch_page) @@ -125,7 +125,7 @@ class MessageWindow(object): self._on_notebook_key_press) self.handlers[id_] = self.notebook - # Remove the glade pages + # Remove the pages from xml file while self.notebook.get_n_pages(): self.notebook.remove_page(0) # Tab customizations @@ -284,9 +284,9 @@ class MessageWindow(object): self.alignment.set_property('top-padding', 2) # Add notebook page and connect up to the tab's close button - xml = gtkgui_helpers.get_glade('message_window.glade', 'chat_tab_ebox') - tab_label_box = xml.get_widget('chat_tab_ebox') - widget = xml.get_widget('tab_close_button') + xml = gtkgui_helpers.get_gtk_builder('message_window.ui', 'chat_tab_ebox') + tab_label_box = xml.get_object('chat_tab_ebox') + widget = xml.get_object('tab_close_button') id_ = widget.connect('clicked', self._on_close_button_clicked, control) control.handlers[id_] = widget diff --git a/src/negotiation.py b/src/negotiation.py index a7cf5c043..6e8161983 100644 --- a/src/negotiation.py +++ b/src/negotiation.py @@ -42,16 +42,16 @@ class FeatureNegotiationWindow: self.form = form self.session = session - self.xml = gtkgui_helpers.get_glade('data_form_window.glade', 'data_form_window') - self.window = self.xml.get_widget('data_form_window') + self.xml = gtkgui_helpers.get_gtk_builder('data_form_window.ui', 'data_form_window') + self.window = self.xml.get_object('data_form_window') - config_vbox = self.xml.get_widget('config_vbox') + config_vbox = self.xml.get_object('config_vbox') dataform = dataforms.ExtendForm(node = self.form) self.data_form_widget = dataforms_widget.DataFormWidget(dataform) self.data_form_widget.show() config_vbox.pack_start(self.data_form_widget) - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) self.window.show_all() def on_ok_button_clicked(self, widget): diff --git a/src/profile_window.py b/src/profile_window.py index c0705adc8..834f1e59e 100644 --- a/src/profile_window.py +++ b/src/profile_window.py @@ -41,10 +41,10 @@ class ProfileWindow: """ def __init__(self, account): - self.xml = gtkgui_helpers.get_glade('profile_window.glade') - self.window = self.xml.get_widget('profile_window') - self.progressbar = self.xml.get_widget('progressbar') - self.statusbar = self.xml.get_widget('statusbar') + self.xml = gtkgui_helpers.get_gtk_builder('profile_window.ui') + self.window = self.xml.get_object('profile_window') + self.progressbar = self.xml.get_object('progressbar') + self.statusbar = self.xml.get_object('statusbar') self.context_id = self.statusbar.get_context_id('profile') self.account = account @@ -61,8 +61,8 @@ class ProfileWindow: # Create Image for avatar button image = gtk.Image() - self.xml.get_widget('PHOTO_button').set_image(image) - self.xml.signal_autoconnect(self) + self.xml.get_object('PHOTO_button').set_image(image) + self.xml.connect_signals(self) self.window.show_all() def update_progressbar(self): @@ -88,11 +88,11 @@ class ProfileWindow: def on_clear_button_clicked(self, widget): # empty the image - button = self.xml.get_widget('PHOTO_button') + button = self.xml.get_object('PHOTO_button') image = button.get_image() image.set_from_pixbuf(None) button.hide() - text_button = self.xml.get_widget('NOPHOTO_button') + text_button = self.xml.get_object('NOPHOTO_button') text_button.show() self.avatar_encoded = None self.avatar_mime_type = None @@ -144,11 +144,11 @@ class ProfileWindow: return self.dialog.destroy() self.dialog = None - button = self.xml.get_widget('PHOTO_button') + button = self.xml.get_object('PHOTO_button') image = button.get_image() image.set_from_pixbuf(pixbuf) button.show() - text_button = self.xml.get_widget('NOPHOTO_button') + text_button = self.xml.get_object('NOPHOTO_button') text_button.hide() self.avatar_encoded = base64.encodestring(data) # returns None if unknown type @@ -205,14 +205,14 @@ class ProfileWindow: def set_value(self, entry_name, value): try: - self.xml.get_widget(entry_name).set_text(value) + self.xml.get_object(entry_name).set_text(value) except AttributeError: pass def set_values(self, vcard_): - button = self.xml.get_widget('PHOTO_button') + button = self.xml.get_object('PHOTO_button') image = button.get_image() - text_button = self.xml.get_widget('NOPHOTO_button') + text_button = self.xml.get_object('NOPHOTO_button') if not 'PHOTO' in vcard_: # set default image image.set_from_pixbuf(None) @@ -244,7 +244,7 @@ class ProfileWindow: self.set_value(i + '_' + j + '_entry', vcard_[i][j]) else: if i == 'DESC': - self.xml.get_widget('DESC_textview').get_buffer().set_text( + self.xml.get_object('DESC_textview').get_buffer().set_text( vcard_[i], 0) else: self.set_value(i + '_entry', vcard_[i]) @@ -298,12 +298,12 @@ class ProfileWindow: 'ADR_WORK_REGION', 'ADR_WORK_PCODE', 'ADR_WORK_CTRY'] vcard_ = {} for e in entries: - txt = self.xml.get_widget(e + '_entry').get_text().decode('utf-8') + txt = self.xml.get_object(e + '_entry').get_text().decode('utf-8') if txt != '': vcard_ = self.add_to_vcard(vcard_, e, txt) # DESC textview - buff = self.xml.get_widget('DESC_textview').get_buffer() + buff = self.xml.get_object('DESC_textview').get_buffer() start_iter = buff.get_start_iter() end_iter = buff.get_end_iter() txt = buff.get_text(start_iter, end_iter, 0) diff --git a/src/roster_window.py b/src/roster_window.py index a121e4057..957411d22 100644 --- a/src/roster_window.py +++ b/src/roster_window.py @@ -1857,9 +1857,9 @@ class RosterWindow: def show_roster_vbox(self, active): if active: - self.xml.get_widget('roster_vbox2').show() + self.xml.get_object('roster_vbox2').show() else: - self.xml.get_widget('roster_vbox2').hide() + self.xml.get_object('roster_vbox2').hide() def show_tooltip(self, contact): @@ -2265,10 +2265,10 @@ class RosterWindow: width, height = self.window.get_size() # For the width use the size of the vbox containing the tree and # status combo, this will cancel out any hpaned width - width = self.xml.get_widget('roster_vbox2').allocation.width + width = self.xml.get_object('roster_vbox2').allocation.width gajim.config.set('roster_width', width) gajim.config.set('roster_height', height) - if not self.xml.get_widget('roster_vbox2').get_property('visible'): + if not self.xml.get_object('roster_vbox2').get_property('visible'): # The roster vbox is hidden, so the message window is larger # then we want to save (i.e. the window will grow every startup) # so adjust. @@ -3879,7 +3879,7 @@ class RosterWindow: """ gajim.config.set('showoffline', not gajim.config.get('showoffline')) self.refilter_shown_roster_items() - w = self.xml.get_widget('show_only_active_contacts_menuitem') + w = self.xml.get_object('show_only_active_contacts_menuitem') if gajim.config.get('showoffline'): # We need to filter twice to show groups with no contacts inside # in the correct expand state @@ -3895,7 +3895,7 @@ class RosterWindow: gajim.config.set('show_only_chat_and_online', not gajim.config.get( 'show_only_chat_and_online')) self.refilter_shown_roster_items() - w = self.xml.get_widget('show_offline_contacts_menuitem') + w = self.xml.get_object('show_offline_contacts_menuitem') if gajim.config.get('show_only_chat_and_online'): # We need to filter twice to show groups with no contacts inside # in the correct expand state @@ -3907,9 +3907,9 @@ class RosterWindow: def on_view_menu_activate(self, widget): # Hide the show roster menu if we are not in the right windowing mode. if self.hpaned.get_child2() is not None: - self.xml.get_widget('show_roster_menuitem').show() + self.xml.get_object('show_roster_menuitem').show() else: - self.xml.get_widget('show_roster_menuitem').hide() + self.xml.get_object('show_roster_menuitem').hide() def on_show_roster_menuitem_toggled(self, widget): # when num controls is 0 this menuitem is hidden, but still need to @@ -4645,17 +4645,17 @@ class RosterWindow: """ if not force and not self.actions_menu_needs_rebuild: return - new_chat_menuitem = self.xml.get_widget('new_chat_menuitem') - single_message_menuitem = self.xml.get_widget( + new_chat_menuitem = self.xml.get_object('new_chat_menuitem') + single_message_menuitem = self.xml.get_object( 'send_single_message_menuitem') - join_gc_menuitem = self.xml.get_widget('join_gc_menuitem') + join_gc_menuitem = self.xml.get_object('join_gc_menuitem') muc_icon = gtkgui_helpers.load_icon('muc_active') if muc_icon: join_gc_menuitem.set_image(muc_icon) - add_new_contact_menuitem = self.xml.get_widget('add_new_contact_menuitem') - service_disco_menuitem = self.xml.get_widget('service_disco_menuitem') - advanced_menuitem = self.xml.get_widget('advanced_menuitem') - profile_avatar_menuitem = self.xml.get_widget('profile_avatar_menuitem') + add_new_contact_menuitem = self.xml.get_object('add_new_contact_menuitem') + service_disco_menuitem = self.xml.get_object('service_disco_menuitem') + advanced_menuitem = self.xml.get_object('advanced_menuitem') + profile_avatar_menuitem = self.xml.get_object('profile_avatar_menuitem') # destroy old advanced menus for m in self.advanced_menus: @@ -4934,21 +4934,21 @@ class RosterWindow: state_images = gtkgui_helpers.load_iconset(path) if not gajim.config.get_per('accounts', account, 'is_zeroconf'): - xml = gtkgui_helpers.get_glade('account_context_menu.glade') - account_context_menu = xml.get_widget('account_context_menu') + xml = gtkgui_helpers.get_gtk_builder('account_context_menu.ui') + account_context_menu = xml.get_object('account_context_menu') - status_menuitem = xml.get_widget('status_menuitem') - start_chat_menuitem = xml.get_widget('start_chat_menuitem') - join_group_chat_menuitem = xml.get_widget('join_group_chat_menuitem') + status_menuitem = xml.get_object('status_menuitem') + start_chat_menuitem = xml.get_object('start_chat_menuitem') + join_group_chat_menuitem = xml.get_object('join_group_chat_menuitem') muc_icon = gtkgui_helpers.load_icon('muc_active') if muc_icon: join_group_chat_menuitem.set_image(muc_icon) - open_gmail_inbox_menuitem = xml.get_widget('open_gmail_inbox_menuitem') - add_contact_menuitem = xml.get_widget('add_contact_menuitem') - service_discovery_menuitem = xml.get_widget( + open_gmail_inbox_menuitem = xml.get_object('open_gmail_inbox_menuitem') + add_contact_menuitem = xml.get_object('add_contact_menuitem') + service_discovery_menuitem = xml.get_object( 'service_discovery_menuitem') - execute_command_menuitem = xml.get_widget('execute_command_menuitem') - edit_account_menuitem = xml.get_widget('edit_account_menuitem') + execute_command_menuitem = xml.get_object('execute_command_menuitem') + edit_account_menuitem = xml.get_object('edit_account_menuitem') sub_menu = gtk.Menu() status_menuitem.set_submenu(sub_menu) @@ -4986,7 +4986,7 @@ class RosterWindow: sub_menu.append(item) item.connect('activate', self.change_status, account, 'offline') - pep_menuitem = xml.get_widget('pep_menuitem') + pep_menuitem = xml.get_object('pep_menuitem') if gajim.connections[account].pep_supported: pep_submenu = gtk.Menu() pep_menuitem.set_submenu(pep_submenu) @@ -5051,11 +5051,11 @@ class RosterWindow: start_chat_menuitem): widget.set_sensitive(False) else: - xml = gtkgui_helpers.get_glade('zeroconf_context_menu.glade') - account_context_menu = xml.get_widget('zeroconf_context_menu') + xml = gtkgui_helpers.get_gtk_builder('zeroconf_context_menu.ui') + account_context_menu = xml.get_object('zeroconf_context_menu') - status_menuitem = xml.get_widget('status_menuitem') - zeroconf_properties_menuitem = xml.get_widget( + status_menuitem = xml.get_object('status_menuitem') + zeroconf_properties_menuitem = xml.get_object( 'zeroconf_properties_menuitem') sub_menu = gtk.Menu() status_menuitem.set_submenu(sub_menu) @@ -5585,17 +5585,17 @@ class RosterWindow: """ Add FOR ACCOUNT options """ - xml = gtkgui_helpers.get_glade('advanced_menuitem_menu.glade') - advanced_menuitem_menu = xml.get_widget('advanced_menuitem_menu') + xml = gtkgui_helpers.get_gtk_builder('advanced_menuitem_menu.ui') + advanced_menuitem_menu = xml.get_object('advanced_menuitem_menu') - xml_console_menuitem = xml.get_widget('xml_console_menuitem') - privacy_lists_menuitem = xml.get_widget('privacy_lists_menuitem') - administrator_menuitem = xml.get_widget('administrator_menuitem') - send_server_message_menuitem = xml.get_widget( + xml_console_menuitem = xml.get_object('xml_console_menuitem') + privacy_lists_menuitem = xml.get_object('privacy_lists_menuitem') + administrator_menuitem = xml.get_object('administrator_menuitem') + send_server_message_menuitem = xml.get_object( 'send_server_message_menuitem') - set_motd_menuitem = xml.get_widget('set_motd_menuitem') - update_motd_menuitem = xml.get_widget('update_motd_menuitem') - delete_motd_menuitem = xml.get_widget('delete_motd_menuitem') + set_motd_menuitem = xml.get_object('set_motd_menuitem') + update_motd_menuitem = xml.get_object('update_motd_menuitem') + delete_motd_menuitem = xml.get_object('delete_motd_menuitem') xml_console_menuitem.connect('activate', self.on_xml_console_menuitem_activate, account) @@ -5726,16 +5726,16 @@ class RosterWindow: def __init__(self): self.filtering = False - self.xml = gtkgui_helpers.get_glade('roster_window.glade') - self.window = self.xml.get_widget('roster_window') - self.hpaned = self.xml.get_widget('roster_hpaned') + self.xml = gtkgui_helpers.get_gtk_builder('roster_window.ui') + self.window = self.xml.get_object('roster_window') + self.hpaned = self.xml.get_object('roster_hpaned') gajim.interface.msg_win_mgr = MessageWindowMgr(self.window, self.hpaned) gajim.interface.msg_win_mgr.connect('window-delete', self.on_message_window_delete) self.advanced_menus = [] # We keep them to destroy them if gajim.config.get('roster_window_skip_taskbar'): self.window.set_property('skip-taskbar-hint', True) - self.tree = self.xml.get_widget('roster_treeview') + self.tree = self.xml.get_object('roster_treeview') sel = self.tree.get_selection() sel.set_mode(gtk.SELECTION_MULTIPLE) #sel.connect('changed', @@ -5782,7 +5782,7 @@ class RosterWindow: # uf_show, img, show, sensitive liststore = gtk.ListStore(str, gtk.Image, str, bool) - self.status_combobox = self.xml.get_widget('status_combobox') + self.status_combobox = self.xml.get_object('status_combobox') cell = cell_renderer_image.CellRendererImage(0, 1) self.status_combobox.pack_start(cell, False) @@ -5841,21 +5841,21 @@ class RosterWindow: showOffline = gajim.config.get('showoffline') showOnlyChatAndOnline = gajim.config.get('show_only_chat_and_online') - w = self.xml.get_widget('show_offline_contacts_menuitem') + w = self.xml.get_object('show_offline_contacts_menuitem') w.set_active(showOffline) if showOnlyChatAndOnline: w.set_sensitive(False) - w = self.xml.get_widget('show_only_active_contacts_menuitem') + w = self.xml.get_object('show_only_active_contacts_menuitem') w.set_active(showOnlyChatAndOnline) if showOffline: w.set_sensitive(False) show_transports_group = gajim.config.get('show_transports_group') - self.xml.get_widget('show_transports_menuitem').set_active( + self.xml.get_object('show_transports_menuitem').set_active( show_transports_group) - self.xml.get_widget('show_roster_menuitem').set_active(True) + self.xml.get_object('show_roster_menuitem').set_active(True) # columns @@ -5950,7 +5950,7 @@ class RosterWindow: self.tree.connect('drag_data_get', self.drag_data_get_data) self.tree.connect('drag_data_received', self.drag_data_received_data) self.dragging = False - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) self.combobox_callback_active = True self.collapsed_rows = gajim.config.get('collapsed_rows').split('\t') diff --git a/src/search_window.py b/src/search_window.py index bce009207..08eb4276c 100644 --- a/src/search_window.py +++ b/src/search_window.py @@ -40,14 +40,14 @@ class SearchWindow: self.jid = jid # retrieving widgets from xml - self.xml = gtkgui_helpers.get_glade('search_window.glade') - self.window = self.xml.get_widget('search_window') + self.xml = gtkgui_helpers.get_gtk_builder('search_window.ui') + self.window = self.xml.get_object('search_window') for name in ('label', 'progressbar', 'search_vbox', 'search_button', 'add_contact_button', 'information_button'): - self.__dict__[name] = self.xml.get_widget(name) + self.__dict__[name] = self.xml.get_object(name) # displaying the window - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) self.window.show_all() self.request_form() self.pulse_id = gobject.timeout_add(80, self.pulse_callback) diff --git a/src/statusicon.py b/src/statusicon.py index 17bfa7b83..38c0e0936 100644 --- a/src/statusicon.py +++ b/src/statusicon.py @@ -49,9 +49,9 @@ class StatusIcon: # click somewhere else does not popdown menu. workaround this. self.added_hide_menuitem = False self.status = 'offline' - self.xml = gtkgui_helpers.get_glade('systray_context_menu.glade') - self.systray_context_menu = self.xml.get_widget('systray_context_menu') - self.xml.signal_autoconnect(self) + self.xml = gtkgui_helpers.get_gtk_builder('systray_context_menu.ui') + self.systray_context_menu = self.xml.get_object('systray_context_menu') + self.xml.connect_signals(self) self.popup_menus = [] self.status_icon = None self.tooltip = tooltips.NotificationAreaTooltip() @@ -166,12 +166,12 @@ class StatusIcon: for m in self.popup_menus: m.destroy() - chat_with_menuitem = self.xml.get_widget('chat_with_menuitem') - single_message_menuitem = self.xml.get_widget( + chat_with_menuitem = self.xml.get_object('chat_with_menuitem') + single_message_menuitem = self.xml.get_object( 'single_message_menuitem') - status_menuitem = self.xml.get_widget('status_menu') - join_gc_menuitem = self.xml.get_widget('join_gc_menuitem') - sounds_mute_menuitem = self.xml.get_widget('sounds_mute_menuitem') + status_menuitem = self.xml.get_object('status_menu') + join_gc_menuitem = self.xml.get_object('join_gc_menuitem') + sounds_mute_menuitem = self.xml.get_object('sounds_mute_menuitem') if self.single_message_handler_id: single_message_menuitem.handler_disconnect( diff --git a/src/vcard.py b/src/vcard.py index b2f8fd084..a1605b91c 100644 --- a/src/vcard.py +++ b/src/vcard.py @@ -80,9 +80,9 @@ class VcardWindow: def __init__(self, contact, account, gc_contact = None): # the contact variable is the jid if vcard is true - self.xml = gtkgui_helpers.get_glade('vcard_information_window.glade') - self.window = self.xml.get_widget('vcard_information_window') - self.progressbar = self.xml.get_widget('progressbar') + self.xml = gtkgui_helpers.get_gtk_builder('vcard_information_window.ui') + self.window = self.xml.get_object('vcard_information_window') + self.progressbar = self.xml.get_object('progressbar') self.contact = contact self.account = account @@ -112,10 +112,10 @@ class VcardWindow: for extension in ('.png', '.jpeg'): local_avatar_path = local_avatar_basepath + extension if os.path.isfile(local_avatar_path): - image = self.xml.get_widget('custom_avatar_image') + image = self.xml.get_object('custom_avatar_image') image.set_from_file(local_avatar_path) image.show() - self.xml.get_widget('custom_avatar_label').show() + self.xml.get_object('custom_avatar_label').show() break self.avatar_mime_type = None self.avatar_encoded = None @@ -128,12 +128,12 @@ class VcardWindow: self.fill_jabber_page() annotations = gajim.connections[self.account].annotations if self.contact.jid in annotations: - buffer_ = self.xml.get_widget('textview_annotation').get_buffer() + buffer_ = self.xml.get_object('textview_annotation').get_buffer() buffer_.set_text(annotations[self.contact.jid]) - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) self.window.show_all() - self.xml.get_widget('close_button').grab_focus() + self.xml.get_object('close_button').grab_focus() def update_progressbar(self): self.progressbar.pulse() @@ -143,7 +143,7 @@ class VcardWindow: if self.update_progressbar_timeout_id is not None: gobject.source_remove(self.update_progressbar_timeout_id) del gajim.interface.instances[self.account]['infos'][self.contact.jid] - buffer_ = self.xml.get_widget('textview_annotation').get_buffer() + buffer_ = self.xml.get_object('textview_annotation').get_buffer() annotation = buffer_.get_text(buffer_.get_start_iter(), buffer_.get_end_iter()) connection = gajim.connections[self.account] @@ -177,22 +177,22 @@ class VcardWindow: widget = gtk.LinkButton(value, value) widget.set_alignment(0, 0) widget.show() - table = self.xml.get_widget('personal_info_table') + table = self.xml.get_object('personal_info_table') table.attach(widget, 1, 4, 3, 4, yoptions = 0) else: - self.xml.get_widget(entry_name).set_text(value) + self.xml.get_object(entry_name).set_text(value) except AttributeError: pass def set_values(self, vcard): for i in vcard.keys(): - if i == 'PHOTO' and self.xml.get_widget('information_notebook').\ + if i == 'PHOTO' and self.xml.get_object('information_notebook').\ get_n_pages() > 4: pixbuf, self.avatar_encoded, self.avatar_mime_type = \ get_avatar_pixbuf_encoded_mime(vcard[i]) - image = self.xml.get_widget('PHOTO_image') + image = self.xml.get_object('PHOTO_image') image.show() - self.xml.get_widget('user_avatar_label').show() + self.xml.get_object('user_avatar_label').show() if not pixbuf: image.set_from_icon_name('stock_person', gtk.ICON_SIZE_DIALOG) @@ -212,7 +212,7 @@ class VcardWindow: self.set_value(i + '_' + j + '_label', vcard[i][j]) else: if i == 'DESC': - self.xml.get_widget('DESC_textview').get_buffer().set_text( + self.xml.get_object('DESC_textview').get_buffer().set_text( vcard[i], 0) elif i != 'jid': # Do not override jid_label self.set_value(i + '_label', vcard[i]) @@ -230,7 +230,7 @@ class VcardWindow: self.fill_status_label() def set_os_info(self, resource, client_info, os_info): - if self.xml.get_widget('information_notebook').get_n_pages() < 5: + if self.xml.get_object('information_notebook').get_n_pages() < 5: return i = 0 client = '' @@ -251,13 +251,13 @@ class VcardWindow: client = Q_('?Client:Unknown') if os == '': os = Q_('?OS:Unknown') - self.xml.get_widget('client_name_version_label').set_text(client) - self.xml.get_widget('os_label').set_text(os) + self.xml.get_object('client_name_version_label').set_text(client) + self.xml.get_object('os_label').set_text(os) self.os_info_arrived = True self.test_remove_progressbar() def set_entity_time(self, resource, time_info): - if self.xml.get_widget('information_notebook').get_n_pages() < 5: + if self.xml.get_object('information_notebook').get_n_pages() < 5: return i = 0 time_s = '' @@ -272,12 +272,12 @@ class VcardWindow: if time_s == '': time_s = Q_('?Time:Unknown') - self.xml.get_widget('time_label').set_text(time_s) + self.xml.get_object('time_label').set_text(time_s) self.entity_time_arrived = True self.test_remove_progressbar() def fill_status_label(self): - if self.xml.get_widget('information_notebook').get_n_pages() < 5: + if self.xml.get_object('information_notebook').get_n_pages() < 5: return contact_list = gajim.contacts.get_contacts(self.account, self.contact.jid) connected_contact_list = [] @@ -311,34 +311,34 @@ class VcardWindow: stats = helpers.get_uf_show(self.contact.show) if self.contact.status: stats += ': ' + self.contact.status - status_label = self.xml.get_widget('status_label') + status_label = self.xml.get_object('status_label') status_label.set_max_width_chars(15) status_label.set_text(stats) - status_label_eventbox = self.xml.get_widget('status_label_eventbox') + status_label_eventbox = self.xml.get_object('status_label_eventbox') status_label_eventbox.set_tooltip_text(stats) def fill_jabber_page(self): - self.xml.get_widget('nickname_label').set_markup( + self.xml.get_object('nickname_label').set_markup( '<b><span size="x-large">' + self.contact.get_shown_name() + '</span></b>') - self.xml.get_widget('jid_label').set_text(self.contact.jid) + self.xml.get_object('jid_label').set_text(self.contact.jid) - subscription_label = self.xml.get_widget('subscription_label') - ask_label = self.xml.get_widget('ask_label') + subscription_label = self.xml.get_object('subscription_label') + ask_label = self.xml.get_object('ask_label') if self.gc_contact: - self.xml.get_widget('subscription_title_label').set_markup(_("<b>Role:</b>")) + self.xml.get_object('subscription_title_label').set_markup(_("<b>Role:</b>")) uf_role = helpers.get_uf_role(self.gc_contact.role) subscription_label.set_text(uf_role) - self.xml.get_widget('ask_title_label').set_markup(_("<b>Affiliation:</b>")) + self.xml.get_object('ask_title_label').set_markup(_("<b>Affiliation:</b>")) uf_affiliation = helpers.get_uf_affiliation(self.gc_contact.affiliation) ask_label.set_text(uf_affiliation) else: uf_sub = helpers.get_uf_sub(self.contact.sub) subscription_label.set_text(uf_sub) - eb = self.xml.get_widget('subscription_label_eventbox') + eb = self.xml.get_object('subscription_label_eventbox') if self.contact.sub == 'from': tt_text = _("This contact is interested in your presence information, but you are not interested in his/her presence") elif self.contact.sub == 'to': @@ -351,7 +351,7 @@ class VcardWindow: uf_ask = helpers.get_uf_ask(self.contact.ask) ask_label.set_text(uf_ask) - eb = self.xml.get_widget('ask_label_eventbox') + eb = self.xml.get_object('ask_label_eventbox') if self.contact.ask == 'subscribe': tt_text = _("You are waiting contact's answer about your subscription request") else: @@ -426,8 +426,8 @@ class VcardWindow: self.time_info[i] = {'resource': c.resource, 'time': ''} i += 1 - self.xml.get_widget('resource_prio_label').set_text(resources) - resource_prio_label_eventbox = self.xml.get_widget( + self.xml.get_object('resource_prio_label').set_text(resources) + resource_prio_label_eventbox = self.xml.get_object( 'resource_prio_label_eventbox') resource_prio_label_eventbox.set_tooltip_text(uf_resources) @@ -447,8 +447,8 @@ class VcardWindow: class ZeroconfVcardWindow: def __init__(self, contact, account, is_fake = False): # the contact variable is the jid if vcard is true - self.xml = gtkgui_helpers.get_glade('zeroconf_information_window.glade') - self.window = self.xml.get_widget('zeroconf_information_window') + self.xml = gtkgui_helpers.get_gtk_builder('zeroconf_information_window.ui') + self.window = self.xml.get_object('zeroconf_information_window') self.contact = contact self.account = account @@ -460,7 +460,7 @@ class ZeroconfVcardWindow: self.fill_contact_page() self.fill_personal_page() - self.xml.signal_autoconnect(self) + self.xml.connect_signals(self) self.window.show_all() def on_zeroconf_information_window_destroy(self, widget): @@ -491,15 +491,15 @@ class ZeroconfVcardWindow: if value and entry_name == 'URL_label': widget = gtk.LinkButton(value, value) widget.set_alignment(0, 0) - table = self.xml.get_widget('personal_info_table') + table = self.xml.get_object('personal_info_table') table.attach(widget, 1, 4, 3, 4, yoptions = 0) else: - self.xml.get_widget(entry_name).set_text(value) + self.xml.get_object(entry_name).set_text(value) except AttributeError: pass def fill_status_label(self): - if self.xml.get_widget('information_notebook').get_n_pages() < 2: + if self.xml.get_object('information_notebook').get_n_pages() < 2: return contact_list = gajim.contacts.get_contacts(self.account, self.contact.jid) # stats holds show and status message @@ -520,19 +520,19 @@ class ZeroconfVcardWindow: stats = helpers.get_uf_show(self.contact.show) if self.contact.status: stats += ': ' + self.contact.status - status_label = self.xml.get_widget('status_label') + status_label = self.xml.get_object('status_label') status_label.set_max_width_chars(15) status_label.set_text(stats) - status_label_eventbox = self.xml.get_widget('status_label_eventbox') + status_label_eventbox = self.xml.get_object('status_label_eventbox') status_label_eventbox.set_tooltip_text(stats) def fill_contact_page(self): - self.xml.get_widget('nickname_label').set_markup( + self.xml.get_object('nickname_label').set_markup( '<b><span size="x-large">' + self.contact.get_shown_name() + '</span></b>') - self.xml.get_widget('local_jid_label').set_text(self.contact.jid) + self.xml.get_object('local_jid_label').set_text(self.contact.jid) resources = '%s (%s)' % (self.contact.resource, unicode( self.contact.priority)) @@ -541,8 +541,8 @@ class ZeroconfVcardWindow: if not self.contact.status: self.contact.status = '' - self.xml.get_widget('resource_prio_label').set_text(resources) - resource_prio_label_eventbox = self.xml.get_widget( + self.xml.get_object('resource_prio_label').set_text(resources) + resource_prio_label_eventbox = self.xml.get_object( 'resource_prio_label_eventbox') resource_prio_label_eventbox.set_tooltip_text(uf_resources) @@ -553,10 +553,10 @@ class ZeroconfVcardWindow: for key in ('1st', 'last', 'jid', 'email'): if key not in contact['txt_dict']: contact['txt_dict'][key] = '' - self.xml.get_widget('first_name_label').set_text(contact['txt_dict']['1st']) - self.xml.get_widget('last_name_label').set_text(contact['txt_dict']['last']) - self.xml.get_widget('jabber_id_label').set_text(contact['txt_dict']['jid']) - self.xml.get_widget('email_label').set_text(contact['txt_dict']['email']) + self.xml.get_object('first_name_label').set_text(contact['txt_dict']['1st']) + self.xml.get_object('last_name_label').set_text(contact['txt_dict']['last']) + self.xml.get_object('jabber_id_label').set_text(contact['txt_dict']['jid']) + self.xml.get_object('email_label').set_text(contact['txt_dict']['email']) def on_close_button_clicked(self, widget): self.window.destroy() diff --git a/test/lib/__init__.py b/test/lib/__init__.py index 4b5f8ca12..7d0b1bd98 100644 --- a/test/lib/__init__.py +++ b/test/lib/__init__.py @@ -47,6 +47,6 @@ def setup_env(): if use_x: import gtkgui_helpers - gtkgui_helpers.GLADE_DIR = gajim_root + '/data/glade' + gtkgui_helpers.GUI_DIR = gajim_root + '/data/gui' # vim: se ts=3: |