Commits January 2010

commits@gajim.org

7 participants
107 discussions

gajim: [zimio & me] undo functionality in message text imput fie...
by Yann Leboulanger 24 Jan '10

24 Jan '10

changeset 130fe55edac4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=130fe55edac4 description: [zimio & me] undo functionality in message text imput field. Fixes #4825 diffstat: src/chat_control.py | 30 ++++++++++++++++++++++++++++-- src/message_textview.py | 23 +++++++++++++++++++++++ 2 files changed, 51 insertions(+), 2 deletions(-) diffs (120 lines): diff -r 21007eafc99c -r 130fe55edac4 src/chat_control.py --- a/src/chat_control.py Sun Jan 24 11:03:53 2010 +0100 +++ b/src/chat_control.py Sun Jan 24 11:44:54 2010 +0100 @@ -230,7 +230,11 @@ helpers.launch_browser_mailer('url', url) def __init__(self, type_id, parent_win, widget_name, contact, acct, - resource = None): + resource=None): + # Undo needs this variable to know if space has been pressed. + # Initialize it to True so empty textview is saved in undo list + self.space_pressed = True + if resource is None: # We very likely got a contact with a random resource. # This is bad, we need the highest for caps etc. @@ -426,6 +430,11 @@ spell.set_language(lang) widget.set_active(True) + item = gtk.ImageMenuItem(gtk.STOCK_UNDO) + menu.prepend(item) + id_ = item.connect('activate', self.msg_textview.undo) + self.handlers[id_] = item + item = gtk.SeparatorMenuItem() menu.prepend(item) @@ -586,6 +595,20 @@ set_emoticons_menu_position, 1, 0) def _on_message_textview_key_press_event(self, widget, event): + if event.keyval == gtk.keysyms.space: + self.space_pressed = True + + elif (self.space_pressed or self.msg_textview.undo_pressed) and \ + event.keyval not in (gtk.keysyms.Control_L, gtk.keysyms.Control_R) and \ + not (event.keyval == gtk.keysyms.z and event.state & gtk.gdk.CONTROL_MASK): + # If the space key has been pressed and now it hasnt, + # we save the buffer into the undo list. But be carefull we're not + # pressiong Control again (as in ctrl+z) + _buffer = widget.get_buffer() + start_iter, end_iter = _buffer.get_bounds() + self.msg_textview.save_undo(_buffer.get_text(start_iter, end_iter)) + self.space_pressed = False + # Ctrl [+ Shift] + Tab are not forwarded to notebook. We handle it here if self.widget_name == 'groupchat_control': if event.keyval not in (gtk.keysyms.ISO_Left_Tab, gtk.keysyms.Tab): @@ -608,7 +631,7 @@ return False def _on_message_textview_mykeypress_event(self, widget, event_keyval, - event_keymod): + event_keymod): """ When a key is pressed: if enter is pressed without the shift key, message (if not empty) is sent and printed in the conversation @@ -665,6 +688,9 @@ if send_message: self.send_message(message, xhtml=xhtml) # send the message + elif event.keyval == gtk.keysyms.z: # CTRL+z + if event.state & gtk.gdk.CONTROL_MASK: + self.msg_textview.undo() else: # Give the control itself a chance to process self.handle_message_textview_mykey_press(widget, event_keyval, diff -r 21007eafc99c -r 130fe55edac4 src/message_textview.py --- a/src/message_textview.py Sun Jan 24 11:03:53 2010 +0100 +++ b/src/message_textview.py Sun Jan 24 11:44:54 2010 +0100 @@ -35,6 +35,7 @@ Class for the message textview (where user writes new messages) for chat/groupchat windows """ + UNDO_LIMIT = 20 __gsignals__ = dict( mykeypress = (gobject.SIGNAL_RUN_LAST | gobject.SIGNAL_ACTION, None, # return value @@ -56,6 +57,10 @@ self.set_pixels_above_lines(2) self.set_pixels_below_lines(2) + # set undo list + self.undo_list = [] + # needed to know if we undid something + self.undo_pressed = False self.lang = None # Lang used for spell checking _buffer = self.get_buffer() self.begin_tags = {} @@ -287,6 +292,20 @@ start, end = _buffer.get_bounds() _buffer.delete(start, end) + def save_undo(self, text): + self.undo_list.append(text) + if len(self.undo_list) > self.UNDO_LIMIT: + del self.undo_list[0] + self.undo_pressed = False + + def undo(self, widget=None): + """ + Undo text in the textview + """ + _buffer = self.get_buffer() + if self.undo_list: + _buffer.set_text(self.undo_list.pop()) + self.undo_pressed = True # We register depending on keysym and modifier some bindings # but we also pass those as param so we can construct fake Event @@ -340,4 +359,8 @@ gtk.gdk.CONTROL_MASK, 'mykeypress', int, gtk.keysyms.KP_Enter, gtk.gdk.ModifierType, gtk.gdk.CONTROL_MASK) +# Ctrl + z +gtk.binding_entry_add_signal(MessageTextView, gtk.keysyms.z, + gtk.gdk.CONTROL_MASK, 'mykeypress', int, gtk.keysyms.z, + gtk.gdk.ModifierType, gtk.gdk.CONTROL_MASK) # vim: se ts=3:

