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

* Add button for new chat window GUI. 

* Buttons get disabled as needed now [we still need something to update
  this while the window is open (it might change, for example, the
  contact was added)].
* Remove the new accelerators in destroy_menu().
* Move some OTR stuff.
* Don't hide OTR from the user if not available, but set unsensitive.
This commit is contained in:
js 2008-05-10 11:39:25 +00:00
parent 435042968e
commit c4b2cdc31f
4 changed files with 86 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
data/glade/chat_control_popup_menu.glade
View File

@ -5,7 +5,7 @@
<widget class="GtkMenu" id="chat_control_popup_menu">
<child>
<widget class="GtkImageMenuItem" id="add_to_roster_menuitem">
<property name="visible">True</property>
<property name="no_show_all">True</property>
<property name="label" translatable="yes">_Add to Roster</property>
<property name="use_underline">True</property>
<signal name="activate" handler="_on_add_to_roster_menuitem_activate"/>
@ -73,7 +73,8 @@
</child>
<child>
<widget class="GtkMenuItem" id="otr_submenu">
<property name="no_show_all">True</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="label" translatable="yes">Off-the-Record Encryption</property>
<property name="use_underline">True</property>
<child>

40
data/glade/message_window.glade
View File

@ -183,6 +183,30 @@
<property name="position">1</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="add_to_roster_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="tooltip" translatable="yes">Add this contact to roster (Ctrl-D)</property>
<property name="relief">GTK_RELIEF_NONE</property>
<property name="response_id">0</property>
<child>
<widget class="GtkImage" id="image9">
<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-add</property>
<property name="icon_size">1</property>
</widget>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="send_file_button">
<property name="visible">True</property>
@ -202,7 +226,7 @@
</widget>
<packing>
<property name="expand">False</property>
<property name="position">2</property>
<property name="position">3</property>
</packing>
</child>
<child>
@ -224,7 +248,7 @@
</widget>
<packing>
<property name="expand">False</property>
<property name="position">3</property>
<property name="position">4</property>
</packing>
</child>
<child>
@ -246,7 +270,7 @@
</widget>
<packing>
<property name="expand">False</property>
<property name="position">4</property>
<property name="position">5</property>
</packing>
</child>
<child>
@ -268,7 +292,7 @@
</widget>
<packing>
<property name="expand">False</property>
<property name="position">5</property>
<property name="position">6</property>
</packing>
</child>
<child>
@ -278,7 +302,7 @@
</widget>
<packing>
<property name="expand">False</property>
<property name="position">6</property>
<property name="position">7</property>
</packing>
</child>
<child>
@ -299,7 +323,7 @@
</widget>
<packing>
<property name="expand">False</property>
<property name="position">7</property>
<property name="position">8</property>
</packing>
</child>
<child>
@ -311,7 +335,7 @@
</child>
</widget>
<packing>
<property name="position">8</property>
<property name="position">9</property>
</packing>
</child>
<child>
@ -357,7 +381,7 @@
</widget>
<packing>
<property name="expand">False</property>
<property name="position">9</property>
<property name="position">10</property>
</packing>
</child>
</widget>

75
src/chat_control.py
View File

