diff --git a/src/dialogs.py b/src/dialogs.py
index 366197c8280765d929266eb291ffc8c89f5d954a..ba167c3005a0aba59eb5511ac853c3dad753c256 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -581,7 +581,6 @@ def on_chat_button_clicked(self, widget):
self.plugin.roster.new_chat(user, self.account)
self.plugin.windows[self.account]['chats'][jid].active_tab(jid)
self.plugin.windows[self.account]['chats'][jid].window.present()
- #FIXME: PROBLEM WITH FOCUS
class Change_password_dialog:
def __init__(self, plugin, account):
diff --git a/src/gtkgui.glade b/src/gtkgui.glade
index ba7e446632a1f924c9ebc8be1bc5ff2ba2dab0ef..e6cf90adad0f298003d38ab4d9c92387d9dac4ba 100644
--- a/src/gtkgui.glade
+++ b/src/gtkgui.glade
@@ -313,7 +313,7 @@
<widget class="GtkWindow" id="accounts_window">
<property name="border_width">4</property>
<property name="width_request">420</property>
- <property name="height_request">160</property>
+ <property name="height_request">170</property>
<property name="title" translatable="yes">Accounts</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
@@ -330,10 +330,9 @@
<child>
<widget class="GtkVBox" id="vbox5">
- <property name="border_width">7</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <property name="spacing">5</property>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow5">
@@ -367,195 +366,181 @@
</child>
<child>
- <widget class="GtkAlignment" id="alignment1">
+ <widget class="GtkHButtonBox" id="hbuttonbox15">
+ <property name="border_width">5</property>
<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">1</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>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="spacing">10</property>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox15">
- <property name="border_width">5</property>
+ <widget class="GtkButton" id="new_button">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
- <property name="spacing">3</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_button_clicked" last_modification_time="Tue, 01 Mar 2005 18:20:36 GMT"/>
+ </widget>
+ </child>
- <child>
- <widget class="GtkButton" id="new_button">
- <property name="visible">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_button_clicked" last_modification_time="Tue, 01 Mar 2005 18:20:36 GMT"/>
- </widget>
- </child>
+ <child>
+ <widget class="GtkButton" id="modify_button">
+ <property name="visible">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="clicked" handler="on_modify_button_clicked" last_modification_time="Tue, 01 Mar 2005 18:20:53 GMT"/>
<child>
- <widget class="GtkButton" id="modify_button">
+ <widget class="GtkAlignment" id="alignment44">
<property name="visible">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_modify_button_clicked" last_modification_time="Tue, 01 Mar 2005 18:20:53 GMT"/>
+ <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="GtkAlignment" id="alignment44">
+ <widget class="GtkHBox" id="hbox2919">
<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>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
<child>
- <widget class="GtkHBox" id="hbox2919">
+ <widget class="GtkImage" id="image334">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
-
- <child>
- <widget class="GtkImage" id="image334">
- <property name="visible">True</property>
- <property name="stock">gtk-preferences</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>
+ <property name="stock">gtk-preferences</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="label201">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Modify</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="GtkLabel" id="label201">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Modify</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="remove_button">
+ <property name="visible">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 22:15:48 GMT"/>
<child>
- <widget class="GtkButton" id="remove_button">
+ <widget class="GtkAlignment" id="alignment61">
<property name="visible">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 22:15:48 GMT"/>
+ <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="GtkAlignment" id="alignment61">
+ <widget class="GtkHBox" id="hbox2953">
<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>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
<child>
- <widget class="GtkHBox" id="hbox2953">
+ <widget class="GtkImage" id="image500">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
-
- <child>
- <widget class="GtkImage" id="image500">
- <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>
+ <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="label244">
- <property name="visible">True</property>
- <property name="label">_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>
+ <child>
+ <widget class="GtkLabel" id="label244">
+ <property name="visible">True</property>
+ <property name="label">_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>
- <child>
- <widget class="GtkButton" id="close_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="has_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 18:21:00 GMT"/>
- </widget>
- </child>
+ <child>
+ <widget class="GtkButton" id="close_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="has_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 18:21:00 GMT"/>
</widget>
</child>
</widget>
@@ -1687,7 +1672,7 @@
<widget class="GtkWindow" id="add_new_contact_window">
<property name="border_width">4</property>
<property name="width_request">317</property>
- <property name="height_request">277</property>
+ <property name="height_request">290</property>
<property name="title" translatable="yes">Add New Contact</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
@@ -1705,7 +1690,7 @@
<widget class="GtkVBox" id="vbox8">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <property name="spacing">5</property>
<child>
<widget class="GtkTable" id="table21">
@@ -1990,7 +1975,7 @@
<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="shadow_type">GTK_SHADOW_ETCHED_IN</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
@@ -2022,7 +2007,6 @@
<child>
<widget class="GtkHButtonBox" id="hbuttonbox1">
- <property name="border_width">5</property>
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<property name="spacing">10</property>
@@ -2147,7 +2131,7 @@
<widget class="GtkVBox" id="vbox10">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <property name="spacing">5</property>
<child>
<widget class="GtkLabel" id="from_label">
@@ -2168,9 +2152,9 @@
<property name="angle">0</property>
</widget>
<packing>
- <property name="padding">10</property>
+ <property name="padding">0</property>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
</packing>
</child>
@@ -2412,7 +2396,6 @@
<child>
<widget class="GtkVBox" id="vbox11">
- <property name="border_width">5</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">5</property>
@@ -2891,7 +2874,7 @@
<widget class="GtkWindow" id="preferences_window">
<property name="border_width">4</property>
<property name="width_request">470</property>
- <property name="height_request">410</property>
+ <property name="height_request">415</property>
<property name="title" translatable="yes">Preferences</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
@@ -7653,7 +7636,6 @@ Custom</property>
<child>
<widget class="GtkVBox" id="vbox24">
- <property name="border_width">4</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
@@ -7663,7 +7645,7 @@ Custom</property>
<property name="border_width">6</property>
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
- <property name="spacing">3</property>
+ <property name="spacing">0</property>
<child>
<widget class="GtkButton" id="earliest_button">
@@ -7929,7 +7911,7 @@ Custom</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="shadow_type">GTK_SHADOW_ETCHED_IN</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
@@ -7963,6 +7945,7 @@ Custom</property>
</widget>
<widget class="GtkWindow" id="groupchat_window">
+ <property name="border_width">4</property>
<property name="title" translatable="yes">Groupchat</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
@@ -7984,7 +7967,6 @@ Custom</property>
<child>
<widget class="GtkVBox" id="vbox27">
- <property name="border_width">4</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
@@ -8086,7 +8068,7 @@ Custom</property>
<widget class="GtkNotebook" id="chat_notebook">
<property name="visible">True</property>
<property name="show_tabs">False</property>
- <property name="show_border">True</property>
+ <property name="show_border">False</property>
<property name="tab_pos">GTK_POS_TOP</property>
<property name="scrollable">True</property>
<property name="enable_popup">False</property>
@@ -8290,11 +8272,10 @@ Custom</property>
<widget class="GtkVBox" id="vbox28">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <property name="spacing">15</property>
<child>
<widget class="GtkTable" id="table15">
- <property name="border_width">5</property>
<property name="visible">True</property>
<property name="n_rows">5</property>
<property name="n_columns">2</property>
@@ -8553,10 +8534,9 @@ Custom</property>
<child>
<widget class="GtkHButtonBox" id="hbuttonbox12">
- <property name="border_width">10</property>
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
- <property name="spacing">20</property>
+ <property name="spacing">10</property>
<child>
<widget class="GtkButton" id="cancel_button">
@@ -8677,7 +8657,7 @@ Custom</property>
<widget class="GtkVBox" id="dialog-vbox4">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <property name="spacing">5</property>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area3">
@@ -8822,7 +8802,7 @@ Custom</property>
<widget class="GtkVBox" id="vbox33">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <property name="spacing">5</property>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="hbuttonbox14">
@@ -9129,9 +9109,9 @@ Custom</property>
<widget class="GtkNotebook" id="chat_notebook">
<property name="visible">True</property>
<property name="show_tabs">False</property>
- <property name="show_border">True</property>
+ <property name="show_border">False</property>
<property name="tab_pos">GTK_POS_TOP</property>
- <property name="scrollable">False</property>
+ <property name="scrollable">True</property>
<property name="enable_popup">False</property>
<signal name="switch_page" handler="on_chat_notebook_switch_page" last_modification_time="Wed, 02 Mar 2005 18:00:21 GMT"/>
<signal name="key_press_event" handler="on_chat_notebook_key_press_event" last_modification_time="Sat, 12 Mar 2005 21:18:17 GMT"/>
@@ -10656,7 +10636,7 @@ send a chat message to</property>
<widget class="GtkVBox" id="vbox68">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <property name="spacing">5</property>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow35">
@@ -10670,7 +10650,7 @@ send a chat message to</property>
<child>
<widget class="GtkViewport" id="viewport1">
<property name="visible">True</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
<widget class="GtkTable" id="config_table">
@@ -10735,23 +10715,11 @@ send a chat message to</property>
</packing>
</child>
- <child>
- <widget class="GtkHSeparator" id="hseparator12">
- <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="GtkHButtonBox" id="hbuttonbox17">
- <property name="border_width">5</property>
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
- <property name="spacing">5</property>
+ <property name="spacing">10</property>
<child>
<widget class="GtkButton" id="close_button">