1 0

gajim: fix rendering of PEP renderer background color in account...
by Yann Leboulanger 24 Jan '10

24 Jan '10

changeset 21007eafc99c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=21007eafc99c description: fix rendering of PEP renderer background color in account row diffstat: src/roster_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r cddb2e95f55d -r 21007eafc99c src/roster_window.py --- a/src/roster_window.py Sun Jan 24 01:01:13 2010 +0100 +++ b/src/roster_window.py Sun Jan 24 11:03:53 2010 +0100 @@ -4553,7 +4553,7 @@ renderer.set_property('visible', True) if type_ == 'account': - self.set_renderer_color(renderer, gtk.STATE_ACTIVE) + self._set_account_row_background_color(renderer) renderer.set_property('xalign', 1) elif type_: if not model[titer][C_JID] or not model[titer][C_ACCOUNT]:

1 0

gajim: fix handler name in pref window
by Yann Leboulanger 24 Jan '10

24 Jan '10

changeset cddb2e95f55d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cddb2e95f55d description: fix handler name in pref window diffstat: data/gui/preferences_window.ui | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diffs (66 lines): diff -r 22b15fb95afd -r cddb2e95f55d data/gui/preferences_window.ui --- a/data/gui/preferences_window.ui Sun Jan 24 00:39:35 2010 +0100 +++ b/data/gui/preferences_window.ui Sun Jan 24 01:01:13 2010 +0100 @@ -4,7 +4,7 @@  <object class="GtkListStore" id="liststore1"> <columns> -  +  <column type="gchararray"/> </columns> <data> @@ -27,7 +27,7 @@ </object> <object class="GtkListStore" id="liststore2"> <columns> -  +  <column type="gchararray"/> </columns> <data> @@ -44,7 +44,7 @@ </object> <object class="GtkListStore" id="liststore3"> <columns> -  +  <column type="gchararray"/> </columns> <data> @@ -61,7 +61,7 @@ </object> <object class="GtkListStore" id="liststore4"> <columns> -  +  <column type="gchararray"/> </columns> <data> @@ -78,7 +78,7 @@ </object> <object class="GtkListStore" id="liststore5"> <columns> -  +  <column type="gchararray"/> </columns> <data> @@ -95,7 +95,7 @@ </object> <object class="GtkListStore" id="liststore6"> <columns> -  +  <column type="gchararray"/> </columns> <data> @@ -2542,7 +2542,7 @@ <property name="receives_default">False</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_allow_idle_time_checkbutton_toggled"/> + <signal name="toggled" handler="on_send_idle_time_checkbutton_toggled"/> </object> <packing> <property name="top_attach">3</property>

1 0

gajim: remove unused signals
by Yann Leboulanger 23 Jan '10

23 Jan '10

