From affda1546172dbd2fa635b8fcf5fa9c2d49b0b5d Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Fri, 28 May 2004 04:04:04 +0000 Subject: [PATCH] * various: installation fixes svn: r3196 --- gramps2/ChangeLog | 3 + gramps2/gramps-mdk.spec | 2 +- gramps2/gramps.spec | 2 +- gramps2/src/data/Makefile.am | 14 +++- gramps2/src/data/Makefile.in | 5 +- .../data/gnome-mime-application-x-gramps.png | Bin 2670 -> 2798 bytes gramps2/src/data/gramps.applications | 7 ++ gramps2/src/data/gramps.keys | 10 +++ gramps2/src/data/gramps.mime | 3 + gramps2/src/gramps.glade | 60 ++++++++++++++++++ gramps2/src/gramps_main.py | 12 +++- 11 files changed, 111 insertions(+), 7 deletions(-) create mode 100644 gramps2/src/data/gramps.applications create mode 100644 gramps2/src/data/gramps.keys create mode 100644 gramps2/src/data/gramps.mime diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 4ec427764..2e7a8737b 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,6 @@ +2004-05-27 Don Allingham + * various: installation fixes + 2004-05-26 Don Allingham * Makefiles: updated for installation * src/data/gnome-mime-application-x-gramps.png: new icon diff --git a/gramps2/gramps-mdk.spec b/gramps2/gramps-mdk.spec index acdcd037a..09d7097c3 100644 --- a/gramps2/gramps-mdk.spec +++ b/gramps2/gramps-mdk.spec @@ -1,5 +1,5 @@ %define ver 1.1.0 -%define rel 0.CVS20040525 +%define rel 0.CVS20040526 %define prefix /usr %define localstatedir /var/lib # Ensure that internal RPM macros for configure & makeinstall diff --git a/gramps2/gramps.spec b/gramps2/gramps.spec index 583c68b13..995c8c7b3 100644 --- a/gramps2/gramps.spec +++ b/gramps2/gramps.spec @@ -1,5 +1,5 @@ %define ver 1.1.0 -%define rel 0.CVS20040525 +%define rel 0.CVS20040526 %define prefix /usr %define localstatedir /var/lib # Ensure that internal RPM macros for configure & makeinstall diff --git a/gramps2/src/data/Makefile.am b/gramps2/src/data/Makefile.am index c773bee60..000ca8142 100644 --- a/gramps2/src/data/Makefile.am +++ b/gramps2/src/data/Makefile.am @@ -6,7 +6,10 @@ pkgdata_DATA = gedcom.xml \ papersize.xml \ tips.xml \ gnome-mime-application-x-gramps.png \ - gramps.svg + gramps.applications \ + gramps.svg \ + gramps.keys \ + gramps.mime EXTRA_DIST = $(pkgdata_DATA) @@ -14,15 +17,22 @@ install-data-local: $(INSTALL) -d $(DESTDIR)$(prefix)/share/pixmaps $(INSTALL_DATA) gramps.png $(DESTDIR)$(prefix)/share/pixmaps $(INSTALL) -d $(DESTDIR)$(prefix)/share/gnome/apps/Applications - $(INSTALL_DATA) gramps.desktop $(DESTDIR)$(prefix)/share/gnome/apps/Applications + $(INSTALL_DATA) gramps.desktop $(DESTDIR)$(prefix)/share/applications $(INSTALL) -d $(DESTDIR)$(prefix)/share/icons/gnome/48x48/mimetypes/ $(INSTALL_DATA) gnome-mime-application-x-gramps.png $(DESTDIR)$(prefix)/share/icons/gnome/48x48/mimetypes/ + $(INSTALL) -d $(DESTDIR)$(prefix)/share/application-registry + $(INSTALL_DATA) gramps.applications $(DESTDIR)$(prefix)/share/application-registry $(INSTALL) -d $(DESTDIR)$(prefix)/share/mime/packages $(INSTALL_DATA) gramps.xml $(DESTDIR)$(prefix)/share/mime/packages update-mime-database $(DESTDIR)$(prefix)/share/mime + $(INSTALL) -d $(DESTDIR)$(prefix)/share/mime-info + $(INSTALL_DATA) gramps.keys gramps.mime $(DESTDIR)$(prefix)/share/mime-info uninstall-local: -rm $(DESTDIR)$(prefix)/share/pixmaps/gramps.png -rm $(DESTDIR)$(prefix)/share/gnome/apps/Applications/gramps.desktop -rm $(DESTDIR)$(prefix)/share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-gramps.png + -rm $(DESTDIR)$(prefix)/share/mime-info/gramps.keys + -rm $(DESTDIR)$(prefix)/share/mime-info/gramps.mime + -rm $(DESTDIR)$(prefix)/share/mime/packages/gramps.xml diff --git a/gramps2/src/data/Makefile.in b/gramps2/src/data/Makefile.in index 5db644715..9ee3aeb01 100644 --- a/gramps2/src/data/Makefile.in +++ b/gramps2/src/data/Makefile.in @@ -141,6 +141,7 @@ pkgdata_DATA = gedcom.xml \ papersize.xml \ tips.xml \ gnome-mime-application-x-gramps.png \ + gramps.applications\ gramps.svg EXTRA_DIST = $(pkgdata_DATA) @@ -453,9 +454,11 @@ install-data-local: $(INSTALL) -d $(DESTDIR)$(prefix)/share/pixmaps $(INSTALL_DATA) gramps.png $(DESTDIR)$(prefix)/share/pixmaps $(INSTALL) -d $(DESTDIR)$(prefix)/share/gnome/apps/Applications - $(INSTALL_DATA) gramps.desktop $(DESTDIR)$(prefix)/share/gnome/apps/Applications + $(INSTALL_DATA) gramps.desktop $(DESTDIR)$(prefix)/share/applications $(INSTALL) -d $(DESTDIR)$(prefix)/share/icons/gnome/48x48/mimetypes/ $(INSTALL_DATA) gnome-mime-application-x-gramps.png $(DESTDIR)$(prefix)/share/icons/gnome/48x48/mimetypes/ + $(INSTALL) -d $(DESTDIR)$(prefix)/share/application-registry + $(INSTALL_DATA) gramps.applications $(DESTDIR)$(prefix)/share/application-registry $(INSTALL) -d $(DESTDIR)$(prefix)/share/mime/packages $(INSTALL_DATA) gramps.xml $(DESTDIR)$(prefix)/share/mime/packages update-mime-database $(DESTDIR)$(prefix)/share/mime diff --git a/gramps2/src/data/gnome-mime-application-x-gramps.png b/gramps2/src/data/gnome-mime-application-x-gramps.png index 3ec55752b6db8816ae8a26c95bf2e745d1940952..0d8291649587045ca224427ff2044280de7b401b 100644 GIT binary patch delta 2784 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 N002ovPDHLkV1itZ9q#}D diff --git a/gramps2/src/data/gramps.applications b/gramps2/src/data/gramps.applications new file mode 100644 index 000000000..d6b54807c --- /dev/null +++ b/gramps2/src/data/gramps.applications @@ -0,0 +1,7 @@ +gramps + command=gramps + name=GRAMPS + can_open_multiple_files=false + expects_uris=false + requires_terminal=false + mime_types=application/x-gramps,application/x-gedcom diff --git a/gramps2/src/data/gramps.keys b/gramps2/src/data/gramps.keys new file mode 100644 index 000000000..6b2f90996 --- /dev/null +++ b/gramps2/src/data/gramps.keys @@ -0,0 +1,10 @@ +application/x-gramps: + description=GRAMPS database + default_action_type=appliction + short_list_application_ids=gramps + short_list_application_ids_for_novice_user_level=gramps + short_list_application_ids_for_intermediate_user_level=gramps + short_list_application_ids_for_advanced_user_level=gramps + category=Documents/Genealogy + icon-filename=/usr/share/gramps/gramps.png + open=gramps %f diff --git a/gramps2/src/data/gramps.mime b/gramps2/src/data/gramps.mime new file mode 100644 index 000000000..50d74f01c --- /dev/null +++ b/gramps2/src/data/gramps.mime @@ -0,0 +1,3 @@ +application/x-gramps + ext: grdb + diff --git a/gramps2/src/gramps.glade b/gramps2/src/gramps.glade index c05c0e323..d3f126edb 100644 --- a/gramps2/src/gramps.glade +++ b/gramps2/src/gramps.glade @@ -31390,4 +31390,64 @@ + + True + window1 + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + True + False + False + False + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + + + + True + False + 0 + + + + True + splash.jpg + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + <span size="larger">Starting GRAMPS...</span> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + diff --git a/gramps2/src/gramps_main.py b/gramps2/src/gramps_main.py index a363a45bb..c937a0f71 100755 --- a/gramps2/src/gramps_main.py +++ b/gramps2/src/gramps_main.py @@ -58,6 +58,7 @@ import FamilyView import SourceView import PeopleView import GenericFilter +import GrampsMime import DisplayTrace import const import Plugins @@ -135,12 +136,20 @@ class Gramps: GrampsCfg.loadConfig(self.pref_callback) self.RelClass = Plugins.relationship_class self.relationship = self.RelClass(self.db) + self.gtop = gtk.glade.XML(const.gladeFile, "gramps", "gramps") self.init_interface() if GrampsCfg.usetips: TipOfDay.TipOfDay() - if args: + if args and len(args)==1: + if GrampsMime.get_type(args[0]) == "application/x-gramps": + if self.auto_save_load(args[0]) == 0: + DbPrompter.DbPrompter(self,0,self.topWindow) + else: + import ArgHandler + ArgHandler.ArgHandler(self,args) + elif args: import ArgHandler ArgHandler.ArgHandler(self,args) elif GrampsCfg.lastfile and GrampsCfg.autoload: @@ -163,7 +172,6 @@ class Gramps: widgets that it will need. """ - self.gtop = gtk.glade.XML(const.gladeFile, "gramps", "gramps") self.topWindow = self.gtop.get_widget("gramps") self.report_button = self.gtop.get_widget("reports")