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

GEPS008: Moved Bookmarks module

Browse Source 
svn: r19776
This commit is contained in:
Nick Hall 2012-06-06 18:36:23 +00:00
parent 308f2616ba
commit 32b61fc60f
27 changed files with 48 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
po/POTFILES.in
View File

@ -2,7 +2,6 @@
#
# Python files
#
src/Bookmarks.py
src/const.py
src/DateEdit.py
src/ExportAssistant.py
@ -451,6 +450,7 @@ src/gui/selectors/selectrepository.py
src/gui/selectors/selectsource.py
# gui/views - the GUI views package
src/gui/views/bookmarks.py
src/gui/views/listview.py
src/gui/views/navigationview.py
src/gui/views/pageview.py
@ -713,7 +713,7 @@ src/gui/glade/reorder.glade
src/gui/glade/tipofday.glade
src/gui/glade/displaystate.glade
src/gui/glade/addmedia.glade
src/gui/glade/questiondialog.glade
src/gui/glade/dialog.glade
src/gui/glade/configure.glade
src/gui/glade/dateedit.glade
src/gui/glade/editsource.glade
@ -751,7 +751,7 @@ src/gui/glade/mergerepository.glade
src/gui/glade/mergesource.glade
src/gui/glade/plugins.glade
src/gui/glade/rule.glade
src/gui/glade/scratchpad.glade
src/gui/glade/clipboard.glade
src/gui/glade/papermenu.glade
src/gui/glade/updateaddons.glade
src/plugins/tool/notrelated.glade

1
src/Makefile.am
View File

@ -14,7 +14,6 @@ gdirdir=$(prefix)/share/gramps
gdir_PYTHON = \
AutoComp.py\
Bookmarks.py\
config.py\
const.py\
constfunc.py\

4
src/gui/glade/Makefile.am
View File

@ -9,7 +9,7 @@ dist_pkgdata_DATA = \
mergedata.glade\
plugins.glade\
rule.glade\
scratchpad.glade\
clipboard.glade\
papermenu.glade \
grampletpane.glade \
baseselector.glade \
@ -17,7 +17,7 @@ dist_pkgdata_DATA = \
tipofday.glade \
displaystate.glade \
addmedia.glade \
questiondialog.glade \
dialog.glade \
configure.glade \
dateedit.glade \
editsource.glade \

1
src/gui/views/Makefile.am
View File

@ -11,6 +11,7 @@ pkgpythondir = $(datadir)/@PACKAGE@/gui/views
pkgpython_PYTHON = \
__init__.py \
bookmarks.py \
listview.py \
navigationview.py \
pageview.py \

0
src/Bookmarks.py → src/gui/views/bookmarks.py
View File

4
src/plugins/lib/libpersonview.py
View File

@ -54,7 +54,7 @@ import Utils
from gen.display.name import displayer as name_displayer
from gui.dialog import ErrorDialog, QuestionDialog
import Errors
import Bookmarks
from gui.views.bookmarks import PersonBookmarks
import config
from gui.ddtargets import DdTargets
from gui.editors import EditPerson
@ -135,7 +135,7 @@ class BasePersonView(ListView):
self, title, pdata, dbstate, uistate,
BasePersonView.COLUMN_NAMES, len(BasePersonView.COLUMN_NAMES),
model, signal_map, dbstate.db.get_bookmarks(),
Bookmarks.PersonBookmarks, nav_group,
PersonBookmarks, nav_group,
multiple=True,
filter_class=PersonSidebarFilter,
markup=BasePersonView.MARKUP_COLS)

4
src/plugins/lib/libplaceview.py
View File

@ -49,7 +49,7 @@ import gen.lib
from gui.views.listview import ListView
from gui.utils import add_menuitem
import Errors
import Bookmarks
from gui.views.bookmarks import PlaceBookmarks
import config
from gui.dialog import ErrorDialog
from gui.pluginmanager import GuiPluginManager
@ -141,7 +141,7 @@ class PlaceBaseView(ListView):
self.COLUMN_NAMES, 14,
model, signal_map,
dbstate.db.get_place_bookmarks(),
Bookmarks.PlaceBookmarks, nav_group,
PlaceBookmarks, nav_group,
multiple=True,
filter_class=PlaceSidebarFilter, markup=markup)

1
src/plugins/lib/maps/geography.py
View File

@ -51,7 +51,6 @@ from gen.display.name import displayer as _nd
from gui.views.navigationview import NavigationView
from libformatting import FormattingHelper
import Errors
import Bookmarks
import const
import constfunc
from gui.managedwindow import ManagedWindow

4
src/plugins/view/citationlistview.py
View File

