Author: nicfit Date: 2007-12-14 05:49:09 +0100 (Fri, 14 Dec 2007) New Revision: 9145

Modified: branches/one_window/data/glade/roster_window.glade branches/one_window/src/roster_window.py Log: Implemented the original Nikos patch with an HPaned instead of a HBox and only do this mode when one_message_window == 'always'

Modified: branches/one_window/data/glade/roster_window.glade =================================================================== --- branches/one_window/data/glade/roster_window.glade 2007-12-14 03:33:17 UTC (rev 9144) +++ branches/one_window/data/glade/roster_window.glade 2007-12-14 04:49:09 UTC (rev 9145) @@ -352,45 +352,65 @@ </packing> </child> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow"> + <widget class="GtkHPaned" id="roster_hpaned"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="border_width">2</property> - <property name="hscrollbar_policy">GTK_POLICY_NEVER</property> - <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</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="GtkTreeView" id="roster_treeview"> + <widget class="GtkVBox" id="roster_vbox2"> <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="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="scroll_event" handler="on_roster_treeview_scroll_event"/> - <signal name="style_set" handler="on_roster_treeview_style_set"/> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <child> + <widget class="GtkScrolledWindow" id="scrolledwindow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="border_width">2</property> + <property name="hscrollbar_policy">GTK_POLICY_NEVER</property> + <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <child> + <widget 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="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="scroll_event" handler="on_roster_treeview_scroll_event"/> + <signal name="style_set" handler="on_roster_treeview_style_set"/> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkComboBox" id="status_combobox"> + <property name="visible">True</property> + <signal name="changed" handler="on_status_combobox_changed"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> </widget> + <packing> + <property name="resize">False</property> + <property name="shrink">True</property> + </packing> </child> + <child> + <placeholder/> + </child> </widget> <packing> <property name="position">1</property> </packing> </child> - <child> - <widget class="GtkComboBox" id="status_combobox"> - <property name="visible">True</property> - <signal name="changed" handler="on_status_combobox_changed"/> - </widget> - <packing> - <property name="expand">False</property> - <property name="position">2</property> - </packing> - </child> </widget> </child> </widget>

Modified: branches/one_window/src/roster_window.py =================================================================== --- branches/one_window/src/roster_window.py 2007-12-14 03:33:17 UTC (rev 9144) +++ branches/one_window/src/roster_window.py 2007-12-14 04:49:09 UTC (rev 9145) @@ -4397,7 +4397,15 @@ gajim.connections[account].status in ('offline', 'invisible'): win.get_control(fjid, account).got_disconnected()

- win.window.present() + if gajim.config.get('one_message_window') == 'always': + win.window.hide() + hpaned = self.xml.get_widget('roster_hpaned') + notebook = win.xml.get_widget('notebook') + notebook.reparent(hpaned) + hpaned.pack2(notebook, resize=True, shrink=True) + notebook.show_all() + else: + win.window.present()

def on_row_activated(self, widget, path): '''When an iter is activated (dubblick or single click if gnome is set