renaming open_file_chooser to open_project and cleaning

[cascardo/movie.git] / gzv.py

diff --git a/gzv.py b/gzv.py
index 958d13b..2bee2ff 100644 (file)
--- a/gzv.py
+++ b/gzv.py
@@ -66,11 +66,27 @@ class GladeLoader(object):
     def gtk_main(self, *args):
         gtk.main()
 
+class Project(object):
+    def __init__(self, image, width, height):
+        self.image = image
+        self.width = width
+        self.height = height
+
 class NewProject(GladeLoader):
     def __init__(self, parent=None):
         super(NewProject, self).__init__('gzv.glade', 'new-project')
+        self.dialog = self.wid('new-project')
         if parent:
-            self.wid('new-project').set_transient_for(parent)
+            self.dialog.set_transient_for(parent)
+
+    def get_project(self):
+        fname = self.wid('image').get_filename()
+        width = self.wid('width').get_text()
+        height = self.wid('height').get_text()
+        return Project(fname, width, height)
+
+    def destroy(self):
+        self.dialog.destroy()
 
 class Gzv(GladeLoader):
     def __init__(self):
@@ -90,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
@@ -123,19 +142,20 @@ class Gzv(GladeLoader):
         print args
 
     def new_project(self, button):
-        dialog = NewProject(self.window).wid('new-project')
+        proj = NewProject(self.window)
 
         # This '1' was defined in the glade file
-        if dialog.run() == 1:
-            pass
-        dialog.destroy()
+        if proj.dialog.run() == 1:
+            self.load_new_project(proj.get_project())
+        proj.destroy()
 
-    def open_file_chooser(self, button):
-        fc = gtk.FileChooserDialog(_('Choose an image'), self,
+    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()