Merge lp:~jonobacon/lolocopter/importing-sounds into lp:lolocopter

[Jono Bacon]

[Jono Bacon (jonobacon)]

 * Adding functionality to import a lol to the lolobase.

[Stuart Langridge (sil)]

Nice.

review: Approve

=== modified file 'data/ui/AddSoundLolocopterDialog.ui'
--- data/ui/AddSoundLolocopterDialog.ui	2009-11-14 17:18:08 +0000
+++ data/ui/AddSoundLolocopterDialog.ui	2009-11-14 19:30:23 +0000
@@ -5,6 +5,7 @@
   <!-- interface-naming-policy project-wide -->
   <object class="AddSoundLolocopterDialog" id="addsound_lolocopter_dialog">
     <property name="border_width">5</property>
+    <property name="title" translatable="yes">Add a sound to LOL at</property>
     <property name="icon">../media/icon.png</property>
     <property name="type_hint">normal</property>
     <property name="has_separator">False</property>
@@ -18,48 +19,61 @@
             <property name="visible">True</property>
             <property name="orientation">vertical</property>
             <child>
-              <object class="GtkTreeView" id="sound_treeview">
+              <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="label" translatable="yes">Choosing a sound to LOL at is as
+simple as following these two steps.</property>
+                <property name="use_markup">True</property>
               </object>
               <packing>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkHButtonBox" id="hbuttonbox1">
+              <object class="GtkTable" id="table1">
                 <property name="visible">True</property>
-                <property name="layout_style">end</property>
-                <child>
-                  <object class="GtkButton" id="delete_sound">
-                    <property name="label">gtk-delete</property>
+                <property name="n_rows">2</property>
+                <property name="n_columns">2</property>
+                <child>
+                  <object class="GtkLabel" id="label2">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">1. Choose a sound to LOL to</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkFileChooserButton" id="filechooser_sound">
+                    <property name="visible">True</property>
+                    <property name="create_folders">False</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label3">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">2. Give said LOL a name</property>
+                  </object>
+                  <packing>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="tb_soundname">
                     <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="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkFileChooserButton" id="filechooserbutton1">
-                    <property name="visible">True</property>
-                    <property name="create_folders">False</property>
-                    <property name="use_preview_label">False</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
                   </packing>
                 </child>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>

=== modified file 'lolocopter/AddSoundLolocopterDialog.py'
--- lolocopter/AddSoundLolocopterDialog.py	2009-11-14 17:18:08 +0000
+++ lolocopter/AddSoundLolocopterDialog.py	2009-11-14 19:30:23 +0000
@@ -17,6 +17,8 @@
 import sys
 import os
 import gtk
+import xdg.BaseDirectory
+import shutil
 
 from lolocopter.lolocopterconfig import getdatapath
 
@@ -45,40 +47,31 @@
         self.builder = builder
         self.builder.connect_signals(self)
 
-        self.sound_treeview = builder.get_object("sound_treeview")
-
-        self.sound_model = gtk.ListStore(str, str)
-        self.sound_treeview.set_model(self.sound_model)
-
-        self.tvcolumn = gtk.TreeViewColumn('Available LOLs')
-        self.cellsound = gtk.CellRendererPixbuf()
-        self.cell = gtk.CellRendererText()
-
-        self.tvcolumn.pack_start(self.cellsound, False)
-        self.tvcolumn.pack_start(self.cell, True)
-
-        self.tvcolumn.set_attributes(self.cellsound, stock_id=0)
-        self.tvcolumn.set_attributes(self.cell, text=1)
-
-        self.sound_treeview.append_column(self.tvcolumn)
-
-        lis = ["foo", "bar", "bas"]
-        
-        templist = []
-
-        for l in lis:
-            templist.append(gtk.STOCK_DND)
-            templist.append(l)
-            self.sound_model.append(templist)
-            templist = []
-
-
+        self.lolfile = builder.get_object("filechooser_sound")
+        self.lolname = builder.get_object("tb_soundname")
+
+        # create the sounds directory if not there
+        self.lolofolder = xdg.BaseDirectory.save_data_path('lolocopter')
+        self.lolofolder_sounds = os.path.join(self.lolofolder,"sounds")
+
+        try:
+            os.mkdir(self.lolofolder_sounds)
+        except:
+            pass
+            
     def ok(self, widget, data=None):
         """ok - The user has elected to save the changes.
         Called before the dialog returns gtk.RESONSE_OK from run().
+        Copies the sound over to the 'lolocopter/sounds' folder
         """
 
-        print "ok"
+        # copy the file to the sounds folder
+        shutil.copy(self.lolfile.get_filename(), self.lolofolder_sounds)
+
+        # this is the label of the sound
+        self.lol_name = self.lolname.get_text()
+        
+        
 
     def cancel(self, widget, data=None):
         """cancel - The user has elected cancel changes.
@@ -87,6 +80,8 @@
 
         #restore any changes to self.__preferences here
         pass
+        
+        
 
 def NewAddSoundLolocopterDialog():
     """NewAddSoundLolocopterDialog - returns a fully instantiated