From 20682993b5e87ac4fc5f976ed38dd57a25243f7d Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Fri, 8 Jun 2012 23:37:19 +0000 Subject: [PATCH] GEPS008: Moved AutoComp module svn: r19804 --- po/POTFILES.skip | 2 +- src/Makefile.am | 1 - src/gui/Makefile.am | 1 + src/{AutoComp.py => gui/autocomp.py} | 0 src/gui/editors/displaytabs/surnametab.py | 1 - src/gui/editors/filtereditor.py | 10 +++++----- src/gui/widgets/monitoredwidgets.py | 10 +++++----- src/plugins/tool/ChangeTypes.py | 6 +++--- src/plugins/tool/SoundGen.py | 4 ++-- 9 files changed, 17 insertions(+), 18 deletions(-) rename src/{AutoComp.py => gui/autocomp.py} (100%) diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 082b6b2bf..5c3d67f38 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -4,7 +4,6 @@ # #src -src/AutoComp.py src/ImgManip.py # cli @@ -221,6 +220,7 @@ src/gen/utils/callman.py # gui - GUI code src/gui/__init__.py +src/gui/autocomp.py src/gui/dbguielement.py src/gui/ddtargets.py src/gui/display.py diff --git a/src/Makefile.am b/src/Makefile.am index b31ba85bd..71e5fefd7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -13,7 +13,6 @@ SUBDIRS = \ gdirdir=$(prefix)/share/gramps gdir_PYTHON = \ - AutoComp.py\ config.py\ const.py\ constfunc.py\ diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index 324e63790..82530e323 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -20,6 +20,7 @@ pkgpythondir = $(datadir)/@PACKAGE@/gui pkgpython_PYTHON = \ __init__.py \ aboutdialog.py \ + autocomp.py \ basesidebar.py \ clipboard.py \ columnorder.py \ diff --git a/src/AutoComp.py b/src/gui/autocomp.py similarity index 100% rename from src/AutoComp.py rename to src/gui/autocomp.py diff --git a/src/gui/editors/displaytabs/surnametab.py b/src/gui/editors/displaytabs/surnametab.py index 8855fbb77..1afc471fb 100644 --- a/src/gui/editors/displaytabs/surnametab.py +++ b/src/gui/editors/displaytabs/surnametab.py @@ -48,7 +48,6 @@ _ENTER = gtk.gdk.keyval_from_name("Enter") from surnamemodel import SurnameModel from embeddedlist import EmbeddedList from gui.ddtargets import DdTargets -import AutoComp from gen.lib import Surname, NameOriginType #------------------------------------------------------------------------- diff --git a/src/gui/editors/filtereditor.py b/src/gui/editors/filtereditor.py index 84a64e997..e549fc8cb 100644 --- a/src/gui/editors/filtereditor.py +++ b/src/gui/editors/filtereditor.py @@ -65,7 +65,7 @@ from gen.errors import WindowActiveError from gen.ggettext import sgettext as _ import gen.lib from gen.filters import rules -import AutoComp +from gui.autocomp import StandardCustomSelector, fill_entry from gui.selectors import SelectorFactory from gen.display.name import displayer as _nd import Utils @@ -275,7 +275,7 @@ class MyPlaces(gtk.Entry): def __init__(self, places): gtk.Entry.__init__(self) - AutoComp.fill_entry(self, places) + fill_entry(self, places) self.show() #------------------------------------------------------------------------- @@ -398,9 +398,9 @@ class MySelect(gtk.ComboBoxEntry): def __init__(self, type_class): gtk.ComboBoxEntry.__init__(self) self.type_class = type_class - self.sel = AutoComp.StandardCustomSelector(type_class._I2SMAP, self, - type_class._CUSTOM, - type_class._DEFAULT) + self.sel = StandardCustomSelector(type_class._I2SMAP, self, + type_class._CUSTOM, + type_class._DEFAULT) self.show() def get_text(self): diff --git a/src/gui/widgets/monitoredwidgets.py b/src/gui/widgets/monitoredwidgets.py index 522653016..3549aff6f 100644 --- a/src/gui/widgets/monitoredwidgets.py +++ b/src/gui/widgets/monitoredwidgets.py @@ -51,7 +51,7 @@ import pango # #------------------------------------------------------------------------- from gen.ggettext import gettext as _ -import AutoComp +from gui.autocomp import StandardCustomSelector, fill_entry import gen.datehandler from gen.lib.date import Date, NextYear from gen.errors import ValidationError @@ -116,7 +116,7 @@ class MonitoredEntry(object): self.obj.set_editable(not read_only) if autolist: - AutoComp.fill_entry(obj, autolist) + fill_entry(obj, autolist) ## def destroy(self): ## """ @@ -234,7 +234,7 @@ class MonitoredSpinButton(object): self.obj.set_editable(not read_only) if autolist: - AutoComp.fill_entry(obj,autolist) + fill_entry(obj,autolist) ## def destroy(self): ## """ @@ -380,7 +380,7 @@ class MonitoredType(object): else: default = None - self.sel = AutoComp.StandardCustomSelector( + self.sel = StandardCustomSelector( mapping, obj, custom, default, additional=custom_values) self.set_val(self.sel.get_values()) @@ -452,7 +452,7 @@ class MonitoredDataType(object): if key in ignore_values and key not in (None, default): del map[key] - self.sel = AutoComp.StandardCustomSelector( + self.sel = StandardCustomSelector( map, obj, get_val().get_custom(), diff --git a/src/plugins/tool/ChangeTypes.py b/src/plugins/tool/ChangeTypes.py index 61460ec02..47da3058f 100644 --- a/src/plugins/tool/ChangeTypes.py +++ b/src/plugins/tool/ChangeTypes.py @@ -40,7 +40,7 @@ from gen.ggettext import ngettext from gui.utils import ProgressMeter import locale from gui.managedwindow import ManagedWindow -import AutoComp +from gui.autocomp import fill_combo from gen.lib import EventType from gen.db import DbTxn from gui.dialog import OkDialog @@ -80,8 +80,8 @@ class ChangeTypes(tool.BatchTool, ManagedWindow): etype = EventType() event_names = sorted(etype.get_standard_names(), key=locale.strxfrm) - AutoComp.fill_combo(self.auto1,event_names) - AutoComp.fill_combo(self.auto2,event_names) + fill_combo(self.auto1,event_names) + fill_combo(self.auto2,event_names) etype.set_from_xml_str(self.options.handler.options_dict['fromtype']) self.auto1.child.set_text(str(etype)) diff --git a/src/plugins/tool/SoundGen.py b/src/plugins/tool/SoundGen.py index 7a1500911..8e64dc582 100644 --- a/src/plugins/tool/SoundGen.py +++ b/src/plugins/tool/SoundGen.py @@ -33,7 +33,7 @@ import const from gen.soundex import soundex from gui.display import display_help from gui.managedwindow import ManagedWindow -import AutoComp +from gui.autocomp import fill_combo from gen.ggettext import sgettext as _ from gui.plug import tool from gui.glade import Glade @@ -84,7 +84,7 @@ class SoundGen(tool.Tool, ManagedWindow): names.sort() - AutoComp.fill_combo(self.autocomp, names) + fill_combo(self.autocomp, names) if person: n = person.get_primary_name().get_surname()