Merge lp:~nico-inattendu/luciole/nico-4 into lp:luciole/0.7

[NicoInattendu]

[NicoInattendu (nico-inattendu)]

Fixed bugs
  Bug #374146: Failed detection of webcam Philips SPC 1030 NC
  Bug #374181: Acqusisition stop when mixer started whitout image on capture view
  Bug #374197: Failed to load project of type other device
  Bug #374249: Focus not disabled for Hscale widgets

French translation update

=== modified file 'lucioLib/controller/controller_load_project.py'
--- lucioLib/controller/controller_load_project.py	2009-05-07 09:27:18 +0000
+++ lucioLib/controller/controller_load_project.py	2009-05-09 17:56:06 +0000
@@ -181,7 +181,7 @@
             # for mixer initialisation set image to miw with the last image of the capture view. only if capture image is not empty
             if len( self.project['capture_images'] ) > 0 :
                 l_last_image_path = os.path.join(self.project['project_dir'],self.project['rush_dir'],self.project['capture_images'][-1])
-                if os.path.exists(l_last_image_path) : acq_obj.Image2Mix = l_last_image_path
+                if os.path.exists(l_last_image_path) and acq_obj != None : acq_obj.Image2Mix = l_last_image_path
             
             #  update fpi on gui and show it
             self.gui.update_fpi(int(self.project['fpi']))
 
=== modified file 'lucioLib/gui/gui_controller.py'
--- lucioLib/gui/gui_controller.py	2009-05-04 22:24:14 +0000
+++ lucioLib/gui/gui_controller.py	2009-05-09 20:32:07 +0000
@@ -283,7 +283,10 @@
         self._snapshot_button =  self.builder.get_object('snapshot_button')
         self._mixer_checkbutton =  self.builder.get_object('mixer_checkbutton')
         self._alpha_hscale = self.builder.get_object('alpha_hscale')
-
+        # focus disable on Hscalse does not work with glade forced here
+        self._alpha_hscale.set_property('can-focus',False)
+        self._alpha_hscale.set_property('can-default',False)
+        
         # load pixbuf for luciole activity in acquiistion button
         self._pxb_luciole_sleep = gtk.gdk.pixbuf_new_from_file("images/luciole-dodo.png")
         self._pxb_luciole_wakedup = gtk.gdk.pixbuf_new_from_file("images/luciole-eveillee.png")
@@ -331,6 +334,9 @@
         self._acq_button =  self.builder.get_object('acquisition_button')
         self._acq_button_image =  self.builder.get_object('acquisition_button_image')
         self._fpi_hscale =  self.builder.get_object('hscale_fps')
+        # focus disable on Hscalse does not work with glade forced here
+        self._fpi_hscale.set_property('can-focus',False)
+        self._fpi_hscale.set_property('can-default',False)
         self._fpi_label = self.builder.get_object('label_fpi')
         
 
@@ -369,7 +375,7 @@
 
     def alpha_hide(self) :
         """ Hide Hscale for alpha mixer """
-        self._alpha_hscale.show() 
+        self._alpha_hscale.hide() 
 
 
 
@@ -622,7 +628,7 @@
     def on_alpha_hscale_value_changed(self,widget) :
         """ Alpha mixer value changed """
         # parameter should be a value between 0 and 1 , so value is divided by max
-        self.ctrl_obj.mixer_alpha_changed( widget.get_value()/ widget.get_adjustment().upper) 
+        self.ctrl_obj.mixer_alpha_changed( widget.get_value()/ widget.get_adjustment().upper)
         
     def on_hscale_fps_value_changed(self,widget) :
         """ Fps Scale value changed"""
@@ -636,6 +642,9 @@
         
         self.ctrl_obj.update_fpi(fpi) 
     