@ -50,7 +50,7 @@ from gen.plug import CATEGORY_QR_CITATION
import gen.lib
from gui.views.listview import ListView
import Utils
import Bookmarks
from gui.views.bookmarks import CitationBookmarks
import Errors
from gui.ddtargets import DdTargets
from gui.dialog import ErrorDialog
@ -139,7 +139,7 @@ class CitationListView(ListView):
self.COLUMN_NAMES, len(self.COLUMN_NAMES),
CitationListModel, signal_map,
dbstate.db.get_citation_bookmarks(),
Bookmarks.CitationBookmarks, nav_group,
CitationBookmarks, nav_group,
multiple=True,
filter_class=CitationSidebarFilter,
markup = CitationListView.MARKUP_COLS)

4
src/plugins/view/citationtreeview.py
View File

@ -51,7 +51,7 @@ from gen.plug import CATEGORY_QR_SOURCE_OR_CITATION
import gen.lib
from gui.views.listview import ListView
import Utils
import Bookmarks
from gui.views.bookmarks import CitationBookmarks
import Errors
from gui.ddtargets import DdTargets
from gui.dialog import ErrorDialog
@ -143,7 +143,7 @@ class CitationTreeView(ListView):
self.COLUMN_NAMES, len(self.COLUMN_NAMES),
CitationTreeModel, signal_map,
dbstate.db.get_citation_bookmarks(),
Bookmarks.CitationBookmarks, nav_group,
CitationBookmarks, nav_group,
multiple=True,
filter_class=SourceSidebarFilter,
markup = CitationTreeView.MARKUP_COLS)

4
src/plugins/view/eventview.py
View File

@ -51,7 +51,7 @@ from gui.views.listview import ListView
from gui.views.treemodels import EventModel
import Utils
import Errors
import Bookmarks
from gui.views.bookmarks import EventBookmarks
import config
from gui.ddtargets import DdTargets
from gui.dialog import ErrorDialog
@ -119,7 +119,7 @@ class EventView(ListView):
EventView.COLUMN_NAMES, len(EventView.COLUMN_NAMES),
EventModel,
signal_map, dbstate.db.get_event_bookmarks(),
Bookmarks.EventBookmarks, nav_group,
EventBookmarks, nav_group,
multiple=True,
filter_class=EventSidebarFilter,
markup = EventView.MARKUP_COLS)

4
src/plugins/view/familyview.py
View File

@ -49,7 +49,7 @@ import gen.lib
from gui.views.listview import ListView
from gui.views.treemodels import FamilyModel
from gui.editors import EditFamily
import Bookmarks
from gui.views.bookmarks import FamilyBookmarks
import Errors
import config
from gui.dialog import ErrorDialog
@ -116,7 +116,7 @@ class FamilyView(ListView):
FamilyView.COLUMN_NAMES, len(FamilyView.COLUMN_NAMES),
FamilyModel,
signal_map, dbstate.db.get_family_bookmarks(),
Bookmarks.FamilyBookmarks, nav_group,
FamilyBookmarks, nav_group,
multiple=True,
filter_class=FamilySidebarFilter,
markup=FamilyView.MARKUP_COLS)

4
src/plugins/view/fanchartview.py
View File

@ -59,7 +59,7 @@ from libformatting import FormattingHelper
import gen.lib
from gui.views.navigationview import NavigationView
import Errors
import Bookmarks
from gui.views.bookmarks import PersonBookmarks
from gui.editors import EditPerson
import gui.utils
@ -571,7 +571,7 @@ class FanChartView(NavigationView):
NavigationView.__init__(self, _('Fan Chart'),
pdata, dbstate, uistate,
dbstate.db.get_bookmarks(),
Bookmarks.PersonBookmarks,
PersonBookmarks,
nav_group)
dbstate.connect('active-changed', self.active_changed)

4
src/plugins/view/geoclose.py
View File

@ -54,7 +54,7 @@ import gen.datehandler
from gen.display.name import displayer as _nd
from PlaceUtils import conv_lat_lon
from gui.views.navigationview import NavigationView
import Bookmarks
from gui.views.bookmarks import PersonBookmarks
from maps import constants
from maps.geography import GeoGraphyView
from gui.selectors import SelectorFactory
@ -128,7 +128,7 @@ class GeoClose(GeoGraphyView):
GeoGraphyView.__init__(self, _("Have they been able to meet?"),
pdata, dbstate, uistate,
dbstate.db.get_bookmarks(),
Bookmarks.PersonBookmarks,
PersonBookmarks,
nav_group)
self.dbstate = dbstate
self.uistate = uistate

4
src/plugins/view/geoevents.py
View File