changeset 22b15fb95afd in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=22b15fb95afd description: remove unused signals diffstat: data/gui/change_activity_dialog.ui | 1 - data/gui/change_mood_dialog.ui | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diffs (22 lines): diff -r abc381c8bb2d -r 22b15fb95afd data/gui/change_activity_dialog.ui --- a/data/gui/change_activity_dialog.ui Sun Jan 24 00:31:49 2010 +0100 +++ b/data/gui/change_activity_dialog.ui Sun Jan 24 00:39:35 2010 +0100 @@ -7,7 +7,6 @@ <property name="title" translatable="yes">Set Activity</property> <property name="default_width">270</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"> <object class="GtkVBox" id="dialog-vbox5"> <property name="visible">True</property> diff -r abc381c8bb2d -r 22b15fb95afd data/gui/change_mood_dialog.ui --- a/data/gui/change_mood_dialog.ui Sun Jan 24 00:31:49 2010 +0100 +++ b/data/gui/change_mood_dialog.ui Sun Jan 24 00:39:35 2010 +0100 @@ -6,7 +6,6 @@ <property name="border_width">6</property> <property name="default_width">270</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"> <object class="GtkVBox" id="dialog-vbox5"> <property name="visible">True</property>

1 0

gajim: add missing window in dataform_window.ui. Fixes #5573
by Yann Leboulanger 23 Jan '10

23 Jan '10

changeset abc381c8bb2d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=abc381c8bb2d description: add missing window in dataform_window.ui. Fixes #5573 diffstat: data/gui/data_form_window.ui | 246 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 246 insertions(+), 0 deletions(-) diffs (254 lines): diff -r 2ef24c80269e -r abc381c8bb2d data/gui/data_form_window.ui --- a/data/gui/data_form_window.ui Sat Jan 23 20:42:23 2010 +0100 +++ b/data/gui/data_form_window.ui Sun Jan 24 00:31:49 2010 +0100 @@ -143,4 +143,250 @@ </object> </child> </object> + <object class="GtkWindow" id="data_form_fake_window"> + <property name="visible">True</property> + <property name="title" translatable="yes">window1</property> + <child> + <object class="GtkVBox" id="data_form_vbox"> + <property name="visible">True</property> + <property name="border_width">3</property> + <property name="orientation">vertical</property> + <property name="spacing">3</property> + <child> + <object class="GtkLabel" id="instructions_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">Fill in the form.</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="data_form_types_notebook"> + <property name="visible">True</property> + <property name="show_tabs">False</property> + <property name="show_border">False</property> + <child> + <object class="GtkScrolledWindow" id="single_form_scrolledwindow"> + <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="single_form_viewport"> + <property name="visible">True</property> + <property name="resize_mode">queue</property> + <property name="shadow_type">none</property> + <child> + <placeholder/> + </child> + </object> + </child> + </object> + <packing> + <property name="tab_expand">True</property> + </packing> + </child> + <child type="tab"> + <object class="GtkLabel" id="label1"> + <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="label2"> + <property name="visible">True</property> + </object> + <packing> + <property name="position">1</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="multiple_form_hbox"> + <property name="visible">True</property> + <child> + <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> + <object class="GtkTreeView" id="records_treeview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + </object> + </child> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="buttons_vbox"> + <property name="visible">True</property> + <property name="orientation">vertical</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="receives_default">True</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="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="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkHSeparator" id="hseparator17"> + <property name="visible">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="padding">3</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="edit_button"> + <property name="label">gtk-edit</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkHSeparator" id="hseparator18"> + <property name="visible">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="padding">3</property> + <property name="position">4</property> + </packing> + </child> + <child> + <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="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">5</property> + </packing> + </child> + <child> + <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="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">6</property> + </packing> + </child> + <child> + <object class="GtkHSeparator" id="hseparator19"> + <property name="visible">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="padding">3</property> + <property name="position">7</property> + </packing> + </child> + <child> + <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">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">8</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">2</property> + </packing> + </child> + <child type="tab"> + <object class="GtkLabel" id="label3"> + <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="label4"> + <property name="visible">True</property> + </object> + <packing> + <property name="position">3</property> + <property name="tab_fill">False</property> + </packing> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> </interface>

