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

new message dialog fix for title and add to accounts shouldn't list not in the roster. plz see my fixme comment

Browse source
This commit is contained in:
Nikos Kouremenos 2005-03-28 01:39:12 +00:00
parent d80325510b
commit 72e212731c
3 changed files with 42 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
plugins/gtkgui/dialogs.py
View file

@ -404,8 +404,8 @@ class Change_status_message_dialog:
message_comboboxentry.append_text(val) message_comboboxentry.append_text(val)
self.xml.signal_autoconnect(self) self.xml.signal_autoconnect(self)
class Add_contact_window: class Add_new_contact_window:
"""Class for add_contact_window""" """Class for Add_new_contact_window"""
def on_cancel_button_clicked(self, widget): def on_cancel_button_clicked(self, widget):
"""When Cancel button is clicked""" """When Cancel button is clicked"""
widget.get_toplevel().destroy() widget.get_toplevel().destroy()
@ -480,8 +480,8 @@ class Add_contact_window:
return return
self.plugin = plugin self.plugin = plugin
self.account = account self.account = account
self.xml = gtk.glade.XML(GTKGUI_GLADE, 'add_contact_window', APP) self.xml = gtk.glade.XML(GTKGUI_GLADE, 'add_new_contact_window', APP)
self.window = self.xml.get_widget('add_contact_window') self.window = self.xml.get_widget('add_new_contact_window')
self.old_uid_value = '' self.old_uid_value = ''
liststore = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING) liststore = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
liststore.append(['Jabber', '']) liststore.append(['Jabber', ''])
@ -519,6 +519,9 @@ class Add_contact_window:
liststore = gtk.ListStore(str) liststore = gtk.ListStore(str)
self.group_comboboxentry.set_model(liststore) self.group_comboboxentry.set_model(liststore)
for g in self.plugin.roster.groups[account].keys(): for g in self.plugin.roster.groups[account].keys():
if g != 'not in the roster': #FIXME: nk 2 yann. it seems that the empty groups are NOT deleted!
#NO MATTER WHAT LEAVE THAT HIS, because even if we delete empty groups, not in roster can have one
#and we don't want the user to choose to add more
self.group_comboboxentry.append_text(g) self.group_comboboxentry.append_text(g)
self.xml.signal_autoconnect(self) self.xml.signal_autoconnect(self)
@ -584,7 +587,6 @@ class Information_dialog:
gtk.MESSAGE_INFO, gtk.BUTTONS_CLOSE, label) gtk.MESSAGE_INFO, gtk.BUTTONS_CLOSE, label)
dialog.connect('response', self.on_response) dialog.connect('response', self.on_response)
dialog.show() dialog.show()
#dialog.run() #IT freezes WHY? also if you do a lot of stuff all together it freezes
class Error_dialog: class Error_dialog:
"""Class for error dialog""" """Class for error dialog"""
@ -610,7 +612,7 @@ class subscription_request_window:
self.plugin.send('AUTH', self.account, self.jid) self.plugin.send('AUTH', self.account, self.jid)
widget.get_toplevel().destroy() widget.get_toplevel().destroy()
if not self.plugin.roster.contacts[self.account].has_key(self.jid): if not self.plugin.roster.contacts[self.account].has_key(self.jid):
Add_contact_window(self.plugin, self.account, self.jid) Add_new_contact_window(self.plugin, self.account, self.jid)
def on_deny_button_clicked(self, widget): def on_deny_button_clicked(self, widget):
"""refuse the request""" """refuse the request"""
@ -702,13 +704,17 @@ class New_message_dialog:
self.xml = gtk.glade.XML(GTKGUI_GLADE, 'new_message_dialog', APP) self.xml = gtk.glade.XML(GTKGUI_GLADE, 'new_message_dialog', APP)
self.window = self.xml.get_widget('new_message_dialog') self.window = self.xml.get_widget('new_message_dialog')
self.jid_entry = self.xml.get_widget('jid_entry') self.jid_entry = self.xml.get_widget('jid_entry')
self.xml.signal_autoconnect(self)
our_jid = self.plugin.accounts[account]['name'] + '@' +\
self.plugin.accounts[account]['hostname']
if len(self.plugin.accounts) > 1: if len(self.plugin.accounts) > 1:
title = 'New Message as %s' % self.plugin.accounts[account]['jid'] title = 'New Message as ' + our_jid
else: else:
title = 'New Message' title = 'New Message'
self.window.set_title(title) self.window.set_title(title)
self.xml.signal_autoconnect(self)
class Change_password_dialog: class Change_password_dialog:
def run(self): def run(self):
"""Wait for OK button to be pressed and return new password""" """Wait for OK button to be pressed and return new password"""

20
plugins/gtkgui/gtkgui.glade
View file

