From 60f6d339e64889785ca2f392b1d1767ca3b26127 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Wed, 8 Mar 2006 05:22:58 +0000 Subject: [PATCH] remove WindowsUtils svn: r6101 --- ChangeLog | 4 + src/AddMedia.py | 5 +- src/WindowUtils.py | 36 --- src/glade/gramps.glade | 546 ----------------------------------------- 4 files changed, 6 insertions(+), 585 deletions(-) delete mode 100644 src/WindowUtils.py diff --git a/ChangeLog b/ChangeLog index 81869325c..4075b6c5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-03-07 Don Allingham + * src/AddMedia.py: remove WindowsUtils dependency + * src/WindowUtils.py: remove + 2006-03-07 Alex Roitman * src/DateHadnler: Move all date parsers/displayers into new directory. diff --git a/src/AddMedia.py b/src/AddMedia.py index 0a6e992dc..f48cb014c 100644 --- a/src/AddMedia.py +++ b/src/AddMedia.py @@ -46,7 +46,6 @@ from gettext import gettext as _ # #------------------------------------------------------------------------- from QuestionDialog import ErrorDialog -from WindowUtils import GladeIf import gtk.glade #------------------------------------------------------------------------- @@ -93,8 +92,8 @@ class AddMediaObject: Utils.set_titles(self.window,self.glade.get_widget('title'), _('Select a media object')) - self.gladeif = GladeIf(self.glade) - self.gladeif.connect('fname', 'update_preview', self.on_name_changed) + self.glade.get_widget('fname').connect('update_preview', + self.on_name_changed) self.window.show() def internal_toggled(self, obj): diff --git a/src/WindowUtils.py b/src/WindowUtils.py deleted file mode 100644 index b39156ee7..000000000 --- a/src/WindowUtils.py +++ /dev/null @@ -1,36 +0,0 @@ -# -# Gramps - a GTK+/GNOME based genealogy program -# -# Copyright (C) 2000-2005 Donald N. Allingham -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# - -class GladeIf: - def __init__(self,top): - self.top = top - self.sigs = [] - - def connect(self,wname,sname,func): - w = self.top.get_widget(wname) - sig = w.connect(sname, func) - self.sigs.append((sig,w)) - - def close(self): - for s,w in self.sigs: - w.disconnect(s) - - def get_widget(self,name): - return self.top.get_widget(name) diff --git a/src/glade/gramps.glade b/src/glade/gramps.glade index f017d6e1d..a8796b3f8 100644 --- a/src/glade/gramps.glade +++ b/src/glade/gramps.glade @@ -13278,552 +13278,6 @@ Text Beside Icons - - True - - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - 550 - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - False - - - - - True - False - 8 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - -6 - - - - - - - True - True - True - True - gtk-ok - True - GTK_RELIEF_NORMAL - True - -5 - - - - - - - True - True - True - gtk-help - True - GTK_RELIEF_NORMAL - True - -11 - - - - - - 0 - False - True - GTK_PACK_END - - - - - - True - False - 0 - - - - True - - False - True - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 5 - False - False - - - - - - True - False - 0 - - - - 12 - True - 9 - 4 - False - 6 - 12 - - - - True - _Media Type: - True - False - GTK_JUSTIFY_CENTER - False - False - 1 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 6 - 7 - fill - - - - - - - True - _Call number: - True - False - GTK_JUSTIFY_CENTER - False - False - 1 - 0.5 - 0 - 0 - repos_ref_callnumber - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 7 - 8 - fill - - - - - - - True - _Note: - True - False - GTK_JUSTIFY_CENTER - False - False - 1 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 8 - 9 - fill - fill - - - - - - True - Author: - False - False - GTK_JUSTIFY_CENTER - False - False - 1 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 2 - 3 - fill - - - - - - - True - _Title: - True - False - GTK_JUSTIFY_CENTER - False - False - 1 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 1 - 2 - fill - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 3 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 4 - 2 - 3 - fill - - - - - - - True - <b>Source selection</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 4 - 0 - 1 - fill - - - - - - - True - <b>Repository details</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 4 - 5 - 6 - fill - - - - - - - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - True - GTK_JUSTIFY_LEFT - GTK_WRAP_NONE - True - 0 - 0 - 0 - 0 - 0 - 0 - - - - - - 2 - 4 - 8 - 9 - fill - fill - - - - - - True - Creates a new source - True - _New... - True - GTK_RELIEF_NORMAL - True - - - - 3 - 4 - 1 - 2 - fill - - - - - - - True - False - True - - - 2 - 3 - 1 - 2 - fill - fill - - - - - - True - True - True - True - 0 - - True - * - False - - - 2 - 4 - 7 - 8 - - - - - - - True - Publication Information: - False - False - GTK_JUSTIFY_CENTER - False - False - 1 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 3 - 4 - fill - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 3 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 4 - 3 - 4 - fill - - - - - - - True - False - True - True - - - 2 - 4 - 6 - 7 - fill - fill - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - GTK_WINDOW_TOPLEVEL