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

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

@ -1,11 +1,9 @@
<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
<glade-interface>
<widget class="GtkWindow" id="top">
<?xml version="1.0"?>
<!--*- mode: xml -*-->
<interface>
<object class="GtkWindow" id="top">
<property name="visible">True</property>
<property name="title" translatable="yes"></property>
<property name="title" translatable="yes"/>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
@ -20,19 +18,17 @@
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="focus_on_map">True</property>
<property name="urgency_hint">False</property>
<signal name="delete_event" handler="on_delete_event" last_modification_time="Mon, 10 May 2004 00:32:54 GMT"/>
<signal handler="on_delete_event" last_modification_time="Mon, 10 May 2004 00:32:54 GMT" name="delete_event"/>
<child>
<widget class="GtkVBox" id="vbox2">
<object class="GtkVBox" id="vbox2">
<property name="border_width">6</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<widget class="GtkLabel" id="title">
<object class="GtkLabel" id="title">
<property name="visible">True</property>
<property name="label" translatable="yes"></property>
<property name="label" translatable="yes"/>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -46,16 +42,15 @@
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
</object>
<packing>
<property name="padding">6</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="info">
<object 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.
@ -73,25 +68,23 @@ Select the names you wish GRAMPS to convert. </property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
</object>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow2">
<object class="GtkScrolledWindow" id="scrolledwindow2">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="shadow_type">GTK_SHADOW_IN</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
<widget class="GtkTreeView" id="list">
<object class="GtkTreeView" id="list">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">True</property>
@ -101,24 +94,22 @@ Select the names you wish GRAMPS to convert. </property>
<property name="fixed_height_mode">False</property>
<property name="hover_selection">False</property>
<property name="hover_expand">False</property>
</widget>
</object>
</child>
</widget>
</object>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
<child>
<widget class="GtkHButtonBox" id="hbuttonbox2">
<object class="GtkHButtonBox" id="hbuttonbox2">
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<property name="spacing">6</property>
<child>
<widget class="GtkButton" id="button6">
<object class="GtkButton" id="button6">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
@ -126,12 +117,11 @@ Select the names you wish GRAMPS to convert. </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="destroy_passed_object" object="top" last_modification_time="Wed, 16 Apr 2003 05:06:50 GMT"/>
</widget>
<signal handler="destroy_passed_object" last_modification_time="Wed, 16 Apr 2003 05:06:50 GMT" name="clicked" object="top"/>
</object>
</child>
<child>
<widget class="GtkButton" id="button5">
<object class="GtkButton" id="button5">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
@ -139,18 +129,17 @@ Select the names you wish GRAMPS to convert. </property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_ok_clicked" object="top" last_modification_time="Wed, 16 Apr 2003 05:07:24 GMT"/>
</widget>
<signal handler="on_ok_clicked" last_modification_time="Wed, 16 Apr 2003 05:07:24 GMT" name="clicked" object="top"/>
</object>
</child>
</widget>
</object>
<packing>
<property name="padding">6</property>
<property name="expand">False</property>
<property name="fill">True</property>
</packing>
</child>
</widget>
</object>
</child>
</widget>
</glade-interface>
</object>
</interface>