@ -48,7 +48,7 @@
<property name="use_underline">True</property> <property name="use_underline">True</property>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image481"> <widget class="GtkImage" id="image488">
<property name="visible">True</property> <property name="visible">True</property>
<property name="stock">gtk-new</property> <property name="stock">gtk-new</property>
<property name="icon_size">1</property> <property name="icon_size">1</property>
@ -68,7 +68,7 @@
<property name="use_underline">True</property> <property name="use_underline">True</property>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image482"> <widget class="GtkImage" id="image489">
<property name="visible">True</property> <property name="visible">True</property>
<property name="stock">gtk-connect</property> <property name="stock">gtk-connect</property>
<property name="icon_size">1</property> <property name="icon_size">1</property>
@ -88,13 +88,13 @@
</child> </child>
<child> <child>
<widget class="GtkImageMenuItem" id="add_contact_menuitem"> <widget class="GtkImageMenuItem" id="add_new_contact_menuitem">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">Add _Contact</property> <property name="label" translatable="yes">Add _Contact</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image483"> <widget class="GtkImage" id="image490">
<property name="visible">True</property> <property name="visible">True</property>
<property name="stock">gtk-add</property> <property name="stock">gtk-add</property>
<property name="icon_size">1</property> <property name="icon_size">1</property>
@ -132,7 +132,7 @@
<signal name="activate" handler="on_about_menuitem_activate" last_modification_time="Tue, 01 Mar 2005 22:56:45 GMT"/> <signal name="activate" handler="on_about_menuitem_activate" last_modification_time="Tue, 01 Mar 2005 22:56:45 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image484"> <widget class="GtkImage" id="image491">
<property name="visible">True</property> <property name="visible">True</property>
<property name="stock">gtk-about</property> <property name="stock">gtk-about</property>
<property name="icon_size">1</property> <property name="icon_size">1</property>
@ -160,7 +160,7 @@
<accelerator key="Q" modifiers="GDK_CONTROL_MASK" signal="activate"/> <accelerator key="Q" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image485"> <widget class="GtkImage" id="image492">
<property name="visible">True</property> <property name="visible">True</property>
<property name="stock">gtk-quit</property> <property name="stock">gtk-quit</property>
<property name="icon_size">1</property> <property name="icon_size">1</property>
@ -195,7 +195,7 @@
<accelerator key="A" modifiers="GDK_CONTROL_MASK" signal="activate"/> <accelerator key="A" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image486"> <widget class="GtkImage" id="image493">
<property name="visible">True</property> <property name="visible">True</property>
<property name="stock">gtk-select-color</property> <property name="stock">gtk-select-color</property>
<property name="icon_size">1</property> <property name="icon_size">1</property>
@ -215,7 +215,7 @@
<property name="use_underline">True</property> <property name="use_underline">True</property>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image487"> <widget class="GtkImage" id="image494">
<property name="visible">True</property> <property name="visible">True</property>
<property name="stock">gtk-find</property> <property name="stock">gtk-find</property>
<property name="icon_size">1</property> <property name="icon_size">1</property>
@ -243,7 +243,7 @@
<accelerator key="P" modifiers="GDK_CONTROL_MASK" signal="activate"/> <accelerator key="P" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image488"> <widget class="GtkImage" id="image495">
<property name="visible">True</property> <property name="visible">True</property>
<property name="stock">gtk-preferences</property> <property name="stock">gtk-preferences</property>
<property name="icon_size">1</property> <property name="icon_size">1</property>
@ -1666,7 +1666,7 @@
</child> </child>
</widget> </widget>
<widget class="GtkWindow" id="add_contact_window"> <widget class="GtkWindow" id="add_new_contact_window">
<property name="border_width">4</property> <property name="border_width">4</property>
<property name="width_request">317</property> <property name="width_request">317</property>
<property name="height_request">277</property> <property name="height_request">277</property>

34
plugins/gtkgui/roster_window.py
View file

