Changeset 3255

Timestamp:

07/29/08 12:08:01 (5 years ago)

Author:

nopper

Message:

Better message :D

Location:

branch/PacketManipulator

Files:

• MainWindow.py (modified) (4 diffs)
• Tabs/VteTab.py (modified) (2 diffs)

branch/PacketManipulator/MainWindow.py

@@ -27 +27 @@
     from fallbackpaned import *
 
-#from Tabs.VteTab import VteTab
+from Tabs.VteTab import VteTab
 from Tabs.MainTab import MainTab
 from Tabs.ConsoleTab import ConsoleTab
@@ -119 +119 @@
 
         # Tabs
-        #self.vte_tab = VteTab()
+        self.vte_tab = VteTab()
         self.protocols_tab = ProtocolSelectorTab()
         self.property_tab = PropertyTab()
@@ -126 +126 @@
         # This should be moved to UmitPaned btw...
         self.registered_tabs.append(self.main_tab)
-        #self.registered_tabs.append(self.vte_tab)
+        self.registered_tabs.append(self.vte_tab)
         self.registered_tabs.append(self.protocols_tab)
         self.registered_tabs.append(self.property_tab)
@@ -149 +149 @@
         self.main_paned.add_view(PANE_RIGHT, self.property_tab, False)
 
-        #self.main_paned.add_view(PANE_BOTTOM, self.vte_tab, False)
+        self.main_paned.add_view(PANE_BOTTOM, self.vte_tab, False)
         self.main_paned.add_view(PANE_BOTTOM, self.console_tab, False)
 

branch/PacketManipulator/Tabs/VteTab.py

@@ -19 +19 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-import vte
 import gtk
 import gobject
@@ -26 +25 @@
 
 class TerminalWidget(gtk.Bin):
+    __gtype_name__ = "TerminalWidget"
+
     def __init__(self):
         super(TerminalWidget, self).__init__()
-
-        self.term = vte.Terminal()
-        self.term.fork_command()
-
         self.__termbox = gtk.HBox()
-        self.__scroll = gtk.VScrollbar(self.term.get_adjustment())
-        border = gtk.Frame()
-        border.set_shadow_type(gtk.SHADOW_ETCHED_IN)
-        border.add(self.term)
-        self.__termbox.pack_start(border)
-        self.__termbox.pack_start(self.__scroll, False)
         self.add(self.__termbox)
 
+        try:
+            import vtesd
+
+            self.term = vte.Terminal()
+            self.term.fork_command()
+
+            self.__scroll = gtk.VScrollbar(self.term.get_adjustment())
+            border = gtk.Frame()
+            border.set_shadow_type(gtk.SHADOW_ETCHED_IN)
+            border.add(self.term)
+
+            self.__termbox.pack_start(border)
+            self.__termbox.pack_start(self.__scroll, False)
+
+            self.term.set_size_request(0, 0)
+        except ImportError:
+            label = gtk.Label(
+                "<b>Loser!</b> You don't have vte python bindings installed.\n"
+                "Download it from <tt>http://ftp.acc.umu.se/pub/GNOME/sources/vte/</tt>"
+            )
+
+            label.set_use_markup(True)
+            label.set_selectable(True)
+
+            self.__termbox.pack_start(label)
+
+        self.show_all()
+
     def do_size_request(self, req):
-        (w,h) = self.__termbox.size_request()
+        w, h = self.__termbox.size_request()
         req.width = w
         req.height = h
 
     def do_size_allocate(self, alloc):
-        self.allocation = alloc
-        wid_req = self.__termbox.size_allocate(alloc)
+        return self.__termbox.size_allocate(alloc)
 
 gobject.type_register(TerminalWidget)