diff --git a/src/ScratchPad.py b/src/ScratchPad.py
index 6f93a8c7e..5f4280436 100644
--- a/src/ScratchPad.py
+++ b/src/ScratchPad.py
@@ -43,7 +43,6 @@ except:
#-------------------------------------------------------------------------
import gtk
from gtk.gdk import ACTION_COPY, BUTTON1_MASK, ACTION_MOVE
-from gtk import glade
#-------------------------------------------------------------------------
#
@@ -1202,17 +1201,17 @@ class ScratchPadWindow(ManagedWindow.ManagedWindow):
self.width_key = Config.CLIPBOARD_WIDTH
self.height_key = Config.CLIPBOARD_HEIGHT
self.glade_file = os.path.join(const.GLADE_DIR, "scratchpad.glade")
-
- self.top = glade.XML(self.glade_file,"scratch_pad","gramps")
- self.set_window(self.top.get_widget("scratch_pad"),
+ self.top = gtk.Builder()
+ self.top.add_from_file(self.glade_file)
+ self.set_window(self.top.get_object("scratch_pad"),
None, None, msg=_("Clipboard"))
self._set_size()
- self.clear_all_btn = self.top.get_widget("btn_clear_all")
- self.clear_btn = self.top.get_widget("btn_clear")
+ self.clear_all_btn = self.top.get_object("btn_clear_all")
+ self.clear_btn = self.top.get_object("btn_clear")
self.object_list = ScratchPadListView(
- self.dbstate,self.top.get_widget('objectlist'))
+ self.dbstate,self.top.get_object('objectlist'))
self.object_list.get_selection().connect('changed',
self.set_clear_btn_sensitivity)
self.set_clear_btn_sensitivity(sel=self.object_list.get_selection())
@@ -1229,7 +1228,7 @@ class ScratchPadWindow(ManagedWindow.ManagedWindow):
self.object_list.set_model(ScratchPadWindow.otree)
- self.top.signal_autoconnect({
+ self.top.connect_signals({
"on_close_scratchpad" : self.close,
"on_clear_clicked": self.on_clear_clicked,
"on_help_clicked": self.on_help_clicked,
diff --git a/src/glade/scratchpad.glade b/src/glade/scratchpad.glade
index 9a5d2b320..4d01c2fe0 100644
--- a/src/glade/scratchpad.glade
+++ b/src/glade/scratchpad.glade
@@ -1,129 +1,120 @@
-
-
-
-
-
-
- True
- Clipboard
- GTK_WINDOW_TOPLEVEL
- GTK_WIN_POS_NONE
- False
- 500
- 300
- True
- False
- True
- False
- False
- GDK_WINDOW_TYPE_HINT_DIALOG
- GDK_GRAVITY_NORTH_WEST
- True
-
-
-
-
- True
- False
- 0
-
-
-
- True
- GTK_BUTTONBOX_END
-
-
-
- True
- True
- True
- gtk-help
- True
- GTK_RELIEF_NORMAL
- True
- -11
-
-
-
-
-
-
- True
- True
- True
- Clear _All
- True
- GTK_RELIEF_NORMAL
- True
- 0
-
-
-
-
-
-
- True
- True
- True
- gtk-clear
- True
- GTK_RELIEF_NORMAL
- True
- 0
-
-
-
-
-
-
- True
- True
- True
- gtk-close
- True
- GTK_RELIEF_NORMAL
- True
- -7
-
-
-
-
-
- 0
- False
- True
- GTK_PACK_END
-
-
-
-
-
- True
- True
- GTK_POLICY_AUTOMATIC
- GTK_POLICY_AUTOMATIC
- GTK_SHADOW_IN
- GTK_CORNER_TOP_LEFT
-
-
-
- True
- True
- True
- False
- False
- True
-
-
-
-
- 0
- True
- True
-
-
-
-
-
-
-
+
+
+
+
+