diff --git a/ChangeLog b/ChangeLog index c72e77bd4..17f1f1b0a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-02-25 Benny Malengier + * src/gramps_main.py: new icons, register them + * src/DateEdit.py : use icon + * src/PageView.py : use icon + * src/DisplayTabs/_AddrEmbedList.py and + src/DisplayTabs/_AttrEmbedList.py : use icon 2007-02-25 Don Allingham * src/DataViews/Makefile.am: install _NoteView.py * src/DisplayTabs/Makefile.am: install NoteModel.py diff --git a/src/DateEdit.py b/src/DateEdit.py index 8d515f97c..31bb73c95 100644 --- a/src/DateEdit.py +++ b/src/DateEdit.py @@ -120,7 +120,7 @@ class DateEdit: self.button_obj = button_obj image = gtk.Image() - image.set_from_stock('gramps-date', gtk.ICON_SIZE_BUTTON) + image.set_from_stock('gramps-date-edit', gtk.ICON_SIZE_BUTTON) self.button_obj.set_image(image) self.button_obj.set_relief(gtk.RELIEF_NORMAL) self.pixmap_obj = button_obj.get_child() diff --git a/src/DisplayTabs/_AddrEmbedList.py b/src/DisplayTabs/_AddrEmbedList.py index 094b7313d..c6fd46755 100644 --- a/src/DisplayTabs/_AddrEmbedList.py +++ b/src/DisplayTabs/_AddrEmbedList.py @@ -60,6 +60,9 @@ class AddrEmbedList(EmbeddedList): self.data = data EmbeddedList.__init__(self, dbstate, uistate, track, _('Addresses'), AddressModel) + + def get_icon_name(self): + return 'gramps-address' def get_data(self): return self.data diff --git a/src/DisplayTabs/_AttrEmbedList.py b/src/DisplayTabs/_AttrEmbedList.py index c06835f39..02f60c56d 100644 --- a/src/DisplayTabs/_AttrEmbedList.py +++ b/src/DisplayTabs/_AttrEmbedList.py @@ -65,6 +65,9 @@ class AttrEmbedList(EmbeddedList): def get_user_values(self): return self.dbstate.db.get_person_attribute_types() + def get_icon_name(self): + return 'gramps-attribute' + def get_data(self): return self.data diff --git a/src/PageView.py b/src/PageView.py index 2697c6561..05e089f1b 100644 --- a/src/PageView.py +++ b/src/PageView.py @@ -247,9 +247,9 @@ class BookMarkView(PageView): def define_actions(self): self.book_action = gtk.ActionGroup(self.title + '/Bookmark') self.book_action.add_actions([ - ('AddBook','gramps-add-bookmark', _('_Add bookmark'),'d',None, + ('AddBook','gramps-bookmark-new', _('_Add bookmark'),'d',None, self.add_bookmark), - ('EditBook','gramps-edit-bookmark', _('_Edit bookmarks'),'b',None, + ('EditBook','gramps-bookmark-edit', _('_Edit bookmarks'),'b',None, self.edit_bookmarks), ]) diff --git a/src/gramps_main.py b/src/gramps_main.py index e5d401d8f..5e73f49c4 100644 --- a/src/gramps_main.py +++ b/src/gramps_main.py @@ -64,45 +64,64 @@ from QuestionDialog import ErrorDialog def register_stock_icons (): + ''' + Add the gramps names for its icons (eg gramps-person) to the GTK icon + factory. This allows all gramps modules to call up the icons by their name + ''' + #iconpath to the base image. The front of the list has highest priority if platform.system() == "Windows": - iconpaths = [(os.path.join(const.image_dir,'48x48'),'.png'), - (const.image_dir,'.png')] + iconpaths = [ + (os.path.join(const.image_dir,'48x48'),'.png'), + (const.image_dir,'.png'), + ] else : - iconpaths = [(os.path.join(const.image_dir,'scalable'),'.svg'), - (const.image_dir,'.svg'), (const.image_dir,'.png')] + iconpaths = [ + (os.path.join(const.image_dir,'scalable'),'.svg'), + (const.image_dir,'.svg'), (const.image_dir,'.png'), + ] - #sizes: menu=16,small_toolbar=18,large_toolbar=24,button=20,dnd=32,dialog=48 - extraiconsize = [('22x22',gtk.ICON_SIZE_LARGE_TOOLBAR), - ('16x16',gtk.ICON_SIZE_MENU), - ('22x22',gtk.ICON_SIZE_BUTTON), + #sizes: menu=16, small_toolbar=18, large_toolbar=24, + # button=20, dnd=32, dialog=48 + #add to the back of this list to overrule images set at beginning of list + extraiconsize = [ + (os.path.join(const.image_dir, '22x22'), + gtk.ICON_SIZE_LARGE_TOOLBAR), + (os.path.join(const.image_dir, '16x16'), + gtk.ICON_SIZE_MENU), + (os.path.join(const.image_dir, '22x22'), + gtk.ICON_SIZE_BUTTON), ] items = [ - ('gramps-person',_('Person'),gtk.gdk.CONTROL_MASK,0,''), - ('gramps-parents',_('Add Parents'),gtk.gdk.CONTROL_MASK,0,''), - ('gramps-spouse',_('Add Spouse'),gtk.gdk.CONTROL_MASK,0,''), - ('gramps-relation',_('Relationships'),gtk.gdk.CONTROL_MASK,0,''), - ('gramps-family',_('Family'),gtk.gdk.CONTROL_MASK,0,''), - ('gramps-media',_('Media'),gtk.gdk.CONTROL_MASK,0,''), - ('gramps-pedigree',_('Pedigree'),gtk.gdk.CONTROL_MASK,0,''), - ('gramps-repository',_('Repositories'),gtk.gdk.CONTROL_MASK,0,''), - ('gramps-source',_('Sources'),gtk.gdk.CONTROL_MASK,0,''), - ('gramps-event',_('Events'),gtk.gdk.CONTROL_MASK,0,''), - ('gramps-place',_('Places'),gtk.gdk.CONTROL_MASK,0,''), - ('gramps-tools',_('Tools'),gtk.gdk.CONTROL_MASK,0,''), - ('gramps-reports',_('Reports'),gtk.gdk.CONTROL_MASK,0,''), - ('gramps-notes',_('Notes'),gtk.gdk.CONTROL_MASK,0,''), + ('gramps-address',_('Address'),gtk.gdk.CONTROL_MASK,0,''), + ('gramps-attribute',_('Attribute'),gtk.gdk.CONTROL_MASK,0,''), + #('gramps-bookmark',_('Bookmarks'),gtk.gdk.CONTROL_MASK,0,''), + #('gramps-bookmark-delete',_('Delete bookmark'),gtk.gdk.CONTROL_MASK,0,''), + ('gramps-bookmark-edit',_('Edit Bookmarks'),gtk.gdk.CONTROL_MASK,0,''), + ('gramps-bookmark-new',_('Add Bookmark'),gtk.gdk.CONTROL_MASK,0,''), + ('gramps-date',_('Date'),gtk.gdk.CONTROL_MASK,0,''), + ('gramps-date-edit',_('Edit Date'),gtk.gdk.CONTROL_MASK,0,''), + ('gramps-event',_('Events'),gtk.gdk.CONTROL_MASK,0,''), + ('gramps-family',_('Family'),gtk.gdk.CONTROL_MASK,0,''), + ('gramps-media',_('Media'),gtk.gdk.CONTROL_MASK,0,''), + ('gramps-notes',_('Notes'),gtk.gdk.CONTROL_MASK,0,''), + ('gramps-parents',_('Add Parents'),gtk.gdk.CONTROL_MASK,0,''), + ('gramps-pedigree',_('Pedigree'),gtk.gdk.CONTROL_MASK,0,''), + ('gramps-person',_('Person'),gtk.gdk.CONTROL_MASK,0,''), + ('gramps-place',_('Places'),gtk.gdk.CONTROL_MASK,0,''), + ('gramps-relation',_('Relationships'),gtk.gdk.CONTROL_MASK,0,''), + ('gramps-reports',_('Reports'),gtk.gdk.CONTROL_MASK,0,''), + ('gramps-repository',_('Repositories'),gtk.gdk.CONTROL_MASK,0,''), + ('gramps-source',_('Sources'),gtk.gdk.CONTROL_MASK,0,''), + ('gramps-spouse',_('Add Spouse'),gtk.gdk.CONTROL_MASK,0,''), + ('gramps-tools',_('Tools'),gtk.gdk.CONTROL_MASK,0,''), ] # the following icons are not yet in new directory structure # they should be ported in the near future items_legacy = [ - ('gramps-date',_('Date'),gtk.gdk.CONTROL_MASK,0,''), - ('gramps-parents',_('Add Parents'),gtk.gdk.CONTROL_MASK,0,''), ('gramps-export',_('Export'),gtk.gdk.CONTROL_MASK,0,''), ('gramps-undo-history',_('Undo History'),gtk.gdk.CONTROL_MASK,0,''), - ('gramps-add-bookmark',_('Add bookmark'),gtk.gdk.CONTROL_MASK,0,''), - ('gramps-edit-bookmark',_('Edit bookmarks'),gtk.gdk.CONTROL_MASK,0,''), ('gramps-url',_('URL'),gtk.gdk.CONTROL_MASK,0,''), ('gramps-sharefamily',_('Share Family'),gtk.gdk.CONTROL_MASK,0,''), ('gramps-viewmedia',_('View'),gtk.gdk.CONTROL_MASK,0,''), @@ -136,7 +155,7 @@ def register_stock_icons (): for size in extraiconsize : pixbuf = 0 icon_file = os.path.expanduser( - os.path.join(const.image_dir, size[0], data[0]+'.png')) + os.path.join(size[0], data[0]+'.png')) if os.path.isfile(icon_file): try: pixbuf = gtk.gdk.pixbuf_new_from_file (icon_file) diff --git a/src/images/16x16/Makefile.am b/src/images/16x16/Makefile.am index f59618d29..630ec8023 100644 --- a/src/images/16x16/Makefile.am +++ b/src/images/16x16/Makefile.am @@ -5,13 +5,23 @@ SUBDIRS = pkgdatadir = $(datadir)/@PACKAGE@/images/16x16 dist_pkgdata_DATA = \ + gramps-attribute.png \ + gramps-address.png \ + gramps-bookmark-delete.png \ + gramps-bookmark-edit.png \ + gramps-bookmark-new.png \ + gramps-bookmark.png \ + gramps-date-edit.png \ + gramps-date.png \ gramps-event.png \ gramps-family.png \ gramps-media.png \ gramps-notes.png \ + gramps-parents.png \ gramps-pedigree.png \ gramps-person.png \ gramps-place.png \ gramps-relation.png \ gramps-repository.png \ - gramps-source.png + gramps-source.png \ + gramps-spouse.png \ No newline at end of file diff --git a/src/images/16x16/gramps-address.png b/src/images/16x16/gramps-address.png new file mode 100644 index 000000000..eaeb7414d Binary files /dev/null and b/src/images/16x16/gramps-address.png differ diff --git a/src/images/16x16/gramps-attribute.png b/src/images/16x16/gramps-attribute.png new file mode 100644 index 000000000..2a598a4a6 Binary files /dev/null and b/src/images/16x16/gramps-attribute.png differ diff --git a/src/images/16x16/gramps-bookmark-delete.png b/src/images/16x16/gramps-bookmark-delete.png new file mode 100644 index 000000000..b22631450 Binary files /dev/null and b/src/images/16x16/gramps-bookmark-delete.png differ diff --git a/src/images/16x16/gramps-bookmark-edit.png b/src/images/16x16/gramps-bookmark-edit.png new file mode 100644 index 000000000..f45f8f8ef Binary files /dev/null and b/src/images/16x16/gramps-bookmark-edit.png differ diff --git a/src/images/16x16/gramps-bookmark-new.png b/src/images/16x16/gramps-bookmark-new.png new file mode 100644 index 000000000..20e181940 Binary files /dev/null and b/src/images/16x16/gramps-bookmark-new.png differ diff --git a/src/images/16x16/gramps-bookmark.png b/src/images/16x16/gramps-bookmark.png new file mode 100644 index 000000000..a76c651e0 Binary files /dev/null and b/src/images/16x16/gramps-bookmark.png differ diff --git a/src/images/16x16/gramps-date-edit.png b/src/images/16x16/gramps-date-edit.png new file mode 100644 index 000000000..7edd36291 Binary files /dev/null and b/src/images/16x16/gramps-date-edit.png differ diff --git a/src/images/16x16/gramps-date.png b/src/images/16x16/gramps-date.png new file mode 100644 index 000000000..f6978d7d3 Binary files /dev/null and b/src/images/16x16/gramps-date.png differ diff --git a/src/images/16x16/gramps-parents.png b/src/images/16x16/gramps-parents.png new file mode 100644 index 000000000..af0f178d7 Binary files /dev/null and b/src/images/16x16/gramps-parents.png differ diff --git a/src/images/16x16/gramps-spouse.png b/src/images/16x16/gramps-spouse.png new file mode 100644 index 000000000..3d5a7f3ad Binary files /dev/null and b/src/images/16x16/gramps-spouse.png differ diff --git a/src/images/22x22/Makefile.am b/src/images/22x22/Makefile.am index f98bc8d7d..458d8c765 100644 --- a/src/images/22x22/Makefile.am +++ b/src/images/22x22/Makefile.am @@ -5,13 +5,23 @@ SUBDIRS = pkgdatadir = $(datadir)/@PACKAGE@/images/22x22 dist_pkgdata_DATA = \ + gramps-attribute.png \ + gramps-address.png \ + gramps-bookmark-delete.png \ + gramps-bookmark-edit.png \ + gramps-bookmark-new.png \ + gramps-bookmark.png \ + gramps-date-edit.png \ + gramps-date.png \ gramps-event.png \ gramps-family.png \ gramps-media.png \ gramps-notes.png \ + gramps-parents.png \ gramps-pedigree.png \ gramps-person.png \ gramps-place.png \ gramps-relation.png \ gramps-repository.png \ - gramps-source.png + gramps-source.png \ + gramps-spouse.png \ No newline at end of file diff --git a/src/images/22x22/gramps-address.png b/src/images/22x22/gramps-address.png new file mode 100644 index 000000000..c8b0a6c7a Binary files /dev/null and b/src/images/22x22/gramps-address.png differ diff --git a/src/images/22x22/gramps-attribute.png b/src/images/22x22/gramps-attribute.png new file mode 100644 index 000000000..ed42cb34e Binary files /dev/null and b/src/images/22x22/gramps-attribute.png differ diff --git a/src/images/22x22/gramps-bookmark-delete.png b/src/images/22x22/gramps-bookmark-delete.png new file mode 100644 index 000000000..cfb79ab9d Binary files /dev/null and b/src/images/22x22/gramps-bookmark-delete.png differ diff --git a/src/images/22x22/gramps-bookmark-edit.png b/src/images/22x22/gramps-bookmark-edit.png new file mode 100644 index 000000000..797b8dfa5 Binary files /dev/null and b/src/images/22x22/gramps-bookmark-edit.png differ diff --git a/src/images/22x22/gramps-bookmark-new.png b/src/images/22x22/gramps-bookmark-new.png new file mode 100644 index 000000000..c360d3641 Binary files /dev/null and b/src/images/22x22/gramps-bookmark-new.png differ diff --git a/src/images/22x22/gramps-bookmark.png b/src/images/22x22/gramps-bookmark.png new file mode 100644 index 000000000..39545cb91 Binary files /dev/null and b/src/images/22x22/gramps-bookmark.png differ diff --git a/src/images/22x22/gramps-date-edit.png b/src/images/22x22/gramps-date-edit.png new file mode 100644 index 000000000..bc766da07 Binary files /dev/null and b/src/images/22x22/gramps-date-edit.png differ diff --git a/src/images/gramps-date.png b/src/images/22x22/gramps-date.png similarity index 100% rename from src/images/gramps-date.png rename to src/images/22x22/gramps-date.png diff --git a/src/images/22x22/gramps-parents.png b/src/images/22x22/gramps-parents.png new file mode 100644 index 000000000..9668ad0a8 Binary files /dev/null and b/src/images/22x22/gramps-parents.png differ diff --git a/src/images/22x22/gramps-spouse.png b/src/images/22x22/gramps-spouse.png new file mode 100644 index 000000000..f8cde7bbb Binary files /dev/null and b/src/images/22x22/gramps-spouse.png differ diff --git a/src/images/48x48/Makefile.am b/src/images/48x48/Makefile.am index 7fe5e876e..c06903817 100644 --- a/src/images/48x48/Makefile.am +++ b/src/images/48x48/Makefile.am @@ -5,6 +5,14 @@ SUBDIRS = pkgdatadir = $(datadir)/@PACKAGE@/images/48x48 dist_pkgdata_DATA = \ + gramps-attribute.png \ + gramps-address.png \ + gramps-bookmark-delete.png \ + gramps-bookmark-edit.png \ + gramps-bookmark-new.png \ + gramps-bookmark.png \ + gramps-date-edit.png \ + gramps-date.png \ gramps-event.png \ gramps-family.png \ gramps-media.png \ @@ -15,8 +23,7 @@ dist_pkgdata_DATA = \ gramps-place.png \ gramps.png \ gramps-relation.png \ - gramps-reports.png \ gramps-repository.png \ gramps-source.png \ gramps-spouse.png \ - gramps-tools.png + gramps-tools.png \ No newline at end of file diff --git a/src/images/48x48/gramps-address.png b/src/images/48x48/gramps-address.png new file mode 100644 index 000000000..fc026ad35 Binary files /dev/null and b/src/images/48x48/gramps-address.png differ diff --git a/src/images/48x48/gramps-attribute.png b/src/images/48x48/gramps-attribute.png new file mode 100644 index 000000000..2b566a19e Binary files /dev/null and b/src/images/48x48/gramps-attribute.png differ diff --git a/src/images/48x48/gramps-bookmark-delete.png b/src/images/48x48/gramps-bookmark-delete.png new file mode 100644 index 000000000..f29bedd1a Binary files /dev/null and b/src/images/48x48/gramps-bookmark-delete.png differ diff --git a/src/images/48x48/gramps-bookmark-edit.png b/src/images/48x48/gramps-bookmark-edit.png new file mode 100644 index 000000000..47e5809f9 Binary files /dev/null and b/src/images/48x48/gramps-bookmark-edit.png differ diff --git a/src/images/48x48/gramps-bookmark-new.png b/src/images/48x48/gramps-bookmark-new.png new file mode 100644 index 000000000..b0e5d597c Binary files /dev/null and b/src/images/48x48/gramps-bookmark-new.png differ diff --git a/src/images/48x48/gramps-bookmark.png b/src/images/48x48/gramps-bookmark.png new file mode 100644 index 000000000..fcd4e3421 Binary files /dev/null and b/src/images/48x48/gramps-bookmark.png differ diff --git a/src/images/48x48/gramps-date-edit.png b/src/images/48x48/gramps-date-edit.png new file mode 100644 index 000000000..5b2cb4525 Binary files /dev/null and b/src/images/48x48/gramps-date-edit.png differ diff --git a/src/images/48x48/gramps-date.png b/src/images/48x48/gramps-date.png new file mode 100644 index 000000000..0fef6ff52 Binary files /dev/null and b/src/images/48x48/gramps-date.png differ diff --git a/src/images/48x48/gramps-parents.png b/src/images/48x48/gramps-parents.png index fc78c0864..b4243c5ef 100644 Binary files a/src/images/48x48/gramps-parents.png and b/src/images/48x48/gramps-parents.png differ diff --git a/src/images/48x48/gramps-spouse.png b/src/images/48x48/gramps-spouse.png index f79a160f3..2ebd1fa30 100644 Binary files a/src/images/48x48/gramps-spouse.png and b/src/images/48x48/gramps-spouse.png differ diff --git a/src/images/Makefile.am b/src/images/Makefile.am index af95fcf2c..392ff0ed2 100644 --- a/src/images/Makefile.am +++ b/src/images/Makefile.am @@ -60,13 +60,7 @@ dist_pkgdata_DATA = \ gramps.png\ locked.png\ logo.png\ - gramps-parents.svg\ splash.jpg\ - gramps-add-bookmark.png\ - gramps-date.png\ - stock_bookmark.png\ - stock_delete-bookmark.png\ - gramps-edit-bookmark.png\ gramps-export.png\ gramps-url.png\ stock_new-html.png\ diff --git a/src/images/gramps-add-bookmark.png b/src/images/gramps-add-bookmark.png deleted file mode 100644 index cf3295281..000000000 Binary files a/src/images/gramps-add-bookmark.png and /dev/null differ diff --git a/src/images/gramps-edit-bookmark.png b/src/images/gramps-edit-bookmark.png deleted file mode 100644 index 9164a2067..000000000 Binary files a/src/images/gramps-edit-bookmark.png and /dev/null differ diff --git a/src/images/scalable/Makefile.am b/src/images/scalable/Makefile.am index acc1bc42d..40672c6f2 100644 --- a/src/images/scalable/Makefile.am +++ b/src/images/scalable/Makefile.am @@ -5,18 +5,25 @@ SUBDIRS = pkgdatadir = $(datadir)/@PACKAGE@/images/scalable dist_pkgdata_DATA = \ - gramps-event.svg \ - gramps-family.svg \ - gramps-media.svg \ - gramps-notes.svg \ - gramps-parents.svg \ - gramps-pedigree.svg \ - gramps-person.svg \ - gramps-place.svg \ - gramps.svg \ - gramps-relation.svg \ - gramps-reports.svg \ - gramps-repository.svg \ - gramps-source.svg \ - gramps-spouse.svg \ - gramps-tools.svg + gramps-attribute.png \ + gramps-address.png \ + gramps-bookmark-delete.png \ + gramps-bookmark-edit.png \ + gramps-bookmark-new.png \ + gramps-bookmark.png \ + gramps-date-edit.png \ + gramps-date.png \ + gramps-event.png \ + gramps-family.png \ + gramps-media.png \ + gramps-notes.png \ + gramps-parents.png \ + gramps-pedigree.png \ + gramps-person.png \ + gramps-place.png \ + gramps.png \ + gramps-relation.png \ + gramps-repository.png \ + gramps-source.png \ + gramps-spouse.png \ + gramps-tools.png \ No newline at end of file diff --git a/src/images/scalable/gramps-address.svg b/src/images/scalable/gramps-address.svg new file mode 100644 index 000000000..de84fdd39 --- /dev/null +++ b/src/images/scalable/gramps-address.svg @@ -0,0 +1,423 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Mail Reply + + + Garrett LeSage + + + + + Jakub Steiner, Andreas Nilsson + + + + + + mail + e-mail + reply + sender + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/images/scalable/gramps-attribute.svg b/src/images/scalable/gramps-attribute.svg new file mode 100644 index 000000000..fa2cb2858 --- /dev/null +++ b/src/images/scalable/gramps-attribute.svg @@ -0,0 +1,557 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + attribute + + + attribute id-card + + + + + + Jakub Steiner, B. Malengier + + + http://jimmac.musichall.cz + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/images/scalable/gramps-bookmark-delete.svg b/src/images/scalable/gramps-bookmark-delete.svg new file mode 100644 index 000000000..c6594906b --- /dev/null +++ b/src/images/scalable/gramps-bookmark-delete.svg @@ -0,0 +1,514 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Delete Bookmark + + + text + plaintext + regular + document + + + + + + Andreas Nilsson, B. Malengier + + + http://www.gnome.org + + + Luca Ferretti +Jakub Steiner +Lapo Calamandrei + + + January 2007 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/images/scalable/gramps-bookmark-edit.svg b/src/images/scalable/gramps-bookmark-edit.svg new file mode 100644 index 000000000..52b4a9751 --- /dev/null +++ b/src/images/scalable/gramps-bookmark-edit.svg @@ -0,0 +1,566 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Edit Bookmark + + + text + plaintext + regular + document + + + + + + Andreas Nilsson B. Malengier + + + http://www.gnome.org + + + Luca Ferretti +Jakub Steiner +Lapo Calamandrei + + + December 2006 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/images/scalable/gramps-bookmark-new.svg b/src/images/scalable/gramps-bookmark-new.svg new file mode 100644 index 000000000..c22ee1121 --- /dev/null +++ b/src/images/scalable/gramps-bookmark-new.svg @@ -0,0 +1,495 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + New Bookmark + + + text + plaintext + regular + document + + + + + + Andreas Nilsson + + + http://www.gnome.org + + + Luca Ferretti +Jakub Steiner +Lapo Calamandrei + + + December 2006 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/images/scalable/gramps-bookmark.svg b/src/images/scalable/gramps-bookmark.svg new file mode 100644 index 000000000..6d03460b0 --- /dev/null +++ b/src/images/scalable/gramps-bookmark.svg @@ -0,0 +1,469 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Bookmark + + + text + plaintext + regular + document + + + + + + Andreas Nilsson + + + http://www.gnome.org + + + Luca Ferretti +Jakub Steiner +Lapo Calamandrei + + + December 2006 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/images/scalable/gramps-date-edit.svg b/src/images/scalable/gramps-date-edit.svg new file mode 100644 index 000000000..ca58707cd --- /dev/null +++ b/src/images/scalable/gramps-date-edit.svg @@ -0,0 +1,1119 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/images/scalable/gramps-date.svg b/src/images/scalable/gramps-date.svg new file mode 100644 index 000000000..2edc84a10 --- /dev/null +++ b/src/images/scalable/gramps-date.svg @@ -0,0 +1,913 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/images/scalable/gramps-parents.svg b/src/images/scalable/gramps-parents.svg index e5d642ae2..9dd58e86a 100644 --- a/src/images/scalable/gramps-parents.svg +++ b/src/images/scalable/gramps-parents.svg @@ -7,17 +7,131 @@ xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="48px" height="48px" id="svg2108" sodipodi:version="0.32" - inkscape:version="0.44" - sodipodi:docbase="/home/dona/gramps-svn/src/images" - sodipodi:docname="parents.svg"> + inkscape:version="0.43" + sodipodi:docbase="/home/benny/programms/gramps/myicons/scalable" + sodipodi:docname="gramps-parents_2.svg"> + + + + + + + + + + + + + + + + + @@ -382,6 +496,98 @@ y1="36.390400" x2="21.408455" y2="35.739632" /> + + + + + + + + + + inkscape:window-height="814" + inkscape:window-x="66" + inkscape:window-y="57" /> @@ -622,82 +828,92 @@ id="g2292" transform="translate(-8.237686,3.795331)"> + id="g3540" + transform="matrix(0.63351,0,0,0.63351,29.8034,-3.50389)"> + id="path3514" + d="M -9.2855096,53.742947 L -3.4049346,53.742947 L -6.8352696,50.707924 L -7.5703416,51.641777 L -8.3054146,50.941387 L -9.2855096,53.742947 z " + style="color:#000000;fill:url(#linearGradient3573);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> - + d="M 39.774755 19.008621 A 8.6620579 8.6620579 0 1 1 22.45064,19.008621 A 8.6620579 8.6620579 0 1 1 39.774755 19.008621 z" + sodipodi:ry="8.6620579" + sodipodi:rx="8.6620579" + sodipodi:cy="19.008621" + sodipodi:cx="31.112698" + id="path3518" + style="color:#000000;fill:url(#radialGradient3577);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + sodipodi:type="arc" + transform="matrix(2.460972,0,0,1.266762,-74.20479,42.83012)" /> + id="path3520" + d="M -4.5697286,73.026546 L 10.131711,73.026546 C 14.297119,73.026546 18.421051,71.57126 19.93267,67.423426 C 21.368133,63.484565 20.177694,55.983723 10.866783,49.913676 L -6.5299206,49.913676 C -15.840832,55.516795 -17.004402,63.179563 -14.860736,67.656888 C -12.676859,72.218198 -8.9801606,73.026546 -4.5697286,73.026546 z " + style="color:#000000;fill:url(#radialGradient3579);fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:1.35297143px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> + + style="opacity:0.21518986;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.35297108px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + d="M -4.6685716,71.65027 L 9.8760284,71.621087 C 13.534855,71.621087 17.15725,70.342787 18.485033,66.699397 C 19.745921,63.239564 18.353742,56.650944 10.175186,51.319113 L -5.7988316,50.998101 C -13.977387,55.919791 -15.56036,62.650644 -13.646771,66.904467 C -11.733181,71.158289 -8.9407886,71.621087 -4.6685716,71.65027 z " + id="path3526" + sodipodi:nodetypes="cczcczc" /> + + id="path3532" + style="color:#000000;fill:url(#radialGradient3585);fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + sodipodi:type="arc" /> + transform="matrix(1.215711,0,0,1.158351,-35.28805,21.1246)" + sodipodi:type="arc" + style="opacity:0.19620254;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.14012825px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + id="path3534" + sodipodi:cx="31.112698" + sodipodi:cy="19.008621" + sodipodi:rx="8.6620579" + sodipodi:ry="8.6620579" + d="M 39.774755 19.008621 A 8.6620579 8.6620579 0 1 1 22.45064,19.008621 A 8.6620579 8.6620579 0 1 1 39.774755 19.008621 z" /> + id="path3536" + d="M -10.300254,71.889659 C -12.029518,71.169936 -12.803478,69.435492 -12.803478,69.435492 C -11.637409,64.061515 -7.6474206,60.12978 -7.6474206,60.12978 C -7.6474206,60.12978 -10.806708,68.597262 -10.300254,71.889659 z " + style="opacity:0.22784807;color:#000000;fill:url(#linearGradient3587);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> + diff --git a/src/images/scalable/gramps-spouse.svg b/src/images/scalable/gramps-spouse.svg index d39034bdb..4fc2abf8d 100644 --- a/src/images/scalable/gramps-spouse.svg +++ b/src/images/scalable/gramps-spouse.svg @@ -7,17 +7,101 @@ xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="48px" height="48px" id="svg2108" sodipodi:version="0.32" - inkscape:version="0.44" - sodipodi:docbase="/home/dona/gramps-svn/src/images" - sodipodi:docname="spouse.svg"> + inkscape:version="0.43" + sodipodi:docbase="/home/benny/programms/gramps/myicons" + sodipodi:docname="gramps-spouse_2.svg"> + + + + + + + + + + + + + + @@ -30,37 +114,15 @@ offset="1" id="stop4360" /> - - - - - - - - - - + cx="31.112698" + cy="19.008621" + fx="31.112698" + fy="19.008621" + r="8.6620579" /> + - - - - - - + + + + + inkscape:window-width="755" + inkscape:window-height="814" + inkscape:window-x="389" + inkscape:window-y="67" /> @@ -378,10 +410,16 @@ id="layer1" inkscape:label="cipek" inkscape:groupmode="layer" + style="display:inline" /> + + style="display:inline" + id="g8831" + transform="translate(-0.112686,0.42033)"> + transform="matrix(1.77551,0,0,0.959183,-40.25322,16.02153)" /> + d="M 9.986174,38.886039 L 20.592776,38.886039 C 23.59798,38.886039 26.57326,37.784107 27.663843,34.643398 C 28.699482,31.660922 27.84062,25.98134 21.123106,21.385146 L 8.57196,21.385146 C 1.854446,25.627786 1.014969,31.429977 2.561553,34.820174 C 4.137148,38.273964 6.804193,38.886039 9.986174,38.886039 z " + style="color:#000000;fill:url(#radialGradient1412);fill-opacity:1;fill-rule:evenodd;stroke:#404604;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> + d="M 16.035795,24.036797 C 16.035795,24.036797 18.187118,25.697132 18.001786,27.69733 C 20.043012,25.896536 20.101659,22.445806 20.101659,22.445806 L 16.035795,24.036797 z " + style="color:#000000;fill:#9db029;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> - + d="M 5.6729535,37.851747 C 4.4253465,37.306778 3.8669595,35.99347 3.8669595,35.99347 C 4.7082405,31.924334 7.586885,28.947254 7.586885,28.947254 C 7.586885,28.947254 5.3075635,35.358768 5.6729535,37.851747 z " + style="opacity:0.22784807;color:#000000;fill:url(#linearGradient1400);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> - - + id="g3992" + transform="matrix(0.7244,0,0,0.7244,15.87825,7.849471)"> - + style="color:#000000;fill:url(#linearGradient4020);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + d="M 12.402006,24.298421 L 18.282581,24.298421 L 14.852246,21.263398 L 14.117174,22.197251 L 13.382101,21.496861 L 12.402006,24.298421 z " + id="path3994" /> + id="path3996" + d="M 19.15182,31.837791 C 20.858414,31.070512 21.652808,29.19339 21.652808,29.19339 C 20.323405,23.853951 16.141607,20.156295 16.141607,20.156295 C 16.141607,20.156295 19.557693,28.532766 19.15182,31.837791 z " + style="opacity:0.22784807;color:#000000;fill:url(#linearGradient4022);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> + transform="matrix(2.460972,0,0,1.266762,-52.51728,13.38559)" + sodipodi:type="arc" + style="color:#000000;fill:url(#radialGradient4024);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + id="path3998" + sodipodi:cx="31.112698" + sodipodi:cy="19.008621" + sodipodi:rx="8.6620579" + sodipodi:ry="8.6620579" + d="M 39.774755 19.008621 A 8.6620579 8.6620579 0 1 1 22.45064,19.008621 A 8.6620579 8.6620579 0 1 1 39.774755 19.008621 z" /> + style="color:#000000;fill:url(#linearGradient4028);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + d="M 18.097884,22.57032 C 22.508315,26.305733 24.468507,39.846607 24.468507,39.846607 C 24.468507,39.846607 26.428698,26.305734 29.859035,22.336858 L 18.097884,22.57032 z " + id="path4002" + sodipodi:nodetypes="cccc" /> + sodipodi:nodetypes="cccc" + id="path4004" + d="M 21.257336,23.971101 C 21.257336,23.971101 18.275462,26.163852 18.532344,28.80545 C 15.703072,26.427199 15.621784,21.86993 15.621784,21.86993 L 21.257336,23.971101 z " + style="color:#000000;fill:#babdb6;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> + + - + + d="M 39.774755 19.008621 A 8.6620579 8.6620579 0 1 1 22.45064,19.008621 A 8.6620579 8.6620579 0 1 1 39.774755 19.008621 z" + transform="matrix(1.386065,0,0,1.320668,-18.90074,-11.40536)" /> + + - + id="path4018" + d="M 37.591801,41.311537 C 39.298395,40.544258 40.092789,38.667135 40.092789,38.667135 C 38.763386,33.327697 34.581588,29.630041 34.581588,29.630041 C 34.581588,29.630041 37.997674,38.006512 37.591801,41.311537 z " + style="opacity:0.22784807;color:#000000;fill:url(#linearGradient4036);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> diff --git a/src/images/stock_bookmark.png b/src/images/stock_bookmark.png deleted file mode 100644 index df496d22a..000000000 Binary files a/src/images/stock_bookmark.png and /dev/null differ diff --git a/src/images/stock_delete-bookmark.png b/src/images/stock_delete-bookmark.png deleted file mode 100644 index 4a8a3ccdb..000000000 Binary files a/src/images/stock_delete-bookmark.png and /dev/null differ