@ -1033,17 +1033,21 @@ class ChatControl(ChatControlBase):
id = self.actions_button.connect('clicked', self.on_actions_button_clicked)
self.handlers[id] = self.actions_button
widget = self.xml.get_widget('send_file_button')
id = widget.connect('clicked', self._on_send_file_menuitem_activate)
self.handlers[id] = widget
add_to_roster_button = self.xml.get_widget('add_to_roster_button')
id = add_to_roster_button.connect('clicked', self._on_add_to_roster_menuitem_activate)
self.handlers[id] = add_to_roster_button
widget = self.xml.get_widget('convert_to_gc_button')
id = widget.connect('clicked', self._on_convert_to_gc_menuitem_activate)
self.handlers[id] = widget
send_file_button = self.xml.get_widget('send_file_button')
id = send_file_button.connect('clicked', self._on_send_file_menuitem_activate)
self.handlers[id] = send_file_button
widget = self.xml.get_widget('contact_information_button')
id = widget.connect('clicked', self._on_contact_information_menuitem_activate)
self.handlers[id] = widget
convert_to_gc_button = self.xml.get_widget('convert_to_gc_button')
id = convert_to_gc_button.connect('clicked', self._on_convert_to_gc_menuitem_activate)
self.handlers[id] = convert_to_gc_button
contact_information_button = self.xml.get_widget('contact_information_button')
id = contact_information_button.connect('clicked', self._on_contact_information_menuitem_activate)
self.handlers[id] = contact_information_button
compact_view = gajim.config.get('compact_view')
self.chat_buttons_set_visible(compact_view)
@ -1058,6 +1062,25 @@ class ChatControl(ChatControlBase):
img = self.xml.get_widget('convert_to_gc_button_image')
img.set_from_pixbuf(gtkgui_helpers.load_icon('muc_active').get_pixbuf())
# Add to roster button
if _('Not in Roster') in contact.groups:
add_to_roster_button.show()
# If we don't have resource, we can't do file transfer
# in transports, contact holds our info we need to disable it too
if self.TYPE_ID == message_control.TYPE_PM and self.gc_contact.jid and \
self.gc_contact.resource:
send_file_button.set_sensitive(True)
elif contact.resource and contact.jid.find('@') != -1:
send_file_button.set_sensitive(True)
else:
send_file_button.set_sensitive(False)
# check if it's possible to convert to groupchat
if gajim.get_transport_name_from_jid(self.contact.jid) or \
gajim.connections[self.account].is_zeroconf:
convert_to_gc_button.set_sensitive(False)
# keep timeout id and window obj for possible big avatar
# it is on enter-notify and leave-notify so no need to be per jid
self.show_bigger_avatar_timeout_id = None
@ -1110,6 +1133,10 @@ class ChatControl(ChatControlBase):
self.session.is_loggable())
self.status_tooltip = gtk.Tooltips()
if gajim.otr_module:
self.update_otr(True)
self.update_ui()
# restore previous conversation
self.restore_conversation()
@ -1176,8 +1203,6 @@ class ChatControl(ChatControlBase):
self.check_for_possible_inactive_chatstate, None)
def update_ui(self):
if gajim.otr_module:
self.update_otr(True)
# The name banner is drawn here
ChatControlBase.update_ui(self)
@ -1721,6 +1746,7 @@ class ChatControl(ChatControlBase):
xml = gtkgui_helpers.get_glade('chat_control_popup_menu.glade')
menu = xml.get_widget('chat_control_popup_menu')
add_to_roster_menuitem = xml.get_widget('add_to_roster_menuitem')
history_menuitem = xml.get_widget('history_menuitem')
toggle_gpg_menuitem = xml.get_widget('toggle_gpg_menuitem')
toggle_e2e_menuitem = xml.get_widget('toggle_e2e_menuitem')
@ -1729,7 +1755,6 @@ class ChatControl(ChatControlBase):
smp_otr_menuitem = xml.get_widget('smp_otr_menuitem')
start_otr_menuitem = xml.get_widget('start_otr_menuitem')
end_otr_menuitem = xml.get_widget('end_otr_menuitem')
add_to_roster_menuitem = xml.get_widget('add_to_roster_menuitem')
send_file_menuitem = xml.get_widget('send_file_menuitem')
information_menuitem = xml.get_widget('information_menuitem')
convert_to_gc_menuitem = xml.get_widget('convert_to_groupchat')
@ -1769,6 +1794,10 @@ class ChatControl(ChatControlBase):
toggle_e2e_menuitem.set_active(isactive)
toggle_e2e_menuitem.set_sensitive(not self.gpg_is_active)
# add_to_roster_menuitem
if _('Not in Roster') in contact.groups:
add_to_roster_menuitem.show()
# If we don't have resource, we can't do file transfer
# in transports, contact holds our info we need to disable it too
if self.TYPE_ID == message_control.TYPE_PM and self.gc_contact.jid and \
@ -1784,14 +1813,6 @@ class ChatControl(ChatControlBase):
gajim.connections[self.account].is_zeroconf:
convert_to_gc_menuitem.set_sensitive(False)
# add_to_roster_menuitem
if _('Not in Roster') in contact.groups:
add_to_roster_menuitem.show()
add_to_roster_menuitem.set_no_show_all(False)
else:
add_to_roster_menuitem.hide()
add_to_roster_menuitem.set_no_show_all(True)
# connect signals
id = history_menuitem.connect('activate',
self._on_history_menuitem_activate)
@ -1816,7 +1837,7 @@ class ChatControl(ChatControlBase):
self.handlers[id] = convert_to_gc_menuitem
if gajim.otr_module:
otr_submenu.show()
otr_submenu.set_sensitive(True)
id = otr_settings_menuitem.connect('activate',
self._on_otr_settings_menuitem_activate)
self.handlers[id] = otr_settings_menuitem
@ -1841,15 +1862,19 @@ class ChatControl(ChatControlBase):
smp_otr_menuitem.set_sensitive(ctx.msgstate ==
gajim.otr_module.OTRL_MSGSTATE_ENCRYPTED)
menu.connect('selection-done', self.destroy_menu, history_menuitem,
information_menuitem)
menu.connect('selection-done', self.destroy_menu,
send_file_menuitem, convert_to_gc_menuitem,
information_menuitem, history_menuitem)
return menu
def destroy_menu(self, menu, history_menuitem, information_menuitem):
def destroy_menu(self, menu, send_file_menuitem,
convert_to_gc_menuitem, information_menuitem, history_menuitem):
# destroy accelerators
ag = gtk.accel_groups_from_object(self.parent_win.window)[0]
history_menuitem.remove_accelerator(ag, gtk.keysyms.h, gtk.gdk.CONTROL_MASK)
send_file_menuitem.remove_accelerator(ag, gtk.keysyms.f, gtk.gdk.CONTROL_MASK)
convert_to_gc_menuitem.remove_accelerator(ag, gtk.keysyms.g, gtk.gdk.CONTROL_MASK)
information_menuitem.remove_accelerator(ag, gtk.keysyms.i, gtk.gdk.CONTROL_MASK)
history_menuitem.remove_accelerator(ag, gtk.keysyms.h, gtk.gdk.CONTROL_MASK)
# destroy menu
menu.destroy()

1
src/groupchat_control.py
View File

@ -593,6 +593,7 @@ class GroupchatControl(ChatControlBase):
self.destroy_room_menuitem.set_sensitive(False)
self.change_subject_menuitem.set_sensitive(False)
self.change_nick_menuitem.set_sensitive(False)
return self.gc_popup_menu
def on_message(self, nick, msg, tim, has_timestamp = False, xhtml = None,