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

[Jon Dowland]

The following commit has been merged in the gui branch:
commit 70f628385eb7a77a047ec96d7ac18079c94619e8
Author: Jon Dowland <jmtd at debian.org>
Date:   Thu Sep 24 15:35:45 2009 +0100

    embed placeholder file chooser window

diff --git a/gdp.glade b/gdp.glade
index b0c4f38..51382cb 100644
--- a/gdp.glade
+++ b/gdp.glade
@@ -11,6 +11,9 @@
   <object class="GtkAssistant" id="assistant1">
     <property name="border_width">12</property>
     <child>
+      <placeholder/>
+    </child>
+    <child>
       <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
         <property name="orientation">vertical</property>
@@ -81,4 +84,52 @@
       </object>
     </child>
   </object>
+  <object class="GtkWindow" id="placeholder_filechooser_window">
+    <child>
+      <object class="GtkVBox" id="vbox2">
+        <property name="visible">True</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkLabel" id="label2">
+            <property name="visible">True</property>
+            <property name="label" translatable="yes">Please locate your doom2.wad file.</property>
+          </object>
+          <packing>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHBox" id="hbox1">
+            <property name="visible">True</property>
+            <child>
+              <object class="GtkEntry" id="entry1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="invisible_char">&#x25CF;</property>
+              </object>
+              <packing>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button1">
+                <property name="label" translatable="yes">Choose file...</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
 </interface>
diff --git a/gdp.py b/gdp.py
index 8af4784..b6324ba 100755
--- a/gdp.py
+++ b/gdp.py
@@ -55,7 +55,7 @@ class View:
 		"""setup the assistant's second page. Assume that the first
 		action for whatever game is selected, is a "install file"
 		type one."""
-		w = self.builder.get_object("filechooserdialog1")
+		w = self.builder.get_object("placeholder_filechooser_window")
 		children = w.get_children()
 		print "there are %d children" % len(children)
 		w.remove(children[0])

-- 
Installer for game data files