Removed conflicting class "file"

Now sets the disc type every time a new file or title is created

src/devede/file_movie.py

@@ -17,12 +17,17 @@
 
 from gi.repository import GObject
 
-class file(GObject.GObject):
+class file_movie(GObject.GObject):
+
+    counter2 = 0
 
     def __init__(self):
 
         GObject.GObject.__init__(self)
-        self.counter2 = 0
+
+    def set_type(self,disc_type):
+
+        self.disc_type = disc_type
 
     def delete_file(self):
 
@@ -30,5 +35,5 @@ class file(GObject.GObject):
 
     def properties(self):
 
-        self.file_name = "Hola"+str(self.counter2)
+        self.file_name = "Hola"+str(file_movie.counter2)
-        self.counter2 += 1
+        file_movie.counter2 += 1

src/devede/project.py

@@ -19,7 +19,7 @@ from gi.repository import Gtk
 import os
 
 import devede.title
-import devede.file
+import devede.file_movie
 import devede.ask
 
 class devede_project:
@@ -44,7 +44,7 @@ class devede_project:
         self.wuse_pal = None
         self.wuse_ntsc = None
         self.wcreate_menu = None
-        self.project_type = None
+        self.disc_type = None
         self.wdelete_title = None
         self.wup_title = None
         self.wdown_title = None
@@ -108,11 +108,11 @@ class devede_project:
             self.wask_window.destroy()
         self.destroy_all()
 
-        self.project_type = disc_type
+        self.disc_type = disc_type
         self.show_main_window()
 
         # Set the default disc size
-        if (self.project_type == "dvd"):
+        if (self.disc_type == "dvd"):
             self.wdisc_size.set_active(1) # 4.7 GB DVD
             self.wframe_titles.show()
         else:
@@ -124,93 +124,6 @@ class devede_project:
         self.on_add_title_clicked(None)
 
 
-    def on_add_title_clicked(self,b):
-        """ Creates a new title and adds it to the current project """
-        
-        self.get_current_title()
-        
-        new_title = devede.title.title(self.wfiles,self.wliststore_files)
-        self.wliststore_titles.append([new_title.title_name, new_title])
-        self.set_interface_status(None)
-
-    def on_add_file_clicked(self,b):
-        
-        (element, position, model, treeiter) = self.get_current_title()
-        if (element == None):
-            return
-
-        new_file = devede.file.file()
-        new_file.properties()
-        
-        if (new_file.file_name != None):
-            element.add_file(new_file)
-            self.set_interface_status(None)
-        
-
-    def on_delete_title_clicked(self,b):
-        
-        (element, position, model, treeiter) = self.get_current_title()
-        if (element == None):
-            return
-        
-        ask_w = devede.ask.ask_window(self.paths)
-        if (ask_w.run(_("The title <b>%(X)s</b> will be removed.") % {"X":element.title_name},_("Delete title"))):
-            element.delete_title()
-            model.remove(treeiter)
-            self.set_interface_status(None)
-
-    def on_delete_file_clicked(self,b):
-        
-        (element, position, model, treeiter) = self.get_current_file()
-        if (element == None):
-            return
-        
-        ask_w = devede.ask.ask_window(self.paths)
-        if (ask_w.run(_("The file <b>%(X)s</b> will be removed.") % {"X":element.file_name},_("Delete file"))):
-            element.delete_file()
-            model.remove(treeiter)
-            self.set_interface_status(None)
-
-    def on_up_title_clicked(self,b):
-        
-        (element, position, model, treeiter) = self.get_current_title()
-        if (element == None) or (position == 0):
-            return
-        
-        last_element = self.wliststore_titles[position-1]
-        self.wliststore_titles.swap(last_element.iter,treeiter)
-        self.set_interface_status(None)
-        
-    def on_up_file_clicked(self,b):
-        
-        (element, position, model, treeiter) = self.get_current_file()
-        if (element == None) or (position == 0):
-            return
-        
-        last_element = self.wfiles.get_model()[position-1]
-        self.wfiles.get_model().swap(last_element.iter,treeiter)
-        self.set_interface_status(None)
-        
-    def on_down_title_clicked(self,b):
-        
-        (element, position, model, treeiter) = self.get_current_title()
-        if (element == None) or (position == (len(self.wliststore_titles)-1)):
-            return
-        
-        last_element = self.wliststore_titles[position+1]
-        self.wliststore_titles.swap(last_element.iter,treeiter)
-        self.set_interface_status(None)
-
-    def on_down_file_clicked(self,b):
-        
-        (element, position, model, treeiter) = self.get_current_file()
-        if (element == None) or (position == (len(self.wfiles.get_model())-1)):
-            return
-        
-        last_element = self.wfiles.get_model()[position+1]
-        self.wfiles.get_model().swap(last_element.iter,treeiter)
-        self.set_interface_status(None)
-
     def get_current_title(self):
         """ returns the currently selected title """
 
@@ -371,6 +284,95 @@ class devede_project:
             Gtk.main_quit()
         return True
 
+    def on_add_title_clicked(self,b):
+        """ Creates a new title and adds it to the current project """
+
+        self.get_current_title()
+
+        new_title = devede.title.title(self.wfiles,self.wliststore_files)
+        new_title.set_type(self.disc_type)
+        self.wliststore_titles.append([new_title.title_name, new_title])
+        self.set_interface_status(None)
+
+    def on_add_file_clicked(self,b):
+
+        (element, position, model, treeiter) = self.get_current_title()
+        if (element == None):
+            return
+
+        new_file = devede.file_movie.file_movie()
+        new_file.set_type(self.disc_type)
+        new_file.properties()
+
+        if (new_file.file_name != None):
+            element.add_file(new_file)
+            self.set_interface_status(None)
+
+
+    def on_delete_title_clicked(self,b):
+
+        (element, position, model, treeiter) = self.get_current_title()
+        if (element == None):
+            return
+
+        ask_w = devede.ask.ask_window(self.paths)
+        if (ask_w.run(_("The title <b>%(X)s</b> will be removed.") % {"X":element.title_name},_("Delete title"))):
+            element.delete_title()
+            model.remove(treeiter)
+            self.set_interface_status(None)
+
+    def on_delete_file_clicked(self,b):
+
+        (element, position, model, treeiter) = self.get_current_file()
+        if (element == None):
+            return
+
+        ask_w = devede.ask.ask_window(self.paths)
+        if (ask_w.run(_("The file <b>%(X)s</b> will be removed.") % {"X":element.file_name},_("Delete file"))):
+            element.delete_file()
+            model.remove(treeiter)
+            self.set_interface_status(None)
+
+    def on_up_title_clicked(self,b):
+
+        (element, position, model, treeiter) = self.get_current_title()
+        if (element == None) or (position == 0):
+            return
+
+        last_element = self.wliststore_titles[position-1]
+        self.wliststore_titles.swap(last_element.iter,treeiter)
+        self.set_interface_status(None)
+
+    def on_up_file_clicked(self,b):
+
+        (element, position, model, treeiter) = self.get_current_file()
+        if (element == None) or (position == 0):
+            return
+
+        last_element = self.wfiles.get_model()[position-1]
+        self.wfiles.get_model().swap(last_element.iter,treeiter)
+        self.set_interface_status(None)
+
+    def on_down_title_clicked(self,b):
+
+        (element, position, model, treeiter) = self.get_current_title()
+        if (element == None) or (position == (len(self.wliststore_titles)-1)):
+            return
+
+        last_element = self.wliststore_titles[position+1]
+        self.wliststore_titles.swap(last_element.iter,treeiter)
+        self.set_interface_status(None)
+
+    def on_down_file_clicked(self,b):
+
+        (element, position, model, treeiter) = self.get_current_file()
+        if (element == None) or (position == (len(self.wfiles.get_model())-1)):
+            return
+
+        last_element = self.wfiles.get_model()[position+1]
+        self.wfiles.get_model().swap(last_element.iter,treeiter)
+        self.set_interface_status(None)
+
     def on_adjust_disc_usage_clicked(self,b):
 
         pass

src/devede/title.py

@@ -33,6 +33,10 @@ class title(GObject.GObject):
         self.files = Gtk.ListStore()
         self.files.set_column_types(columns)
 
+    def set_type(self,disc_type):
+
+        self.disc_type = disc_type
+
     def delete_title(self):
 
         print("Deleted title "+self.title_name)