renaming open_file_chooser to open_project and cleaning

some things in Gzv.__init__

diff --git a/gzv.glade b/gzv.glade
index b097e28..82dfa44 100644 (file)
--- a/gzv.glade
+++ b/gzv.glade
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Sat Aug  9 16:21:30 2008 -->
+<!--Generated with glade3 3.4.5 on Sat Aug  9 16:31:44 2008 -->
 <glade-interface>
   <widget class="GtkWindow" id="main-window">
     <property name="title" translatable="yes">Gzv</property>
@@ -35,7 +35,7 @@
                         <property name="label" translatable="yes">gtk-open</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
-                        <signal name="activate" handler="open_file_chooser"/>
+                        <signal name="activate" handler="open_project"/>
                       </widget>
                     </child>
                     <child>
@@ -141,7 +141,7 @@
               <widget class="GtkToolButton" id="toolbutton2">
                 <property name="visible">True</property>
                 <property name="stock_id">gtk-open</property>
-                <signal name="clicked" handler="open_file_chooser"/>
+                <signal name="clicked" handler="open_project"/>
               </widget>
               <packing>
                 <property name="expand">False</property>

diff --git a/gzv.py b/gzv.py
index 318a0f8..2bee2ff 100644 (file)
--- a/gzv.py
+++ b/gzv.py
@@ -106,14 +106,17 @@ class Gzv(GladeLoader):
         self.draw = self.wid('draw')
         self.draw.connect('expose-event', self.expose_draw)
 
-        # FIXME: Hardcoded.
-        self.image = 'skol.jpg'
-        self.balls = self.load_balls_from_file('xxx')
-        self.load_balls_to_treeview()
+        # Starting with an empty project with no image loaded
+        self.project = None
+        self.image = None
+
+        # This attr may be overriten, if so, call the method (load_balls_to_treeview)
+        self.balls = BallManager()
 
-        # this *MUST* be called *AFTER* load_balls_to_treeview
+        self.load_balls_to_treeview()
         self.setup_treeview()
 
+        # drawing stuff
         self.ball_width = Ball.DEFAULT_WIDTH
         self.selecting = False
         self.start_x = -1
@@ -146,12 +149,13 @@ class Gzv(GladeLoader):
             self.load_new_project(proj.get_project())
         proj.destroy()
 
-    def open_file_chooser(self, button):
+    def open_project(self, *args):
         fc = gtk.FileChooserDialog(_('Choose a gzv project'), self.window,
                                    buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
                                             gtk.STOCK_OK, gtk.RESPONSE_OK))
         if fc.run() == gtk.RESPONSE_OK:
-            self.image = fc.get_filename()
+            proj_file = fc.get_filename()
+            self.balls = self.load_balls_from_file(proj_file)
 
         fc.destroy()