@ -66,7 +66,7 @@ from gui.editors import EditPlace
from gui.selectors.selectplace import SelectPlace
from gui.filters.sidebar import EventSidebarFilter
from gui.views.navigationview import NavigationView
import Bookmarks
from gui.views.bookmarks import EventBookmarks
from Utils import navigation_label
from maps.geography import GeoGraphyView
@ -116,7 +116,7 @@ class GeoEvents(GeoGraphyView):
GeoGraphyView.__init__(self, _('Events places map'),
pdata, dbstate, uistate,
dbstate.db.get_event_bookmarks(),
Bookmarks.EventBookmarks,
EventBookmarks,
nav_group)
self.dbstate = dbstate
self.uistate = uistate

4
src/plugins/view/geofamclose.py
View File

@ -54,7 +54,7 @@ import gen.datehandler
from gen.display.name import displayer as _nd
from PlaceUtils import conv_lat_lon
from gui.views.navigationview import NavigationView
import Bookmarks
from gui.views.bookmarks import FamilyBookmarks
from maps import constants
from maps.geography import GeoGraphyView
from gui.selectors import SelectorFactory
@ -128,7 +128,7 @@ class GeoFamClose(GeoGraphyView):
GeoGraphyView.__init__(self, _("Have these two families been able to meet?"),
pdata, dbstate, uistate,
dbstate.db.get_bookmarks(),
Bookmarks.FamilyBookmarks,
FamilyBookmarks,
nav_group)
self.dbstate = dbstate
self.uistate = uistate

4
src/plugins/view/geofamily.py
View File

@ -66,7 +66,7 @@ from gui.editors import EditPlace
from gui.selectors.selectplace import SelectPlace
from gui.filters.sidebar import FamilySidebarFilter
from gui.views.navigationview import NavigationView
import Bookmarks
from gui.views.bookmarks import FamilyBookmarks
from Utils import navigation_label
from maps.geography import GeoGraphyView
@ -116,7 +116,7 @@ class GeoFamily(GeoGraphyView):
GeoGraphyView.__init__(self, _('Family places map'),
pdata, dbstate, uistate,
dbstate.db.get_family_bookmarks(),
Bookmarks.FamilyBookmarks,
FamilyBookmarks,
nav_group)
self.dbstate = dbstate
self.uistate = uistate

4
src/plugins/view/geomoves.py
View File

@ -57,7 +57,7 @@ import gen.datehandler
from gen.display.name import displayer as _nd
from PlaceUtils import conv_lat_lon
from gui.views.navigationview import NavigationView
import Bookmarks
from gui.views.bookmarks import PersonBookmarks
from maps import constants
from maps.geography import GeoGraphyView
from gui.selectors import SelectorFactory
@ -130,7 +130,7 @@ class GeoMoves(GeoGraphyView):
GeoGraphyView.__init__(self, _("Descendance of the active person."),
pdata, dbstate, uistate,
dbstate.db.get_bookmarks(),
Bookmarks.PersonBookmarks,
PersonBookmarks,
nav_group)
self.dbstate = dbstate
self.uistate = uistate

4
src/plugins/view/geoperson.py
View File

@ -67,7 +67,7 @@ from gui.editors import EditPlace
from gui.selectors.selectplace import SelectPlace
from gui.filters.sidebar import PersonSidebarFilter
from gui.views.navigationview import NavigationView
import Bookmarks
from gui.views.bookmarks import PersonBookmarks
import constants
from Utils import navigation_label
from maps.geography import GeoGraphyView
@ -144,7 +144,7 @@ class GeoPerson(GeoGraphyView):
GeoGraphyView.__init__(self, _("Person places map"),
pdata, dbstate, uistate,
dbstate.db.get_bookmarks(),
Bookmarks.PersonBookmarks,
PersonBookmarks,
nav_group)
self.dbstate = dbstate
self.uistate = uistate

4
src/plugins/view/geoplaces.py
View File

@ -66,7 +66,7 @@ from gui.editors import EditPlace
from gui.selectors.selectplace import SelectPlace
from gui.filters.sidebar import PlaceSidebarFilter
from gui.views.navigationview import NavigationView
import Bookmarks
from gui.views.bookmarks import PlaceBookmarks
from Utils import navigation_label
from maps.geography import GeoGraphyView
@ -116,7 +116,7 @@ class GeoPlaces(GeoGraphyView):
GeoGraphyView.__init__(self, _('Places places map'),
pdata, dbstate, uistate,
dbstate.db.get_place_bookmarks(),
Bookmarks.PlaceBookmarks,
PlaceBookmarks,
nav_group)
self.dbstate = dbstate
self.uistate = uistate

4
src/plugins/view/htmlrenderer.py
View File