1 0

gajim: restore icons in menus
by Yann Leboulanger 23 Jan '10

23 Jan '10

changeset 2ef24c80269e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2ef24c80269e description: restore icons in menus diffstat: data/gui/account_context_menu.ui | 73 +++++++++++++++---- data/gui/advanced_menuitem_menu.ui | 20 +++- data/gui/chat_context_menu.ui | 64 +++++++++++++---- data/gui/gc_control_popup_menu.ui | 64 +++++++++++++---- data/gui/gc_occupants_menu.ui | 48 +++++++++++- data/gui/roster_window.ui | 104 +++++++++++++++++++++++---- data/gui/subscription_request_popup_menu.ui | 8 +- data/gui/systray_context_menu.ui | 40 +++++++++- data/gui/zeroconf_context_menu.ui | 19 +++- 9 files changed, 353 insertions(+), 87 deletions(-) diffs (truncated from 871 to 300 lines): diff -r 1e853e64228e -r 2ef24c80269e data/gui/account_context_menu.ui --- a/data/gui/account_context_menu.ui Sat Jan 23 13:03:44 2010 +0100 +++ b/data/gui/account_context_menu.ui Sat Jan 23 20:42:23 2010 +0100 @@ -8,8 +8,8 @@ <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> + <property name="image">image1</property> + <property name="use_stock">False</property> </object> </child> <child> @@ -18,8 +18,8 @@ <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> + <property name="image">image2</property> + <property name="use_stock">False</property> </object> </child> <child> @@ -34,8 +34,8 @@ <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> + <property name="image">image3</property> + <property name="use_stock">False</property> </object> </child> <child> @@ -43,8 +43,8 @@ <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> + <property name="image">image4</property> + <property name="use_stock">False</property> </object> </child> <child> @@ -57,8 +57,8 @@ <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> + <property name="image">image5</property> + <property name="use_stock">False</property> </object> </child> <child> @@ -66,8 +66,8 @@ <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> + <property name="image">image6</property> + <property name="use_stock">False</property> </object> </child> <child> @@ -75,8 +75,8 @@ <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> + <property name="image">image7</property> + <property name="use_stock">False</property> </object> </child> <child> @@ -96,10 +96,49 @@ <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> + <property name="image">image8</property> + <property name="use_stock">False</property> </object> </child> </object> - <object class="GtkAccelGroup" id="accelgroup1"/> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-network</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="stock">gtk-home</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image3"> + <property name="visible">True</property> + <property name="stock">gtk-jump-to</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image4"> + <property name="visible">True</property> + <property name="stock">gtk-connect</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image5"> + <property name="visible">True</property> + <property name="stock">gtk-add</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image6"> + <property name="visible">True</property> + <property name="stock">gtk-find</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="image8"> + <property name="visible">True</property> + <property name="stock">gtk-preferences</property> + <property name="icon-size">1</property> + </object> </interface> diff -r 1e853e64228e -r 2ef24c80269e data/gui/advanced_menuitem_menu.ui --- a/data/gui/advanced_menuitem_menu.ui Sat Jan 23 13:03:44 2010 +0100 +++ b/data/gui/advanced_menuitem_menu.ui Sat Jan 23 20:42:23 2010 +0100 @@ -29,8 +29,8 @@ <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> + <property name="image">image1</property> + <property name="use_stock">False</property> </object> </child> <child> @@ -56,9 +56,8 @@ <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> + <property name="image">image2</property> + <property name="use_stock">False</property> </object> </child> </object> @@ -66,5 +65,14 @@ </object> </child> </object> - <object class="GtkAccelGroup" id="accelgroup1"/> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-new</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="stock">gtk-clear</property> + <property name="icon-size">1</property> + </object> </interface> diff -r 1e853e64228e -r 2ef24c80269e data/gui/chat_context_menu.ui --- a/data/gui/chat_context_menu.ui Sat Jan 23 13:03:44 2010 +0100 +++ b/data/gui/chat_context_menu.ui Sat Jan 23 20:42:23 2010 +0100 @@ -8,8 +8,8 @@ <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> + <property name="image">image1</property> + <property name="use_stock">False</property> </object> </child> <child> @@ -17,8 +17,8 @@ <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> + <property name="image">image2</property> + <property name="use_stock">False</property> </object> </child> <child> @@ -26,8 +26,8 @@ <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> + <property name="image">image3</property> + <property name="use_stock">False</property> </object> </child> <child> @@ -35,8 +35,8 @@ <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> + <property name="image">image4</property> + <property name="use_stock">False</property> </object> </child> <child> @@ -49,8 +49,8 @@ <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> + <property name="image">image5</property> + <property name="use_stock">False</property> </object> </child> <child> @@ -58,8 +58,8 @@ <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> + <property name="image">image6</property> + <property name="use_stock">False</property> <signal name="activate" handler="on_join_group_chat_menuitem_activate"/> </object> </child> @@ -68,10 +68,44 @@ <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> + <property name="image">image7</property> + <property name="use_stock">False</property> </object> </child> </object> - <object class="GtkAccelGroup" id="accelgroup1"/> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-copy</property> + <property name="icon-size">1</property> + </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-copy</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image4"> + <property name="visible">True</property> + <property name="stock">gtk-jump-to</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image5"> + <property name="visible">True</property> + <property name="stock">gtk-jump-to</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image6"> + <property name="visible">True</property> + <property name="stock">gtk-connect</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image7"> + <property name="visible">True</property> + <property name="stock">gtk-add</property> + <property name="icon-size">1</property> + </object> </interface> diff -r 1e853e64228e -r 2ef24c80269e data/gui/gc_control_popup_menu.ui --- a/data/gui/gc_control_popup_menu.ui Sat Jan 23 13:03:44 2010 +0100 +++ b/data/gui/gc_control_popup_menu.ui Sat Jan 23 20:42:23 2010 +0100 @@ -8,8 +8,8 @@ <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>

