Changeset 6407

Timestamp:

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

Author:

dkirov

Message:

r6265, r6266, r6267, r6269, r6350, r6366

Location:

branches/gajim_0.10

Files:

• data/glade (copied) (copied from trunk/data/glade)
• data/glade/manage_accounts_window.glade (added)
• po/Makefile (modified) (1 diff)
• po/POTFILES.in (modified) (2 diffs)
• scripts/dev/translations.py (modified) (1 diff)
• src/advanced.py (modified) (2 diffs)
• src/chat_control.py (modified) (2 diffs)
• src/config.py (modified) (10 diffs)
• src/conversation_textview.py (modified) (3 diffs)
• src/dialogs.py (modified) (15 diffs)
• src/disco.py (modified) (3 diffs)
• src/filetransfers_window.py (modified) (3 diffs)
• src/gajim.py (modified) (1 diff)
• src/gajim_themes_window.py (modified) (1 diff)
• src/groupchat_control.py (modified) (3 diffs)
• src/gtkgui.glade (deleted)
• src/gtkgui_helpers.py (modified) (1 diff)
• src/history_manager.glade (deleted)
• src/history_manager.py (modified) (3 diffs)
• src/history_window.py (modified) (2 diffs)
• src/message_control.py (modified) (3 diffs)
• src/message_window.py (modified) (3 diffs)
• src/roster_window.py (modified) (5 diffs)
• src/systray.py (modified) (2 diffs)
• src/systraywin32.py (modified) (3 diffs)
• src/vcard.py (modified) (2 diffs)

branches/gajim_0.10/po/Makefile

@@ -9 +9 @@
         msgfmt $< -o $@
 