@ -58,7 +58,7 @@ import gtk
#
#-------------------------------------------------------------------------
from gui.views.navigationview import NavigationView
import Bookmarks
from gui.views.bookmarks import PersonBookmarks
import Utils
import constfunc
import config
@ -445,7 +445,7 @@ class HtmlView(NavigationView):
def __init__(self, pdata, dbstate, uistate, title=_('HtmlView')):
NavigationView.__init__(self, title, pdata, dbstate, uistate,
dbstate.db.get_bookmarks(),
Bookmarks.PersonBookmarks,
PersonBookmarks,
nav_group=0
)
self.dbstate = dbstate

4
src/plugins/view/mediaview.py
View File

@ -56,7 +56,7 @@ import const
import constfunc
import config
import Utils
import Bookmarks
from gui.views.bookmarks import MediaBookmarks
import gen.mime
import gen.lib
from gen.db import DbTxn
@ -129,7 +129,7 @@ class MediaView(ListView):
MediaView.COLUMN_NAMES, len(MediaView.COLUMN_NAMES),
MediaModel,
signal_map, dbstate.db.get_media_bookmarks(),
Bookmarks.MediaBookmarks, nav_group,
MediaBookmarks, nav_group,
filter_class=MediaSidebarFilter,
multiple=True)

4
src/plugins/view/noteview.py
View File

@ -49,7 +49,7 @@ from gui.views.listview import ListView
from gui.views.treemodels import NoteModel
import Utils
import Errors
import Bookmarks
from gui.views.bookmarks import NoteBookmarks
import config
from gen.lib import Note
from gui.ddtargets import DdTargets
@ -108,7 +108,7 @@ class NoteView(ListView):
self, _('Notes'), pdata, dbstate, uistate, NoteView.COLUMN_NAMES,
len(NoteView.COLUMN_NAMES), NoteModel, signal_map,
dbstate.db.get_note_bookmarks(),
Bookmarks.NoteBookmarks, nav_group,
NoteBookmarks, nav_group,
filter_class=NoteSidebarFilter,
multiple=True)

4
src/plugins/view/pedigreeview.py
View File

@ -60,7 +60,7 @@ from gui.editors import EditPerson, EditFamily
from gui.ddtargets import DdTargets
import cPickle as pickle
import config
import Bookmarks
from gui.views.bookmarks import PersonBookmarks
import const
import constfunc
from gui.dialog import RunDatabaseRepair, ErrorDialog
@ -689,7 +689,7 @@ class PedigreeView(NavigationView):
def __init__(self, pdata, dbstate, uistate, nav_group=0):
NavigationView.__init__(self, _('Pedigree'), pdata, dbstate, uistate,
dbstate.db.get_bookmarks(),
Bookmarks.PersonBookmarks,
PersonBookmarks,
nav_group)
self.func_list.update({

4
src/plugins/view/relview.py
View File

@ -60,7 +60,7 @@ import config
from gui import widgets
from gui.selectors import SelectorFactory
import Errors
import Bookmarks
from gui.views.bookmarks import PersonBookmarks
import const
from Utils import preset_name
from gen.utils import get_birth_or_fallback, get_death_or_fallback
@ -135,7 +135,7 @@ class RelationshipView(NavigationView):
NavigationView.__init__(self, _('Relationships'),
pdata, dbstate, uistate,
dbstate.db.get_bookmarks(),
Bookmarks.PersonBookmarks,
PersonBookmarks,
nav_group)
self.func_list.update({

4
src/plugins/view/repoview.py
View File

@ -39,7 +39,7 @@ import gtk
import gen.lib
from gui.views.listview import ListView
from gui.views.treemodels import RepositoryModel
import Bookmarks
from gui.views.bookmarks import RepoBookmarks
import Errors
import config
from gui.editors import EditRepository, DeleteRepositoryQuery
@ -125,7 +125,7 @@ class RepositoryView(ListView):
RepositoryView.COLUMN_NAMES, len(RepositoryView.COLUMN_NAMES),
RepositoryModel, signal_map,
dbstate.db.get_repo_bookmarks(),
Bookmarks.RepoBookmarks, nav_group,
RepoBookmarks, nav_group,
multiple=True,
filter_class=RepoSidebarFilter)

4
src/plugins/view/sourceview.py
View File

@ -44,7 +44,7 @@ import config
from gui.views.listview import ListView
from gui.views.treemodels import SourceModel
import Utils
import Bookmarks
from gui.views.bookmarks import SourceBookmarks
import Errors
from gui.ddtargets import DdTargets
from gui.dialog import ErrorDialog
@ -112,7 +112,7 @@ class SourceView(ListView):
SourceView.COLUMN_NAMES, len(SourceView.COLUMN_NAMES),
SourceModel, signal_map,
dbstate.db.get_source_bookmarks(),
Bookmarks.SourceBookmarks, nav_group,
SourceBookmarks, nav_group,
multiple=True,
filter_class=SourceSidebarFilter)