Luciole

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

  1. nico-4
  2. Merge into main
Proposed by NicoInattendu
Status: Merged
Approved by: NicoInattendu
Approved revision: 24
Merged at revision: not available
Proposed branch: lp:~nico-inattendu/luciole/nico-4
Merge into: lp:luciole/0.7
Diff against target: None lines
To merge this branch: bzr merge lp:~nico-inattendu/luciole/nico-4
Reviewer Review Type Date Requested Status
NicoInattendu Pending
Review via email: mp+6380@code.launchpad.net
To post a comment you must log in.
Revision history for this message
NicoInattendu (nico-inattendu) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lucioLib/controller/controller_load_project.py'
2--- lucioLib/controller/controller_load_project.py 2009-05-07 09:27:18 +0000
3+++ lucioLib/controller/controller_load_project.py 2009-05-09 17:56:06 +0000
4@@ -181,7 +181,7 @@
5 # for mixer initialisation set image to miw with the last image of the capture view. only if capture image is not empty
6 if len( self.project['capture_images'] ) > 0 :
7 l_last_image_path = os.path.join(self.project['project_dir'],self.project['rush_dir'],self.project['capture_images'][-1])
8- if os.path.exists(l_last_image_path) : acq_obj.Image2Mix = l_last_image_path
9+ if os.path.exists(l_last_image_path) and acq_obj != None : acq_obj.Image2Mix = l_last_image_path
10
11 # update fpi on gui and show it
12 self.gui.update_fpi(int(self.project['fpi']))
13
14=== modified file 'lucioLib/gui/gui_controller.py'
15--- lucioLib/gui/gui_controller.py 2009-05-04 22:24:14 +0000
16+++ lucioLib/gui/gui_controller.py 2009-05-09 20:32:07 +0000
17@@ -283,7 +283,10 @@
18 self._snapshot_button = self.builder.get_object('snapshot_button')
19 self._mixer_checkbutton = self.builder.get_object('mixer_checkbutton')
20 self._alpha_hscale = self.builder.get_object('alpha_hscale')
21-
22+ # focus disable on Hscalse does not work with glade forced here
23+ self._alpha_hscale.set_property('can-focus',False)
24+ self._alpha_hscale.set_property('can-default',False)
25+
26 # load pixbuf for luciole activity in acquiistion button
27 self._pxb_luciole_sleep = gtk.gdk.pixbuf_new_from_file("images/luciole-dodo.png")
28 self._pxb_luciole_wakedup = gtk.gdk.pixbuf_new_from_file("images/luciole-eveillee.png")
29@@ -331,6 +334,9 @@
30 self._acq_button = self.builder.get_object('acquisition_button')
31 self._acq_button_image = self.builder.get_object('acquisition_button_image')
32 self._fpi_hscale = self.builder.get_object('hscale_fps')
33+ # focus disable on Hscalse does not work with glade forced here
34+ self._fpi_hscale.set_property('can-focus',False)
35+ self._fpi_hscale.set_property('can-default',False)
36 self._fpi_label = self.builder.get_object('label_fpi')
37
38
39@@ -369,7 +375,7 @@
40
41 def alpha_hide(self) :
42 """ Hide Hscale for alpha mixer """
43- self._alpha_hscale.show()
44+ self._alpha_hscale.hide()
45
46
47
48@@ -622,7 +628,7 @@
49 def on_alpha_hscale_value_changed(self,widget) :
50 """ Alpha mixer value changed """
51 # parameter should be a value between 0 and 1 , so value is divided by max
52- self.ctrl_obj.mixer_alpha_changed( widget.get_value()/ widget.get_adjustment().upper)
53+ self.ctrl_obj.mixer_alpha_changed( widget.get_value()/ widget.get_adjustment().upper)
54
55 def on_hscale_fps_value_changed(self,widget) :
56 """ Fps Scale value changed"""
57@@ -636,6 +642,9 @@
58
59 self.ctrl_obj.update_fpi(fpi)
60
61+ self._fpi_hscale.set_property('has-focus',False)
62+ self._fpi_hscale.set_property('has-default',False)
63+
64 def on_hscale_fps_format_value(self,widget,value) :
65 """ Fps Scale value changed.
66 This callback allow display of range [1..25 ] in the scale bar instead of [1..6]
67
68=== modified file 'lucioLib/lucioWebCamDetect/luciole_webcam_detection.py'
69--- lucioLib/lucioWebCamDetect/luciole_webcam_detection.py 2009-05-06 16:38:41 +0000
70+++ lucioLib/lucioWebCamDetect/luciole_webcam_detection.py 2009-05-09 16:11:31 +0000
71@@ -171,10 +171,25 @@
72 nb_device_detected = 0
73 for webcam_device in self._webcam_devices :
74 # for each detected device get the data (source type, mimetype, resolution)
75- webcam_device_data = self.__get_gst_webcam_data(webcam_device["device"], webcam_device["v4l_driver"])
76- if webcam_device_data != None :
77+ (status, webcam_device_data) = self.__get_gst_webcam_data(webcam_device["device"], webcam_device["v4l_driver"])
78+ if status[0] == gst.STATE_CHANGE_SUCCESS and webcam_device_data != None :
79+ # detection is success
80 webcam_device["webcam_data"] = webcam_device_data
81 nb_device_detected = nb_device_detected +1
82+ else :
83+ # gstreamer test unsuccesfull : test with other driver
84+ if webcam_device["v4l_driver"] == 'v4lsrc' :
85+ webcam_device["v4l_driver"] = 'v4l2src'
86+ else :
87+ webcam_device["v4l_driver"] ='v4lsrc'
88+ (status, webcam_device_data) = self.__get_gst_webcam_data(webcam_device["device"], webcam_device["v4l_driver"])
89+ if status[0] == gst.STATE_CHANGE_SUCCESS and webcam_device_data != None :
90+ # detection is success
91+ webcam_device["webcam_data"] = webcam_device_data
92+ nb_device_detected = nb_device_detected +1
93+ else :
94+ #Nothing detected . Reset webcam device
95+ webcam_device=dict()
96 return nb_device_detected
97
98
99@@ -225,7 +240,7 @@
100 luciole_webcam_detection.gst_get_supported_video_formats(webcam_device,caps)
101 # stop playing with webcam
102 pipeline.set_state(gst.STATE_NULL)
103- return webcam_device
104+ return (ret,webcam_device)
105 __get_gst_webcam_data = staticmethod(__get_gst_webcam_data)
106
107 def __gst_get_supported_video_formats(webcam_device, caps) :
108
109=== modified file 'lucioLib/luciole_acquisition.py'
110--- lucioLib/luciole_acquisition.py 2009-05-07 09:27:18 +0000
111+++ lucioLib/luciole_acquisition.py 2009-05-09 17:25:06 +0000
112@@ -25,11 +25,12 @@
113
114 import pygtk
115 pygtk.require("2.0")
116+import os.path
117+import time
118
119 import luciole_gstreamer as MGST
120 import luciole_constants as LCONST
121 import luciole_exceptions as M_EXCEP
122-import os.path
123
124
125 class luciole_acquisition(object) :
126@@ -127,16 +128,6 @@
127 def capture_image(self) :
128 """ capture/snapshot of an image from video device """
129 self.GstObj.capture()
130- # commented by nbd@grape : Now job of controller
131- # if self.GstObj.is_playing():
132- # # copy of snapshot on capture Treeview
133- # try :
134- # self.__Image2Mix = self.tvCapture.AppendFromCapture(self.Image2save)
135- # except M_EXCEP.LucioException,err :
136- # print " exception dans capture_image" + err.message
137- # else:
138- # if ( self.__IsOnionSkinActive) :
139- # self.GstObj.image2Mix = self.__Image2Mix
140
141 def active_onion_skin(self,Img = None) :
142 """ activation of onion skin"""
143@@ -145,7 +136,6 @@
144 # first if an image was yet captured ( self.__Image2Mix Not empty)
145 # if no image select, checl if an image is given as parameter
146 # if no image as parm image. get an image from stream by forcing a capture
147- print "image 2 mix : ", self.__Image2Mix
148 if ( self.__Image2Mix ) :
149 self.GstObj.image2Mix = self.__Image2Mix
150 else :
151@@ -153,7 +143,12 @@
152 self.GstObj.image2Mix = Img
153 else :
154 # force image capture
155- self.GstObj.stop()
156+ self.GstObj.capture()
157+ #wait acquisition is done i.e. file self.Image2save exists on dir
158+ # this wait is done for simplification . could be also done with
159+ # callback on_capture
160+ while not os.path.exists(self.Image2save) :
161+ time.sleep(0.01)
162 self.__Image2Mix = self.Image2save
163 if ( self.__Image2Mix ) :
164 self.GstObj.image2Mix = self.__Image2Mix
165
166=== modified file 'po/de_DE/LC_MESSAGES/luciole.mo'
167Binary 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
168=== modified file 'po/en_EN/LC_MESSAGES/luciole.mo'
169Binary 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
170=== modified file 'po/en_US/LC_MESSAGES/luciole.mo'
171Binary 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
172=== modified file 'po/fr_FR.po'
173--- po/fr_FR.po 2009-05-07 09:27:18 +0000
174+++ po/fr_FR.po 2009-05-09 20:44:28 +0000
175@@ -9,14 +9,14 @@
176 msgstr ""
177 "Project-Id-Version: myrtille export\n"
178 "Report-Msgid-Bugs-To: \n"
179-"POT-Creation-Date: 2009-05-07 11:21+0200\n"
180-"PO-Revision-Date: 2009-04-30 18:04+0000\n"
181+"POT-Creation-Date: 2009-05-09 22:41+0200\n"
182+"PO-Revision-Date: 2009-05-08 17:28+0000\n"
183 "Last-Translator: Lili <Unknown>\n"
184 "Language-Team: French <gnomefr@traduc.org>\n"
185 "MIME-Version: 1.0\n"
186 "Content-Type: text/plain; charset=UTF-8\n"
187 "Content-Transfer-Encoding: 8bit\n"
188-"X-Launchpad-Export-Date: 2009-05-01 14:52+0000\n"
189+"X-Launchpad-Export-Date: 2009-05-09 20:20+0000\n"
190 "X-Generator: Launchpad (build Unknown)\n"
191
192 #: ../images/luciole.glade.h:1
193@@ -34,7 +34,7 @@
194
195 #: ../images/luciole.glade.h:5
196 msgid " Export file name (without extension) :"
197-msgstr " nom du fichier (sans extension)"
198+msgstr " Nom du fichier (sans extension)"
199
200 #: ../images/luciole.glade.h:6
201 msgid "About"
202@@ -57,9 +57,8 @@
203 msgstr "Choisir un format d'export"
204
205 #: ../images/luciole.glade.h:11
206-#, fuzzy
207 msgid "Copyright 2009 Nicolas Bertrand /GRAPE"
208-msgstr "Copyright 2009 Nicolas Bertrand/GRAPE"
209+msgstr "Copyright 2009 Nicolas Bertrand / GRAPE"
210
211 #: ../images/luciole.glade.h:12
212 msgid ""
213@@ -75,7 +74,7 @@
214 msgid ""
215 "Default\n"
216 "Tropical"
217-msgstr ""
218+msgstr "Tropical"
219
220 #: ../images/luciole.glade.h:17
221 msgid ""
222@@ -83,10 +82,10 @@
223 "Nico : nico@inattendu.org"
224 msgstr ""
225
226+# msgstr "Le Fichier %s existe. Ecraser ce fichier ?"
227 #: ../images/luciole.glade.h:19
228-#, fuzzy
229 msgid "Export"
230-msgstr "Export terminé"
231+msgstr "Export"
232
233 #: ../images/luciole.glade.h:20
234 msgid "Export path:"
235@@ -134,7 +133,7 @@
236 #. Monter un/ou plusieurs images
237 #: ../images/luciole.glade.h:34
238 msgid "Move up one or several images"
239-msgstr "Monter une ou plusieurs images"
240+msgstr "Monter une ou plusieurs images"
241
242 #: ../images/luciole.glade.h:35
243 msgid "Open recent"
244@@ -188,20 +187,19 @@
245 "Inc., 59 Temple Place - \n"
246 "Suite 330, Boston, MA 02111-1307, USA."
247 msgstr ""
248-"Ce programme est un logiciel libre, vous pouvez le redistribuer et / ou le \n"
249-"modifier selon les termes de la GNU General Public License publiée par la \n"
250-"Free Software Foundation ; soit la version 2 de la Licence, ou (à votre \n"
251+"Ce programme est un logiciel libre, vous pouvez le redistribuer et / ou le "
252+"modifier selon les termes de la GNU General Public License publiée par la "
253+"Free Software Foundation ; soit la version 2 de la Licence, ou (à votre "
254 "convenance) toute version ultérieure.\n"
255-"Ce programme est distribué dans l'espoir qu'il sera utile, mais SANS "
256-"AUCUNE \n"
257-"GARANTIE ; sans même une garantie implicite de commercialisation ou \n"
258+"Ce programme est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE "
259+"GARANTIE ; sans même une garantie implicite de commercialisation ou "
260 "d'adaptation à un USAGE PARTICULIER. Voir la GNU General Public\n"
261 "License pour plus de détails.\n"
262-"Vous devriez avoir reçu une copie de la GNU General Public License avec ce \n"
263+"Vous devriez avoir reçu une copie de la GNU General Public License avec ce "
264 "programme ; sinon, écrivez à la\n"
265 "Free Software Foundation,\n"
266 "Inc, 59 Temple Place -\n"
267-"Suite 330, Boston, MA 02111-1307, USA.\n"
268+"Suite 330, Boston, MA 02111-1307, USA."
269
270 #. Jeter &#xE0; la poubelle
271 #: ../images/luciole.glade.h:60
272@@ -212,11 +210,9 @@
273 msgid "Transparency level"
274 msgstr "Niveau de transparence"
275
276-# msgstr "Le Fichier %s existe. Ecraser ce fichier ?"
277 #: ../images/luciole.glade.h:62
278-#, fuzzy
279 msgid "Video Export"
280-msgstr "Export"
281+msgstr "Export vidéo"
282
283 #: ../images/luciole.glade.h:63
284 msgid "_File"
285@@ -224,11 +220,11 @@
286
287 #: ../images/luciole.glade.h:64
288 msgid "_Help"
289-msgstr "_Aide"
290+msgstr "Aide"
291
292 #: ../images/luciole.glade.h:65
293 msgid "_View"
294-msgstr "_Options"
295+msgstr "_Affichage"
296
297 #: ../images/luciole.glade.h:66
298 msgid "gtk-apply"
299@@ -294,9 +290,8 @@
300 msgstr "Toutes les images ont été importées"
301
302 #: ../lucioLib/controller/controller_import.py:189
303-#, fuzzy
304 msgid "Importing images ..."
305-msgstr "Images en cours d'import..."
306+msgstr "Images en cours d'import ..."
307
308 #: ../lucioLib/gui/dialog_project_properties.py:41
309 msgid "Project folder :"
310@@ -421,6 +416,8 @@
311 " Other device.\n"
312 "(Manual import)"
313 msgstr ""
314+" Autre matériel\n"
315+"(import manuel)"
316
317 #: ../lucioLib/gui/assistant_new_project.py:240
318 msgid "Images per second"
319@@ -504,7 +501,6 @@
320 msgstr "Détection de webcam terminée"
321
322 #: ../lucioLib/gui/webcam_detection_widget.py:188
323-#, fuzzy
324 msgid "Detected webcam(s)"
325 msgstr "Webcam détectée(s)"
326
327@@ -522,7 +518,7 @@
328
329 #: ../lucioLib/luciole_constants.py:42
330 msgid "OTHER DEVICE"
331-msgstr ""
332+msgstr "AUTRE MATERIEL"
333
334 #: ../lucioLib/luciole_controller.py:157
335 #, python-format
336@@ -583,6 +579,9 @@
337 "No acquisition available. Use 'import image' button to load images in "
338 "project."
339 msgstr ""
340+"L'acquisition n'est pas disponible pour ce type de matériel.\n"
341+"Veuillez utiliser le bouton 'import images' pour ajouter des images dans le "
342+"projet."
343
344 #: ../lucioLib/luciole_controller.py:436
345 msgid " Can not start acquisition when no project are loaded."
346@@ -607,7 +606,6 @@
347 msgstr "Merci de redémarrer Luciole pour prendre en compte le nouveau thème. "
348
349 #: ../lucioLib/luciole_controller.py:650
350-#, fuzzy
351 msgid "Failed to load project "
352 msgstr "Impossible de charger le projet "
353
354
355=== modified file 'po/fr_FR/LC_MESSAGES/luciole.mo'
356Binary 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
357=== modified file 'po/luciole.pot'
358--- po/luciole.pot 2009-05-07 09:27:18 +0000
359+++ po/luciole.pot 2009-05-09 20:44:28 +0000
360@@ -8,7 +8,7 @@
361 msgstr ""
362 "Project-Id-Version: PACKAGE VERSION\n"
363 "Report-Msgid-Bugs-To: \n"
364-"POT-Creation-Date: 2009-05-07 11:21+0200\n"
365+"POT-Creation-Date: 2009-05-09 22:42+0200\n"
366 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
367 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
368 "Language-Team: LANGUAGE <LL@li.org>\n"

Subscribers

People subscribed via source and target branches

to all changes: