diff --git a/src/plugins/tool/PHPGedViewConnector.py b/src/plugins/tool/PHPGedViewConnector.py index f66105539..8163c1fb1 100644 --- a/src/plugins/tool/PHPGedViewConnector.py +++ b/src/plugins/tool/PHPGedViewConnector.py @@ -26,7 +26,6 @@ import httplib import urllib2 import gtk -from gtk import glade import os from tempfile import mkstemp from gettext import gettext as _ @@ -280,22 +279,24 @@ class phpGedViewImporter: self.url = None self.connector = None - glade_file = "%s/phpgedview.glade" % os.path.dirname(__file__) - top = glade.XML(glade_file,'importer','gramps') - self.url_entry = top.get_widget('url_entry') - self.version_label = top.get_widget('version_label') + base = os.path.dirname(__file__) + glade_file = os.path.join(base, "phpgedview.glade") + top = gtk.Builder() + top.add_from_file(glade_file) + self.url_entry = top.get_object('url_entry') + self.version_label = top.get_object('version_label') self.version_label.set_text("") - self.file_combo = top.get_widget('file_combo') + self.file_combo = top.get_object('file_combo') self.file_combo.hide() - self.username_entry = top.get_widget('username_entry') + self.username_entry = top.get_object('username_entry') self.username_entry.hide() - self.password_entry = top.get_widget('password_entry') + self.password_entry = top.get_object('password_entry') self.password_entry.hide() - self.ok_button = top.get_widget('ok_button') + self.ok_button = top.get_object('ok_button') self.ok_button.connect("activate", self.on_next_pressed_cb) self.ok_button.connect("button_release_event", self.on_next_pressed_cb) - self.progressbar = top.get_widget('progressbar') - self.dialog = top.get_widget('importer') + self.progressbar = top.get_object('progressbar') + self.dialog = top.get_object('importer') self.dialog.show() def filter_url(self, url): diff --git a/src/plugins/tool/phpgedview.glade b/src/plugins/tool/phpgedview.glade index bf912eb99..9a981585d 100644 --- a/src/plugins/tool/phpgedview.glade +++ b/src/plugins/tool/phpgedview.glade @@ -1,335 +1,334 @@ - - - - - - - True - phpGedView import - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_MOUSE - False - True - True - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - -6 - - - - - - True - True - True - gtk-apply - True - GTK_RELIEF_NORMAL - True - -10 - - - - - - 0 - False - True - GTK_PACK_END - - - - - - 12 - True - 7 - 2 - False - 9 - 9 - - - - True - <b>phpGedView import</b> - False - True - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - 2 - 0 - 1 - fill - - - - - - - True - True - True - True - 0 - http:// - True - * - False - 25 - - - 1 - 2 - 1 - 2 - - - - - - - True - True - False - True - 0 - - True - * - False - - - 1 - 2 - 4 - 5 - fill - - - - - - - True - True - False - False - 0 - - True - * - False - - - 1 - 2 - 5 - 6 - fill - - - - - - - True - - default - - - - 1 - 2 - 3 - 4 - fill - fill - - - - - - True - File: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 3 - 4 - 7 - fill - - - - - - - True - Username: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 4 - 5 - 7 - fill - - - - - - - True - Password: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 5 - 6 - 7 - fill - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 2 - 2 - 3 - 7 - fill - - - - - - - True - URL: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 1 - 2 - 7 - fill - - - - - - - True - GTK_PROGRESS_LEFT_TO_RIGHT - 0 - 0.10000000149 - - - - 1 - 2 - 6 - 7 - fill - - - - - - 5 - True - True - - - - - - - + + + + + + + + + + - default - + + + + + True + phpGedView import + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_MOUSE + False + True + True + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + + + True + False + 0 + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + True + + + + + True + True + True + gtk-apply + True + GTK_RELIEF_NORMAL + True + + + + + + 0 + False + True + GTK_PACK_END + + + + + 12 + True + 7 + 2 + False + 9 + 9 + + + True + <b>phpGedView import</b> + False + True + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + 2 + 0 + 1 + fill + + + + + + True + True + True + True + 0 + http:// + True + * + False + 25 + + + 1 + 2 + 1 + 2 + + + + + + True + True + False + True + 0 + + True + * + False + + + 1 + 2 + 4 + 5 + fill + + + + + + True + True + False + False + 0 + + True + * + False + + + 1 + 2 + 5 + 6 + fill + + + + + + True + model1 + + + + 0 + + + + + 1 + 2 + 3 + 4 + fill + fill + + + + + True + File: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 3 + 4 + 7 + fill + + + + + + True + Username: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 4 + 5 + 7 + fill + + + + + + True + Password: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 5 + 6 + 7 + fill + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 2 + 2 + 3 + 7 + fill + + + + + + True + URL: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 1 + 2 + 7 + fill + + + + + + True + GTK_PROGRESS_LEFT_TO_RIGHT + 0 + 0.10000000149 + + + + 1 + 2 + 6 + 7 + fill + + + + + + 5 + True + True + + + + + + button1 + ok_button + + +