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

Preferences updates - removal of options that no longer apply

Browse Source 
svn: r1163
This commit is contained in:
Don Allingham 2002-11-04 04:18:56 +00:00
parent aa4b5ecbda
commit 2eacdd41e6
13 changed files with 55 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.in
View File

@ -100,6 +100,7 @@ RELEASE = @RELEASE@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
STRIP = @STRIP@ STRIP = @STRIP@
SWIG = @SWIG@
VERSION = @VERSION@ VERSION = @VERSION@
VERSIONSTRING = @VERSIONSTRING@ VERSIONSTRING = @VERSIONSTRING@
ZIP = @ZIP@ ZIP = @ZIP@

42
configure vendored
View File

@ -1441,7 +1441,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE=gramps PACKAGE=gramps
VERSION=0.9.0pre1 VERSION=0.9.0pre2
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
@ -1834,6 +1834,45 @@ else
echo "${ECHO_T}no" >&6 echo "${ECHO_T}no" >&6
fi 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]"` 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,@pyexecdir@,$pyexecdir,;t t
s,@pkgpyexecdir@,$pkgpyexecdir,;t t s,@pkgpyexecdir@,$pkgpyexecdir,;t t
s,@BINSH@,$BINSH,;t t s,@BINSH@,$BINSH,;t t
s,@SWIG@,$SWIG,;t t
s,@PYTHON22@,$PYTHON22,;t t s,@PYTHON22@,$PYTHON22,;t t
s,@ZIP@,$ZIP,;t t s,@ZIP@,$ZIP,;t t
s,@CC@,$CC,;t t s,@CC@,$CC,;t t

5
configure.in
View File

@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
dnl May need to run automake && aclocal first dnl May need to run automake && aclocal first
AC_INIT(src/gramps.py) AC_INIT(src/gramps.py)
AM_INIT_AUTOMAKE(gramps, 0.9.0pre1) AM_INIT_AUTOMAKE(gramps, 0.9.0pre2)
RELEASE=rc4 RELEASE=rc4
VERSIONSTRING=$VERSION VERSIONSTRING=$VERSION
@ -42,6 +42,7 @@ pkgpythondir=\${prefix}/share/\${PACKAGE}
pkgpyexecdir=\${prefix}/share/\${PACKAGE} pkgpyexecdir=\${prefix}/share/\${PACKAGE}
AC_PATH_PROG(BINSH, sh) AC_PATH_PROG(BINSH, sh)
AC_PATH_PROG(SWIG, swig)
changequote(<<, >>)dnl changequote(<<, >>)dnl
PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[:3]"` PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[:3]"`
@ -261,8 +262,8 @@ dnl ======================================================
dnl == end of modern doc tests dnl == end of modern doc tests
dnl ====================================================== dnl ======================================================
AC_SUBST(BINSH) AC_SUBST(BINSH)
AC_SUBST(SWIG)
AC_SUBST(PYTHON) AC_SUBST(PYTHON)
AC_SUBST(PYTHON_VERSION) AC_SUBST(PYTHON_VERSION)
AC_SUBST(GNOMEHELP) AC_SUBST(GNOMEHELP)

1
doc/Makefile.in
View File

@ -100,6 +100,7 @@ RELEASE = @RELEASE@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
STRIP = @STRIP@ STRIP = @STRIP@
SWIG = @SWIG@
VERSION = @VERSION@ VERSION = @VERSION@
VERSIONSTRING = @VERSIONSTRING@ VERSIONSTRING = @VERSIONSTRING@
ZIP = @ZIP@ ZIP = @ZIP@

1
doc/extending-gramps/C/Makefile.in
View File

@ -98,6 +98,7 @@ RELEASE = @RELEASE@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
STRIP = @STRIP@ STRIP = @STRIP@
SWIG = @SWIG@
VERSION = @VERSION@ VERSION = @VERSION@
VERSIONSTRING = @VERSIONSTRING@ VERSIONSTRING = @VERSIONSTRING@
ZIP = @ZIP@ ZIP = @ZIP@

1
doc/extending-gramps/Makefile.in
View File

@ -100,6 +100,7 @@ RELEASE = @RELEASE@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
STRIP = @STRIP@ STRIP = @STRIP@
SWIG = @SWIG@
VERSION = @VERSION@ VERSION = @VERSION@
VERSIONSTRING = @VERSIONSTRING@ VERSIONSTRING = @VERSIONSTRING@
ZIP = @ZIP@ ZIP = @ZIP@

1
doc/gramps-manual/C/Makefile.in
View File

@ -132,6 +132,7 @@ RELEASE = @RELEASE@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
STRIP = @STRIP@ STRIP = @STRIP@
SWIG = @SWIG@
VERSION = @VERSION@ VERSION = @VERSION@
VERSIONSTRING = @VERSIONSTRING@ VERSIONSTRING = @VERSIONSTRING@
ZIP = @ZIP@ ZIP = @ZIP@

1
doc/gramps-manual/Makefile.in
View File

@ -100,6 +100,7 @@ RELEASE = @RELEASE@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
STRIP = @STRIP@ STRIP = @STRIP@
SWIG = @SWIG@
VERSION = @VERSION@ VERSION = @VERSION@
VERSIONSTRING = @VERSIONSTRING@ VERSIONSTRING = @VERSIONSTRING@
ZIP = @ZIP@ ZIP = @ZIP@

2
doc/gramps.1
View File

@ -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" .SH "NAME"
.LP .LP
gramps \- Genealogical Research and Analysis Management Programming System gramps \- Genealogical Research and Analysis Management Programming System

2
gramps.spec
View File

@ -1,4 +1,4 @@
%define ver 0.9.0pre1 %define ver 0.9.0pre2
%define rel rc4 %define rel rc4
%define prefix /usr %define prefix /usr

1
omf-install/Makefile.in
View File

@ -98,6 +98,7 @@ RELEASE = @RELEASE@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
STRIP = @STRIP@ STRIP = @STRIP@
SWIG = @SWIG@
VERSION = @VERSION@ VERSION = @VERSION@
VERSIONSTRING = @VERSIONSTRING@ VERSIONSTRING = @VERSIONSTRING@
ZIP = @ZIP@ ZIP = @ZIP@

23
src/GrampsCfg.py
View File

@ -121,13 +121,11 @@ pprefix = "P"
fprefix = "F" fprefix = "F"
autoload = 0 autoload = 0
autosave_int = 0 autosave_int = 0
usetabs = 0
uselds = 0 uselds = 0
autocomp = 1 autocomp = 1
usevc = 0 usevc = 0
vc_comment = 0 vc_comment = 0
uncompress = 0 uncompress = 0
show_detail = 0
hide_altnames = 0 hide_altnames = 0
lastfile = None lastfile = None
nameof = Utils.normal_name nameof = Utils.normal_name
@ -143,7 +141,6 @@ lastnamegen = None
report_dir = "./" report_dir = "./"
web_dir = "./" web_dir = "./"
db_dir = "./" db_dir = "./"
id_visible = 0
id_edit = 0 id_edit = 0
index_visible = 0 index_visible = 0
mediaref = 1 mediaref = 1
@ -191,7 +188,6 @@ def make_path(path):
def loadConfig(call): def loadConfig(call):
global autoload global autoload
global autosave_int global autosave_int
global usetabs
global uselds global uselds
global autocomp global autocomp
global calendar global calendar
@ -199,10 +195,8 @@ def loadConfig(call):
global iprefix, fprefix, pprefix, oprefix, sprefix global iprefix, fprefix, pprefix, oprefix, sprefix
global vc_comment global vc_comment
global uncompress global uncompress
global id_visible
global id_edit global id_edit
global index_visible global index_visible
global show_detail
global hide_altnames global hide_altnames
global lastfile global lastfile
global nameof global nameof
@ -225,7 +219,6 @@ def loadConfig(call):
_callback = call _callback = call
lastfile = get_string("/gramps/data/LastFile") lastfile = get_string("/gramps/data/LastFile")
usetabs = get_bool("/gramps/config/UseTabs")
uselds = get_bool("/gramps/config/UseLDS") uselds = get_bool("/gramps/config/UseLDS")
ac = get_bool("/gramps/config/DisableAutoComplete",0) ac = get_bool("/gramps/config/DisableAutoComplete",0)
mediaref = get_bool("/gramps/config/MakeReference",1) mediaref = get_bool("/gramps/config/MakeReference",1)
@ -235,10 +228,8 @@ def loadConfig(call):
usevc = get_bool("/gramps/config/UseVersionControl") usevc = get_bool("/gramps/config/UseVersionControl")
vc_comment = get_bool("/gramps/config/UseComment") vc_comment = get_bool("/gramps/config/UseComment")
uncompress = get_bool("/gramps/config/DontCompressXML") uncompress = get_bool("/gramps/config/DontCompressXML")
id_visible = get_bool("/gramps/config/IdVisible")
id_edit = get_bool("/gramps/config/IdEdit") id_edit = get_bool("/gramps/config/IdEdit")
index_visible = get_bool("/gramps/config/IndexVisible") index_visible = get_bool("/gramps/config/IndexVisible")
show_detail = get_bool("/gramps/config/ShowDetail")
status_bar = get_int("/gramps/config/StatusBar") status_bar = get_int("/gramps/config/StatusBar")
toolbar = get_int("/gramps/config/ToolBar",2) toolbar = get_int("/gramps/config/ToolBar",2)
display_attr = get_bool("/gramps/config/DisplayAttr") display_attr = get_bool("/gramps/config/DisplayAttr")
@ -583,10 +574,8 @@ class GrampsPreferences:
def build(self): def build(self):
auto = self.top.get_widget("autoload") auto = self.top.get_widget("autoload")
asave_int = self.top.get_widget("autosave_interval") asave_int = self.top.get_widget("autosave_interval")
vis = self.top.get_widget("gid_visible")
idedit = self.top.get_widget("gid_edit") idedit = self.top.get_widget("gid_edit")
index_vis = self.top.get_widget("show_child_id") index_vis = self.top.get_widget("show_child_id")
tabs = self.top.get_widget("usetabs")
lds = self.top.get_widget("uselds") lds = self.top.get_widget("uselds")
ac = self.top.get_widget("autocomp") ac = self.top.get_widget("autocomp")
mr = self.top.get_widget("mediaref") mr = self.top.get_widget("mediaref")
@ -603,8 +592,6 @@ class GrampsPreferences:
auto.set_active(autoload) auto.set_active(autoload)
asave_int.set_value(int(autosave_int)) asave_int.set_value(int(autosave_int))
detail.set_active(show_detail)
tabs.set_active(usetabs)
lds.set_active(uselds) lds.set_active(uselds)
ac.set_active(autocomp) ac.set_active(autocomp)
if mediaref: if mediaref:
@ -617,7 +604,6 @@ class GrampsPreferences:
vc.set_active(usevc) vc.set_active(usevc)
vcom.set_active(vc_comment) vcom.set_active(vc_comment)
compress.set_active(uncompress) compress.set_active(uncompress)
vis.set_active(id_visible)
idedit.set_active(id_edit) idedit.set_active(id_edit)
index_vis.set_active(index_visible) index_vis.set_active(index_visible)
@ -829,7 +815,6 @@ class GrampsPreferences:
def on_propertybox_apply(self,obj): def on_propertybox_apply(self,obj):
global nameof global nameof
global usetabs
global uselds global uselds
global autocomp global autocomp
global autosave_int global autosave_int
@ -845,7 +830,6 @@ class GrampsPreferences:
global oprefix global oprefix
global vc_comment global vc_comment
global uncompress global uncompress
global id_visible
global id_edit global id_edit
global index_visible global index_visible
global status_bar global status_bar
@ -856,19 +840,16 @@ class GrampsPreferences:
global paper_preference global paper_preference
global output_preference global output_preference
global goutput_preference global goutput_preference
global show_detail
global report_dir global report_dir
global web_dir global web_dir
global db_dir global db_dir
global lastnamegen global lastnamegen
global autoload global autoload
show_detail = self.top.get_widget("showdetail").get_active()
autoload = self.top.get_widget("autoload").get_active() autoload = self.top.get_widget("autoload").get_active()
autosave_int = self.top.get_widget("autosave_interval").get_value_as_int() autosave_int = self.top.get_widget("autosave_interval").get_value_as_int()
display_attr = self.top.get_widget("attr_display").get_active() display_attr = self.top.get_widget("attr_display").get_active()
attr_name = string.strip(self.top.get_widget("attr_name").get_text()) 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() uselds = self.top.get_widget("uselds").get_active()
autocomp = self.top.get_widget("autocomp").get_active() autocomp = self.top.get_widget("autocomp").get_active()
mediaref = self.top.get_widget("mediaref").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() usevc = self.top.get_widget("use_vc").get_active()
vc_comment = self.top.get_widget("vc_comment").get_active() vc_comment = self.top.get_widget("vc_comment").get_active()
uncompress = self.top.get_widget("uncompress").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() id_edit = self.top.get_widget("gid_edit").get_active()
index_visible = self.top.get_widget("show_child_id").get_active() index_visible = self.top.get_widget("show_child_id").get_active()
hide_altnames = self.top.get_widget("display_altnames").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) output_preference = output_obj.get_data(DATA)
goutput_preference = goutput_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/UseLDS",uselds)
set_bool("/gramps/config/DisableAutoComplete",not autocomp) set_bool("/gramps/config/DisableAutoComplete",not autocomp)
set_bool("/gramps/config/MakeReference",mediaref) set_bool("/gramps/config/MakeReference",mediaref)
@ -943,10 +922,8 @@ class GrampsPreferences:
set_bool("/gramps/config/UseVersionControl",usevc) set_bool("/gramps/config/UseVersionControl",usevc)
set_bool("/gramps/config/UseComment",vc_comment) set_bool("/gramps/config/UseComment",vc_comment)
set_bool("/gramps/config/DontCompressXML",uncompress) set_bool("/gramps/config/DontCompressXML",uncompress)
set_bool("/gramps/config/IdVisible",id_visible)
set_bool("/gramps/config/IdEdit",id_edit) set_bool("/gramps/config/IdEdit",id_edit)
set_bool("/gramps/config/IndexVisible",index_visible) 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/StatusBar",status_bar)
set_int("/gramps/config/ToolBar",toolbar+1) set_int("/gramps/config/ToolBar",toolbar+1)
set_bool("/gramps/config/DisplayAttr",display_attr) set_bool("/gramps/config/DisplayAttr",display_attr)

60
src/preferences.glade
View File

@ -986,26 +986,6 @@
<property name="homogeneous">False</property> <property name="homogeneous">False</property>
<property name="spacing">0</property> <property name="spacing">0</property>
<child>
<widget class="GtkCheckButton" id="usetabs">
<property name="border_width">3</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Use tabbed pages</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_object_toggled" object="propertybox"/>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child> <child>
<widget class="GtkCheckButton" id="uselds"> <widget class="GtkCheckButton" id="uselds">
<property name="border_width">3</property> <property name="border_width">3</property>
@ -1123,6 +1103,7 @@
<child> <child>
<widget class="GtkCheckButton" id="display_altnames"> <widget class="GtkCheckButton" id="display_altnames">
<property name="border_width">3</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="label" translatable="yes">Do not display alternate names in person list</property> <property name="label" translatable="yes">Do not display alternate names in person list</property>
@ -1140,27 +1121,9 @@
</packing> </packing>
</child> </child>
<child>
<widget class="GtkCheckButton" id="showdetail">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Show Detail Flags in display lists</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_object_toggled" object="propertybox"/>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child> <child>
<widget class="GtkCheckButton" id="show_child_id"> <widget class="GtkCheckButton" id="show_child_id">
<property name="border_width">3</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="label" translatable="yes">Show index numbers in child list</property> <property name="label" translatable="yes">Show index numbers in child list</property>
@ -1177,25 +1140,6 @@
<property name="fill">False</property> <property name="fill">False</property>
</packing> </packing>
</child> </child>
<child>
<widget class="GtkCheckButton" id="gid_visible">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Display GRAMPS ID in lists</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_object_toggled" object="propertybox"/>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget> </widget>
</child> </child>