diff --git a/ChangeLog b/ChangeLog index a1c239c4b..2f76c3965 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2007-04-17 Benny Malengier + * src/images/ + * src/GrampsWidgets.py + * src/glade/gramps.glade + * src/glade/edit_person.glade + * src/DisplayTabs/_NoteTab.py + Added new icons for lock, unlock, viewmedia, and start using them. + Removed old lock and view icons. + 2007-04-16 Martin Hawlisch * src/ViewManager.py (create_pages): fix off-by-one error when preselecting last view diff --git a/src/DisplayTabs/_NoteTab.py b/src/DisplayTabs/_NoteTab.py index 95e338511..c5543060b 100644 --- a/src/DisplayTabs/_NoteTab.py +++ b/src/DisplayTabs/_NoteTab.py @@ -119,6 +119,9 @@ class NoteTab(EmbeddedList): self.edit_callback) except Errors.WindowActiveError: pass + + def get_icon_name(self): + return 'gramps-notes' def edit_callback(self, name): self.changed = True diff --git a/src/GrampsWidgets.py b/src/GrampsWidgets.py index a35992ea7..edd87202a 100644 --- a/src/GrampsWidgets.py +++ b/src/GrampsWidgets.py @@ -66,8 +66,7 @@ from DdTargets import DdTargets # Constants # #------------------------------------------------------------------------- -_lock_path = os.path.join(const.image_dir, 'stock_lock.png') -_lock_open_path = os.path.join(const.image_dir, 'stock_lock-open.png') + # STOCK_INFO was added only in Gtk 2.8 try: @@ -306,12 +305,12 @@ class PrivacyButton: image = gtk.Image() if obj.get_active(): # image.set_from_icon_name('stock_lock', gtk.ICON_SIZE_MENU) - image.set_from_file(_lock_path) + image.set_from_stock('gramps-lock', gtk.ICON_SIZE_MENU) self.tooltips.set_tip(obj, _('Record is private')) self.obj.set_privacy(True) else: # image.set_from_icon_name('stock_lock-open', gtk.ICON_SIZE_MENU) - image.set_from_file(_lock_open_path) + image.set_from_stock('gramps-unlock', gtk.ICON_SIZE_MENU) self.tooltips.set_tip(obj, _('Record is public')) self.obj.set_privacy(False) image.show() diff --git a/src/glade/edit_person.glade b/src/glade/edit_person.glade index 810b1e94b..15a9f331a 100644 --- a/src/glade/edit_person.glade +++ b/src/glade/edit_person.glade @@ -589,7 +589,7 @@ True 4 - stock_lock-open + gramps-unlock 0.5 0.5 0 diff --git a/src/glade/gramps.glade b/src/glade/gramps.glade index 91f004b7a..9b55594a5 100644 --- a/src/glade/gramps.glade +++ b/src/glade/gramps.glade @@ -368,7 +368,7 @@ True 4 - stock_lock-open + gramps-unlock 0.5 0.5 0 @@ -1360,7 +1360,7 @@ True 4 - stock_lock-open + gramps-unlock 0.5 0.5 0 @@ -1691,7 +1691,7 @@ True 4 - stock_lock-open + gramps-unlock 0.5 0.5 0 @@ -5800,7 +5800,7 @@ True 4 - stock_lock-open + gramps-unlock 0.5 0.5 0 @@ -6917,7 +6917,7 @@ True 4 - stock_lock-open + gramps-unlock 0.5 0.5 0 @@ -10168,7 +10168,7 @@ True 4 - stock_lock-open + gramps-unlock 0.5 0.5 0 @@ -10379,7 +10379,7 @@ True 1 - stock_lock-open + gramps-unlock 0.5 0.5 0 @@ -10913,7 +10913,7 @@ True 1 - stock_lock-open + gramps-unlock 0.5 0.5 0 @@ -11319,7 +11319,7 @@ True 4 - stock_lock-open + gramps-unlock 0.5 0.5 0 @@ -11745,7 +11745,7 @@ Very High True 4 - stock_lock-open + gramps-unlock 0.5 0.5 0 @@ -12379,7 +12379,7 @@ Very High True 4 - stock_lock-open + gramps-unlock 0.5 0.5 0 diff --git a/src/gramps_main.py b/src/gramps_main.py index 67ac11ae5..d26c84c0c 100644 --- a/src/gramps_main.py +++ b/src/gramps_main.py @@ -105,7 +105,9 @@ def register_stock_icons (): ('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-lock',_('Public'),gtk.gdk.CONTROL_MASK,0,''), ('gramps-media',_('Media'),gtk.gdk.CONTROL_MASK,0,''), + ('gramps-media-all',_('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,''), @@ -117,6 +119,8 @@ def register_stock_icons (): ('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,''), + ('gramps-unlock',_('Private'),gtk.gdk.CONTROL_MASK,0,''), + ('gramps-viewmedia',_('View'),gtk.gdk.CONTROL_MASK,0,''), ] # the following icons are not yet in new directory structure # they should be ported in the near future @@ -125,7 +129,6 @@ def register_stock_icons (): ('gramps-undo-history',_('Undo History'),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,''), ] # Register our stock items diff --git a/src/images/16x16/gramps-lock.png b/src/images/16x16/gramps-lock.png new file mode 100644 index 000000000..04ddd632f Binary files /dev/null and b/src/images/16x16/gramps-lock.png differ diff --git a/src/images/16x16/gramps-media-all.png b/src/images/16x16/gramps-media-all.png new file mode 100644 index 000000000..9daf5fe16 Binary files /dev/null and b/src/images/16x16/gramps-media-all.png differ diff --git a/src/images/16x16/gramps-unlock.png b/src/images/16x16/gramps-unlock.png new file mode 100644 index 000000000..2c2330889 Binary files /dev/null and b/src/images/16x16/gramps-unlock.png differ diff --git a/src/images/22x22/gramps-lock.png b/src/images/22x22/gramps-lock.png new file mode 100644 index 000000000..80a0272f4 Binary files /dev/null and b/src/images/22x22/gramps-lock.png differ diff --git a/src/images/22x22/gramps-media-all.png b/src/images/22x22/gramps-media-all.png new file mode 100644 index 000000000..e8354ed3e Binary files /dev/null and b/src/images/22x22/gramps-media-all.png differ diff --git a/src/images/22x22/gramps-unlock.png b/src/images/22x22/gramps-unlock.png new file mode 100644 index 000000000..2db59cf44 Binary files /dev/null and b/src/images/22x22/gramps-unlock.png differ diff --git a/src/images/48x48/gramps-lock.png b/src/images/48x48/gramps-lock.png new file mode 100644 index 000000000..4831a504f Binary files /dev/null and b/src/images/48x48/gramps-lock.png differ diff --git a/src/images/48x48/gramps-media-all.png b/src/images/48x48/gramps-media-all.png new file mode 100644 index 000000000..9c2a566f1 Binary files /dev/null and b/src/images/48x48/gramps-media-all.png differ diff --git a/src/images/48x48/gramps-unlock.png b/src/images/48x48/gramps-unlock.png new file mode 100644 index 000000000..78e1403fa Binary files /dev/null and b/src/images/48x48/gramps-unlock.png differ diff --git a/src/images/48x48/gramps-viewmedia.png b/src/images/48x48/gramps-viewmedia.png new file mode 100644 index 000000000..190faadbb Binary files /dev/null and b/src/images/48x48/gramps-viewmedia.png differ diff --git a/src/images/gramps-viewmedia.png b/src/images/gramps-viewmedia.png deleted file mode 100644 index 5ba0ab109..000000000 Binary files a/src/images/gramps-viewmedia.png and /dev/null differ diff --git a/src/images/locked.png b/src/images/locked.png deleted file mode 100644 index ece23ef62..000000000 Binary files a/src/images/locked.png and /dev/null differ diff --git a/src/images/scalable/gramps-lock.svg b/src/images/scalable/gramps-lock.svg new file mode 100644 index 000000000..69f0614a7 --- /dev/null +++ b/src/images/scalable/gramps-lock.svg @@ -0,0 +1,416 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Lock + + + Luca Ferretti <elle.uca@libero.it> + + + + + + monitor + display + video + screen + LCD + CRT + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/images/scalable/gramps-media-all.svg b/src/images/scalable/gramps-media-all.svg new file mode 100644 index 000000000..61d9e3891 --- /dev/null +++ b/src/images/scalable/gramps-media-all.svg @@ -0,0 +1,1027 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + Emblem Photos + + + Jakub Steiner + + + + + emblem + photos + pictures + raw + jpeg + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/images/scalable/gramps-unlock.svg b/src/images/scalable/gramps-unlock.svg new file mode 100644 index 000000000..fc0f9986a --- /dev/null +++ b/src/images/scalable/gramps-unlock.svg @@ -0,0 +1,413 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Lock + + + Luca Ferretti <elle.uca@libero.it> + + + + + + monitor + display + video + screen + LCD + CRT + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/images/scalable/gramps-viewmedia.svg b/src/images/scalable/gramps-viewmedia.svg new file mode 100644 index 000000000..bbf15a4aa --- /dev/null +++ b/src/images/scalable/gramps-viewmedia.svg @@ -0,0 +1,701 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner, B. Malengier + + + http://jimmac.musichall.cz + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/images/stock_lock-open.png b/src/images/stock_lock-open.png deleted file mode 100644 index 5bc6cd62b..000000000 Binary files a/src/images/stock_lock-open.png and /dev/null differ diff --git a/src/images/stock_lock.png b/src/images/stock_lock.png deleted file mode 100644 index 33091eb85..000000000 Binary files a/src/images/stock_lock.png and /dev/null differ