Split Utils in a non GUI and GUI part

move GrampsCfg utils to Utils
improve import strategy


svn: r12680
This commit is contained in:
Benny Malengier
2009-06-19 15:23:58 +00:00
parent 0ac67e8a59
commit 9d417e2cd6
40 changed files with 327 additions and 405 deletions

View File

@@ -49,7 +49,7 @@ import const
import PageView
import ManagedWindow
import ConfigParser
import Utils
from gui.utils import add_menuitem
from QuickReports import run_quick_report_by_name
import GrampsDisplay
from glade import Glade
@@ -1585,7 +1585,7 @@ class GrampletView(PageView.PersonNavView):
in AVAILABLE_GRAMPLETS]
names.sort()
for name in names:
Utils.add_menuitem(qr_menu, name,
add_menuitem(qr_menu, name,
None, self.add_gramplet)
self.uistate.uimanager.get_widget('/Popup/AddGramplet').set_submenu(qr_menu)
rg_menu = self.uistate.uimanager.get_widget('/Popup/RestoreGramplet')
@@ -1602,7 +1602,7 @@ class GrampletView(PageView.PersonNavView):
if len(names) > 0:
qr_menu = gtk.Menu()
for name in names:
Utils.add_menuitem(qr_menu, name,
add_menuitem(qr_menu, name,
None, self.restore_gramplet)
self.uistate.uimanager.get_widget('/Popup/RestoreGramplet').set_submenu(qr_menu)
if menu:

View File

@@ -51,6 +51,7 @@ from DisplayModels import PeopleModel
import PageView
from BasicUtils import name_displayer
import Utils
from gui.utils import add_menuitem
from QuestionDialog import ErrorDialog, QuestionDialog
import TreeTips
import Errors
@@ -856,7 +857,7 @@ class PersonView(PageView.PersonNavView):
if len(reportactions) > 1 :
qr_menu = gtk.Menu()
for action in reportactions[1:] :
Utils.add_menuitem(qr_menu, action[2], None, action[5])
add_menuitem(qr_menu, action[2], None, action[5])
self.uistate.uimanager.get_widget('/Popup/QuickReport').\
set_submenu(qr_menu)
if menu:

View File

@@ -46,7 +46,7 @@ import gtk
import gen.lib
import PageView
import DisplayModels
import Utils
from gui.utils import add_menuitem
import Errors
import Bookmarks
import Config
@@ -195,7 +195,7 @@ class PlaceView(PageView.ListView):
servlist = PluginManager.get_instance().get_mapservice_list()
for i, service in zip(range(len(servlist)), servlist):
key = service[2].replace(' ', '-')
Utils.add_menuitem(menu, service[1], None,
add_menuitem(menu, service[1], None,
make_callback(self.set_mapservice, key))
self.mapservicedata[key] = (service[0], service[2], service[3])