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

merge trunk from 19853 to 19947

Browse Source 
svn: r19949
This commit is contained in:
Benny Malengier
2012-07-05 00:38:18 +00:00
parent aba47d38cb e73eec36aa
commit 226a3eee2b
360 changed files with 9231 additions and 4315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/guiQML/viewmanager.py
View File

@@ -61,7 +61,7 @@ from PySide import QtOpenGL
# GRAMPS modules
#
#-------------------------------------------------------------------------
import const
from gen.const import ROOT_DIR
from cli.grampscli import CLIManager, CLIDbLoader
from gen.ggettext import gettext as _
from guiQML.views.dbman import DbManager
@@ -100,7 +100,7 @@ class ViewManager(CLIManager):
self.mainview.setResizeMode(QtDeclarative.QDeclarativeView.SizeRootObjectToView)
self.engine = self.mainview.engine()
self.engine.rootContext().setBaseUrl(QtCore.QUrl.fromLocalFile(
os.path.join(const.ROOT_DIR, "guiQML")))
os.path.join(ROOT_DIR, "guiQML")))
#set up the family tree list to select from
self.dbman = DbManager(self.dbstate, self.engine, self.load_db)

4
src/guiQML/views/centralview.py
View File

@@ -61,7 +61,7 @@ from PySide import QtOpenGL
# GRAMPS modules
#
#-------------------------------------------------------------------------
import const
from gen.const import ROOT_DIR
from gen.ggettext import gettext as _
#-------------------------------------------------------------------------
@@ -149,7 +149,7 @@ class CentralView(QtCore.QObject):
#create a Component to show
self.centralview = QtDeclarative.QDeclarativeComponent(engine)
self.centralview.loadUrl(QtCore.QUrl.fromLocalFile(
os.path.join(const.ROOT_DIR, "guiQML", 'views', 'centralview.qml')))
os.path.join(ROOT_DIR, "guiQML", 'views', 'centralview.qml')))
#and obtain the QObject of it
self.Qcentralview = self.centralview.create(self.centralviewcontext)

6
src/guiQML/views/dbman.py
View File

@@ -61,7 +61,7 @@ from PySide import QtOpenGL
# GRAMPS modules
#
#-------------------------------------------------------------------------
import const
from gen.const import IMAGE_DIR, ROOT_DIR
from cli.clidbman import CLIDbManager, NAME_FILE, time_val
from gen.ggettext import gettext as _
@@ -72,7 +72,7 @@ from gen.ggettext import gettext as _
#-------------------------------------------------------------------------
#open_icon = QtGui.QIcon.fromTheme('open')
FAMTREE_ICONPATH = os.path.join(const.IMAGE_DIR, '22x22', 'gramps.png')
FAMTREE_ICONPATH = os.path.join(IMAGE_DIR, '22x22', 'gramps.png')
class FamTreeWrapper(QtCore.QObject):
"""
@@ -182,7 +182,7 @@ class DbManager(CLIDbManager, QtCore.QObject):
#create a Component to show
self.famtreeview = QtDeclarative.QDeclarativeComponent(engine)
self.famtreeview.loadUrl(QtCore.QUrl.fromLocalFile(
os.path.join(const.ROOT_DIR, "guiQML", 'views', 'dbman.qml')))
os.path.join(ROOT_DIR, "guiQML", 'views', 'dbman.qml')))
#and obtain the QObject of it
self.Qfamtreeview = self.famtreeview.create(self.famtreecontext)

6
src/guiQML/views/personview.py
View File

@@ -54,8 +54,8 @@ from PySide import QtOpenGL
# GRAMPS modules
#
#-------------------------------------------------------------------------
import const
from Utils import conv_unicode_tosrtkey_ongtk
from gen.const import ROOT_DIR
from gui.views.treemodels import conv_unicode_tosrtkey_ongtk
from gen.ggettext import gettext as _
from gen.display.name import displayer as name_displayer
from gen.lib import Name
@@ -192,7 +192,7 @@ class QMLPersonList(QtCore.QObject):
#create a Component to show
self.qmlpersonlist = QtDeclarative.QDeclarativeComponent(engine)
self.qmlpersonlist.loadUrl(QtCore.QUrl.fromLocalFile(
os.path.join(const.ROOT_DIR, "guiQML", 'views', 'peopleview.qml')))
os.path.join(ROOT_DIR, "guiQML", 'views', 'peopleview.qml')))
#and obtain the QObject of it
self.Qpersonlist = self.qmlpersonlist.create(self.qmlpersonlistcontext)