diff --git a/Makefile.in b/Makefile.in index c86eceed4..ffa4413fd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -100,6 +100,7 @@ RELEASE = @RELEASE@ SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ STRIP = @STRIP@ +SWIG = @SWIG@ VERSION = @VERSION@ VERSIONSTRING = @VERSIONSTRING@ ZIP = @ZIP@ diff --git a/configure b/configure index 7fbefa128..8d331ddcc 100755 --- a/configure +++ b/configure @@ -1441,7 +1441,7 @@ fi # Define the identity of the package. PACKAGE=gramps - VERSION=0.9.0pre1 + VERSION=0.9.0pre2 cat >>confdefs.h <<_ACEOF @@ -1834,6 +1834,45 @@ else echo "${ECHO_T}no" >&6 fi +# Extract the first word of "swig", so it can be a program name with args. +set dummy swig; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_SWIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $SWIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_SWIG="$SWIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_SWIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + ;; +esac +fi +SWIG=$ac_cv_path_SWIG + +if test -n "$SWIG"; then + echo "$as_me:$LINENO: result: $SWIG" >&5 +echo "${ECHO_T}$SWIG" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[:3]"` @@ -4542,6 +4581,7 @@ s,@pkgpythondir@,$pkgpythondir,;t t s,@pyexecdir@,$pyexecdir,;t t s,@pkgpyexecdir@,$pkgpyexecdir,;t t s,@BINSH@,$BINSH,;t t +s,@SWIG@,$SWIG,;t t s,@PYTHON22@,$PYTHON22,;t t s,@ZIP@,$ZIP,;t t s,@CC@,$CC,;t t diff --git a/configure.in b/configure.in index 8cbd1c578..30be3da82 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. dnl May need to run automake && aclocal first AC_INIT(src/gramps.py) -AM_INIT_AUTOMAKE(gramps, 0.9.0pre1) +AM_INIT_AUTOMAKE(gramps, 0.9.0pre2) RELEASE=rc4 VERSIONSTRING=$VERSION @@ -42,6 +42,7 @@ pkgpythondir=\${prefix}/share/\${PACKAGE} pkgpyexecdir=\${prefix}/share/\${PACKAGE} AC_PATH_PROG(BINSH, sh) +AC_PATH_PROG(SWIG, swig) changequote(<<, >>)dnl PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[:3]"` @@ -261,8 +262,8 @@ dnl ====================================================== dnl == end of modern doc tests dnl ====================================================== - AC_SUBST(BINSH) +AC_SUBST(SWIG) AC_SUBST(PYTHON) AC_SUBST(PYTHON_VERSION) AC_SUBST(GNOMEHELP) diff --git a/doc/Makefile.in b/doc/Makefile.in index c22f74458..4a037eb8d 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -100,6 +100,7 @@ RELEASE = @RELEASE@ SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ STRIP = @STRIP@ +SWIG = @SWIG@ VERSION = @VERSION@ VERSIONSTRING = @VERSIONSTRING@ ZIP = @ZIP@ diff --git a/doc/extending-gramps/C/Makefile.in b/doc/extending-gramps/C/Makefile.in index 120e67d36..d2a978f47 100644 --- a/doc/extending-gramps/C/Makefile.in +++ b/doc/extending-gramps/C/Makefile.in @@ -98,6 +98,7 @@ RELEASE = @RELEASE@ SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ STRIP = @STRIP@ +SWIG = @SWIG@ VERSION = @VERSION@ VERSIONSTRING = @VERSIONSTRING@ ZIP = @ZIP@ diff --git a/doc/extending-gramps/Makefile.in b/doc/extending-gramps/Makefile.in index 8452bf2e6..db6eb050e 100644 --- a/doc/extending-gramps/Makefile.in +++ b/doc/extending-gramps/Makefile.in @@ -100,6 +100,7 @@ RELEASE = @RELEASE@ SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ STRIP = @STRIP@ +SWIG = @SWIG@ VERSION = @VERSION@ VERSIONSTRING = @VERSIONSTRING@ ZIP = @ZIP@ diff --git a/doc/gramps-manual/C/Makefile.in b/doc/gramps-manual/C/Makefile.in index b6a9fa6c5..e9854f8b2 100644 --- a/doc/gramps-manual/C/Makefile.in +++ b/doc/gramps-manual/C/Makefile.in @@ -132,6 +132,7 @@ RELEASE = @RELEASE@ SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ STRIP = @STRIP@ +SWIG = @SWIG@ VERSION = @VERSION@ VERSIONSTRING = @VERSIONSTRING@ ZIP = @ZIP@ diff --git a/doc/gramps-manual/Makefile.in b/doc/gramps-manual/Makefile.in index c7bdf4be5..9d682321c 100644 --- a/doc/gramps-manual/Makefile.in +++ b/doc/gramps-manual/Makefile.in @@ -100,6 +100,7 @@ RELEASE = @RELEASE@ SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ STRIP = @STRIP@ +SWIG = @SWIG@ VERSION = @VERSION@ VERSIONSTRING = @VERSIONSTRING@ ZIP = @ZIP@ diff --git a/doc/gramps.1 b/doc/gramps.1 index 326bc4e93..9b5b1bb1f 100644 --- a/doc/gramps.1 +++ b/doc/gramps.1 @@ -1,4 +1,4 @@ -.TH gramps 1 "0.9.0pre1" "man page by Brandon L. Griffith" "" +.TH gramps 1 "0.9.0pre2" "man page by Brandon L. Griffith" "" .SH "NAME" .LP gramps \- Genealogical Research and Analysis Management Programming System diff --git a/gramps.spec b/gramps.spec index ae1e06bfa..19908a7ce 100644 --- a/gramps.spec +++ b/gramps.spec @@ -1,4 +1,4 @@ -%define ver 0.9.0pre1 +%define ver 0.9.0pre2 %define rel rc4 %define prefix /usr diff --git a/omf-install/Makefile.in b/omf-install/Makefile.in index c95086f1e..449abfc44 100644 --- a/omf-install/Makefile.in +++ b/omf-install/Makefile.in @@ -98,6 +98,7 @@ RELEASE = @RELEASE@ SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ STRIP = @STRIP@ +SWIG = @SWIG@ VERSION = @VERSION@ VERSIONSTRING = @VERSIONSTRING@ ZIP = @ZIP@ diff --git a/src/GrampsCfg.py b/src/GrampsCfg.py index 27d92ad13..95aac9a80 100644 --- a/src/GrampsCfg.py +++ b/src/GrampsCfg.py @@ -121,13 +121,11 @@ pprefix = "P" fprefix = "F" autoload = 0 autosave_int = 0 -usetabs = 0 uselds = 0 autocomp = 1 usevc = 0 vc_comment = 0 uncompress = 0 -show_detail = 0 hide_altnames = 0 lastfile = None nameof = Utils.normal_name @@ -143,7 +141,6 @@ lastnamegen = None report_dir = "./" web_dir = "./" db_dir = "./" -id_visible = 0 id_edit = 0 index_visible = 0 mediaref = 1 @@ -191,7 +188,6 @@ def make_path(path): def loadConfig(call): global autoload global autosave_int - global usetabs global uselds global autocomp global calendar @@ -199,10 +195,8 @@ def loadConfig(call): global iprefix, fprefix, pprefix, oprefix, sprefix global vc_comment global uncompress - global id_visible global id_edit global index_visible - global show_detail global hide_altnames global lastfile global nameof @@ -225,7 +219,6 @@ def loadConfig(call): _callback = call lastfile = get_string("/gramps/data/LastFile") - usetabs = get_bool("/gramps/config/UseTabs") uselds = get_bool("/gramps/config/UseLDS") ac = get_bool("/gramps/config/DisableAutoComplete",0) mediaref = get_bool("/gramps/config/MakeReference",1) @@ -235,10 +228,8 @@ def loadConfig(call): usevc = get_bool("/gramps/config/UseVersionControl") vc_comment = get_bool("/gramps/config/UseComment") uncompress = get_bool("/gramps/config/DontCompressXML") - id_visible = get_bool("/gramps/config/IdVisible") id_edit = get_bool("/gramps/config/IdEdit") index_visible = get_bool("/gramps/config/IndexVisible") - show_detail = get_bool("/gramps/config/ShowDetail") status_bar = get_int("/gramps/config/StatusBar") toolbar = get_int("/gramps/config/ToolBar",2) display_attr = get_bool("/gramps/config/DisplayAttr") @@ -583,10 +574,8 @@ class GrampsPreferences: def build(self): auto = self.top.get_widget("autoload") asave_int = self.top.get_widget("autosave_interval") - vis = self.top.get_widget("gid_visible") idedit = self.top.get_widget("gid_edit") index_vis = self.top.get_widget("show_child_id") - tabs = self.top.get_widget("usetabs") lds = self.top.get_widget("uselds") ac = self.top.get_widget("autocomp") mr = self.top.get_widget("mediaref") @@ -603,8 +592,6 @@ class GrampsPreferences: auto.set_active(autoload) asave_int.set_value(int(autosave_int)) - detail.set_active(show_detail) - tabs.set_active(usetabs) lds.set_active(uselds) ac.set_active(autocomp) if mediaref: @@ -617,7 +604,6 @@ class GrampsPreferences: vc.set_active(usevc) vcom.set_active(vc_comment) compress.set_active(uncompress) - vis.set_active(id_visible) idedit.set_active(id_edit) index_vis.set_active(index_visible) @@ -829,7 +815,6 @@ class GrampsPreferences: def on_propertybox_apply(self,obj): global nameof - global usetabs global uselds global autocomp global autosave_int @@ -845,7 +830,6 @@ class GrampsPreferences: global oprefix global vc_comment global uncompress - global id_visible global id_edit global index_visible global status_bar @@ -856,19 +840,16 @@ class GrampsPreferences: global paper_preference global output_preference global goutput_preference - global show_detail global report_dir global web_dir global db_dir global lastnamegen global autoload - show_detail = self.top.get_widget("showdetail").get_active() autoload = self.top.get_widget("autoload").get_active() autosave_int = self.top.get_widget("autosave_interval").get_value_as_int() display_attr = self.top.get_widget("attr_display").get_active() attr_name = string.strip(self.top.get_widget("attr_name").get_text()) - usetabs = self.top.get_widget("usetabs").get_active() uselds = self.top.get_widget("uselds").get_active() autocomp = self.top.get_widget("autocomp").get_active() mediaref = self.top.get_widget("mediaref").get_active() @@ -878,7 +859,6 @@ class GrampsPreferences: usevc = self.top.get_widget("use_vc").get_active() vc_comment = self.top.get_widget("vc_comment").get_active() uncompress = self.top.get_widget("uncompress").get_active() - id_visible = self.top.get_widget("gid_visible").get_active() id_edit = self.top.get_widget("gid_edit").get_active() index_visible = self.top.get_widget("show_child_id").get_active() hide_altnames = self.top.get_widget("display_altnames").get_active() @@ -933,7 +913,6 @@ class GrampsPreferences: output_preference = output_obj.get_data(DATA) goutput_preference = goutput_obj.get_data(DATA) - set_bool("/gramps/config/UseTabs",usetabs) set_bool("/gramps/config/UseLDS",uselds) set_bool("/gramps/config/DisableAutoComplete",not autocomp) set_bool("/gramps/config/MakeReference",mediaref) @@ -943,10 +922,8 @@ class GrampsPreferences: set_bool("/gramps/config/UseVersionControl",usevc) set_bool("/gramps/config/UseComment",vc_comment) set_bool("/gramps/config/DontCompressXML",uncompress) - set_bool("/gramps/config/IdVisible",id_visible) set_bool("/gramps/config/IdEdit",id_edit) set_bool("/gramps/config/IndexVisible",index_visible) - set_bool("/gramps/config/ShowDetail",show_detail) set_int("/gramps/config/StatusBar",status_bar) set_int("/gramps/config/ToolBar",toolbar+1) set_bool("/gramps/config/DisplayAttr",display_attr) diff --git a/src/preferences.glade b/src/preferences.glade index 8e58f41c8..a8beb712e 100644 --- a/src/preferences.glade +++ b/src/preferences.glade @@ -986,26 +986,6 @@ False 0 - - - 3 - True - True - Use tabbed pages - True - GTK_RELIEF_NORMAL - False - False - True - - - - 0 - False - False - - - 3 @@ -1123,6 +1103,7 @@ + 3 True True Do not display alternate names in person list @@ -1140,27 +1121,9 @@ - - - True - True - Show Detail Flags in display lists - True - GTK_RELIEF_NORMAL - False - False - True - - - - 0 - False - False - - - + 3 True True Show index numbers in child list @@ -1177,25 +1140,6 @@ False - - - - True - True - Display GRAMPS ID in lists - True - GTK_RELIEF_NORMAL - False - False - True - - - - 0 - False - False - -