glade fixes and variable naming in classes
This commit is contained in:
Nikos Kouremenos
parent
772e6c3310
commit
7b5d79a716
|
|
@ -4,6 +4,7 @@
|
|||
## - Yann Le Boulanger <asterix@lagaule.org>
|
||||
## - Vincent Hanquez <tab@snarc.org>
|
||||
## - Nikos Kouremenos <nkour@jabber.org>
|
||||
## - Alex Podaras <bigpod@jabber.org>
|
||||
##
|
||||
## Copyright (C) 2003-2005 Gajim Team
|
||||
##
|
||||
|
|
@ -17,8 +18,6 @@
|
|||
## GNU General Public License for more details.
|
||||
##
|
||||
|
||||
import pygtk
|
||||
pygtk.require('2.0')
|
||||
import gtk
|
||||
import gtk.glade
|
||||
import gobject
|
||||
|
|
@ -153,7 +152,7 @@ class vcard_information_window:
|
|||
|
||||
def on_publish_button_clicked(self, widget):
|
||||
if not self.plugin.connected[self.account]:
|
||||
warning_dialog(_("You must be connected to publish your informations"))
|
||||
Warning_dialog(_("You must be connected to publish your informations"))
|
||||
return
|
||||
vcard = self.make_vcard()
|
||||
nick = ''
|
||||
|
|
@ -168,7 +167,7 @@ class vcard_information_window:
|
|||
if self.plugin.connected[self.account]:
|
||||
self.plugin.send('ASK_VCARD', self.account, self.jid)
|
||||
else:
|
||||
warning_dialog(_('You must be connected to get your informations'))
|
||||
Warning_dialog(_('You must be connected to get your informations'))
|
||||
|
||||
def change_to_vcard(self):
|
||||
self.xml.get_widget('information_notebook').remove_page(0)
|
||||
|
|
@ -299,7 +298,7 @@ class choose_gpg_key_dialog:
|
|||
class away_message_dialog:
|
||||
"""Class for away_message_dialogWindow"""
|
||||
def run(self):
|
||||
"""Wait for Ok button to be pressed and return away messsage"""
|
||||
"""Wait for OK button to be pressed and return away messsage"""
|
||||
rep = self.window.run()
|
||||
if rep == gtk.RESPONSE_OK:
|
||||
beg, end = self.message_buffer.get_bounds()
|
||||
|
|
@ -357,7 +356,7 @@ class add_contact_window:
|
|||
if not jid:
|
||||
return
|
||||
if jid.find('@') < 0:
|
||||
warning_dialog(_("The contact's name must be something like login@hostname"))
|
||||
Warning_dialog(_("The contact's name must be something like login@hostname"))
|
||||
return
|
||||
message_buffer = self.xml.get_widget('message_textview').get_buffer()
|
||||
start_iter = message_buffer.get_start_iter()
|
||||
|
|
@ -414,7 +413,7 @@ class add_contact_window:
|
|||
|
||||
def __init__(self, plugin, account, jid=None):
|
||||
if not plugin.connected[account]:
|
||||
warning_dialog(_('You must be connected to add a contact'))
|
||||
Warning_dialog(_('You must be connected to add a contact'))
|
||||
return
|
||||
self.plugin = plugin
|
||||
self.account = account
|
||||
|
|
@ -475,7 +474,7 @@ class about_window: #FIXME REWRITE: (nk) pygtk2.6 has a built-in window for that
|
|||
|
||||
self.plugin.windows['about'] = self # add us to open windows
|
||||
|
||||
class confirm_dialog:
|
||||
class Confirmation_dialog:
|
||||
"""Class for confirmation dialog"""
|
||||
def get_response(self):
|
||||
response = self.dialog.run()
|
||||
|
|
@ -487,7 +486,7 @@ class confirm_dialog:
|
|||
gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,\
|
||||
gtk.MESSAGE_QUESTION, gtk.BUTTONS_YES_NO, label)
|
||||
|
||||
class warning_dialog:
|
||||
class Warning_dialog:
|
||||
"""Class for warning dialog"""
|
||||
def on_response(self, dialog, response_id):
|
||||
dialog.destroy()
|
||||
|
|
@ -499,7 +498,7 @@ class warning_dialog:
|
|||
dialog.connect('response', self.on_response)
|
||||
dialog.show()
|
||||
|
||||
class information_dialog:
|
||||
class Information_dialog:
|
||||
"""Class for information dialog"""
|
||||
def on_response(self, dialog, response_id):
|
||||
dialog.destroy()
|
||||
|
|
@ -511,7 +510,7 @@ class information_dialog:
|
|||
dialog.connect('response', self.on_response)
|
||||
dialog.show()
|
||||
|
||||
class error_dialog:
|
||||
class Error_dialog:
|
||||
"""Class for error dialog"""
|
||||
def on_response(self, dialog, response_id):
|
||||
dialog.destroy()
|
||||
|
|
@ -576,7 +575,7 @@ class join_groupchat_window:
|
|||
|
||||
def __init__(self, plugin, account, server='', room = ''):
|
||||
if not plugin.connected[account]:
|
||||
warning_dialog(_('You must be connected to join a group chat on this server'))
|
||||
Warning_dialog(_('You must be connected to join a group chat on this server'))
|
||||
return
|
||||
self.plugin = plugin
|
||||
self.account = account
|
||||
|
|
@ -589,10 +588,10 @@ class join_groupchat_window:
|
|||
self.xml.signal_autoconnect(self)
|
||||
self.plugin.windows['join_gc'] = self # now add us to open windows
|
||||
|
||||
class New_message_window:
|
||||
def on_delete_event(self, widget):
|
||||
class New_message_dialog:
|
||||
def on_delete_event(self, widget, event):
|
||||
"""close window"""
|
||||
del self.plugin.windows['new_msg']
|
||||
del self.plugin.windows['new_message']
|
||||
|
||||
def on_cancel_button_clicked(self, widget):
|
||||
"""When Cancel button is clicked"""
|
||||
|
|
@ -617,29 +616,30 @@ class New_message_window:
|
|||
|
||||
def __init__(self, plugin, account):
|
||||
if not plugin.connected[account]:
|
||||
warning_dialog(_('You must be connected to send a message to a contact'))
|
||||
Warning_dialog(_('You must be connected to send a message to a contact'))
|
||||
return
|
||||
self.plugin = plugin
|
||||
self.account = account
|
||||
self.xml = gtk.glade.XML(GTKGUI_GLADE, 'new_message_window', APP)
|
||||
self.window = self.xml.get_widget('new_message_window')
|
||||
self.xml = gtk.glade.XML(GTKGUI_GLADE, 'new_message_dialog', APP)
|
||||
self.window = self.xml.get_widget('new_message_dialog')
|
||||
self.jid_entry = self.xml.get_widget('jid_entry')
|
||||
self.xml.signal_autoconnect(self)
|
||||
self.plugin.windows['new_message'] = self # now add us to open windows
|
||||
|
||||
class Change_password_dialog:
|
||||
def run(self):
|
||||
"""Wait for Ok button to be pressed and return away messsage"""
|
||||
"""Wait for OK button to be pressed and return new password"""
|
||||
end = False
|
||||
while not end:
|
||||
rep = self.dialog.run()
|
||||
if rep == gtk.RESPONSE_OK:
|
||||
password1 = self.password1_entry.get_text()
|
||||
if not password1:
|
||||
warning_dialog(_('Your password cannot be empty'))
|
||||
Warning_dialog(_('Your password cannot be empty'))
|
||||
continue
|
||||
password2 = self.password2_entry.get_text()
|
||||
if password1 != password2:
|
||||
warning_dialog(_('Your passwords are not the same'))
|
||||
Warning_dialog(_('Your passwords are not the same'))
|
||||
continue
|
||||
message = password1
|
||||
else:
|
||||
|
|
@ -650,7 +650,7 @@ class Change_password_dialog:
|
|||
|
||||
def __init__(self, plugin, account):
|
||||
if not plugin.connected[account]:
|
||||
warning_dialog(_('You must be connected to change your password'))
|
||||
Warning_dialog(_('You must be connected to change your password'))
|
||||
return
|
||||
self.plugin = plugin
|
||||
self.account = account
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@
|
|||
<glade-interface>
|
||||
|
||||
<widget class="GtkWindow" id="gajim_window">
|
||||
<property name="width_request">130</property>
|
||||
<property name="height_request">200</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="title" translatable="yes">Gajim</property>
|
||||
<property name="type">GTK_WINDOW_TOPLEVEL</property>
|
||||
|
|
@ -315,13 +317,13 @@
|
|||
|
||||
<widget class="GtkWindow" id="configure_accounts_window">
|
||||
<property name="border_width">4</property>
|
||||
<property name="height_request">200</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="title" translatable="yes">Accounts</property>
|
||||
<property name="type">GTK_WINDOW_TOPLEVEL</property>
|
||||
<property name="window_position">GTK_WIN_POS_NONE</property>
|
||||
<property name="modal">False</property>
|
||||
<property name="default_height">200</property>
|
||||
<property name="resizable">True</property>
|
||||
<property name="resizable">False</property>
|
||||
<property name="destroy_with_parent">False</property>
|
||||
<property name="decorated">True</property>
|
||||
<property name="skip_taskbar_hint">False</property>
|
||||
|
|
@ -525,7 +527,7 @@
|
|||
<property name="type">GTK_WINDOW_TOPLEVEL</property>
|
||||
<property name="window_position">GTK_WIN_POS_NONE</property>
|
||||
<property name="modal">False</property>
|
||||
<property name="resizable">True</property>
|
||||
<property name="resizable">False</property>
|
||||
<property name="destroy_with_parent">False</property>
|
||||
<property name="decorated">True</property>
|
||||
<property name="skip_taskbar_hint">False</property>
|
||||
|
|
@ -653,7 +655,7 @@ Alex Podaras (bigpod@jabber.org)</property>
|
|||
<property name="type">GTK_WINDOW_TOPLEVEL</property>
|
||||
<property name="window_position">GTK_WIN_POS_NONE</property>
|
||||
<property name="modal">False</property>
|
||||
<property name="resizable">True</property>
|
||||
<property name="resizable">False</property>
|
||||
<property name="destroy_with_parent">False</property>
|
||||
<property name="decorated">True</property>
|
||||
<property name="skip_taskbar_hint">False</property>
|
||||
|
|
@ -1887,7 +1889,7 @@ on the server as a vCard</property>
|
|||
<property name="type">GTK_WINDOW_TOPLEVEL</property>
|
||||
<property name="window_position">GTK_WIN_POS_NONE</property>
|
||||
<property name="modal">False</property>
|
||||
<property name="resizable">True</property>
|
||||
<property name="resizable">False</property>
|
||||
<property name="destroy_with_parent">False</property>
|
||||
<property name="decorated">True</property>
|
||||
<property name="skip_taskbar_hint">False</property>
|
||||
|
|
@ -2266,14 +2268,14 @@ on the server as a vCard</property>
|
|||
|
||||
<widget class="GtkWindow" id="subscription_request_window">
|
||||
<property name="border_width">4</property>
|
||||
<property name="width_request">400</property>
|
||||
<property name="height_request">200</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="title" translatable="yes">Subscription request</property>
|
||||
<property name="type">GTK_WINDOW_TOPLEVEL</property>
|
||||
<property name="window_position">GTK_WIN_POS_NONE</property>
|
||||
<property name="modal">False</property>
|
||||
<property name="default_width">400</property>
|
||||
<property name="default_height">200</property>
|
||||
<property name="resizable">True</property>
|
||||
<property name="resizable">False</property>
|
||||
<property name="destroy_with_parent">False</property>
|
||||
<property name="decorated">True</property>
|
||||
<property name="skip_taskbar_hint">False</property>
|
||||
|
|
@ -2531,14 +2533,14 @@ on the server as a vCard</property>
|
|||
|
||||
<widget class="GtkWindow" id="agent_browser_window">
|
||||
<property name="border_width">4</property>
|
||||
<property name="width_request">400</property>
|
||||
<property name="height_request">250</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="title" translatable="yes">Agents browser</property>
|
||||
<property name="type">GTK_WINDOW_TOPLEVEL</property>
|
||||
<property name="window_position">GTK_WIN_POS_NONE</property>
|
||||
<property name="modal">False</property>
|
||||
<property name="default_width">400</property>
|
||||
<property name="default_height">250</property>
|
||||
<property name="resizable">True</property>
|
||||
<property name="resizable">False</property>
|
||||
<property name="destroy_with_parent">False</property>
|
||||
<property name="decorated">True</property>
|
||||
<property name="skip_taskbar_hint">False</property>
|
||||
|
|
@ -2795,13 +2797,13 @@ on the server as a vCard</property>
|
|||
|
||||
<widget class="GtkWindow" id="agent_registration_window">
|
||||
<property name="border_width">4</property>
|
||||
<property name="width_request">300</property>
|
||||
<property name="height_request">200</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="title" translatable="yes">Register to</property>
|
||||
<property name="type">GTK_WINDOW_TOPLEVEL</property>
|
||||
<property name="window_position">GTK_WIN_POS_NONE</property>
|
||||
<property name="modal">False</property>
|
||||
<property name="default_width">300</property>
|
||||
<property name="default_height">200</property>
|
||||
<property name="resizable">True</property>
|
||||
<property name="destroy_with_parent">False</property>
|
||||
<property name="decorated">True</property>
|
||||
|
|
@ -5209,7 +5211,7 @@ Custom</property>
|
|||
<property name="type">GTK_WINDOW_TOPLEVEL</property>
|
||||
<property name="window_position">GTK_WIN_POS_NONE</property>
|
||||
<property name="modal">False</property>
|
||||
<property name="resizable">True</property>
|
||||
<property name="resizable">False</property>
|
||||
<property name="destroy_with_parent">False</property>
|
||||
<property name="decorated">True</property>
|
||||
<property name="skip_taskbar_hint">False</property>
|
||||
|
|
@ -7176,7 +7178,7 @@ Custom</property>
|
|||
<property name="type">GTK_WINDOW_TOPLEVEL</property>
|
||||
<property name="window_position">GTK_WIN_POS_NONE</property>
|
||||
<property name="modal">False</property>
|
||||
<property name="resizable">True</property>
|
||||
<property name="resizable">False</property>
|
||||
<property name="destroy_with_parent">False</property>
|
||||
<property name="decorated">True</property>
|
||||
<property name="skip_taskbar_hint">False</property>
|
||||
|
|
@ -7509,7 +7511,7 @@ Custom</property>
|
|||
<property name="type">GTK_WINDOW_TOPLEVEL</property>
|
||||
<property name="window_position">GTK_WIN_POS_NONE</property>
|
||||
<property name="modal">False</property>
|
||||
<property name="resizable">True</property>
|
||||
<property name="resizable">False</property>
|
||||
<property name="destroy_with_parent">False</property>
|
||||
<property name="decorated">True</property>
|
||||
<property name="skip_taskbar_hint">False</property>
|
||||
|
|
@ -7782,7 +7784,7 @@ Custom</property>
|
|||
<property name="type">GTK_WINDOW_TOPLEVEL</property>
|
||||
<property name="window_position">GTK_WIN_POS_NONE</property>
|
||||
<property name="modal">False</property>
|
||||
<property name="resizable">True</property>
|
||||
<property name="resizable">False</property>
|
||||
<property name="destroy_with_parent">False</property>
|
||||
<property name="decorated">True</property>
|
||||
<property name="skip_taskbar_hint">False</property>
|
||||
|
|
@ -7935,6 +7937,7 @@ Custom</property>
|
|||
<widget class="GtkWindow" id="tabbed_chat_window">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="has_focus">True</property>
|
||||
<property name="title" translatable="yes">Chat</property>
|
||||
<property name="type">GTK_WINDOW_TOPLEVEL</property>
|
||||
<property name="window_position">GTK_WIN_POS_NONE</property>
|
||||
|
|
@ -7942,7 +7945,7 @@ Custom</property>
|
|||
<property name="default_width">400</property>
|
||||
<property name="default_height">320</property>
|
||||
<property name="resizable">True</property>
|
||||
<property name="destroy_with_parent">True</property>
|
||||
<property name="destroy_with_parent">False</property>
|
||||
<property name="decorated">True</property>
|
||||
<property name="skip_taskbar_hint">False</property>
|
||||
<property name="skip_pager_hint">False</property>
|
||||
|
|
@ -8176,6 +8179,7 @@ Custom</property>
|
|||
<child>
|
||||
<widget class="GtkVPaned" id="vpaned3">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="position">170</property>
|
||||
|
||||
<child>
|
||||
|
|
@ -8284,203 +8288,6 @@ Custom</property>
|
|||
</child>
|
||||
</widget>
|
||||
|
||||
<widget class="GtkWindow" id="new_message_window">
|
||||
<property name="border_width">4</property>
|
||||
<property name="width_request">461</property>
|
||||
<property name="height_request">163</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="title" translatable="yes">New Message</property>
|
||||
<property name="type">GTK_WINDOW_TOPLEVEL</property>
|
||||
<property name="window_position">GTK_WIN_POS_NONE</property>
|
||||
<property name="modal">False</property>
|
||||
<property name="resizable">True</property>
|
||||
<property name="destroy_with_parent">False</property>
|
||||
<property name="decorated">True</property>
|
||||
<property name="skip_taskbar_hint">False</property>
|
||||
<property name="skip_pager_hint">False</property>
|
||||
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
|
||||
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
|
||||
<signal name="delete_event" handler="delete_event" last_modification_time="Wed, 02 Mar 2005 16:14:38 GMT"/>
|
||||
|
||||
<child>
|
||||
<widget class="GtkVBox" id="vbox47">
|
||||
<property name="visible">True</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="spacing">0</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkHBox" id="hbox2917">
|
||||
<property name="visible">True</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="spacing">10</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkImage" id="image319">
|
||||
<property name="visible">True</property>
|
||||
<property name="stock">gtk-dialog-question</property>
|
||||
<property name="icon_size">6</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label194">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Enter the user ID of the contact you would like to
|
||||
send a chat message to</property>
|
||||
<property name="use_underline">False</property>
|
||||
<property name="use_markup">False</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
<property name="wrap">False</property>
|
||||
<property name="selectable">False</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">5</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkEntry" id="jid_entry">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="has_focus">True</property>
|
||||
<property name="editable">True</property>
|
||||
<property name="visibility">True</property>
|
||||
<property name="max_length">0</property>
|
||||
<property name="text" translatable="yes"></property>
|
||||
<property name="has_frame">True</property>
|
||||
<property name="invisible_char">*</property>
|
||||
<property name="activates_default">True</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkHButtonBox" id="hbuttonbox16">
|
||||
<property name="visible">True</property>
|
||||
<property name="layout_style">GTK_BUTTONBOX_END</property>
|
||||
<property name="spacing">10</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkButton" id="cancel_button">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_default">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="label">gtk-cancel</property>
|
||||
<property name="use_stock">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
<signal name="clicked" handler="on_cancel_button_clicked" last_modification_time="Wed, 02 Mar 2005 16:36:13 GMT"/>
|
||||
</widget>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkButton" id="chat_button">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_default">True</property>
|
||||
<property name="has_default">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
<signal name="clicked" handler="on_chat_button_clicked" last_modification_time="Wed, 02 Mar 2005 16:16:54 GMT"/>
|
||||
|
||||
<child>
|
||||
<widget class="GtkAlignment" id="alignment40">
|
||||
<property name="visible">True</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xscale">0</property>
|
||||
<property name="yscale">0</property>
|
||||
<property name="top_padding">0</property>
|
||||
<property name="bottom_padding">0</property>
|
||||
<property name="left_padding">0</property>
|
||||
<property name="right_padding">0</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkHBox" id="hbox2916">
|
||||
<property name="visible">True</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="spacing">2</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkImage" id="image318">
|
||||
<property name="visible">True</property>
|
||||
<property name="stock">gtk-ok</property>
|
||||
<property name="icon_size">4</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label193">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">_Chat</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="use_markup">False</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
<property name="wrap">False</property>
|
||||
<property name="selectable">False</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
|
||||
<widget class="GtkDialog" id="edit_groups_dialog">
|
||||
<property name="border_width">4</property>
|
||||
<property name="visible">True</property>
|
||||
|
|
@ -8893,4 +8700,218 @@ send a chat message to</property>
|
|||
</child>
|
||||
</widget>
|
||||
|
||||
<widget class="GtkDialog" id="new_message_dialog">
|
||||
<property name="border_width">4</property>
|
||||
<property name="width_request">460</property>
|
||||
<property name="height_request">160</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="title" translatable="yes">New Message</property>
|
||||
<property name="type">GTK_WINDOW_TOPLEVEL</property>
|
||||
<property name="window_position">GTK_WIN_POS_NONE</property>
|
||||
<property name="modal">False</property>
|
||||
<property name="resizable">False</property>
|
||||
<property name="destroy_with_parent">False</property>
|
||||
<property name="decorated">True</property>
|
||||
<property name="skip_taskbar_hint">False</property>
|
||||
<property name="skip_pager_hint">False</property>
|
||||
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
|
||||
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
|
||||
<property name="has_separator">False</property>
|
||||
<signal name="delete_event" handler="on_delete_event" last_modification_time="Sat, 05 Mar 2005 18:18:47 GMT"/>
|
||||
|
||||
<child internal-child="vbox">
|
||||
<widget class="GtkVBox" id="dialog-vbox8">
|
||||
<property name="visible">True</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="spacing">0</property>
|
||||
|
||||
<child internal-child="action_area">
|
||||
<widget class="GtkHButtonBox" id="dialog-action_area7">
|
||||
<property name="visible">True</property>
|
||||
<property name="layout_style">GTK_BUTTONBOX_END</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkButton" id="cancel_button">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_default">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="label">gtk-cancel</property>
|
||||
<property name="use_stock">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
<property name="response_id">-6</property>
|
||||
<signal name="clicked" handler="on_cancel_button_clicked" last_modification_time="Sat, 05 Mar 2005 18:13:22 GMT"/>
|
||||
</widget>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkButton" id="chat_button">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_default">True</property>
|
||||
<property name="has_default">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
<property name="response_id">0</property>
|
||||
<signal name="clicked" handler="on_chat_button_clicked" last_modification_time="Wed, 02 Mar 2005 16:16:54 GMT"/>
|
||||
|
||||
<child>
|
||||
<widget class="GtkAlignment" id="alignment48">
|
||||
<property name="visible">True</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xscale">0</property>
|
||||
<property name="yscale">0</property>
|
||||
<property name="top_padding">0</property>
|
||||
<property name="bottom_padding">0</property>
|
||||
<property name="left_padding">0</property>
|
||||
<property name="right_padding">0</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkHBox" id="hbox2931">
|
||||
<property name="visible">True</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="spacing">2</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkImage" id="image436">
|
||||
<property name="visible">True</property>
|
||||
<property name="stock">gtk-ok</property>
|
||||
<property name="icon_size">4</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label211">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">_Chat</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="use_markup">False</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
<property name="wrap">False</property>
|
||||
<property name="selectable">False</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="pack_type">GTK_PACK_END</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkVBox" id="vbox55">
|
||||
<property name="border_width">5</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="spacing">0</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkHBox" id="hbox2932">
|
||||
<property name="visible">True</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="spacing">10</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkImage" id="image437">
|
||||
<property name="visible">True</property>
|
||||
<property name="stock">gtk-dialog-question</property>
|
||||
<property name="icon_size">6</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label212">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Enter the user ID of the contact you would like to
|
||||
send a chat message to</property>
|
||||
<property name="use_underline">False</property>
|
||||
<property name="use_markup">False</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
<property name="wrap">False</property>
|
||||
<property name="selectable">False</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">5</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkEntry" id="jid_entry">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="has_focus">True</property>
|
||||
<property name="editable">True</property>
|
||||
<property name="visibility">True</property>
|
||||
<property name="max_length">0</property>
|
||||
<property name="text" translatable="yes"></property>
|
||||
<property name="has_frame">True</property>
|
||||
<property name="invisible_char">*</property>
|
||||
<property name="activates_default">True</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
|
||||
</glade-interface>
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
## - Yann Le Boulanger <asterix@lagaule.org>
|
||||
## - Vincent Hanquez <tab@snarc.org>
|
||||
## - Nikos Kouremenos <nkour@jabber.org>
|
||||
## - Alex Podaras <bigpod@jabber.org>
|
||||
##
|
||||
## Copyright (C) 2003-2005 Gajim Team
|
||||
##
|
||||
|
|
@ -1693,7 +1694,7 @@ class roster_window:
|
|||
|
||||
def on_remove_agent(self, widget, jid, account):
|
||||
"""When an agent is requested to log in or off"""
|
||||
window = confirm_dialog(_("Are you sure you want to remove the agent %s from your roster ?") % jid)
|
||||
window = Confirmation_dialog(_('Are you sure you want to remove the agent %s from your roster?') % jid)
|
||||
if window.get_response() == gtk.RESPONSE_YES:
|
||||
self.plugin.send('UNSUB_AGENT', account, jid)
|
||||
for u in self.contacts[account][jid]:
|
||||
|
|
@ -1943,7 +1944,7 @@ class roster_window:
|
|||
|
||||
def on_req_usub(self, widget, user, account):
|
||||
"""Remove a user"""
|
||||
window = confirm_dialog(_("Are you sure you want to remove %s (%s) from your roster ?") % (user.name, user.jid))
|
||||
window = Confirmation_dialog(_("Are you sure you want to remove %s (%s) from your roster?") % (user.name, user.jid))
|
||||
if window.get_response() == gtk.RESPONSE_YES:
|
||||
self.plugin.send('UNSUB', account, user.jid)
|
||||
for u in self.contacts[account][user.jid]:
|
||||
|
|
@ -2031,7 +2032,7 @@ class roster_window:
|
|||
return
|
||||
accounts = self.plugin.accounts.keys()
|
||||
if len(accounts) == 0:
|
||||
error_dialog(_("You must setup an account before connecting to jabber network."))
|
||||
Error_dialog(_("You must setup an account before connecting to jabber network."))
|
||||
self.set_cb()
|
||||
return
|
||||
status = model[active][0]
|
||||
|
|
@ -2175,8 +2176,8 @@ class roster_window:
|
|||
|
||||
def on_new_message_menuitem_activate(self, widget, account):
|
||||
"""When new message menuitem is activated:
|
||||
call the new_message_window class"""
|
||||
New_message_window(self.plugin, account)
|
||||
call the New_message_dialog class"""
|
||||
New_message_dialog(self.plugin, account)
|
||||
|
||||
def on_about_menuitem_activate(self, widget):
|
||||
"""When about is selected :
|
||||
|
|
@ -2873,7 +2874,7 @@ class plugin:
|
|||
self.roster.draw_roster()
|
||||
|
||||
def handle_event_warning(self, unused, msg):
|
||||
warning_dialog(msg)
|
||||
Warning_dialog(msg)
|
||||
|
||||
def handle_event_status(self, account, status):
|
||||
#('STATUS', account, status)
|
||||
|
|
@ -3000,10 +3001,10 @@ class plugin:
|
|||
'online', 'to', '', array[1], 0, '')
|
||||
self.roster.contacts[account][jid] = [user1]
|
||||
self.roster.add_user_to_roster(jid, account)
|
||||
information_dialog(_("You are now authorized by %s") % jid)
|
||||
Information_dialog(_("You are now authorized by %s") % jid)
|
||||
|
||||
def handle_event_unsubscribed(self, account, jid):
|
||||
information_dialog(_("You are now unsubscribed by %s") % jid)
|
||||
Information_dialog(_("You are now unsubscribed by %s") % jid)
|
||||
|
||||
def handle_event_agents(self, account, agents):
|
||||
#('AGENTS', account, agents)
|
||||
|
|
@ -3019,7 +3020,7 @@ class plugin:
|
|||
def handle_event_reg_agent_info(self, account, array):
|
||||
#('REG_AGENTS_INFO', account, (agent, infos))
|
||||
if not array[1].has_key('instructions'):
|
||||
error_dialog(_("error contacting %s") % array[0])
|
||||
Error_dialog(_("error contacting %s") % array[0])
|
||||
else:
|
||||
agent_registration_window(array[0], array[1], self, account)
|
||||
|
||||
|
|
@ -3111,7 +3112,7 @@ class plugin:
|
|||
'%s has set the subject to %s' % (jids[1], array[1]), jid)
|
||||
|
||||
def handle_event_bad_passphrase(self, account, array):
|
||||
warning_dialog(_("Your GPG passphrase is wrong, so you are connected without your GPG key."))
|
||||
Warning_dialog(_("Your GPG passphrase is wrong, so you are connected without your GPG key."))
|
||||
|
||||
def handle_event_gpg_secrete_keys(self, account, keys):
|
||||
keys['None'] = 'None'
|
||||
|
|
|
|||
Loading…
Reference in New Issue