diff --git a/ChangeLog b/ChangeLog index b6c143cec..358d1c141 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2003-10-15 Alex Roitman + * src/gramps.glade: Correct tooltips. + * src/GrampsCfg.py: Enable using four toolbar styles as well as + the gnome default style. + * src/preferences.glade: Add a title for the tree. HIGify toolbar styles. + * src/gramps_main.py (pref_callback): Set toolbar style from prefs. + 2003-10-15 Tim Waugh * src/Makefile.am: Add uninstall rule for grampslib.so (now 'make distcheck' passes again). diff --git a/src/GrampsCfg.py b/src/GrampsCfg.py index 71089d3ac..dee02054f 100644 --- a/src/GrampsCfg.py +++ b/src/GrampsCfg.py @@ -25,6 +25,7 @@ # #------------------------------------------------------------------------- import os +import string import PaperMenu import Plugins @@ -134,7 +135,8 @@ nameof = Utils.normal_name display_name = Utils.normal_name display_surname = lambda x : x.getSurname() status_bar = 1 -toolbar = 2 +toolbar = gtk.TOOLBAR_BOTH +save_toolbar = gtk.TOOLBAR_BOTH calendar = 0 paper_preference = "" output_preference = "" @@ -215,6 +217,7 @@ def loadConfig(call): global db_dir global status_bar global toolbar + global save_toolbar global mediaref global globalprop global localprop @@ -237,7 +240,13 @@ def loadConfig(call): # capitalize = get_bool("/apps/gramps/capitalize") index_visible = get_bool("/apps/gramps/index-visible") status_bar = get_int("/apps/gramps/statusbar") - toolbar = get_int("/apps/gramps/toolbar",2) + gnome_toolbar_str = get_string("/desktop/gnome/interface/toolbar_style") + gnome_toolbar = eval("gtk.TOOLBAR_%s" % string.upper(gnome_toolbar_str)) + save_toolbar = get_int("/apps/gramps/toolbar",gtk.TOOLBAR_BOTH) + if save_toolbar == 5: + toolbar = gnome_toolbar + else: + toolbar = save_toolbar defaultview = get_int("/apps/gramps/defaultview") familyview = get_int("/apps/gramps/familyview") @@ -605,12 +614,7 @@ class GrampsPreferences: else: self.top.get_widget("stat3").set_active(1) - if toolbar == 0: - self.top.get_widget("tool1").set_active(1) - elif toolbar == 1: - self.top.get_widget("tool2").set_active(1) - else: - self.top.get_widget("tool3").set_active(1) + self.top.get_widget("tooloptmenu").set_history(save_toolbar) if defaultview == 0: self.top.get_widget('pvbutton').set_active(1) @@ -826,6 +830,7 @@ class GrampsPreferences: global index_visible global status_bar global toolbar + global save_toolbar global defaultview global familyview global paper_preference @@ -862,12 +867,13 @@ class GrampsPreferences: else: status_bar = 2 - if self.top.get_widget("tool1").get_active(): - toolbar = 0 - elif self.top.get_widget("tool2").get_active(): - toolbar = 1 + save_toolbar = self.top.get_widget("tooloptmenu").get_history() + gnome_toolbar_str = get_string("/desktop/gnome/interface/toolbar_style") + gnome_toolbar = eval("gtk.TOOLBAR_%s" % string.upper(gnome_toolbar_str)) + if save_toolbar == 5: + toolbar = gnome_toolbar else: - toolbar = 2 + toolbar = save_toolbar if self.top.get_widget("pvbutton").get_active(): defaultview = 0 @@ -924,7 +930,7 @@ class GrampsPreferences: # set_bool("/apps/gramps/capitalize",capitalize) set_bool("/apps/gramps/index-visible",index_visible) set_int("/apps/gramps/statusbar",status_bar) - set_int("/apps/gramps/toolbar",toolbar) + set_int("/apps/gramps/toolbar",save_toolbar) set_int("/apps/gramps/defaultview",defaultview) set_int("/apps/gramps/familyview",familyview) set_string("/apps/gramps/paper-preference",paper_preference) diff --git a/src/gramps.glade b/src/gramps.glade index 1f75d2bda..8e0659487 100644 --- a/src/gramps.glade +++ b/src/gramps.glade @@ -703,7 +703,7 @@ True - Open file + Open database Open True gtk-open @@ -714,7 +714,7 @@ True - Save file + Save database Save True gtk-save @@ -725,6 +725,7 @@ True + Go back in history Back True gtk-go-back @@ -740,6 +741,7 @@ True + Go forward in history Forward True gtk-go-forward @@ -777,7 +779,7 @@ True - Run a tool + Run tools Tools True tools.png @@ -1302,6 +1304,7 @@ True + Apply filter using the selected controls True GTK_RELIEF_NORMAL diff --git a/src/gramps_main.py b/src/gramps_main.py index 35a78a2e3..ab52c37b8 100755 --- a/src/gramps_main.py +++ b/src/gramps_main.py @@ -171,6 +171,8 @@ class Gramps: def pref_callback(self,val): self.family_view.init_interface() self.update_display(val) + self.toolbar.set_style(GrampsCfg.toolbar) + def init_interface(self): """Initializes the GLADE interface, and gets references to the diff --git a/src/preferences.glade b/src/preferences.glade index a3b9c065f..d3042d387 100644 --- a/src/preferences.glade +++ b/src/preferences.glade @@ -76,22 +76,42 @@ + 6 True False 0 + + + True + <b>Categories:</b> + True + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 6 + True + False + + + True True - 0 - + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + False + 0 @@ -114,6 +134,11 @@ + + 6 + True + True + @@ -245,9 +270,6 @@ 0 0 autosave_interval - - - 1 @@ -294,9 +316,6 @@ 0 0 entry1 - - - 1 @@ -714,7 +733,7 @@ 12 True - 8 + 6 3 False 6 @@ -744,6 +763,119 @@ + + + True + True + 0 + + + + + + + + True + Icons Only + True + + + + + + True + Text Only + True + + + + + + True + Text Below Icons + True + + + + + + True + Text Beside Icons + True + + + + + + True + + + + + + True + GNOME Settings + True + + + + + + + 1 + 3 + 1 + 2 + fill + + + + + + + True + True + Active person's _relationship to Home Person + True + GTK_RELIEF_NORMAL + True + False + True + + + + 1 + 3 + 5 + 6 + fill + + + + + + + True + True + Active person's name and _GRAMPS ID + True + GTK_RELIEF_NORMAL + True + False + True + stat3 + + + + 1 + 3 + 4 + 5 + fill + + + + True @@ -761,125 +893,12 @@ 0 3 - 5 - 6 - fill - - - - - - - True - True - Display only _icons - True - GTK_RELIEF_NORMAL - True - False - True - - - - 1 - 3 - 1 - 2 - fill - - - - - - - True - True - Display only _text - True - GTK_RELIEF_NORMAL - False - False - True - tool1 - - - - 1 - 3 - 2 - 3 - fill - - - - - - - True - True - _Display icons and text - True - GTK_RELIEF_NORMAL - True - False - True - tool1 - - - - 1 - 3 3 4 fill - - - - True - True - Active person's name and _GRAMPS ID - True - GTK_RELIEF_NORMAL - True - False - True - - - - 1 - 3 - 6 - 7 - fill - - - - - - - True - True - Active person's _relationship to Home Person (English only) - True - GTK_RELIEF_NORMAL - True - False - True - stat2 - - - - 1 - 3 - 7 - 8 - fill - - - 0 @@ -1199,9 +1218,6 @@ 5 5 date_format - - - 1 @@ -1227,10 +1243,6 @@ 5 5 name_format - - Name format: - - 1 @@ -1278,9 +1290,6 @@ 5 5 date_entry_format - - - 1 @@ -1491,9 +1500,6 @@ 0 0 resname - - - 1 @@ -1519,9 +1525,6 @@ 0 0 resaddr - - - 1 @@ -1547,9 +1550,6 @@ 0 0 rescity - - - 1 @@ -1575,9 +1575,6 @@ 0 0 resstate - - - 1 @@ -1603,9 +1600,6 @@ 0 0 rescountry - - - 1 @@ -1631,9 +1625,6 @@ 0 0 respostal - - - 1 @@ -1659,9 +1650,6 @@ 0 0 resphone - - - 1 @@ -1687,9 +1675,6 @@ 0 0 resemail - - - 1 @@ -1963,9 +1948,6 @@ 0 0 output_format - - - 1 @@ -2013,9 +1995,6 @@ 0 0 graphical_format - - - 1 @@ -2063,9 +2042,6 @@ 0 0 paper_size - - - 1 @@ -2129,9 +2105,6 @@ 0 0 entry11 - - - 1 @@ -2191,9 +2164,6 @@ 0 0 entry12 - - - 1 @@ -2501,9 +2471,6 @@ 2 2 iprefix - - - 1 @@ -2529,9 +2496,6 @@ 2 2 fprefix - - - 1 @@ -2557,9 +2521,6 @@ 2 2 pprefix - - - 1 @@ -2585,9 +2546,6 @@ 2 2 sprefix - - - 1 @@ -2613,9 +2571,6 @@ 2 2 oprefix - - - 1 @@ -2870,9 +2825,6 @@ 3 3 lastnamegen - - - 1