1 0

gajim: fix history window usage. Fixes #5571
by Yann Leboulanger 23 Jan '10

23 Jan '10

changeset 1e853e64228e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1e853e64228e description: fix history window usage. Fixes #5571 diffstat: data/gui/history_window.ui | 9 ++------- src/history_window.py | 14 +++++++------- 2 files changed, 9 insertions(+), 14 deletions(-) diffs (90 lines): diff -r 7d8781358247 -r 1e853e64228e data/gui/history_window.ui --- a/data/gui/history_window.ui Sat Jan 23 11:31:59 2010 +0100 +++ b/data/gui/history_window.ui Sat Jan 23 13:03:44 2010 +0100 @@ -4,7 +4,7 @@  <object class="GtkListStore" id="liststore1"> <columns> -  +  <column type="gchararray"/> </columns> <data> @@ -48,13 +48,8 @@ <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="model">liststore1</property> + <property name="text_column">0</property> <signal name="changed" handler="on_query_combobox_changed"/> - <child> - <object class="GtkCellRendererText" id="cellrenderertext1"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> </object> <packing> <property name="position">0</property> diff -r 7d8781358247 -r 1e853e64228e src/history_window.py --- a/src/history_window.py Sat Jan 23 11:31:59 2010 +0100 +++ b/src/history_window.py Sat Jan 23 13:03:44 2010 +0100 @@ -66,7 +66,6 @@ def __init__(self, jid = None, account = None): 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( @@ -79,6 +78,8 @@ self.on_log_history_checkbutton_toggled) self.query_entry = xml.get_object('query_entry') self.query_combobox = xml.get_object('query_combobox') + self.jid_entry = self.query_combobox.child + self.jid_entry.connect('activate', self.on_jid_entry_activate) self.query_combobox.set_active(0) self.results_treeview = xml.get_object('results_treeview') self.results_window = xml.get_object('results_scrolledwindow') @@ -148,21 +149,20 @@ # Add all jids in logs.db: db_jids = gajim.logger.get_jids_in_db() - self.completion_dict = dict.fromkeys(db_jids) + completion_dict = dict.fromkeys(db_jids) self.accounts_seen_online = gajim.contacts.get_accounts()[:] # Enhance contacts of online accounts with contact. Needed for mapping below for account in self.accounts_seen_online: - self.completion_dict.update( - helpers.get_contact_dict_for_account(account)) + completion_dict.update(helpers.get_contact_dict_for_account(account)) muc_active_img = gtkgui_helpers.load_icon('muc_active') contact_img = gajim.interface.jabber_state_images['16']['online'] muc_active_pix = muc_active_img.get_pixbuf() contact_pix = contact_img.get_pixbuf() - keys = self.completion_dict.keys() + keys = completion_dict.keys() # Move the actual jid at first so we load history faster actual_jid = self.jid_entry.get_text().decode('utf-8') if actual_jid in keys: @@ -174,7 +174,7 @@ # Warning : This for is time critical with big DB for key in keys: completed = key - contact = self.completion_dict[completed] + contact = completion_dict[completed] if contact: info_name = contact.get_shown_name() info_completion = info_name @@ -251,7 +251,7 @@ def on_jid_entry_focus(self, widget, event): widget.select_region(0, -1) # select text - def _load_history(self, jid_or_name, account = None): + def _load_history(self, jid_or_name, account=None): """ Load history for the given jid/name and show it """

