Commits

commits@gajim.org

17632 discussions

gajim: fix big avatar
by Denis Fomin 04 Jan '13

04 Jan '13

changeset 2a2cc0bd56db in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2a2cc0bd56db description: fix big avatar diffstat: src/chat_control.py | 67 +++++++++++++------------------------------------- src/dialogs.py | 48 ++++++++++++++++++++++++++++++++++++ src/gtkgui_helpers.py | 2 +- 3 files changed, 67 insertions(+), 50 deletions(-) diffs (170 lines): diff -r 5cc164529c5e -r 2a2cc0bd56db src/chat_control.py --- a/src/chat_control.py Fri Jan 04 22:00:16 2013 +0400 +++ b/src/chat_control.py Sat Jan 05 01:27:22 2013 +0400 @@ -3007,9 +3007,9 @@ Resize the avatar, if needed, so it has at max half the screen size and shows it """ - if not small_avatar.window: - # Tab has been closed since we hovered the avatar - return + #if not small_avatar.window: + ### Tab has been closed since we hovered the avatar + #return avatar_pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache( self.contact.jid) if avatar_pixbuf in ('ask', None): @@ -3022,7 +3022,8 @@ image = self.xml.get_object('avatar_image') pixbuf = image.get_pixbuf() pixbuf.fill(0xffffff00) # RGBA - image.queue_draw() + image.set_from_pixbuf(pixbuf) + #image.queue_draw() screen_w = Gdk.Screen.width() screen_h = Gdk.Screen.height() @@ -3034,56 +3035,24 @@ avatar_w = half_scr_w if avatar_h > half_scr_h: avatar_h = half_scr_h - window = Gtk.Window(Gtk.WindowType.POPUP) - self.bigger_avatar_window = window - pixmap, mask = avatar_pixbuf.render_pixmap_and_mask() - window.set_size_request(avatar_w, avatar_h) # we should make the cursor visible # gtk+ doesn't make use of the motion notify on gtkwindow by default # so this line adds that - window.set_events(Gdk.EventMask.POINTER_MOTION_MASK) - window.set_app_paintable(True) - window.set_type_hint(Gdk.WindowTypeHint.TOOLTIP) - - window.realize() - window.window.set_back_pixmap(pixmap, False) # make it transparent - window.window.shape_combine_mask(mask, 0, 0) - + + alloc = small_avatar.get_allocation() # make the bigger avatar window show up centered - x0, y0 = small_avatar.window.get_origin()[1:] - x0 += small_avatar.allocation.x - y0 += small_avatar.allocation.y - center_x= x0 + (small_avatar.allocation.width / 2) - center_y = y0 + (small_avatar.allocation.height / 2) + small_avatar_x, small_avatar_y = alloc.x, alloc.y + translated_coordinates = small_avatar.translate_coordinates( + gajim.interface.roster.window, 0, 0) + if translated_coordinates: + small_avatar_x, small_avatar_y = translated_coordinates + roster_x, roster_y = self.parent_win.window.get_window().get_origin()[1:] + center_x = roster_x + small_avatar_x + (alloc.width / 2) + center_y = roster_y + small_avatar_y + (alloc.height / 2) pos_x, pos_y = center_x - (avatar_w / 2), center_y - (avatar_h / 2) - window.move(pos_x, pos_y) - # make the cursor invisible so we can see the image - invisible_cursor = gtkgui_helpers.get_invisible_cursor() - window.window.set_cursor(invisible_cursor) - - # we should hide the window - window.connect('leave_notify_event', - self._on_window_avatar_leave_notify_event) - window.connect('motion-notify-event', - self._on_window_motion_notify_event) - - window.show_all() - - def _on_window_avatar_leave_notify_event(self, widget, event): - """ - Just left the popup window that holds avatar - """ - self.bigger_avatar_window.destroy() - self.bigger_avatar_window = None - # Re-show the small avatar - self.show_avatar() - - def _on_window_motion_notify_event(self, widget, event): - """ - Just moved the mouse so show the cursor - """ - cursor = Gdk.Cursor.new(Gdk.CursorType.LEFT_PTR) - self.bigger_avatar_window.window.set_cursor(cursor) + + dialogs.BigAvatarWindow(avatar_pixbuf, pos_x, pos_y, avatar_w, + avatar_h, self.show_avatar) def _on_send_file_menuitem_activate(self, widget): self._on_send_file() diff -r 5cc164529c5e -r 2a2cc0bd56db src/dialogs.py --- a/src/dialogs.py Fri Jan 04 22:00:16 2013 +0400 +++ b/src/dialogs.py Sat Jan 05 01:27:22 2013 +0400 @@ -33,6 +33,7 @@ from gi.repository import Gdk from gi.repository import GdkPixbuf from gi.repository import GObject +import cairo import os import gtkgui_helpers @@ -5325,3 +5326,50 @@ def on_cert_clicked(self, button): d = CertificatDialog(self, self.account, self.cert) + + +class BigAvatarWindow(Gtk.Window): + def __init__(self, avatar, pos_x, pos_y, width, height, callback): + super(BigAvatarWindow, self).__init__(type=Gtk.WindowType.POPUP) + self.set_events(Gdk.EventMask.POINTER_MOTION_MASK) + self.avatar = avatar + self.callback = callback + self.screen = self.get_screen() + self.visual = self.screen.get_rgba_visual() + if self.visual != None and self.screen.is_composited(): + self.set_visual(self.visual) + self.set_app_paintable(True) + self.set_size_request(width, height) + self.move(pos_x, pos_y) + self.connect("draw", self.area_draw) + # we should hide the window + self.connect('leave_notify_event', self._on_window_avatar_leave_notify) + self.connect('motion-notify-event', self._on_window_motion_notify) + self.realize() + # make the cursor invisible so we can see the image + invisible_cursor = gtkgui_helpers.get_invisible_cursor() + self.get_window().set_cursor(invisible_cursor) + self.show_all() + + def area_draw(self, widget, cr): + cr.set_source_rgba(.2, .2, .2, 0.0) + cr.set_operator(cairo.OPERATOR_SOURCE) + Gdk.cairo_set_source_pixbuf(cr, self.avatar, 0, 0) + cr.paint() + cr.set_operator(cairo.OPERATOR_OVER) + + def _on_window_avatar_leave_notify(self, widget, event): + """ + Just left the popup window that holds avatar + """ + self.destroy() + self.bigger_avatar_window = None + # Re-show the small avatar + self.callback() + + def _on_window_motion_notify(self, widget, event): + """ + Just moved the mouse so show the cursor + """ + cursor = Gdk.Cursor.new(Gdk.CursorType.LEFT_PTR) + self.get_window().set_cursor(cursor) diff -r 5cc164529c5e -r 2a2cc0bd56db src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Fri Jan 04 22:00:16 2013 +0400 +++ b/src/gtkgui_helpers.py Sat Jan 05 01:27:22 2013 +0400 @@ -133,7 +133,7 @@ gajim.interface.roster.window, 0, 0) if translated_coordinates: button_x, button_y = translated_coordinates - _alloc = parent_win.notebook.get_allocation() + # now convert them to X11-relative window_x, window_y = window_x1, window_y1 x = window_x + button_x

1 0

gajim: fix contact time
by Denis Fomin 04 Jan '13

04 Jan '13

changeset 5cc164529c5e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5cc164529c5e description: fix contact time diffstat: src/vcard.py | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diffs (22 lines): diff -r c97d059e6b49 -r 5cc164529c5e src/vcard.py --- a/src/vcard.py Fri Jan 04 14:12:35 2013 +0100 +++ b/src/vcard.py Fri Jan 04 22:00:16 2013 +0400 @@ -346,8 +346,7 @@ stats += ': ' + self.contact.status if self.contact.last_status_time: stats += '\n' + _('since %s') % time.strftime('%c', - self.contact.last_status_time).decode( - locale.getpreferredencoding()) + self.contact.last_status_time) for c in connected_contact_list: if c.resource != self.contact.resource: stats += '\n' @@ -356,7 +355,7 @@ stats += ': ' + c.status if c.last_status_time: stats += '\n' + _('since %s') % time.strftime('%c', - c.last_status_time).decode(locale.getpreferredencoding()) + c.last_status_time) else: # Maybe gc_vcard ? stats = helpers.get_uf_show(self.contact.show) if self.contact.status:

1 0

gajim: fix __import__ calls
by Yann Leboulanger 04 Jan '13

04 Jan '13

changeset c97d059e6b49 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c97d059e6b49 description: fix __import__ calls diffstat: src/common/gajim.py | 2 +- src/common/passwords.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r 323127b0835b -r c97d059e6b49 src/common/gajim.py --- a/src/common/gajim.py Fri Jan 04 16:40:18 2013 +0400 +++ b/src/common/gajim.py Fri Jan 04 14:12:35 2013 +0100 @@ -158,7 +158,7 @@ HAVE_GPG = True try: - __import__('gnupg', globals(), locals(), [], -1) + __import__('gnupg', globals(), locals(), [], 0) except ImportError: HAVE_GPG = False else: diff -r 323127b0835b -r c97d059e6b49 src/common/passwords.py --- a/src/common/passwords.py Fri Jan 04 16:40:18 2013 +0400 +++ b/src/common/passwords.py Fri Jan 04 14:12:35 2013 +0100 @@ -200,7 +200,7 @@ global GnomeKeyring try: gir = __import__('gi.repository', globals(), locals(), - ['GnomeKeyring'], -1) + ['GnomeKeyring'], 0) GnomeKeyring = gir.GnomeKeyring except ImportError: pass

1 0

gajim: fix get invisible cursor
by Denis Fomin 04 Jan '13

04 Jan '13

changeset 323127b0835b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=323127b0835b description: fix get invisible cursor diffstat: src/gtkgui_helpers.py | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diffs (18 lines): diff -r 2121afd30211 -r 323127b0835b src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Fri Jan 04 15:20:04 2013 +0400 +++ b/src/gtkgui_helpers.py Fri Jan 04 16:40:18 2013 +0400 @@ -433,9 +433,11 @@ return pixbuf def get_invisible_cursor(): - pixmap = Gdk.Pixmap(None, 1, 1, 1) - color = Gdk.Color() - cursor = Gdk.Cursor.new(pixmap, pixmap, color, color, 0, 0) + import cairo + s = cairo.ImageSurface(cairo.FORMAT_A1, 1, 1) + cursor_pixbuf = Gdk.pixbuf_get_from_surface(s, 0, 0, 1, 1) + cursor = Gdk.Cursor.new_from_pixbuf(Gdk.Display.get_default(), \ + cursor_pixbuf, 0, 0) return cursor def get_current_desktop(window):

1 0

gajim: fix join gc dialog
by Denis Fomin 04 Jan '13

04 Jan '13

changeset 2121afd30211 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2121afd30211 description: fix join gc dialog diffstat: data/gui/join_groupchat_window.ui | 83 ++++++++++++++++++++++++-------------- src/dialogs.py | 35 +++++++-------- 2 files changed, 68 insertions(+), 50 deletions(-) diffs (truncated from 356 to 300 lines): diff -r b7c54367355b -r 2121afd30211 data/gui/join_groupchat_window.ui --- a/data/gui/join_groupchat_window.ui Thu Jan 03 23:30:17 2013 +0100 +++ b/data/gui/join_groupchat_window.ui Fri Jan 04 15:20:04 2013 +0400 @@ -1,21 +1,27 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <interface> - <requires lib="gtk+" version="2.16"/> -  +  + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-find</property> + </object> <object class="GtkWindow" id="join_groupchat_window"> + <property name="can_focus">False</property> <property name="border_width">6</property> <property name="title" translatable="yes">Join Group Chat</property> <property name="type_hint">dialog</property> - <signal name="destroy" handler="on_join_groupchat_window_destroy"/> - <signal name="key_press_event" handler="on_join_groupchat_window_key_press_event"/> + <signal name="destroy" handler="on_join_groupchat_window_destroy" swapped="no"/> + <signal name="key-press-event" handler="on_join_groupchat_window_key_press_event" swapped="no"/> <child> <object class="GtkVBox" id="vbox28"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkTable" id="table15"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="n_rows">8</property> <property name="n_columns">2</property> <property name="column_spacing">12</property> @@ -26,7 +32,7 @@ <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"/> + <signal name="changed" handler="on_required_entry_changed" swapped="no"/> </object> <packing> <property name="left_attach">1</property> @@ -41,7 +47,7 @@ <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"/> + <signal name="changed" handler="on_required_entry_changed" swapped="no"/> </object> <packing> <property name="left_attach">1</property> @@ -54,6 +60,7 @@ <child> <object class="GtkLabel" id="label143"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Room:</property> </object> @@ -67,6 +74,7 @@ <child> <object class="GtkLabel" id="label142"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Nickname:</property> </object> @@ -80,6 +88,7 @@ <child> <object class="GtkLabel" id="label225"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Recently:</property> </object> @@ -93,7 +102,8 @@ <child> <object class="GtkComboBox" id="recently_combobox"> <property name="visible">True</property> - <signal name="changed" handler="on_recently_combobox_changed"/> + <property name="can_focus">False</property> + <signal name="changed" handler="on_recently_combobox_changed" swapped="no"/> </object> <packing> <property name="left_attach">1</property> @@ -107,6 +117,7 @@ <child> <object class="GtkLabel" id="label145"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Password:</property> </object> @@ -135,11 +146,14 @@ <child> <object class="GtkCheckButton" id="auto_join_checkbutton"> <property name="label" translatable="yes">Join this room _automatically when I connect</property> + <property name="use_action_appearance">False</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="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -152,6 +166,7 @@ </child> <child> <object class="GtkLabel" id="account_label"> + <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Account</property> @@ -163,8 +178,9 @@ </child> <child> <object class="GtkComboBox" id="account_combobox"> + <property name="can_focus">False</property> <property name="no_show_all">True</property> - <signal name="changed" handler="on_account_combobox_changed"/> + <signal name="changed" handler="on_account_combobox_changed" swapped="no"/> </object> <packing> <property name="left_attach">1</property> @@ -176,12 +192,15 @@ <child> <object class="GtkCheckButton" id="bookmark_checkbutton"> <property name="label" translatable="yes">_Bookmark this room</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_bookmark_checkbutton_toggled"/> + <signal name="toggled" handler="on_bookmark_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="right_attach">2</property> @@ -194,6 +213,7 @@ <child> <object class="GtkLabel" id="label1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Server:</property> </object> @@ -205,27 +225,27 @@ <child> <object class="GtkHBox" id="hbox1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <object class="GtkComboBox" id="server_comboboxentry"> - <property name="visible">True</property> - <property name="model">liststore1</property> - </object> - <packing> - <property name="position">0</property> - </packing> + <placeholder/> </child> <child> <object class="GtkButton" id="browse_rooms_button"> <property name="label" translatable="yes">Bro_wse Rooms</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="use_action_appearance">False</property> <property name="image">image1</property> <property name="use_underline">True</property> - <signal name="clicked" handler="on_browse_rooms_button_clicked"/> + <signal name="clicked" handler="on_browse_rooms_button_clicked" swapped="no"/> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="pack_type">end</property> <property name="position">1</property> </packing> </child> @@ -241,23 +261,27 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkHButtonBox" id="hbuttonbox12"> <property name="visible">True</property> + <property name="can_focus">False</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="use_action_appearance">False</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_action_appearance">False</property> <property name="use_stock">True</property> - <signal name="clicked" handler="on_cancel_button_clicked"/> + <signal name="clicked" handler="on_cancel_button_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -267,24 +291,29 @@ </child> <child> <object class="GtkButton" id="join_button"> + <property name="use_action_appearance">False</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> - <signal name="clicked" handler="on_join_button_clicked"/> + <property name="use_action_appearance">False</property> + <signal name="clicked" handler="on_join_button_clicked" swapped="no"/> <child> <object class="GtkAlignment" id="alignment25"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xscale">0</property> <property name="yscale">0</property> <child> <object class="GtkHBox" id="hbox37"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">2</property> <child> <object class="GtkImage" id="image148"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="stock">gtk-apply</property> </object> <packing> @@ -296,6 +325,7 @@ <child> <object class="GtkLabel" id="label146"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">_Join</property> <property name="use_underline">True</property> </object> @@ -319,6 +349,7 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="pack_type">end</property> <property name="position">1</property> </packing> @@ -326,14 +357,4 @@ </object> </child> </object> - <object class="GtkListStore" id="liststore1"> - <columns> -  - <column type="gchararray"/> - </columns> - </object> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="stock">gtk-find</property> - </object> </interface> diff -r b7c54367355b -r 2121afd30211 src/dialogs.py --- a/src/dialogs.py Thu Jan 03 23:30:17 2013 +0100 +++ b/src/dialogs.py Fri Jan 04 15:20:04 2013 +0400 @@ -2382,18 +2382,13 @@ title = _('Join Group Chat') self.window.set_title(title) - self.server_comboboxentry = self.xml.get_object('server_comboboxentry') - liststore = Gtk.ListStore(str) - self.server_comboboxentry.set_model(liststore) - cell = Gtk.CellRendererText() - self.server_comboboxentry.pack_start(cell, True) - self.server_comboboxentry.add_attribute(cell, 'text', 0) - self.server_comboboxentry.set_active(-1) - self.server_model = liststore#self.server_comboboxentry.get_model() - server_list = [] - # get the muc server of our server

1 0

gajim: fix showing dialpad correctly in LTR languages. Fixes #7285
by Yann Leboulanger 04 Jan '13

04 Jan '13

changeset 5f8bfea2054a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5f8bfea2054a description: fix showing dialpad correctly in LTR languages. Fixes #7285 diffstat: src/chat_control.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 593e195a3bb1 -r 5f8bfea2054a src/chat_control.py --- a/src/chat_control.py Sun Dec 30 19:47:48 2012 +0100 +++ b/src/chat_control.py Fri Jan 04 09:46:13 2013 +0100 @@ -1584,6 +1584,7 @@ self.handlers[id_] = widget self.dtmf_window = self.xml.get_object('dtmf_window') + self.dtmf_window.get_child().set_direction(gtk.TEXT_DIR_LTR) id_ = self.dtmf_window.connect('focus-out-event', self.on_dtmf_window_focus_out_event) self.handlers[id_] = self.dtmf_window

1 0

gajim: [Daniel] fix typo in nb translation
by Yann Leboulanger 04 Jan '13

04 Jan '13

changeset 593e195a3bb1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=593e195a3bb1 description: [Daniel] fix typo in nb translation diffstat: po/nb.po | 9335 +++++++++++++++++++++++++++++++++---------------------------- 1 files changed, 5067 insertions(+), 4268 deletions(-) diffs (truncated from 14752 to 300 lines): diff -r 666f9b2321dc -r 593e195a3bb1 po/nb.po --- a/po/nb.po Sun Dec 30 18:59:48 2012 +0100 +++ b/po/nb.po Sun Dec 30 19:47:48 2012 +0100 @@ -2,15 +2,11 @@ # This file is distributed under the same license as the Gajim package. # Stian B. Barmen <stian(a)jabber.no>, 2005. # -#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228 -#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255 -#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262 -#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264 msgid "" msgstr "" "Project-Id-Version: Gajim 0.11\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-01 20:39+0200\n" +"POT-Creation-Date: 2012-12-30 19:46+0100\n" "PO-Revision-Date: 2009-11-18 15:50+0100\n" "Last-Translator: Stian B. Barmen <stian(a)barmen.nu>\n" "Language-Team: <>\n" @@ -21,44 +17,139 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-Bookmarks: -1,775,-1,-1,-1,-1,-1,-1,-1,-1\n" -#: ../data/gui/account_context_menu.ui.h:1 ../data/gui/roster_window.ui.h:7 +#: ../data/gui/account_context_menu.ui.h:1 +#: ../data/gui/zeroconf_context_menu.ui.h:1 +msgid "_Status" +msgstr "_Status" + +#: ../data/gui/account_context_menu.ui.h:2 +msgid "_Personal Events" +msgstr "_Personlige Hendelser" + +#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3 +msgid "_Start Chat..." +msgstr "_Start Samtale..." + +#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5 msgid "Join _Group Chat..." msgstr "Bli med i _Gruppe Samtale..." -#: ../data/gui/account_context_menu.ui.h:2 +#: ../data/gui/account_context_menu.ui.h:5 msgid "_Add Contact..." msgstr "_Legg til Kontakt..." -#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18 +#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7 msgid "_Discover Services" msgstr "_Oppdag Tjenester" -#: ../data/gui/account_context_menu.ui.h:4 +#: ../data/gui/account_context_menu.ui.h:7 msgid "_Execute Command..." msgstr "_Kjør Kommando" -#: ../data/gui/account_context_menu.ui.h:5 +#: ../data/gui/account_context_menu.ui.h:8 +msgid "_Open Gmail Inbox" +msgstr "_Åpne Gmail Innboks" + +#: ../data/gui/account_context_menu.ui.h:9 msgid "_Modify Account" msgstr "_Rediger Konto" -#: ../data/gui/account_context_menu.ui.h:6 -msgid "_Open Gmail Inbox" -msgstr "_Åpne Gmail Innboks" - -#: ../data/gui/account_context_menu.ui.h:7 -msgid "_Personal Events" -msgstr "_Personlige Hendelser" - -#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24 -msgid "_Start Chat..." -msgstr "_Start Samtale..." - -#: ../data/gui/account_context_menu.ui.h:9 -#: ../data/gui/zeroconf_context_menu.ui.h:2 -msgid "_Status" -msgstr "_Status" - #: ../data/gui/account_creation_wizard_window.ui.h:1 +msgid "Gajim: Account Creation Wizard" +msgstr "Gajim: Konto Opprettings Veiviser" + +#: ../data/gui/account_creation_wizard_window.ui.h:2 +msgid "" +"You need to have an account in order to connect\n" +"to the Jabber network." +msgstr "" +"Du trenger en konto før du kan koble\n" +"til Jabber nettverket." + +#: ../data/gui/account_creation_wizard_window.ui.h:4 +msgid "I already have an account I want to _use" +msgstr "Jeg har allerede en konto jeg ønsker å _bruke" + +#: ../data/gui/account_creation_wizard_window.ui.h:5 +msgid "I want to _register for a new account" +msgstr "Jeg ønsker å _registrere en ny konto" + +#: ../data/gui/account_creation_wizard_window.ui.h:6 +msgid "Please choose one of the options below:" +msgstr "Vennligst velg ett av valgene under:" + +#: ../data/gui/account_creation_wizard_window.ui.h:7 +msgid "Please fill in the data for your existing account" +msgstr "Vennligst fyll in data for din eksisterende konto" + +#: ../data/gui/account_creation_wizard_window.ui.h:8 +#: ../data/gui/accounts_window.ui.h:22 +#: ../data/gui/manage_bookmarks_window.ui.h:2 +msgid "_Password:" +msgstr "_Passord:" + +#: ../data/gui/account_creation_wizard_window.ui.h:9 +#: ../data/gui/accounts_window.ui.h:20 +msgid "Save pass_word" +msgstr "Lagre pass_ord" + +#: ../data/gui/account_creation_wizard_window.ui.h:10 +#: ../data/gui/accounts_window.ui.h:21 +msgid "If checked, Gajim will remember the password for this account" +msgstr "Dersom valgt vil Gajim huske passordet for kontoen" + +#: ../data/gui/account_creation_wizard_window.ui.h:11 +#: ../data/gui/accounts_window.ui.h:23 +msgid "_Jabber ID:" +msgstr "_Jabber ID:" + +#: ../data/gui/account_creation_wizard_window.ui.h:12 +msgid "Anon_ymous authentication" +msgstr "Anon_ym autentisering" + +#: ../data/gui/account_creation_wizard_window.ui.h:13 +msgid "Please select a server" +msgstr "Vennligst velg en server" + +#: ../data/gui/account_creation_wizard_window.ui.h:14 +#: ../data/gui/manage_bookmarks_window.ui.h:3 +msgid "_Server:" +msgstr "_Server:" + +#: ../data/gui/account_creation_wizard_window.ui.h:15 +msgid "Prox_y:" +msgstr "Prox_y:" + +#: ../data/gui/account_creation_wizard_window.ui.h:16 +msgid "Manage..." +msgstr "Behandle..." + +#: ../data/gui/account_creation_wizard_window.ui.h:17 +msgid "Use custom hostname/port" +msgstr "Bruk egendefinert maskinnavn/port" + +#: ../data/gui/account_creation_wizard_window.ui.h:18 +msgid "_Hostname:" +msgstr "_Maskinnavn:" + +#: ../data/gui/account_creation_wizard_window.ui.h:19 +msgid "_Port:" +msgstr "_Port:" + +#: ../data/gui/account_creation_wizard_window.ui.h:20 +#: ../data/gui/roster_window.ui.h:8 +msgid "_Advanced" +msgstr "_Avansert" + +#: ../data/gui/account_creation_wizard_window.ui.h:21 +msgid "" +"Add this certificate to the list of trusted certificates.\n" +"SHA1 fingerprint of the certificate:\n" +msgstr "" +"Legg til dette sertifikatet til listen over tiltrodde leverandører.\n" +"SHA1 fingeravtrykk til sertifikatet:\n" + +#: ../data/gui/account_creation_wizard_window.ui.h:24 msgid "" "Connecting to server\n" "\n" @@ -68,343 +159,61 @@ "\n" "Vennligst vent..." -#: ../data/gui/account_creation_wizard_window.ui.h:4 -msgid "Please choose one of the options below:" -msgstr "Vennligst velg ett av valgene under:" - -#: ../data/gui/account_creation_wizard_window.ui.h:5 -msgid "Please fill in the data for your existing account" -msgstr "Vennligst fyll in data for din eksisterende konto" - -#: ../data/gui/account_creation_wizard_window.ui.h:6 -msgid "Please select a server" -msgstr "Vennligst velg en server" - -#: ../data/gui/account_creation_wizard_window.ui.h:7 -msgid "" -"Add this certificate to the list of trusted certificates.\n" -"SHA1 fingerprint of the certificate:\n" -msgstr "" -"Legg til dette sertifikatet til listen over tiltrodde leverandører.\n" -"SHA1 fingeravtrykk til sertifikatet:\n" - -#: ../data/gui/account_creation_wizard_window.ui.h:10 -msgid "Anon_ymous authentication" -msgstr "Anon_ym autentisering" - -#: ../data/gui/account_creation_wizard_window.ui.h:11 +#: ../data/gui/account_creation_wizard_window.ui.h:27 msgid "Connect when I press Finish" msgstr "Koble til når jeg klikker Ferdig" -#: ../data/gui/account_creation_wizard_window.ui.h:12 -msgid "Gajim: Account Creation Wizard" -msgstr "Gajim: Konto Opprettings Veiviser" - -#: ../data/gui/account_creation_wizard_window.ui.h:13 -msgid "I already have an account I want to _use" -msgstr "Jeg har allerede en konto jeg ønsker å _bruke" - -#: ../data/gui/account_creation_wizard_window.ui.h:14 -msgid "I want to _register for a new account" -msgstr "Jeg ønsker å _registrere en ny konto" - -#: ../data/gui/account_creation_wizard_window.ui.h:15 -#: ../data/gui/accounts_window.ui.h:28 -msgid "If checked, Gajim will remember the password for this account" -msgstr "Dersom valgt vil Gajim huske passordet for kontoen" - -#: ../data/gui/account_creation_wizard_window.ui.h:16 -msgid "Manage..." -msgstr "Behandle..." - -#: ../data/gui/account_creation_wizard_window.ui.h:17 -#: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3 -#: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694 -#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344 -#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688 -#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514 -#: ../src/dialogs.py:527 ../src/roster_window.py:2956 -#: ../src/roster_window.py:2962 ../src/roster_window.py:2967 +#: ../data/gui/account_creation_wizard_window.ui.h:28 +msgid "Set my profile when I connect" +msgstr "Klargjør profilen min når jeg kobler til" + +#: ../data/gui/account_creation_wizard_window.ui.h:29 +msgid "_Finish" +msgstr "_Avslutt" + +#: ../data/gui/account_creation_wizard_window.ui.h:30 +#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1 +#: ../src/config.py:1259 ../src/config.py:1273 ../src/config.py:1278 +#: ../src/config.py:1326 ../src/config.py:1429 ../src/config.py:1744 +#: ../src/config.py:1749 ../src/config.py:2325 ../src/config.py:2404 +#: ../src/config.py:2417 ../src/config.py:3690 ../src/config.py:3765 +#: ../src/dialogs.py:313 ../src/dialogs.py:315 ../src/dialogs.py:521 +#: ../src/dialogs.py:534 ../src/roster_window.py:3214 +#: ../src/roster_window.py:3220 ../src/roster_window.py:3225 msgid "None" msgstr "Ingen" -#: ../data/gui/account_creation_wizard_window.ui.h:18 -msgid "Prox_y:" -msgstr "Prox_y:" - -#: ../data/gui/account_creation_wizard_window.ui.h:19 -#: ../data/gui/accounts_window.ui.h:48 -msgid "Save pass_word" -msgstr "Lagre pass_ord" - -#: ../data/gui/account_creation_wizard_window.ui.h:20 -msgid "Set my profile when I connect" -msgstr "Klargjør profilen min når jeg kobler til" - -#: ../data/gui/account_creation_wizard_window.ui.h:21 -msgid "Use custom hostname/port" -msgstr "Bruk egendefinert maskinnavn/port" - -#: ../data/gui/account_creation_wizard_window.ui.h:22 -msgid "" -"You need to have an account in order to connect\n" -"to the Jabber network." -msgstr "" -"Du trenger en konto før du kan koble\n" -"til Jabber nettverket." - -#: ../data/gui/account_creation_wizard_window.ui.h:24 -#: ../data/gui/roster_window.ui.h:16 -msgid "_Advanced" -msgstr "_Avansert" - -#: ../data/gui/account_creation_wizard_window.ui.h:25 -msgid "_Finish" -msgstr "_Avslutt" - -#: ../data/gui/account_creation_wizard_window.ui.h:26 -msgid "_Hostname:"

1 0

gajim: fix history window
by Yann Leboulanger 03 Jan '13

03 Jan '13

changeset b7c54367355b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b7c54367355b description: fix history window diffstat: data/gui/history_window.ui | 85 +++++++++++++++++++++++---------------------- src/history_window.py | 81 ++++++++++++++----------------------------- 2 files changed, 71 insertions(+), 95 deletions(-) diffs (truncated from 443 to 300 lines): diff -r e35d4ab1480a -r b7c54367355b data/gui/history_window.ui --- a/data/gui/history_window.ui Thu Jan 03 23:31:26 2013 +0400 +++ b/data/gui/history_window.ui Thu Jan 03 23:30:17 2013 +0100 @@ -1,63 +1,49 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <interface> - <requires lib="gtk+" version="2.16"/> -  - <object class="GtkListStore" id="liststore1"> - <columns> -  - <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="can_focus">False</property> <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="destroy" handler="on_history_window_destroy"/> - <signal name="key_press_event" handler="on_history_window_key_press_event"/> + <signal name="destroy" handler="on_history_window_destroy" swapped="no"/> + <signal name="key-press-event" handler="on_history_window_key_press_event" swapped="no"/> <child> <object class="GtkVBox" id="vbox"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">12</property> - <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> + <property name="can_focus">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="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkHBox" id="hbox1"> <property name="visible">True</property> + <property name="can_focus">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="spacing">6</property> <child> - <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="model">liststore1</property> - <property name="text_column">0</property> - <signal name="changed" handler="on_query_combobox_changed"/> + <object class="GtkEntry" id="query_entry"> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + <property name="invisible_char_set">True</property> + <property name="placeholder_text">Enter name / JID of contact or groupchat</property> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkLabel" id="label3"> <property name="visible">True</property> + <property name="can_focus">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">Search:</property> </object> @@ -68,26 +54,30 @@ </packing> </child> <child> - <object class="GtkEntry" id="query_entry"> + <object class="GtkEntry" id="search_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"/> + <signal name="activate" handler="on_search_entry_activate" swapped="no"/> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> <child> <object class="GtkCheckButton" id="search_in_date"> <property name="label" translatable="yes">_In date search</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">searching only in the selected day </property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0.5</property> <property name="draw_indicator">True</property> </object> <packing> @@ -99,6 +89,7 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -114,17 +105,18 @@ <child> <object class="GtkVBox" id="vbox2"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <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"/> + <signal name="month-changed" handler="on_calendar_month_changed" swapped="no"/> + <signal name="day-selected" handler="on_calendar_day_selected" swapped="no"/> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -141,8 +133,6 @@ <object class="GtkScrolledWindow" id="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">etched-in</property> <child> <placeholder/> @@ -163,15 +153,16 @@ <object class="GtkScrolledWindow" id="results_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> <property name="shadow_type">in</property> <child> <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"/> + <signal name="row-activated" handler="on_results_treeview_row_activated" swapped="no"/> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection1"/> + </child> </object> </child> </object> @@ -182,25 +173,33 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkHBox" id="hbox2"> <property name="visible">True</property> + <property name="can_focus">False</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="GtkCheckButton" id="log_history_checkbutton"> <property name="label" translatable="yes">_Log conversation history</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0.5</property> <property name="active">True</property> <property name="draw_indicator">True</property> </object> @@ -216,23 +215,27 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkHButtonBox" id="hbuttonbox"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <property name="layout_style">end</property> <child> <object class="GtkButton" id="close_button"> <property name="label">gtk-close</property> + <property name="use_action_appearance">False</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_action_appearance">False</property> <property name="use_stock">True</property> - <signal name="clicked" handler="on_close_button_clicked"/> + <signal name="clicked" handler="on_close_button_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> diff -r e35d4ab1480a -r b7c54367355b src/history_window.py --- a/src/history_window.py Thu Jan 03 23:31:26 2013 +0400 +++ b/src/history_window.py Thu Jan 03 23:30:17 2013 +0100 @@ -26,6 +26,7 @@ ## from gi.repository import Gtk +from gi.repository import Gdk from gi.repository import GObject import time import calendar @@ -69,18 +70,17 @@ self.calendar = xml.get_object('calendar') scrolledwindow = xml.get_object('scrolledwindow') self.history_textview = conversation_textview.ConversationTextview( - account, used_in_history_window = True) + 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_object('log_history_checkbutton') self.checkbutton.connect('toggled', - 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.get_child() + self.on_log_history_checkbutton_toggled) + self.search_entry = xml.get_object('search_entry') + self.query_liststore = xml.get_object('query_liststore') + self.jid_entry = xml.get_object('query_entry') 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') self.search_in_date = xml.get_object('search_in_date') @@ -91,24 +91,24 @@ col = Gtk.TreeViewColumn(_('Name')) self.results_treeview.append_column(col) renderer = Gtk.CellRendererText() - col.pack_start(renderer, True, True, 0) - col.set_attributes(renderer, text = C_CONTACT_NAME) + col.pack_start(renderer, True) + col.add_attribute(renderer, 'text', C_CONTACT_NAME) col.set_sort_column_id(C_CONTACT_NAME) # user can click this header and sort col.set_resizable(True) col = Gtk.TreeViewColumn(_('Date')) self.results_treeview.append_column(col) renderer = Gtk.CellRendererText() - col.pack_start(renderer, True, True, 0) - col.set_attributes(renderer, text = C_UNIXTIME) + col.pack_start(renderer, True) + col.add_attribute(renderer, 'text', C_UNIXTIME) col.set_sort_column_id(C_UNIXTIME) # user can click this header and sort col.set_resizable(True) col = Gtk.TreeViewColumn(_('Message')) self.results_treeview.append_column(col) renderer = Gtk.CellRendererText() - col.pack_start(renderer, True, True, 0) - col.set_attributes(renderer, text = C_MESSAGE) + col.pack_start(renderer, True)

1 0

gajim: split long lines
by Denis Fomin 03 Jan '13

03 Jan '13

changeset e35d4ab1480a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e35d4ab1480a description: split long lines diffstat: src/dialogs.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diffs (17 lines): diff -r a45fca1c00e6 -r e35d4ab1480a src/dialogs.py --- a/src/dialogs.py Thu Jan 03 23:28:04 2013 +0400 +++ b/src/dialogs.py Thu Jan 03 23:31:26 2013 +0400 @@ -380,9 +380,10 @@ rbtns[act] = group = Gtk.RadioButton() hbox = Gtk.HBox(False, 5) - hbox.pack_start(gtkgui_helpers.load_activity_icon(category, activity), False, - False, 0) - lbl = Gtk.Label(label='' + pep.ACTIVITIES[category]['category'] + '') + hbox.pack_start(gtkgui_helpers.load_activity_icon(category, + activity), False, False, 0) + lbl = Gtk.Label(label='' + pep.ACTIVITIES[category]['category'] \ + + '') lbl.set_use_markup(True) hbox.pack_start(lbl, False, False, 0) rbtns[act].add(hbox)

1 0

gajim: fix change mood window
by Denis Fomin 03 Jan '13

03 Jan '13

changeset a45fca1c00e6 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a45fca1c00e6 description: fix change mood window diffstat: src/dialogs.py | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diffs (35 lines): diff -r c22cbb47abd8 -r a45fca1c00e6 src/dialogs.py --- a/src/dialogs.py Thu Jan 03 23:07:51 2013 +0400 +++ b/src/dialogs.py Thu Jan 03 23:28:04 2013 +0400 @@ -374,8 +374,8 @@ act = category + '_other' if group: - rbtns[act] = new = Gtk.RadioButton() - new.join_group(group) + rbtns[act] = Gtk.RadioButton() + rbtns[act].join_group(group) else: rbtns[act] = group = Gtk.RadioButton() @@ -401,8 +401,8 @@ act = category + '_' + activity if group: - rbtns[act] = new = Gtk.RadioButton() - new.join_group(group) + rbtns[act] = Gtk.RadioButton() + rbtns[act].join_group(group) else: rbtns[act] = group = Gtk.RadioButton() @@ -499,7 +499,8 @@ self.MOODS.sort() for mood in self.MOODS: - self.mood_buttons[mood] = Gtk.RadioButton(no_mood_button) + self.mood_buttons[mood] = Gtk.RadioButton() + self.mood_buttons[mood].join_group(no_mood_button) self.mood_buttons[mood].set_mode(False) self.mood_buttons[mood].add(gtkgui_helpers.load_mood_icon(mood)) self.mood_buttons[mood].set_relief(Gtk.ReliefStyle.NONE)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits