Version 8: GUI tweaks and minor bugfix

2 files changed, 23 insertions, 63 deletions

diff --git a/activity/activity.info b/activity/activity.info
index ee3fc3f..a3d7c63 100755
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -5,7 +5,7 @@ name = FileMix
 bundle_id = org.laptop.FileMix
 icon = activity-filemix
 
-activity_version = 7
+activity_version = 8
 
 host_version = 1
 
diff --git a/filemix.py b/filemix.py
index f5be07a..8506b87 100755
--- a/filemix.py
+++ b/filemix.py
@@ -11,8 +11,8 @@
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
-# version 7  Changes:
-#    Record Activity compatibility updated.
+# version 8  Changes:
+#    GUI tweaks and minor bugfix
 
 
 import csndsugui
@@ -31,14 +31,9 @@ class FileMix(activity.Activity):
    red = (0xDDDD, 0, 0)
    brown = (0x6600, 0, 0)
    green = (0, 0x5500, 0)
-   self.path1 = "0"
-   self.path2 = "0"
-   self.path3 = "0"
-   self.path4 = "0"
-   self.jobject1 = None
-   self.jobject2 = None
-   self.jobject3 = None
-   self.jobject4 = None
+   self.paths = ["0"]*5
+   self.jobjects = [None]*5
+   self.buts = [None]*5
 
    win = csndsugui.CsoundGUI(self)
    width = gtk.gdk.screen_width()
@@ -132,18 +127,9 @@ select your own <b>audio</b> file(s) from Journal.\n\
   Deselect by closing Journal. Create files with Record \
 or Audacity (see ReadMe.txt).", self.b2box, brown)
      win.text("   Load File(s):", self.b2box, brown)
-     but5 = win.cbbutton(self.b2box, self.choose1, " 1 ")
-     but5.modify_bg(gtk.STATE_NORMAL, gtk.gdk.Color(0x6600, 0, 0))
-     but5.modify_bg(gtk.STATE_PRELIGHT, gtk.gdk.Color(0x6600, 0, 0))
-     but6 = win.cbbutton(self.b2box, self.choose2, " 2 ")
-     but6.modify_bg(gtk.STATE_NORMAL, gtk.gdk.Color(0x6600, 0, 0))
-     but6.modify_bg(gtk.STATE_PRELIGHT, gtk.gdk.Color(0x6600, 0, 0))
-     but7 = win.cbbutton(self.b2box, self.choose3, " 3 ")
-     but7.modify_bg(gtk.STATE_NORMAL, gtk.gdk.Color(0x6600, 0, 0))
-     but7.modify_bg(gtk.STATE_PRELIGHT, gtk.gdk.Color(0x6600, 0, 0))
-     but8 = win.cbbutton(self.b2box, self.choose4, " 4 ")
-     but8.modify_bg(gtk.STATE_NORMAL, gtk.gdk.Color(0x6600, 0, 0))
-     but8.modify_bg(gtk.STATE_PRELIGHT, gtk.gdk.Color(0x6600, 0, 0))
+     for i in range(1, 5):
+       self.buts[i] = win.cbbutton(self.b2box, self.choose, " %d " %i)
+       self.buts[i].modify_bg(gtk.STATE_NORMAL, gtk.gdk.Color(0x6600, 0, 0))
 
    bbox = win.box(False, all)
    self.bb = bbox
@@ -153,51 +139,25 @@ or Audacity (see ReadMe.txt).", self.b2box, brown)
    self.br = brown
    self.ver = 0
 
- def choose1(self, widget):
+ def choose(self, widget):
    chooser = ObjectChooser(parent=self, what_filter=mime.GENERIC_TYPE_AUDIO)
    result = chooser.run()
+   index = self.b2box.child_get_property(widget, "position")
+   index = index - 1
    if result == gtk.RESPONSE_ACCEPT:
-     self.jobject1 = chooser.get_selected_object()
-     self.path1 = str(self.jobject1.get_file_path())
+     self.jobjects[index] = chooser.get_selected_object()
+     self.paths[index] = str(self.jobjects[index].get_file_path())
+     self.buts[index].modify_bg(gtk.STATE_NORMAL, gtk.gdk.Color(0, 0x8800, 0))
+     self.buts[index].modify_bg(gtk.STATE_PRELIGHT, gtk.gdk.Color(0, 0x8800, 0))
    else:
-     self.jobject1 = None
-     self.path1 = "0"
+     self.paths[index] = "0"
+     self.jobjects[index] = None
+     self.buts[index].modify_bg(gtk.STATE_NORMAL, gtk.gdk.Color(0x6600, 0, 0))
+     self.buts[index].modify_bg(gtk.STATE_PRELIGHT, gtk.gdk.Color(0x6600, 0, 0))
 
- def choose2(self, widget):
-   chooser = ObjectChooser(parent=self, what_filter=mime.GENERIC_TYPE_AUDIO)
-   result = chooser.run()
-   if result == gtk.RESPONSE_ACCEPT:
-     self.jobject2 = chooser.get_selected_object()
-     self.path2 = str(self.jobject2.get_file_path())
-   else:
-     self.jobject2 = None
-     self.path2 = "0"
-
- def choose3(self, widget):
-   chooser = ObjectChooser(parent=self, what_filter=mime.GENERIC_TYPE_AUDIO)
-   result = chooser.run()
-   if result == gtk.RESPONSE_ACCEPT:
-     self.jobject3 = chooser.get_selected_object()
-     self.path3 = str(self.jobject3.get_file_path())
-   else:
-     self.jobject3 = None
-     self.path3 = "0"
-
- def choose4(self, widget):
-   chooser = ObjectChooser(parent=self, what_filter=mime.GENERIC_TYPE_AUDIO)
-   result = chooser.run()
-   if result == gtk.RESPONSE_ACCEPT:
-     self.jobject4 = chooser.get_selected_object()
-     self.path4 = str(self.jobject4.get_file_path())
-   else:
-     self.jobject4 = None
-     self.path4 = "0"
-
- def send_data(self):  
-   self.w.set_filechannel("file1", self.path1)
-   self.w.set_filechannel("file2", self.path2)
-   self.w.set_filechannel("file3", self.path3)
-   self.w.set_filechannel("file4", self.path4)
+ def send_data(self):
+   for i in range(1, 5):
+     self.w.set_filechannel("file%d" % i, self.paths[i])
 
  def onKeyPress(self, widget, event):
    if self.p: