From 6d579be5450e2f035d01306557498a7e121dbdc8 Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Sat, 2 Aug 2003 05:41:51 +0000 Subject: [PATCH] * src/plugins/writeftree.glade: Swap OK and Cancel buttons (HIG). * src/plugins/cdexport.glade: Likewise. * src/plugins/gedcomexport.glade: Likewise. * src/plugins/pkgexport.glade: Likewise. * src/plugins/ReadGedcom.py: Fix Cancel button (was destroying itself). svn: r1955 --- gramps2/ChangeLog | 7 +++++++ gramps2/src/plugins/ReadGedcom.py | 5 ++++- gramps2/src/plugins/cdexport.glade | 26 +++++++++++++------------- gramps2/src/plugins/gedcomexport.glade | 25 +++++++++++++------------ gramps2/src/plugins/pkgexport.glade | 25 +++++++++++++------------ gramps2/src/plugins/writeftree.glade | 25 +++++++++++++------------ 6 files changed, 63 insertions(+), 50 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 63e2cf20a..b5dadaedb 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,10 @@ +2003-08-01 Alex Roitman + * src/plugins/writeftree.glade: Swap OK and Cancel buttons (HIG). + * src/plugins/cdexport.glade: Likewise. + * src/plugins/gedcomexport.glade: Likewise. + * src/plugins/pkgexport.glade: Likewise. + * src/plugins/ReadGedcom.py: Fix Cancel button (was destroying itself). + 2003-08-01 Don Allingham * src/plugins/GraphViz.py: toggle sensitivity on year button if based of date button selection, add new tab for page options to reduce diff --git a/gramps2/src/plugins/ReadGedcom.py b/gramps2/src/plugins/ReadGedcom.py index 0684f60eb..ab581990f 100644 --- a/gramps2/src/plugins/ReadGedcom.py +++ b/gramps2/src/plugins/ReadGedcom.py @@ -1764,7 +1764,7 @@ def readData(database,active_person,cb): file_top = gtk.FileSelection("%s - GRAMPS" % _title_string) file_top.hide_fileop_buttons() file_top.ok_button.connect('clicked', on_ok_clicked) - file_top.cancel_button.connect('clicked', Utils.destroy_passed_object) + file_top.cancel_button.connect('clicked', on_cancel_clicked) file_top.show() #------------------------------------------------------------------------- @@ -1784,6 +1784,9 @@ def on_ok_clicked(obj): import DisplayTrace DisplayTrace.DisplayTrace() +def on_cancel_clicked(obj): + file_top.destroy() + #------------------------------------------------------------------------- # # diff --git a/gramps2/src/plugins/cdexport.glade b/gramps2/src/plugins/cdexport.glade index 9df8a9fed..a30c8234a 100644 --- a/gramps2/src/plugins/cdexport.glade +++ b/gramps2/src/plugins/cdexport.glade @@ -25,6 +25,19 @@ True GTK_BUTTONBOX_END + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + 0 + + + + True @@ -91,19 +104,6 @@ - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - 0 - - - 0 diff --git a/gramps2/src/plugins/gedcomexport.glade b/gramps2/src/plugins/gedcomexport.glade index ff4948ea0..aa5471d74 100644 --- a/gramps2/src/plugins/gedcomexport.glade +++ b/gramps2/src/plugins/gedcomexport.glade @@ -26,6 +26,19 @@ True GTK_BUTTONBOX_END + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + 0 + + + + True @@ -39,18 +52,6 @@ - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - 0 - - - 0 diff --git a/gramps2/src/plugins/pkgexport.glade b/gramps2/src/plugins/pkgexport.glade index a55dbfc4f..2f6c91423 100644 --- a/gramps2/src/plugins/pkgexport.glade +++ b/gramps2/src/plugins/pkgexport.glade @@ -26,6 +26,19 @@ True GTK_BUTTONBOX_END + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + 0 + + + + True @@ -39,18 +52,6 @@ - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - 0 - - - 0 diff --git a/gramps2/src/plugins/writeftree.glade b/gramps2/src/plugins/writeftree.glade index e5a3b1749..270e36c9b 100644 --- a/gramps2/src/plugins/writeftree.glade +++ b/gramps2/src/plugins/writeftree.glade @@ -26,6 +26,19 @@ True GTK_BUTTONBOX_END + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + 0 + + + + True @@ -39,18 +52,6 @@ - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - 0 - - - 0