From 53f33109b42db51d22d0900561fba62f6af4c984 Mon Sep 17 00:00:00 2001
From: Chris Jones <cmsj@tenshu.net>
Date: Tue, 18 Aug 2009 13:44:41 +0100
Subject: [PATCH] start fleshing out Terminal

---
 terminatorlib/terminal.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/terminatorlib/terminal.py b/terminatorlib/terminal.py
index a1f15fb0..456fe26f 100755
--- a/terminatorlib/terminal.py
+++ b/terminatorlib/terminal.py
@@ -13,6 +13,8 @@ import pango
 from cwd import get_pid_cwd, get_default_cwd
 from util import dbg, err, gerr
 from config import Config
+from titlebar import Titlebar
+from searchbox import Searchbox
 
 try:
     import vte
@@ -24,8 +26,12 @@ class Terminal(gtk.VBox):
     """Class implementing the VTE widget and its wrappings"""
 
     vte = None
+    titlebar = None
+    searchbar = None
+
     matches = None
     config = None
+    default_encoding = None
 
     def __init__(self):
         """Class initialiser"""
@@ -38,9 +44,17 @@ class Terminal(gtk.VBox):
         self.vte.set_size(80, 24)
         self.vte._expose_data = None
         self.vte.show()
-
+        self.default_encoding = self.vte.get_encoding()
         self.update_url_matches(self.config['try_posix_regexp'])
 
+        self.titlebar = Titlebar()
+        self.searchbar = Searchbar()
+
+        self.show()
+        self.pack_start(self.titlebar, False)
+        self.pack_start(self.terminalbox)
+        self.pack_end(self.searchbar)
+
     def update_url_matches(self, posix = True):
         """Update the regexps used to match URLs"""
         userchars = "-A-Za-z0-9"