@ -211,11 +211,11 @@ class Roster_window:
# try to avoid WIDGET_REALIZED_FOR_EVENT failed which freezes gajim # try to avoid WIDGET_REALIZED_FOR_EVENT failed which freezes gajim
new_message_menuitem = self.xml.get_widget('new_message_menuitem') new_message_menuitem = self.xml.get_widget('new_message_menuitem')
join_gc_menuitem = self.xml.get_widget('join_gc_menuitem') join_gc_menuitem = self.xml.get_widget('join_gc_menuitem')
add_contact_menuitem = self.xml.get_widget('add_contact_menuitem') add_new_contact_menuitem = self.xml.get_widget('add_new_contact_menuitem')
service_disco_menuitem = self.xml.get_widget('service_disco_menuitem') service_disco_menuitem = self.xml.get_widget('service_disco_menuitem')
if self.add_contact_handler_id: if self.add_new_contact_handler_id:
add_contact_menuitem.handler_disconnect(self.add_contact_handler_id) add_new_contact_menuitem.handler_disconnect(self.add_new_contact_handler_id)
self.add_contact_handler_id = None self.add_new_contact_handler_id = None
if self.service_disco_handler_id: if self.service_disco_handler_id:
service_disco_menuitem.handler_disconnect(\ service_disco_menuitem.handler_disconnect(\
self.service_disco_handler_id) self.service_disco_handler_id)
@ -228,8 +228,8 @@ class Roster_window:
self.new_message_menuitem_handler_id) self.new_message_menuitem_handler_id)
self.new_message_menuitem_handler_id = None self.new_message_menuitem_handler_id = None
#remove the existing submenus #remove the existing submenus
if add_contact_menuitem.get_submenu(): if add_new_contact_menuitem.get_submenu():
add_contact_menuitem.remove_submenu() add_new_contact_menuitem.remove_submenu()
if service_disco_menuitem.get_submenu(): if service_disco_menuitem.get_submenu():
service_disco_menuitem.remove_submenu() service_disco_menuitem.remove_submenu()
if join_gc_menuitem.get_submenu(): if join_gc_menuitem.get_submenu():
@ -239,21 +239,21 @@ class Roster_window:
if len(self.plugin.accounts.keys()) > 0: if len(self.plugin.accounts.keys()) > 0:
new_message_menuitem.set_sensitive(True) new_message_menuitem.set_sensitive(True)
join_gc_menuitem.set_sensitive(True) join_gc_menuitem.set_sensitive(True)
add_contact_menuitem.set_sensitive(True) add_new_contact_menuitem.set_sensitive(True)
service_disco_menuitem.set_sensitive(True) service_disco_menuitem.set_sensitive(True)
else: else:
new_message_menuitem.set_sensitive(False) new_message_menuitem.set_sensitive(False)
join_gc_menuitem.set_sensitive(False) join_gc_menuitem.set_sensitive(False)
add_contact_menuitem.set_sensitive(False) add_new_contact_menuitem.set_sensitive(False)
service_disco_menuitem.set_sensitive(False) service_disco_menuitem.set_sensitive(False)
if len(self.plugin.accounts.keys()) >= 2: # 2 or more accounts? make submenus if len(self.plugin.accounts.keys()) >= 2: # 2 or more accounts? make submenus
#add #add
sub_menu = gtk.Menu() sub_menu = gtk.Menu()
add_contact_menuitem.set_submenu(sub_menu) add_new_contact_menuitem.set_submenu(sub_menu)
for account in self.plugin.accounts.keys(): for account in self.plugin.accounts.keys():
item = gtk.MenuItem(_('to ') + account + _(' account')) item = gtk.MenuItem(_('to ') + account + _(' account'))
sub_menu.append(item) sub_menu.append(item)
item.connect("activate", self.on_add_contact, account) item.connect("activate", self.on_add_new_contact, account)
sub_menu.show_all() sub_menu.show_all()
#disco #disco
sub_menu = gtk.Menu() sub_menu = gtk.Menu()
@ -287,9 +287,9 @@ class Roster_window:
sub_menu.show_all() sub_menu.show_all()
elif len(self.plugin.accounts.keys()) == 1: # one account elif len(self.plugin.accounts.keys()) == 1: # one account
#add #add
if not self.add_contact_handler_id: if not self.add_new_contact_handler_id:
self.add_contact_handler_id = add_contact_menuitem.connect(\ self.add_new_contact_handler_id = add_new_contact_menuitem.connect(\
'activate', self.on_add_contact, self.plugin.accounts.keys()[0]) 'activate', self.on_add_new_contact, self.plugin.accounts.keys()[0])
#disco #disco
if not self.service_disco_handler_id: if not self.service_disco_handler_id:
self.service_disco_handler_id = service_disco_menuitem.connect(\ self.service_disco_handler_id = service_disco_menuitem.connect(\
@ -574,7 +574,7 @@ class Roster_window:
item.connect('activate', self.on_service_disco_menuitem_activate, account) item.connect('activate', self.on_service_disco_menuitem_activate, account)
item = gtk.MenuItem(_('_Add contact')) item = gtk.MenuItem(_('_Add contact'))
menu.append(item) menu.append(item)
item.connect('activate', self.on_add_contact, account) item.connect('activate', self.on_add_new_contact, account)
item = gtk.MenuItem(_('Join _groupchat')) item = gtk.MenuItem(_('Join _groupchat'))
menu.append(item) menu.append(item)
item.connect('activate', self.on_join_gc_activate, account) item.connect('activate', self.on_join_gc_activate, account)
@ -906,8 +906,8 @@ class Roster_window:
else: else:
self.plugin.windows['preferences'].window.show_all() self.plugin.windows['preferences'].window.show_all()
def on_add_contact(self, widget, account): def on_add_new_contact(self, widget, account):
Add_contact_window(self.plugin, account) Add_new_contact_window(self.plugin, account)
def on_join_gc_activate(self, widget, account): def on_join_gc_activate(self, widget, account):
Join_groupchat_window(self.plugin, account) Join_groupchat_window(self.plugin, account)
@ -1255,7 +1255,7 @@ class Roster_window:
self.tree = self.xml.get_widget('roster_treeview') self.tree = self.xml.get_widget('roster_treeview')
self.plugin = plugin self.plugin = plugin
self.nb_unread = 0 self.nb_unread = 0
self.add_contact_handler_id = False self.add_new_contact_handler_id = False
self.service_disco_handler_id = False self.service_disco_handler_id = False
self.join_gc_handler_id = False self.join_gc_handler_id = False
self.new_message_menuitem_handler_id = False self.new_message_menuitem_handler_id = False