-gajim.pot: ../src/*py ../src/common/*py ../src/gtkgui.glade.h \
-                        ../src/history_manager.glade.h
+gajim.pot: ../src/*py ../src/common/*py \
+                        ../data/glade/account_context_menu.glade.h \
+                        ../data/glade/account_creation_wizard_window.glade.h \
+                        ../data/glade/account_modification_window.glade.h \
+                        ../data/glade/accounts_window.glade.h \
+                        ../data/glade/add_new_contact_window.glade.h \
+                        ../data/glade/advanced_configuration_window.glade.h \
+                        ../data/glade/advanced_menuitem_menu.glade.h \
+                        ../data/glade/change_password_dialog.glade.h \
+                        ../data/glade/change_status_message_dialog.glade.h \
+                        ../data/glade/chat_context_menu.glade.h \
+                        ../data/glade/chat_control_popup_menu.glade.h \
+                        ../data/glade/choose_gpg_key_dialog.glade.h \
+                        ../data/glade/data_form_window.glade.h \
+                        ../data/glade/edit_groups_dialog.glade.h \
+                        ../data/glade/filetransfers.glade.h \
+                        ../data/glade/gajim_themes_window.glade.h \
+                        ../data/glade/gc_control_popup_menu.glade.h \
+                        ../data/glade/gc_occupants_menu.glade.h \
+                        ../data/glade/history_manager.glade.h \
+                        ../data/glade/history_window.glade.h \
+                        ../data/glade/input_dialog.glade.h \
+                        ../data/glade/invitation_received_dialog.glade.h \
+                        ../data/glade/join_groupchat_window.glade.h \
+                        ../data/glade/manage_accounts_window.glade.h \
+                        ../data/glade/manage_bookmarks_window.glade.h \
+                        ../data/glade/manage_proxies_window.glade.h \
+                        ../data/glade/message_window.glade.h \
+                        ../data/glade/passphrase_dialog.glade.h \
+                        ../data/glade/popup_notification_window.glade.h \
+                        ../data/glade/preferences_window.glade.h \
+                        ../data/glade/progress_dialog.glade.h \
+                        ../data/glade/remove_account_window.glade.h \
+                        ../data/glade/roster_contact_context_menu.glade.h \
+                        ../data/glade/roster_window.glade.h \
+                        ../data/glade/service_discovery_window.glade.h \
+                        ../data/glade/service_registration_window.glade.h \
+                        ../data/glade/single_message_window.glade.h \
+                        ../data/glade/subscription_request_window.glade.h \
+                        ../data/glade/systray_context_menu.glade.h \
+                        ../data/glade/vcard_information_window.glade.h \
+                        ../data/glade/xml_console_window.glade.h
         intltool-update --pot --gettext-package=$(NAME)
 

branches/gajim_0.10/po/POTFILES.in

@@ -5 +5 @@
 [encoding: UTF-8]
 gajim.desktop.in
+data/glade/account_context_menu.glade
+data/glade/account_creation_wizard_window.glade
+data/glade/account_modification_window.glade
+data/glade/accounts_window.glade
+data/glade/add_new_contact_window.glade
+data/glade/advanced_configuration_window.glade
+data/glade/advanced_menuitem_menu.glade
+data/glade/change_password_dialog.glade
+data/glade/change_status_message_dialog.glade
+data/glade/chat_context_menu.glade
+data/glade/chat_control_popup_menu.glade
+data/glade/choose_gpg_key_dialog.glade
+data/glade/data_form_window.glade
+data/glade/edit_groups_dialog.glade
+data/glade/filetransfers.glade
+data/glade/gajim_themes_window.glade
+data/glade/gc_control_popup_menu.glade
+data/glade/gc_occupants_menu.glade
+data/glade/history_manager.glade
+data/glade/history_window.glade
+data/glade/input_dialog.glade
+data/glade/invitation_received_dialog.glade
+data/glade/join_groupchat_window.glade
+data/glade/manage_accounts_window.glade
+data/glade/manage_bookmarks_window.glade
+data/glade/manage_proxies_window.glade
+data/glade/message_window.glade
+data/glade/passphrase_dialog.glade
+data/glade/popup_notification_window.glade
+data/glade/preferences_window.glade
+data/glade/progress_dialog.glade
+data/glade/remove_account_window.glade
+data/glade/roster_contact_context_menu.glade
+data/glade/roster_window.glade
+data/glade/service_discovery_window.glade
+data/glade/service_registration_window.glade
+data/glade/single_message_window.glade
+data/glade/subscription_request_window.glade
+data/glade/systray_context_menu.glade
+data/glade/vcard_information_window.glade
+data/glade/xml_console_window.glade
 src/advanced.py
 src/cell_renderer_image.py
@@ -19 +60 @@
 src/groupchat_control.py
 src/gtkexcepthook.py
-src/gtkgui.glade.h
 src/gtkgui_helpers.py
-src/history_manager.glade.h
 src/history_manager.py
 src/history_window.py

branches/gajim_0.10/scripts/dev/translations.py

@@ -37 +37 @@
 def update_pot():
         # create header for glade strings
-        os.system('intltool-extract --type=gettext/glade ../../src/gtkgui.glade')
-        os.system('intltool-extract --type=gettext/glade ../../src/'
-                'history_manager.glade')
+        os.system("""
+        for i in `ls ../../data/glade/*.glade`;do 
+                intltool-extract --type=gettext/glade $i
+        done
+        """)
         # update the pot
         os.system('make -C ../../po/ all gajim.pot')

branches/gajim_0.10/src/advanced.py

@@ -27 +27 @@
 import gtk
 import gtk.glade
+import gtkgui_helpers
 
 from common import gajim
@@ -47 +48 @@
 ) = range(3)
 
-GTKGUI_GLADE = 'gtkgui.glade'
+GTKGUI_GLADE = 'manage_accounts_window.glade'
 
 class AdvancedConfigurationWindow:
         def __init__(self):
-                self.xml = gtk.glade.XML(GTKGUI_GLADE, 'advanced_configuration_window', APP)
+                self.xml = gtkgui_helpers.get_glade('advanced_configuration_window.glade')
                 self.window = self.xml.get_widget('advanced_configuration_window')
                 self.entry = self.xml.get_widget('advanced_entry')

branches/gajim_0.10/src/chat_control.py

@@ -47 +47 @@
 _ = i18n._
 APP = i18n.APP
-
-GTKGUI_GLADE = 'gtkgui.glade'
 
 ################################################################################
@@ -1172 +1170 @@
                 and hide()/show() for add_to_roster_menuitem
                 '''
-                xml = gtk.glade.XML(GTKGUI_GLADE, 'chat_control_popup_menu', APP)
+                xml = gtkgui_helpers.get_glade('chat_control_popup_menu.glade')
                 menu = xml.get_widget('chat_control_popup_menu')
                 

branches/gajim_0.10/src/config.py

@@ -46 +46 @@
 gtk.glade.textdomain (APP)
 
-GTKGUI_GLADE = 'gtkgui.glade'
-
 #---------- PreferencesWindow class -------------#
 class PreferencesWindow:
@@ -61 +59 @@
         def __init__(self):
                 '''Initialize Preferences window'''
-                self.xml = gtk.glade.XML(GTKGUI_GLADE, 'preferences_window', APP)
+                self.xml = gtkgui_helpers.get_glade('preferences_window.glade')
                 self.window = self.xml.get_widget('preferences_window')
                 self.iconset_combobox = self.xml.get_widget('iconset_combobox')
@@ -985 +983 @@
 
         def __init__(self, account):
-                self.xml = gtk.glade.XML(GTKGUI_GLADE, 'account_modification_window', APP)
+                self.xml = gtkgui_helpers.get_glade('account_modification_window.glade')
                 self.window = self.xml.get_widget('account_modification_window')
                 self.account = account
@@ -1476 +1474 @@
 class ManageProxiesWindow:
         def __init__(self):
-                self.xml = gtk.glade.XML(GTKGUI_GLADE, 'manage_proxies_window', APP)
+                self.xml = gtkgui_helpers.get_glade('manage_proxies_window.glade')
                 self.window = self.xml.get_widget('manage_proxies_window')
                 self.proxies_treeview = self.xml.get_widget('proxies_treeview')
@@ -1640 +1638 @@
 
         def __init__(self):
-                self.xml = gtk.glade.XML(GTKGUI_GLADE, 'accounts_window', APP)
+                self.xml = gtkgui_helpers.get_glade('accounts_window.glade')
                 self.window = self.xml.get_widget('accounts_window')
                 self.accounts_treeview = self.xml.get_widget('accounts_treeview')
@@ -1742 +1740 @@
                 self.account = account
                 self.config = config
-                self.xml = gtk.glade.XML(GTKGUI_GLADE, 'data_form_window', APP)
+                self.xml = gtkgui_helpers.get_glade('data_form_window.glade')
                 self.window = self.xml.get_widget('data_form_window')
                 self.config_vbox = self.xml.get_widget('config_vbox')
@@ -1891 +1889 @@
                         DataFormWindow.__init__(self, account, infos)
                 else:
-                        self.xml = gtk.glade.XML(GTKGUI_GLADE,  'service_registration_window', APP)
+                        self.xml = gtkgui_helpers.get_glade('service_registration_window.glade')
                         self.window = self.xml.get_widget('service_registration_window')
                         if infos.has_key('registered'):
@@ -2145 +2143 @@
         def __init__(self, account):
                 self.account = account
-                xml = gtk.glade.XML(GTKGUI_GLADE, 'remove_account_window', APP)
+                xml = gtkgui_helpers.get_glade('remove_account_window.glade')
                 self.window = xml.get_widget('remove_account_window')
                 self.remove_and_unregister_radiobutton = xml.get_widget(
@@ -2224 +2222 @@
 class ManageBookmarksWindow:
         def __init__(self):
-                self.xml = gtk.glade.XML(GTKGUI_GLADE, 'manage_bookmarks_window', APP)
+                self.xml = gtkgui_helpers.get_glade('manage_bookmarks_window.glade')
                 self.window = self.xml.get_widget('manage_bookmarks_window')
 
@@ -2486 +2484 @@
 class AccountCreationWizardWindow:
         def __init__(self):
-                self.xml = gtk.glade.XML(GTKGUI_GLADE, 'account_creation_wizard_window',
-                        APP)
+                self.xml = gtkgui_helpers.get_glade('account_creation_wizard_window.glade')
                 self.window = self.xml.get_widget('account_creation_wizard_window')
 

branches/gajim_0.10/src/conversation_textview.py

@@ -34 +34 @@
 import locale
 
+import gtkgui_helpers
 from common import gajim
 from common import helpers
@@ -43 +44 @@
 gtk.glade.bindtextdomain(APP, i18n.DIR)
 gtk.glade.textdomain(APP)
-
-GTKGUI_GLADE = 'gtkgui.glade'
 
 class ConversationTextview:
@@ -374 +373 @@
 
         def make_link_menu(self, event, kind, text):
-                xml = gtk.glade.XML(GTKGUI_GLADE, 'chat_context_menu', APP)
+                xml = gtkgui_helpers.get_glade('chat_context_menu.glade')
                 menu = xml.get_widget('chat_context_menu')
                 childs = menu.get_children()

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')

branches/gajim_0.10/src/disco.py

@@ -57 +57 @@
 import dialogs
 import tooltips
+import gtkgui_helpers
 
 from common import gajim
@@ -66 +67 @@
 gtk.glade.bindtextdomain (APP, i18n.DIR)
 gtk.glade.textdomain (APP)
-
-GTKGUI_GLADE = 'gtkgui.glade'
-
 
 # Dictionary mapping category, type pairs to browser class, image pairs.
@@ -428 +426 @@
                         gajim.connections[account].services_cache = self.cache
 
-                self.xml = gtk.glade.XML(GTKGUI_GLADE, 'service_discovery_window', APP)
+                self.xml = gtkgui_helpers.get_glade('service_discovery_window.glade')
                 self.window = self.xml.get_widget('service_discovery_window')
                 self.services_treeview = self.xml.get_widget('services_treeview')

branches/gajim_0.10/src/filetransfers_window.py

@@ -38 +38 @@
 gtk.glade.textdomain (APP)
 
-GTKGUI_GLADE = 'gtkgui.glade'
-
 C_IMAGE = 0
 C_LABELS = 1
@@ -53 +51 @@
                 self.files_props = {'r' : {}, 's': {}}
                 self.height_diff = 0
-                self.xml = gtk.glade.XML(GTKGUI_GLADE, 'file_transfers_window', APP)
+                self.xml = gtkgui_helpers.get_glade('filetransfers.glade')
                 self.window = self.xml.get_widget('file_transfers_window')
                 self.tree = self.xml.get_widget('transfers_list')
@@ -121 +119 @@
                 self.tree.get_selection().connect('changed', self.selection_changed)
                 self.tooltip = tooltips.FileTransfersTooltip()
-                self.xml.signal_autoconnect(self)
-                popup_xml = gtk.glade.XML(GTKGUI_GLADE, 'file_transfers_menu',
-                        APP)
-                self.file_transfers_menu = popup_xml.get_widget('file_transfers_menu')
-                self.open_folder_menuitem = popup_xml.get_widget('open_folder_menuitem')
-                self.cancel_menuitem = popup_xml.get_widget('cancel_menuitem')
-                self.pause_menuitem = popup_xml.get_widget('pause_menuitem')
-                self.continue_menuitem = popup_xml.get_widget('continue_menuitem')
+                self.file_transfers_menu = self.xml.get_widget('file_transfers_menu')
+                self.open_folder_menuitem = self.xml.get_widget('open_folder_menuitem')
+                self.cancel_menuitem = self.xml.get_widget('cancel_menuitem')
+                self.pause_menuitem = self.xml.get_widget('pause_menuitem')
+                self.continue_menuitem = self.xml.get_widget('continue_menuitem')
                 self.continue_menuitem.hide()
                 self.continue_menuitem.set_no_show_all(True)
-                self.remove_menuitem = popup_xml.get_widget('remove_menuitem')
-                popup_xml.signal_autoconnect(self)
+                self.remove_menuitem = self.xml.get_widget('remove_menuitem')
+                self.xml.signal_autoconnect(self)
                 
         def find_transfer_by_jid(self, account, jid):

branches/gajim_0.10/src/gajim.py

@@ -147 +147 @@
 import vcard
 import config
-
-GTKGUI_GLADE = 'gtkgui.glade'
 
 class MigrateCommand(nslookup.IdleCommand):

branches/gajim_0.10/src/gajim_themes_window.py

@@ -38 +38 @@
 gtk.glade.textdomain (APP)
 
-GTKGUI_GLADE = 'gtkgui.glade'
-
 class GajimThemesWindow:
 
         def __init__(self):
-                self.xml = gtk.glade.XML(GTKGUI_GLADE, 'gajim_themes_window', APP)
+                self.xml = gtkgui_helpers.get_glade('gajim_themes_window.glade')
                 self.window = self.xml.get_widget('gajim_themes_window')
                 

branches/gajim_0.10/src/groupchat_control.py

@@ -48 +48 @@
 gtk.glade.bindtextdomain(APP, i18n.DIR)
 gtk.glade.textdomain(APP)
-
-GTKGUI_GLADE = 'gtkgui.glade'
 
 #(status_image, type, nick, shown_nick)
@@ -205 +203 @@
 
                 # connect the menuitems to their respective functions
-                xm = gtk.glade.XML(GTKGUI_GLADE, 'gc_control_popup_menu', APP)
+                xm = gtkgui_helpers.get_glade('gc_control_popup_menu.glade')
 
                 widget = xm.get_widget('bookmark_room_menuitem')
@@ -1412 +1410 @@
 
                 # making menu from glade
-                xml = gtk.glade.XML(GTKGUI_GLADE, 'gc_occupants_menu', APP)
+                xml = gtkgui_helpers.get_glade('gc_occupants_menu.glade')
 
                 # these conditions were taken from JEP 0045