[pitivi] dynamic.py: create a ComboBoxEntry variant of TextWidget which accepts a limited number of choices

[Edward Hervey <edwardrv src gnome org>]

commit a9635b9650a917f9f5fcfb2ac62ed8f419023586
Author: Brandon Lewis <brandon_lewis berkeley edu>
Date:   Tue Oct 20 16:05:05 2009 -0700

    dynamic.py: create a ComboBoxEntry variant of TextWidget which accepts a
    limited number of choices

 pitivi/ui/dynamic.py |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 deletions(-)
---
diff --git a/pitivi/ui/dynamic.py b/pitivi/ui/dynamic.py
index fe25d1e..03663af 100644
--- a/pitivi/ui/dynamic.py
+++ b/pitivi/ui/dynamic.py
@@ -78,14 +78,26 @@ class TextWidget(gtk.HBox):
     __INVALID__ = gtk.gdk.Color(0xFFFF, 0, 0)
     __NORMAL__ = gtk.gdk.Color(0, 0, 0)
 
-    def __init__(self, matches = None):
+    def __init__(self, matches = None, choices = None):
         gtk.HBox.__init__(self)
-        self.text = gtk.Entry()
-        self.text.show()
-        self.pack_start(self.text)
+        if choices:
+            self.combo = gtk.ComboBoxEntry()
+            self.text = self.combo.child
+            self.combo.show()
+            self.pack_start(self.combo)
+            model = gtk.ListStore(str)
+            for choice in choices:
+                model.append((choice,))
+            self.combo.set_model(model)
+            self.combo.set_text_column(0)
+            self.combo.set_active(0)
+        else:
+            self.text = gtk.Entry()
+            self.text.show()
+            self.pack_start(self.text)
         self.matches = None
         self.last_valid = None
-        self.valid = True
+        self.valid = False
         self.image = gtk.Image()
         self.image.set_from_stock(gtk.STOCK_DIALOG_WARNING, 
             gtk.ICON_SIZE_BUTTON)
@@ -109,7 +121,8 @@ class TextWidget(gtk.HBox):
     def _filter(self, unused_widget):
         text = self.text.get_text()
         if self.matches:
-            if self.matches.match(text):
+            match = self.matches.match(text)
+            if match is not None:
                 self.last_valid = text
                 self.emit("value-changed")
                 if not self.valid: