[SCM] Installer for game data files branch, gui, updated. 9092133f0b2589fd66ef16e6348f2c3989f9aa4c

[Jon Dowland]

The following commit has been merged in the gui branch:
commit 72f09939e42966cd2e415043c0dbef0969cc2c1d
Author: Jon Dowland <jmtd at debian.org>
Date:   Wed Sep 23 22:14:47 2009 +0100

    remove window1, just use a gtkassistant

diff --git a/gdp.glade b/gdp.glade
index 40e053f..d06e1c6 100644
--- a/gdp.glade
+++ b/gdp.glade
@@ -8,7 +8,8 @@
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkWindow" id="window1">
+  <object class="GtkAssistant" id="assistant1">
+    <property name="border_width">12</property>
     <child>
       <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
@@ -34,6 +35,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="model">liststore1</property>
+                <property name="search_column">0</property>
               </object>
             </child>
           </object>
@@ -41,48 +43,6 @@
             <property name="position">1</property>
           </packing>
         </child>
-        <child>
-          <object class="GtkHBox" id="hbox1">
-            <property name="visible">True</property>
-            <child>
-              <object class="GtkButton" id="quitbutton">
-                <property name="label">gtk-quit</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="nextbutton">
-                <property name="label">gtk-media-next</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-  <object class="GtkAssistant" id="assistant1">
-    <property name="border_width">12</property>
-    <child>
-      <object class="GtkLabel" id="label2">
-        <property name="visible">True</property>
-        <property name="label" translatable="yes">Introduction page</property>
       </object>
       <packing>
         <property name="page_type">intro</property>
@@ -91,5 +51,8 @@
     <child>
       <placeholder/>
     </child>
+    <child>
+      <placeholder/>
+    </child>
   </object>
 </interface>
diff --git a/gdp.py b/gdp.py
index 03d1dad..69c9819 100755
--- a/gdp.py
+++ b/gdp.py
@@ -33,11 +33,8 @@ class View:
 			sys.exit('E: %s. Exiting.' % e)
 		self.builder = gtk.Builder()
 		self.builder.add_from_file("gdp.glade")
-		self.window = self.builder.get_object("window1")
+		self.window = self.builder.get_object("assistant1")
 		self.window.connect("destroy", gtk.main_quit)
-		self.builder.get_object("quitbutton").connect("clicked", gtk.main_quit)
-		self.builder.get_object("nextbutton").connect("clicked", \
-			self.continue_clicked)
 
 		treeview = self.builder.get_object("treeview1")
 		cell = gtk.CellRendererText()
@@ -50,12 +47,6 @@ class View:
 		liststor = self.builder.get_object("liststore1")
 		liststor.append([game['longname']])
 
-	def continue_clicked(self,button):
-		asst = self.builder.get_object("assistant1")
-		asst.connect("destroy", gtk.main_quit)
-		asst.show()
-		self.window.hide()
-
 	def go(self):
 		self.window.show()
 		gtk.main()

-- 
Installer for game data files