Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ChangeNames.py and ExtractCity.py: convert to use gtkbuilder instead of libglade

Browse Source 
svn: r12413
This commit is contained in:
Gerald Britton
2009-04-09 14:28:22 +00:00
parent 1e21b6c20d
commit 2d648289fc
3 changed files with 158 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/tool/ChangeNames.py
View File

@ -37,7 +37,6 @@ import os
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import gobject import gobject
import gtk import gtk
from gtk import glade
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -180,17 +179,17 @@ class ChangeNames(Tool.BatchTool, ManagedWindow.ManagedWindow):
base = os.path.dirname(__file__) base = os.path.dirname(__file__)
glade_file = os.path.join(base,"changenames.glade") glade_file = os.path.join(base,"changenames.glade")
self.top = gtk.Builder()
self.top = glade.XML(glade_file,"top","gramps") self.top.add_from_file(glade_file)
window = self.top.get_widget('top') window = self.top.get_object('top')
self.top.signal_autoconnect({ self.top.connect_signals({
"destroy_passed_object" : self.close, "destroy_passed_object" : self.close,
"on_ok_clicked" : self.on_ok_clicked, "on_ok_clicked" : self.on_ok_clicked,
"on_help_clicked" : self.on_help_clicked, "on_help_clicked" : self.on_help_clicked,
}) })
self.list = self.top.get_widget("list") self.list = self.top.get_object("list")
self.set_window(window,self.top.get_widget('title'),self.label) self.set_window(window,self.top.get_object('title'),self.label)
self.model = gtk.ListStore(gobject.TYPE_BOOLEAN, gobject.TYPE_STRING, self.model = gtk.ListStore(gobject.TYPE_BOOLEAN, gobject.TYPE_STRING,
gobject.TYPE_STRING) gobject.TYPE_STRING)

20
src/plugins/tool/ExtractCity.py
View File

@ -39,7 +39,6 @@ from gettext import gettext as _
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import gtk import gtk
from gtk import glade
import gobject import gobject
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -441,9 +440,8 @@ class ExtractCity(Tool.BatchTool, ManagedWindow.ManagedWindow):
loc = place.get_main_location() loc = place.get_main_location()
self.progress.step() self.progress.step()
if loc.get_street() == "" and loc.get_city() == "" \ if loc.get_street() == loc.get_city() == \
and loc.get_state() == "" and \ loc.get_state() == loc.get_postal_code() == "":
loc.get_postal_code() == "":
match = CITY_STATE_ZIP.match(descr.strip()) match = CITY_STATE_ZIP.match(descr.strip())
if match: if match:
@ -516,18 +514,18 @@ class ExtractCity(Tool.BatchTool, ManagedWindow.ManagedWindow):
base = os.path.dirname(__file__) base = os.path.dirname(__file__)
glade_file = os.path.join(base, "changenames.glade") glade_file = os.path.join(base, "changenames.glade")
self.top = gtk.Builder()
self.top = glade.XML(glade_file, "top", "gramps") self.top.add_from_file(glade_file)
window = self.top.get_widget('top') window = self.top.get_object('top')
self.top.signal_autoconnect({ self.top.connect_signals({
"destroy_passed_object" : self.close, "destroy_passed_object" : self.close,
"on_ok_clicked" : self.on_ok_clicked, "on_ok_clicked" : self.on_ok_clicked,
"on_help_clicked" : self.on_help_clicked, "on_help_clicked" : self.on_help_clicked,
}) })
self.list = self.top.get_widget("list") self.list = self.top.get_object("list")
self.set_window(window, self.top.get_widget('title'), self.label) self.set_window(window, self.top.get_object('title'), self.label)
lbl = self.top.get_widget('info') lbl = self.top.get_object('info')
lbl.set_line_wrap(True) lbl.set_line_wrap(True)
lbl.set_text( lbl.set_text(
_('Below is a list of Places with the possible data that can ' _('Below is a list of Places with the possible data that can '

297
src/plugins/tool/changenames.glade
View File

@ -1,156 +1,145 @@
<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> <?xml version="1.0"?>
<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> <!--*- mode: xml -*-->
<interface>
<glade-interface> <object class="GtkWindow" id="top">
<property name="visible">True</property>
<widget class="GtkWindow" id="top"> <property name="title" translatable="yes"/>
<property name="visible">True</property> <property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="title" translatable="yes"></property> <property name="window_position">GTK_WIN_POS_NONE</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property> <property name="modal">False</property>
<property name="window_position">GTK_WIN_POS_NONE</property> <property name="default_width">500</property>
<property name="modal">False</property> <property name="default_height">450</property>
<property name="default_width">500</property> <property name="resizable">True</property>
<property name="default_height">450</property> <property name="destroy_with_parent">False</property>
<property name="resizable">True</property> <property name="decorated">True</property>
<property name="destroy_with_parent">False</property> <property name="skip_taskbar_hint">False</property>
<property name="decorated">True</property> <property name="skip_pager_hint">False</property>
<property name="skip_taskbar_hint">False</property> <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="skip_pager_hint">False</property> <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> <property name="focus_on_map">True</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <property name="urgency_hint">False</property>
<property name="focus_on_map">True</property> <signal handler="on_delete_event" last_modification_time="Mon, 10 May 2004 00:32:54 GMT" name="delete_event"/>
<property name="urgency_hint">False</property> <child>
<signal name="delete_event" handler="on_delete_event" last_modification_time="Mon, 10 May 2004 00:32:54 GMT"/> <object class="GtkVBox" id="vbox2">
<property name="border_width">6</property>
<child> <property name="visible">True</property>
<widget class="GtkVBox" id="vbox2"> <property name="homogeneous">False</property>
<property name="border_width">6</property> <property name="spacing">0</property>
<property name="visible">True</property> <child>
<property name="homogeneous">False</property> <object class="GtkLabel" id="title">
<property name="spacing">0</property> <property name="visible">True</property>
<property name="label" translatable="yes"/>
<child> <property name="use_underline">False</property>
<widget class="GtkLabel" id="title"> <property name="use_markup">False</property>
<property name="visible">True</property> <property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="label" translatable="yes"></property> <property name="wrap">False</property>
<property name="use_underline">False</property> <property name="selectable">False</property>
<property name="use_markup">False</property> <property name="xalign">0.5</property>
<property name="justify">GTK_JUSTIFY_LEFT</property> <property name="yalign">0.5</property>
<property name="wrap">False</property> <property name="xpad">0</property>
<property name="selectable">False</property> <property name="ypad">0</property>
<property name="xalign">0.5</property> <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="yalign">0.5</property> <property name="width_chars">-1</property>
<property name="xpad">0</property> <property name="single_line_mode">False</property>
<property name="ypad">0</property> <property name="angle">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> </object>
<property name="width_chars">-1</property> <packing>
<property name="single_line_mode">False</property> <property name="padding">6</property>
<property name="angle">0</property> <property name="expand">False</property>
</widget> <property name="fill">False</property>
<packing> </packing>
<property name="padding">6</property> </child>
<property name="expand">False</property> <child>
<property name="fill">False</property> <object class="GtkLabel" id="info">
</packing> <property name="visible">True</property>
</child> <property name="label" translatable="yes">Below is a list of the family names that
<child>
<widget class="GtkLabel" id="info">
<property name="visible">True</property>
<property name="label" translatable="yes">Below is a list of the family names that
GRAMPS can convert to correct capitalization. GRAMPS can convert to correct capitalization.
Select the names you wish GRAMPS to convert. </property> Select the names you wish GRAMPS to convert. </property>
<property name="use_underline">False</property> <property name="use_underline">False</property>
<property name="use_markup">False</property> <property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property> <property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property> <property name="wrap">False</property>
<property name="selectable">False</property> <property name="selectable">False</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
<property name="yalign">0.5</property> <property name="yalign">0.5</property>
<property name="xpad">0</property> <property name="xpad">0</property>
<property name="ypad">10</property> <property name="ypad">10</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property> <property name="width_chars">-1</property>
<property name="single_line_mode">False</property> <property name="single_line_mode">False</property>
<property name="angle">0</property> <property name="angle">0</property>
</widget> </object>
<packing> <packing>
<property name="padding">0</property> <property name="padding">0</property>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">False</property>
</packing> </packing>
</child> </child>
<child>
<child> <object class="GtkScrolledWindow" id="scrolledwindow2">
<widget class="GtkScrolledWindow" id="scrolledwindow2"> <property name="visible">True</property>
<property name="visible">True</property> <property name="can_focus">True</property>
<property name="can_focus">True</property> <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <property name="shadow_type">GTK_SHADOW_IN</property>
<property name="shadow_type">GTK_SHADOW_IN</property> <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property> <child>
<object class="GtkTreeView" id="list">
<child> <property name="visible">True</property>
<widget class="GtkTreeView" id="list"> <property name="can_focus">True</property>
<property name="visible">True</property> <property name="headers_visible">True</property>
<property name="can_focus">True</property> <property name="rules_hint">False</property>
<property name="headers_visible">True</property> <property name="reorderable">False</property>
<property name="rules_hint">False</property> <property name="enable_search">True</property>
<property name="reorderable">False</property> <property name="fixed_height_mode">False</property>
<property name="enable_search">True</property> <property name="hover_selection">False</property>
<property name="fixed_height_mode">False</property> <property name="hover_expand">False</property>
<property name="hover_selection">False</property> </object>
<property name="hover_expand">False</property> </child>
</widget> </object>
</child> <packing>
</widget> <property name="padding">0</property>
<packing> <property name="expand">True</property>
<property name="padding">0</property> <property name="fill">True</property>
<property name="expand">True</property> </packing>
<property name="fill">True</property> </child>
</packing> <child>
</child> <object class="GtkHButtonBox" id="hbuttonbox2">
<property name="visible">True</property>
<child> <property name="layout_style">GTK_BUTTONBOX_END</property>
<widget class="GtkHButtonBox" id="hbuttonbox2"> <property name="spacing">6</property>
<property name="visible">True</property> <child>
<property name="layout_style">GTK_BUTTONBOX_END</property> <object class="GtkButton" id="button6">
<property name="spacing">6</property> <property name="visible">True</property>
<property name="can_default">True</property>
<child> <property name="can_focus">True</property>
<widget class="GtkButton" id="button6"> <property name="label">gtk-cancel</property>
<property name="visible">True</property> <property name="use_stock">True</property>
<property name="can_default">True</property> <property name="relief">GTK_RELIEF_NORMAL</property>
<property name="can_focus">True</property> <property name="focus_on_click">True</property>
<property name="label">gtk-cancel</property> <signal handler="destroy_passed_object" last_modification_time="Wed, 16 Apr 2003 05:06:50 GMT" name="clicked" object="top"/>
<property name="use_stock">True</property> </object>
<property name="relief">GTK_RELIEF_NORMAL</property> </child>
<property name="focus_on_click">True</property> <child>
<signal name="clicked" handler="destroy_passed_object" object="top" last_modification_time="Wed, 16 Apr 2003 05:06:50 GMT"/> <object class="GtkButton" id="button5">
</widget> <property name="visible">True</property>
</child> <property name="can_default">True</property>
<property name="can_focus">True</property>
<child> <property name="label" translatable="yes">_Accept changes and close</property>
<widget class="GtkButton" id="button5"> <property name="use_underline">True</property>
<property name="visible">True</property> <property name="relief">GTK_RELIEF_NORMAL</property>
<property name="can_default">True</property> <property name="focus_on_click">True</property>
<property name="can_focus">True</property> <signal handler="on_ok_clicked" last_modification_time="Wed, 16 Apr 2003 05:07:24 GMT" name="clicked" object="top"/>
<property name="label" translatable="yes">_Accept changes and close</property> </object>
<property name="use_underline">True</property> </child>
<property name="relief">GTK_RELIEF_NORMAL</property> </object>
<property name="focus_on_click">True</property> <packing>
<signal name="clicked" handler="on_ok_clicked" object="top" last_modification_time="Wed, 16 Apr 2003 05:07:24 GMT"/> <property name="padding">6</property>
</widget> <property name="expand">False</property>
</child> <property name="fill">True</property>
</widget> </packing>
<packing> </child>
<property name="padding">6</property> </object>
<property name="expand">False</property> </child>
<property name="fill">True</property> </object>
</packing> </interface>
</child>
</widget>
</child>
</widget>
</glade-interface>