Changeset 6407 for branches/gajim_0.10/src/dialogs.py

Timestamp:

05/31/06 21:31:41 (3 years ago)

Author:

dkirov

Message:

r6265, r6266, r6267, r6269, r6350, r6366

Files:

• branches/gajim_0.10/src/dialogs.py (modified) (15 diffs)

branches/gajim_0.10/src/dialogs.py

@@ -50 +50 @@
 gtk.glade.textdomain (APP)
 
-GTKGUI_GLADE = 'gtkgui.glade'
-
 class EditGroupsDialog:
         '''Class for the edit group dialog window'''
         def __init__(self, user, account):
-                self.xml = gtk.glade.XML(GTKGUI_GLADE, 'edit_groups_dialog', APP)
+                self.xml = gtkgui_helpers.get_glade('edit_groups_dialog.glade')
                 self.dialog = self.xml.get_widget('edit_groups_dialog')
                 self.account = account
@@ -198 +196 @@
 
         def __init__(self, titletext, labeltext, checkbuttontext):
-                self.xml = gtk.glade.XML(GTKGUI_GLADE, 'passphrase_dialog', APP)
+                self.xml = gtkgui_helpers.get_glade('passphrase_dialog.glade')
                 self.window = self.xml.get_widget('passphrase_dialog')
                 self.passphrase_entry = self.xml.get_widget('passphrase_entry')
@@ -213 +211 @@
         def __init__(self, title_text, prompt_text, secret_keys, selected = None):
                 #list : {keyID: userName, ...}
-                xml = gtk.glade.XML(GTKGUI_GLADE, 'choose_gpg_key_dialog', APP)
+                xml = gtkgui_helpers.get_glade('choose_gpg_key_dialog.glade')
                 self.window = xml.get_widget('choose_gpg_key_dialog')
                 self.window.set_title(title_text)
@@ -256 +254 @@
         def __init__(self, show = None):
                 self.show = show
-                self.xml = gtk.glade.XML(GTKGUI_GLADE, 'change_status_message_dialog',
-                        APP)
+                self.xml = gtkgui_helpers.get_glade('change_status_message_dialog.glade')
                 self.window = self.xml.get_widget('change_status_message_dialog')
                 if show:
@@ -361 +358 @@
         def __init__(self, account, jid = None):
                 self.account = account
-                self.xml = gtk.glade.XML(GTKGUI_GLADE, 'add_new_contact_window', APP)
+                self.xml = gtkgui_helpers.get_glade('add_new_contact_window.glade')
                 self.window = self.xml.get_widget('add_new_contact_window')
                 self.uid_entry = self.xml.get_widget('uid_entry')
@@ -789 +786 @@
                 # if modal is True you also need to call get_response()
                 # and ok_handler won't be used
-                xml = gtk.glade.XML(GTKGUI_GLADE, 'input_dialog', APP)
+                xml = gtkgui_helpers.get_glade('input_dialog.glade')
                 self.dialog = xml.get_widget('input_dialog')
                 label = xml.get_widget('label')
@@ -824 +821 @@
 class SubscriptionRequestWindow:
         def __init__(self, jid, text, account):
-                xml = gtk.glade.XML(GTKGUI_GLADE, 'subscription_request_window', APP)
+                xml = gtkgui_helpers.get_glade('subscription_request_window.glade')
                 self.window = xml.get_widget('subscription_request_window')
                 self.jid = jid
@@ -879 +876 @@
                 self._empty_required_widgets = []
 
-                self.xml = gtk.glade.XML(GTKGUI_GLADE, 'join_groupchat_window', APP)
+                self.xml = gtkgui_helpers.get_glade('join_groupchat_window.glade')
                 self.window = self.xml.get_widget('join_groupchat_window')
                 self.xml.get_widget('server_entry').set_text(server)
@@ -1023 +1020 @@
                         raise RuntimeError, 'You are not connected to the server'
                 self.account = account
-                self.xml = gtk.glade.XML(GTKGUI_GLADE, 'change_password_dialog', APP)
+                self.xml = gtkgui_helpers.get_glade('change_password_dialog.glade')
                 self.dialog = self.xml.get_widget('change_password_dialog')
                 self.password1_entry = self.xml.get_widget('password1_entry')
@@ -1061 +1058 @@
                 self.msg_type = msg_type
 
-                xml = gtk.glade.XML(GTKGUI_GLADE, 'popup_notification_window', APP)
+                xml = gtkgui_helpers.get_glade('popup_notification_window.glade')
                 self.window = xml.get_widget('popup_notification_window')
                 close_button = xml.get_widget('close_button')
@@ -1174 +1171 @@
                 self.resource = resource
                 
-                self.xml = gtk.glade.XML(GTKGUI_GLADE, 'single_message_window', APP)
+                self.xml = gtkgui_helpers.get_glade('single_message_window.glade')
                 self.window = self.xml.get_widget('single_message_window')
                 self.count_chars_label = self.xml.get_widget('count_chars_label')
@@ -1380 +1377 @@
                 self.account = account
                 
-                self.xml = gtk.glade.XML(GTKGUI_GLADE, 'xml_console_window', APP)
+                self.xml = gtkgui_helpers.get_glade('xml_console_window.glade')
                 self.window = self.xml.get_widget('xml_console_window')
                 self.input_textview = self.xml.get_widget('input_textview')
@@ -1486 +1483 @@
                 self.room_jid = room_jid
                 self.account = account
-                xml = gtk.glade.XML(GTKGUI_GLADE, 'invitation_received_dialog', APP)
+                xml = gtkgui_helpers.get_glade('invitation_received_dialog.glade')
                 self.dialog = xml.get_widget('invitation_received_dialog')
                 
@@ -1520 +1517 @@
                 messages_queue has the message to show
                 in the textview'''
-                self.xml = gtk.glade.XML(GTKGUI_GLADE, 'progress_dialog', APP)
+                self.xml = gtkgui_helpers.get_glade('progress_dialog.glade')
                 self.dialog = self.xml.get_widget('progress_dialog')
                 self.label = self.xml.get_widget('label')
@@ -1647 +1644 @@
                 '''jid is the jid for which we want to add special notification
                 (sound and notification popups)'''
-                self.xml = gtk.glade.XML(GTKGUI_GLADE, 'add_special_notification_window',
-                        APP)
+                self.xml = gtkgui_helpers.get_glade('add_special_notification_window.glade')
                 self.window = self.xml.get_widget('add_special_notification_window')
                 self.condition_combobox = self.xml.get_widget('condition_combobox')