copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge

This commit is contained in:
Denis Fomin 2013-01-03 23:07:51 +04:00
parent 6be518686f 6d4675d1c7
commit 0e715a47b3
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/dialogs.py
View File

@ -374,12 +374,13 @@ class ChangeActivityDialog:
act = category + '_other' act = category + '_other'
if group: if group:
rbtns[act] = Gtk.RadioButton(group) rbtns[act] = new = Gtk.RadioButton()
new.join_group(group)
else: else:
rbtns[act] = group = Gtk.RadioButton() rbtns[act] = group = Gtk.RadioButton()
hbox = Gtk.HBox(False, 5) hbox = Gtk.HBox(False, 5)
hbox.pack_start(gtkgui_helpers.load_activity_icon(category, True, True, 0), False, hbox.pack_start(gtkgui_helpers.load_activity_icon(category, activity), False,
False, 0) False, 0)
lbl = Gtk.Label(label='<b>' + pep.ACTIVITIES[category]['category'] + '</b>') lbl = Gtk.Label(label='<b>' + pep.ACTIVITIES[category]['category'] + '</b>')
lbl.set_use_markup(True) lbl.set_use_markup(True)
@ -393,7 +394,6 @@ class ChangeActivityDialog:
for activity in pep.ACTIVITIES[category]: for activity in pep.ACTIVITIES[category]:
activities.append(activity) activities.append(activity)
activities.sort() activities.sort()
for activity in activities: for activity in activities:
if activity == 'category': if activity == 'category':
continue continue
@ -401,14 +401,15 @@ class ChangeActivityDialog:
act = category + '_' + activity act = category + '_' + activity
if group: if group:
rbtns[act] = Gtk.RadioButton(group) rbtns[act] = new = Gtk.RadioButton()
new.join_group(group)
else: else:
rbtns[act] = group = Gtk.RadioButton() rbtns[act] = group = Gtk.RadioButton()
hbox = Gtk.HBox(False, 5) hbox = Gtk.HBox(False, 5)
hbox.pack_start(gtkgui_helpers.load_activity_icon(category, hbox.pack_start(gtkgui_helpers.load_activity_icon(category,
activity), False, False, 0) activity), False, False, 0)
hbox.pack_start(Gtk.Label(pep.ACTIVITIES[category][activity], True, True, 0), hbox.pack_start(Gtk.Label(pep.ACTIVITIES[category][activity]),
False, False, 0) False, False, 0)
rbtns[act].connect('toggled', self.on_rbtn_toggled, rbtns[act].connect('toggled', self.on_rbtn_toggled,
[category, activity]) [category, activity])
@ -638,7 +639,7 @@ class ChangeStatusMessageDialog(TimeoutDialog):
self.message_combobox = self.xml.get_object('message_combobox') self.message_combobox = self.xml.get_object('message_combobox')
self.message_combobox.set_model(self.message_liststore) self.message_combobox.set_model(self.message_liststore)
cellrenderertext = Gtk.CellRendererText() cellrenderertext = Gtk.CellRendererText()
self.message_combobox.pack_start(cellrenderertext, True, True, 0) self.message_combobox.pack_start(cellrenderertext, True)
self.message_combobox.add_attribute(cellrenderertext, 'text', 0) self.message_combobox.add_attribute(cellrenderertext, 'text', 0)
for msg_name in sorted_keys_list: for msg_name in sorted_keys_list:
self.message_liststore.append((msg_name,)) self.message_liststore.append((msg_name,))