+        self._fpi_hscale.set_property('has-focus',False)
+        self._fpi_hscale.set_property('has-default',False)
+
     def on_hscale_fps_format_value(self,widget,value) :
         """ Fps Scale value changed.
         This callback allow display of range [1..25 ] in the scale bar instead of [1..6] 
 
=== modified file 'lucioLib/lucioWebCamDetect/luciole_webcam_detection.py'
--- lucioLib/lucioWebCamDetect/luciole_webcam_detection.py	2009-05-06 16:38:41 +0000
+++ lucioLib/lucioWebCamDetect/luciole_webcam_detection.py	2009-05-09 16:11:31 +0000
@@ -171,10 +171,25 @@
         nb_device_detected = 0
         for webcam_device in self._webcam_devices :
             # for each detected device get the data (source type, mimetype, resolution) 
-            webcam_device_data = self.__get_gst_webcam_data(webcam_device["device"], webcam_device["v4l_driver"])
-            if webcam_device_data != None :  
+            (status, webcam_device_data) = self.__get_gst_webcam_data(webcam_device["device"], webcam_device["v4l_driver"])
+            if status[0] == gst.STATE_CHANGE_SUCCESS and webcam_device_data != None :  
+                # detection is success
                 webcam_device["webcam_data"] = webcam_device_data
                 nb_device_detected = nb_device_detected +1
+            else :
+                # gstreamer test unsuccesfull : test with other driver
+                if webcam_device["v4l_driver"] == 'v4lsrc' :
+                    webcam_device["v4l_driver"] = 'v4l2src'
+                else :
+                    webcam_device["v4l_driver"] ='v4lsrc'
+                (status, webcam_device_data) = self.__get_gst_webcam_data(webcam_device["device"], webcam_device["v4l_driver"])
+                if status[0] == gst.STATE_CHANGE_SUCCESS and webcam_device_data != None :  
+                    # detection is success
+                    webcam_device["webcam_data"] = webcam_device_data
+                    nb_device_detected = nb_device_detected +1
+                else :
+                    #Nothing detected . Reset webcam device
+                    webcam_device=dict()
         return nb_device_detected
             
 
@@ -225,7 +240,7 @@
             luciole_webcam_detection.gst_get_supported_video_formats(webcam_device,caps)
             # stop playing with webcam
             pipeline.set_state(gst.STATE_NULL)
-        return webcam_device
+        return (ret,webcam_device)
     __get_gst_webcam_data = staticmethod(__get_gst_webcam_data)
 
     def __gst_get_supported_video_formats(webcam_device, caps) :
 
=== modified file 'lucioLib/luciole_acquisition.py'
--- lucioLib/luciole_acquisition.py	2009-05-07 09:27:18 +0000
+++ lucioLib/luciole_acquisition.py	2009-05-09 17:25:06 +0000
@@ -25,11 +25,12 @@
 
 import pygtk
 pygtk.require("2.0")
+import os.path
+import time
 
 import luciole_gstreamer as MGST
 import luciole_constants as LCONST
 import luciole_exceptions as M_EXCEP
-import os.path
 
 
 class luciole_acquisition(object) :
@@ -127,16 +128,6 @@
     def capture_image(self) :
         """ capture/snapshot of an image from video device """ 
         self.GstObj.capture()
-        # commented by nbd@grape : Now job of controller
-        # if self.GstObj.is_playing():
-        #    # copy of snapshot on capture Treeview
-        #    try :
-        #        self.__Image2Mix = self.tvCapture.AppendFromCapture(self.Image2save)
-        #    except M_EXCEP.LucioException,err :
-        #        print " exception dans capture_image" + err.message
-        #    else: 
-        #        if ( self.__IsOnionSkinActive) :
-        #            self.GstObj.image2Mix =  self.__Image2Mix
   
     def active_onion_skin(self,Img = None) : 
         """ activation of onion skin"""
@@ -145,7 +136,6 @@
         # first if an image was yet captured ( self.__Image2Mix Not empty)
         # if no image select, checl if an image is given as parameter  
         # if no image as parm image. get an image from stream by forcing a capture
-        print "image 2 mix : ", self.__Image2Mix
         if ( self.__Image2Mix ) :
             self.GstObj.image2Mix =  self.__Image2Mix
         else :
@@ -153,7 +143,12 @@
                 self.GstObj.image2Mix = Img
             else :
                 # force image capture
-                self.GstObj.stop()
+                self.GstObj.capture()
+                #wait acquisition is done i.e. file self.Image2save exists on dir
+                # this wait is done for simplification . could be also done with 
+                # callback on_capture
+                while not os.path.exists(self.Image2save) :
+                    time.sleep(0.01)
                 self.__Image2Mix = self.Image2save
                 if ( self.__Image2Mix ) :
                     self.GstObj.image2Mix =  self.__Image2Mix
 
=== modified file 'po/de_DE/LC_MESSAGES/luciole.mo'
 Binary files po/de_DE/LC_MESSAGES/luciole.mo	2009-05-06 17:15:46 +0000 and po/de_DE/LC_MESSAGES/luciole.mo	2009-05-09 20:44:28 +0000 differ
=== modified file 'po/en_EN/LC_MESSAGES/luciole.mo'
 Binary files po/en_EN/LC_MESSAGES/luciole.mo	2009-05-06 17:15:46 +0000 and po/en_EN/LC_MESSAGES/luciole.mo	2009-05-09 20:44:28 +0000 differ
=== modified file 'po/en_US/LC_MESSAGES/luciole.mo'
 Binary files po/en_US/LC_MESSAGES/luciole.mo	2009-05-06 17:15:46 +0000 and po/en_US/LC_MESSAGES/luciole.mo	2009-05-09 20:44:28 +0000 differ
=== modified file 'po/fr_FR.po'
--- po/fr_FR.po	2009-05-07 09:27:18 +0000
+++ po/fr_FR.po	2009-05-09 20:44:28 +0000
@@ -9,14 +9,14 @@
 msgstr ""
 "Project-Id-Version: myrtille export\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-07 11:21+0200\n"
-"PO-Revision-Date: 2009-04-30 18:04+0000\n"
+"POT-Creation-Date: 2009-05-09 22:41+0200\n"
+"PO-Revision-Date: 2009-05-08 17:28+0000\n"
 "Last-Translator: Lili <Unknown>\n"
 "Language-Team: French <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-05-01 14:52+0000\n"
+"X-Launchpad-Export-Date: 2009-05-09 20:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../images/luciole.glade.h:1
@@ -34,7 +34,7 @@
 
 #: ../images/luciole.glade.h:5
 msgid " Export file name (without extension)  :"
-msgstr " nom du fichier (sans extension)"
+msgstr " Nom du fichier (sans extension)"
 
 #: ../images/luciole.glade.h:6
 msgid "About"
@@ -57,9 +57,8 @@
 msgstr "Choisir un format d'export"
 
 #: ../images/luciole.glade.h:11
-#, fuzzy
 msgid "Copyright 2009  Nicolas Bertrand /GRAPE"
-msgstr "Copyright 2009 Nicolas Bertrand/GRAPE"
+msgstr "Copyright 2009 Nicolas Bertrand / GRAPE"
 
 #: ../images/luciole.glade.h:12
 msgid ""
@@ -75,7 +74,7 @@
 msgid ""
 "Default\n"
 "Tropical"
-msgstr ""
+msgstr "Tropical"
 
 #: ../images/luciole.glade.h:17
 msgid ""
@@ -83,10 +82,10 @@
 "Nico : [e-mail]"
 msgstr ""
 
+# msgstr "Le Fichier %s existe. Ecraser ce fichier ?"
 #: ../images/luciole.glade.h:19
-#, fuzzy
 msgid "Export"
-msgstr "Export terminé"
+msgstr "Export"
 
 #: ../images/luciole.glade.h:20
 msgid "Export path:"
@@ -134,7 +133,7 @@
 #. Monter un/ou plusieurs images
 #: ../images/luciole.glade.h:34
 msgid "Move up one or several images"
-msgstr "Monter une ou plusieurs images"
+msgstr "Monter une  ou plusieurs images"
 
 #: ../images/luciole.glade.h:35
 msgid "Open recent"
@@ -188,20 +187,19 @@
 "Inc., 59 Temple Place - \n"
 "Suite 330, Boston, MA 02111-1307, USA."
 msgstr ""
-"Ce programme est un logiciel libre, vous pouvez le redistribuer et / ou le \n"
-"modifier selon les termes de la GNU General Public License publiée par la \n"
-"Free Software Foundation ; soit la version 2 de la Licence, ou (à votre \n"
+"Ce programme est un logiciel libre, vous pouvez le redistribuer et / ou le "
+"modifier selon les termes de la GNU General Public License publiée par la "
+"Free Software Foundation ; soit la version 2 de la Licence, ou (à votre "
 "convenance) toute version ultérieure.\n"
-"Ce programme est distribué dans l'espoir qu'il sera utile, mais SANS "
-"AUCUNE \n"
-"GARANTIE ; sans même une garantie implicite de commercialisation ou \n"
+"Ce programme est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE "
+"GARANTIE ; sans même une garantie implicite de commercialisation ou "
 "d'adaptation à un USAGE PARTICULIER. Voir la GNU General Public\n"
 "License pour plus de détails.\n"
-"Vous devriez avoir reçu une copie de la GNU General Public License avec ce \n"
+"Vous devriez avoir reçu une copie de la GNU General Public License avec ce "
 "programme ; sinon, écrivez à la\n"
 "Free Software Foundation,\n"
 "Inc, 59 Temple Place -\n"
-"Suite 330, Boston, MA 02111-1307, USA.\n"
+"Suite 330, Boston, MA 02111-1307, USA."
 
 #. Jeter &#xE0; la poubelle
 #: ../images/luciole.glade.h:60
@@ -212,11 +210,9 @@
 msgid "Transparency level"
 msgstr "Niveau de transparence"
 
-# msgstr "Le Fichier %s existe. Ecraser ce fichier ?"
 #: ../images/luciole.glade.h:62
-#, fuzzy
 msgid "Video Export"
-msgstr "Export"
+msgstr "Export vidéo"
 
 #: ../images/luciole.glade.h:63
 msgid "_File"
@@ -224,11 +220,11 @@
 
 #: ../images/luciole.glade.h:64
 msgid "_Help"
-msgstr "_Aide"
+msgstr "Aide"
 
 #: ../images/luciole.glade.h:65
 msgid "_View"
-msgstr "_Options"
+msgstr "_Affichage"
 
 #: ../images/luciole.glade.h:66
 msgid "gtk-apply"
@@ -294,9 +290,8 @@
 msgstr "Toutes les images ont été importées"
 
 #: ../lucioLib/controller/controller_import.py:189
-#, fuzzy
 msgid "Importing images ..."
-msgstr "Images en cours d'import..."
+msgstr "Images en cours d'import ..."
 
 #: ../lucioLib/gui/dialog_project_properties.py:41
 msgid "Project folder :"
@@ -421,6 +416,8 @@
 " Other device.\n"
 "(Manual import)"
 msgstr ""
+" Autre matériel\n"
+"(import manuel)"
 
 #: ../lucioLib/gui/assistant_new_project.py:240
 msgid "Images per second"
@@ -504,7 +501,6 @@
 msgstr "Détection de webcam terminée"
 
 #: ../lucioLib/gui/webcam_detection_widget.py:188
-#, fuzzy
 msgid "Detected webcam(s)"
 msgstr "Webcam détectée(s)"
 
@@ -522,7 +518,7 @@
 
 #: ../lucioLib/luciole_constants.py:42
 msgid "OTHER DEVICE"
-msgstr ""
+msgstr "AUTRE MATERIEL"
 
 #: ../lucioLib/luciole_controller.py:157
 #, python-format
@@ -583,6 +579,9 @@
 "No acquisition available. Use 'import image' button to load images in "
 "project."
 msgstr ""
+"L'acquisition n'est pas disponible pour ce type de matériel.\n"
+"Veuillez utiliser le bouton 'import images' pour ajouter des images dans le "
+"projet."
 
 #: ../lucioLib/luciole_controller.py:436
 msgid " Can not start acquisition when no project are loaded."
@@ -607,7 +606,6 @@
 msgstr "Merci de redémarrer Luciole pour prendre en compte le nouveau thème. "
 
 #: ../lucioLib/luciole_controller.py:650
-#, fuzzy
 msgid "Failed to load project "
 msgstr "Impossible de charger le projet "
 
 
=== modified file 'po/fr_FR/LC_MESSAGES/luciole.mo'
 Binary files po/fr_FR/LC_MESSAGES/luciole.mo	2009-05-06 17:15:46 +0000 and po/fr_FR/LC_MESSAGES/luciole.mo	2009-05-09 20:44:28 +0000 differ
=== modified file 'po/luciole.pot'
--- po/luciole.pot	2009-05-07 09:27:18 +0000
+++ po/luciole.pot	2009-05-09 20:44:28 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-07 11:21+0200\n"
+"POT-Creation-Date: 2009-05-09 22:42+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"