1 0

gajim: fix error when opening groupchat. see #5571
by Yann Leboulanger 23 Jan '10

23 Jan '10

changeset 7d8781358247 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7d8781358247 description: fix error when opening groupchat. see #5571 diffstat: src/message_window.py | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diffs (37 lines): diff -r f98ada1b9740 -r 7d8781358247 src/message_window.py --- a/src/message_window.py Fri Jan 22 21:55:03 2010 +0100 +++ b/src/message_window.py Sat Jan 23 11:31:59 2010 +0100 @@ -116,7 +116,6 @@ # 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_object('alignment') id_ = self.notebook.connect('switch-page', self._on_notebook_switch_page) @@ -140,7 +139,6 @@ if gajim.config.get('tabs_always_visible') or \ window_mode == MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER: self.notebook.set_show_tabs(True) - self.alignment.set_property('top-padding', 2) else: self.notebook.set_show_tabs(False) self.notebook.set_show_border(gajim.config.get('tabs_border')) @@ -278,7 +276,6 @@ self.notebook.set_show_tabs(True) if scrolled: gobject.idle_add(conv_textview.scroll_to_end_iter) - self.alignment.set_property('top-padding', 2) # Add notebook page and connect up to the tab's close button xml = gtkgui_helpers.get_gtk_builder('message_window.ui', 'chat_tab_ebox') @@ -588,9 +585,6 @@ show_tabs_if_one_tab = gajim.config.get('tabs_always_visible') or \ window_mode == MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER self.notebook.set_show_tabs(show_tabs_if_one_tab) - if not show_tabs_if_one_tab: - self.alignment.set_property('top-padding', 0) - def redraw_tab(self, ctrl, chatstate = None): hbox = self.notebook.get_tab_label(ctrl.widget).get_children()[0]

1 0

gajim: fix widget id
by Yann Leboulanger 22 Jan '10

22 Jan '10

changeset f98ada1b9740 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f98ada1b9740 description: fix widget id diffstat: data/gui/groupchat_control.ui | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r c4180e3ff1d6 -r f98ada1b9740 data/gui/groupchat_control.ui --- a/data/gui/groupchat_control.ui Fri Jan 22 21:17:59 2010 +0100 +++ b/data/gui/groupchat_control.ui Fri Jan 22 21:55:03 2010 +0100 @@ -7,7 +7,7 @@ <property name="border_width">3</property> <property name="orientation">vertical</property> <child> - <object class="GtkAlignment" id="alignment103"> + <object class="GtkAlignment" id="alignment"> <property name="visible">True</property> <property name="bottom_padding">1</property> <property name="left_padding">3</property>

1 0

gajim: split message_window.ui to separate chat_control.ui and g...
by Yann Leboulanger 22 Jan '10

22 Jan '10

changeset c4180e3ff1d6 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c4180e3ff1d6 description: split message_window.ui to separate chat_control.ui and groupchat_control.ui diffstat: data/gui/chat_control.ui | 831 +++++++++++++++++++++++ data/gui/groupchat_control.ui | 428 ++++++++++++ data/gui/message_window.ui | 1454 +--------------------------------------- src/chat_control.py | 6 +- src/groupchat_control.py | 2 +- src/message_control.py | 4 +- src/message_window.py | 3 - 7 files changed, 1319 insertions(+), 1409 deletions(-) diffs (truncated from 2804 to 300 lines): diff -r 698a99934bff -r c4180e3ff1d6 data/gui/chat_control.ui --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/gui/chat_control.ui Fri Jan 22 21:17:59 2010 +0100 @@ -0,0 +1,831 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> +  + <object class="GtkVBox" id="chat_control_vbox"> + <property name="can_focus">True</property> + <property name="border_width">3</property> + <property name="orientation">vertical</property> + <property name="spacing">1</property> + <child> + <object class="GtkHBox" id="hbox3"> + <property name="visible">True</property> + <child> + <object class="GtkVBox" id="vbox2"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkAlignment" id="alignment"> + <property name="visible">True</property> + <property name="left_padding">3</property> + <property name="right_padding">3</property> + <child> + <object class="GtkEventBox" id="banner_eventbox"> + <property name="visible">True</property> + <child> + <object class="GtkHBox" id="hbox3004"> + <property name="visible">True</property> + <child> + <object class="GtkImage" id="banner_status_image"> + <property name="visible">True</property> + <property name="ypad">5</property> + <property name="stock">gtk-missing-image</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="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> + <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> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <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"/> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <property name="spacing">4</property> + <child> + <object class="GtkImage" id="mood_image"> + <property name="no_show_all">True</property> + <property name="stock">None</property> + <property name="icon-size">1</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkImage" id="activity_image"> + <property name="no_show_all">True</property> + <property name="stock">None</property> + <property name="icon-size">1</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkImage" id="tune_image"> + <property name="no_show_all">True</property> + <property name="stock">None</property> + <property name="icon-size">1</property> + </object> + <packing> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkEventBox" id="location_eventbox"> + <property name="visible">True</property> + <property name="visible_window">False</property> + <child> + <object class="GtkImage" id="location_image"> + <property name="no_show_all">True</property> + <property name="stock">None</property> + <property name="icon-size">1</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkImage" id="audio_banner_image"> + <property name="visible">True</property> + <property name="stock">None</property> + <property name="icon-size">1</property> + </object> + <packing> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkImage" id="video_banner_image"> + <property name="visible">True</property> + <property name="stock">None</property> + <property name="icon-size">1</property> + </object> + <packing> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="alignment3"> + <property name="width_request">11</property> + <property name="visible">True</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="position">6</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkEventBox" id="avatar_eventbox"> + <property name="visible">True</property> + <property name="visible_window">False</property> + <child> + <object class="GtkImage" id="avatar_image"> + <property name="visible">True</property> + <property name="stock">None</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">3</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="GtkVBox" id="vbox106"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkScrolledWindow" id="conversation_scrolledwindow"> + <property name="height_request">60</property> + <property name="can_focus">True</property> + <property name="border_width">3</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">0</property> + </packing> + </child> + <child> + <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> + <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> + <property name="no_show_all">True</property> + <property name="relief">none</property> + <property name="focus_on_click">False</property> + <child> + <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> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="message_scrolledwindow"> + <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">never</property> + <property name="shadow_type">in</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <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">1</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="actions_hbox"> + <property name="visible">True</property> + <child> + <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="relief">none</property> + <property name="focus_on_click">False</property> + <child> + <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> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="formattings_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property>

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2010