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

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

New functionalties/blueprints :
  * Asynchronous Image capture from gstreamer . Tracked through Bug #371910.

Fixed Bugs :
  * Bug #372105: Luciole theme on jaunty
  * Bug #371604: Luciole text typo mismatch
  * Bug #372728: Webcam acquisition does not work with macbook iSight webcam
  * Bug #372739: "Old" Labtec webcam does not work with luciole
  * Bug #371602: In Luciole assistant the luciole_logo is displayed with a text 'luciole logo'
  * Bug #372753: No indication when no webcam are available

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'images/capture.png'
0Binary files images/capture.png 2009-03-08 18:06:41 +0000 and images/capture.png 2009-05-05 22:52:48 +0000 differ0Binary files images/capture.png 2009-03-08 18:06:41 +0000 and images/capture.png 2009-05-05 22:52:48 +0000 differ
=== modified file 'images/luciole.glade'
--- images/luciole.glade 2009-05-01 14:42:17 +0000
+++ images/luciole.glade 2009-05-06 17:15:46 +0000
@@ -1,12 +1,10 @@
1<?xml version="1.0" encoding="UTF-8" standalone="no"?>1<?xml version="1.0"?>
2<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
3<!--Generated with glade3 3.4.5 on Fri May 1 16:39:49 2009 -->
4<glade-interface>2<glade-interface>
3 <!-- interface-requires gtk+ 2.16 -->
4 <!-- interface-naming-policy toplevel-contextual -->
5 <widget class="GtkWindow" id="window1">5 <widget class="GtkWindow" id="window1">
6 <property name="icon">luciole.png</property>6 <property name="icon">luciole.png</property>
7 <property name="icon_name">Luciole</property>7 <property name="icon_name">Luciole</property>
8 <signal name="delete_event" handler="on_window1_delete_event"/>
9 <signal name="destroy_event" handler="on_window1_destroy_event"/>
10 <child>8 <child>
11 <widget class="GtkVBox" id="vbox1">9 <widget class="GtkVBox" id="vbox1">
12 <property name="visible">True</property>10 <property name="visible">True</property>
@@ -23,8 +21,8 @@
23 <property name="visible">True</property>21 <property name="visible">True</property>
24 <child>22 <child>
25 <widget class="GtkImageMenuItem" id="file_new">23 <widget class="GtkImageMenuItem" id="file_new">
24 <property name="label">gtk-new</property>
26 <property name="visible">True</property>25 <property name="visible">True</property>
27 <property name="label" translatable="yes">gtk-new</property>
28 <property name="use_underline">True</property>26 <property name="use_underline">True</property>
29 <property name="use_stock">True</property>27 <property name="use_stock">True</property>
30 <signal name="activate" handler="on_file_new_activate"/>28 <signal name="activate" handler="on_file_new_activate"/>
@@ -32,8 +30,8 @@
32 </child>30 </child>
33 <child>31 <child>
34 <widget class="GtkImageMenuItem" id="file_open">32 <widget class="GtkImageMenuItem" id="file_open">
33 <property name="label">gtk-open</property>
35 <property name="visible">True</property>34 <property name="visible">True</property>
36 <property name="label" translatable="yes">gtk-open</property>
37 <property name="use_underline">True</property>35 <property name="use_underline">True</property>
38 <property name="use_stock">True</property>36 <property name="use_stock">True</property>
39 <signal name="activate" handler="on_file_open_activate"/>37 <signal name="activate" handler="on_file_open_activate"/>
@@ -88,8 +86,8 @@
88 </child>86 </child>
89 <child>87 <child>
90 <widget class="GtkImageMenuItem" id="file_save">88 <widget class="GtkImageMenuItem" id="file_save">
89 <property name="label">gtk-save</property>
91 <property name="visible">True</property>90 <property name="visible">True</property>
92 <property name="label" translatable="yes">gtk-save</property>
93 <property name="use_underline">True</property>91 <property name="use_underline">True</property>
94 <property name="use_stock">True</property>92 <property name="use_stock">True</property>
95 <signal name="activate" handler="on_file_save_activate"/>93 <signal name="activate" handler="on_file_save_activate"/>
@@ -97,8 +95,8 @@
97 </child>95 </child>
98 <child>96 <child>
99 <widget class="GtkImageMenuItem" id="file_save_as">97 <widget class="GtkImageMenuItem" id="file_save_as">
98 <property name="label">gtk-save-as</property>
100 <property name="visible">True</property>99 <property name="visible">True</property>
101 <property name="label" translatable="yes">gtk-save-as</property>
102 <property name="use_underline">True</property>100 <property name="use_underline">True</property>
103 <property name="use_stock">True</property>101 <property name="use_stock">True</property>
104 <signal name="activate" handler="on_file_save_as_activate"/>102 <signal name="activate" handler="on_file_save_as_activate"/>
@@ -111,13 +109,14 @@
111 </child>109 </child>
112 <child>110 <child>
113 <widget class="GtkImageMenuItem" id="file_import">111 <widget class="GtkImageMenuItem" id="file_import">
114 <property name="visible">True</property>
115 <property name="label" translatable="yes">Import images</property>112 <property name="label" translatable="yes">Import images</property>
116 <property name="use_underline">True</property>113 <property name="visible">True</property>
114 <property name="use_stock">False</property>
117 <signal name="activate" handler="on_file_import_activate"/>115 <signal name="activate" handler="on_file_import_activate"/>
118 <child internal-child="image">116 <child internal-child="image">
119 <widget class="GtkImage" id="menu-item-image1">117 <widget class="GtkImage" id="image7">
120 <property name="visible">True</property>118 <property name="visible">True</property>
119 <property name="xalign">0.47999998927116394</property>
121 <property name="stock">gtk-add</property>120 <property name="stock">gtk-add</property>
122 </widget>121 </widget>
123 </child>122 </child>
@@ -125,12 +124,12 @@
125 </child>124 </child>
126 <child>125 <child>
127 <widget class="GtkImageMenuItem" id="file_export">126 <widget class="GtkImageMenuItem" id="file_export">
128 <property name="visible">True</property>
129 <property name="label" translatable="yes">Export</property>127 <property name="label" translatable="yes">Export</property>
130 <property name="use_underline">True</property>128 <property name="visible">True</property>
129 <property name="use_stock">False</property>
131 <signal name="activate" handler="on_file_export_activate"/>130 <signal name="activate" handler="on_file_export_activate"/>
132 <child internal-child="image">131 <child internal-child="image">
133 <widget class="GtkImage" id="menu-item-image2">132 <widget class="GtkImage" id="image8">
134 <property name="visible">True</property>133 <property name="visible">True</property>
135 <property name="stock">gtk-convert</property>134 <property name="stock">gtk-convert</property>
136 </widget>135 </widget>
@@ -140,14 +139,12 @@
140 <child>139 <child>
141 <widget class="GtkSeparatorMenuItem" id="menuitem1">140 <widget class="GtkSeparatorMenuItem" id="menuitem1">
142 <property name="visible">True</property>141 <property name="visible">True</property>
143 <property name="label" translatable="yes">menuitem1</property>
144 <property name="use_underline">True</property>
145 </widget>142 </widget>
146 </child>143 </child>
147 <child>144 <child>
148 <widget class="GtkImageMenuItem" id="file_close">145 <widget class="GtkImageMenuItem" id="file_close">
146 <property name="label">gtk-close</property>
149 <property name="visible">True</property>147 <property name="visible">True</property>
150 <property name="label" translatable="yes">gtk-close</property>
151 <property name="use_underline">True</property>148 <property name="use_underline">True</property>
152 <property name="use_stock">True</property>149 <property name="use_stock">True</property>
153 <signal name="activate" handler="on_file_close_activate"/>150 <signal name="activate" handler="on_file_close_activate"/>
@@ -155,8 +152,8 @@
155 </child>152 </child>
156 <child>153 <child>
157 <widget class="GtkImageMenuItem" id="file_quit">154 <widget class="GtkImageMenuItem" id="file_quit">
155 <property name="label">gtk-quit</property>
158 <property name="visible">True</property>156 <property name="visible">True</property>
159 <property name="label" translatable="yes">gtk-quit</property>
160 <property name="use_underline">True</property>157 <property name="use_underline">True</property>
161 <property name="use_stock">True</property>158 <property name="use_stock">True</property>
162 <signal name="activate" handler="on_file_quit_activate"/>159 <signal name="activate" handler="on_file_quit_activate"/>
@@ -176,13 +173,13 @@
176 <property name="visible">True</property>173 <property name="visible">True</property>
177 <child>174 <child>
178 <widget class="GtkImageMenuItem" id="view_project">175 <widget class="GtkImageMenuItem" id="view_project">
176 <property name="label" translatable="yes">Project properties</property>
179 <property name="visible">True</property>177 <property name="visible">True</property>
180 <property name="tooltip" translatable="yes">Project Properties</property>178 <property name="tooltip" translatable="yes">Project Properties</property>
181 <property name="label" translatable="yes">Project Properties</property>179 <property name="use_stock">False</property>
182 <property name="use_underline">True</property>
183 <signal name="activate" handler="on_view_project_activate"/>180 <signal name="activate" handler="on_view_project_activate"/>
184 <child internal-child="image">181 <child internal-child="image">
185 <widget class="GtkImage" id="menu-item-image3">182 <widget class="GtkImage" id="image4">
186 <property name="visible">True</property>183 <property name="visible">True</property>
187 <property name="stock">gtk-properties</property>184 <property name="stock">gtk-properties</property>
188 </widget>185 </widget>
@@ -191,12 +188,13 @@
191 </child>188 </child>
192 <child>189 <child>
193 <widget class="GtkImageMenuItem" id="Preferences">190 <widget class="GtkImageMenuItem" id="Preferences">
194 <property name="visible">True</property>
195 <property name="label" translatable="yes">Preferences</property>191 <property name="label" translatable="yes">Preferences</property>
196 <property name="use_underline">True</property>192 <property name="visible">True</property>
193 <property name="use_stock">False</property>
197 <signal name="activate" handler="on_Preferences_activate"/>194 <signal name="activate" handler="on_Preferences_activate"/>
198 <child internal-child="image">195 <child internal-child="image">
199 <widget class="GtkImage" id="menu-item-image4">196 <widget class="GtkImage" id="image6">
197 <property name="visible">True</property>
200 <property name="stock">gtk-preferences</property>198 <property name="stock">gtk-preferences</property>
201 </widget>199 </widget>
202 </child>200 </child>
@@ -216,9 +214,9 @@
216 <property name="visible">True</property>214 <property name="visible">True</property>
217 <child>215 <child>
218 <widget class="GtkImageMenuItem" id="help_about">216 <widget class="GtkImageMenuItem" id="help_about">
217 <property name="label">gtk-about</property>
219 <property name="visible">True</property>218 <property name="visible">True</property>
220 <property name="tooltip" translatable="yes">About</property>219 <property name="tooltip" translatable="yes">About</property>
221 <property name="label" translatable="yes">gtk-about</property>
222 <property name="use_underline">True</property>220 <property name="use_underline">True</property>
223 <property name="use_stock">True</property>221 <property name="use_stock">True</property>
224 <signal name="activate" handler="on_help_about_activate"/>222 <signal name="activate" handler="on_help_about_activate"/>
@@ -231,6 +229,7 @@
231 </widget>229 </widget>
232 <packing>230 <packing>
233 <property name="expand">False</property>231 <property name="expand">False</property>
232 <property name="position">0</property>
234 </packing>233 </packing>
235 </child>234 </child>
236 <child>235 <child>
@@ -247,7 +246,7 @@
247 <property name="border_width">7</property>246 <property name="border_width">7</property>
248 <property name="label_xalign">0</property>247 <property name="label_xalign">0</property>
249 <property name="label_yalign">0</property>248 <property name="label_yalign">0</property>
250 <property name="shadow_type">GTK_SHADOW_IN</property>249 <property name="shadow_type">in</property>
251 <property name="xalign">0.10000000149011612</property>250 <property name="xalign">0.10000000149011612</property>
252 <property name="yalign">0.10000000149011612</property>251 <property name="yalign">0.10000000149011612</property>
253 <property name="ratio">1.25</property>252 <property name="ratio">1.25</property>
@@ -260,6 +259,9 @@
260 </widget>259 </widget>
261 </child>260 </child>
262 </widget>261 </widget>
262 <packing>
263 <property name="position">0</property>
264 </packing>
263 </child>265 </child>
264 <child>266 <child>
265 <widget class="GtkFixed" id="fixed7">267 <widget class="GtkFixed" id="fixed7">
@@ -276,7 +278,7 @@
276 <widget class="GtkAspectFrame" id="aspectframe2">278 <widget class="GtkAspectFrame" id="aspectframe2">
277 <property name="visible">True</property>279 <property name="visible">True</property>
278 <property name="label_xalign">0</property>280 <property name="label_xalign">0</property>
279 <property name="shadow_type">GTK_SHADOW_NONE</property>281 <property name="shadow_type">none</property>
280 <child>282 <child>
281 <widget class="GtkHBox" id="hbox_acquisition">283 <widget class="GtkHBox" id="hbox_acquisition">
282 <property name="height_request">51</property>284 <property name="height_request">51</property>
@@ -288,6 +290,9 @@
288 <property name="visible">True</property>290 <property name="visible">True</property>
289 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>291 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
290 </widget>292 </widget>
293 <packing>
294 <property name="position">0</property>
295 </packing>
291 </child>296 </child>
292 <child>297 <child>
293 <widget class="GtkToggleButton" id="acquisition_button">298 <widget class="GtkToggleButton" id="acquisition_button">
@@ -295,11 +300,11 @@
295 <property name="height_request">46</property>300 <property name="height_request">46</property>
296 <property name="visible">True</property>301 <property name="visible">True</property>
297 <property name="can_focus">True</property>302 <property name="can_focus">True</property>
303 <property name="receives_default">False</property>
298 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>304 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
299 <property name="has_tooltip">True</property>305 <property name="has_tooltip">True</property>
300 <property name="tooltip" translatable="yes">Activate/Deactivate camera preview</property>306 <property name="tooltip" translatable="yes">Activate/Deactivate camera preview</property>
301 <property name="focus_on_click">False</property>307 <property name="focus_on_click">False</property>
302 <property name="response_id">0</property>
303 <signal name="toggled" handler="on_acquisition_button_toggled"/>308 <signal name="toggled" handler="on_acquisition_button_toggled"/>
304 <child>309 <child>
305 <widget class="GtkImage" id="acquisition_button_image">310 <widget class="GtkImage" id="acquisition_button_image">
@@ -330,13 +335,14 @@
330 <widget class="GtkButton" id="snapshot_button">335 <widget class="GtkButton" id="snapshot_button">
331 <property name="visible">True</property>336 <property name="visible">True</property>
332 <property name="can_focus">True</property>337 <property name="can_focus">True</property>
338 <property name="can_default">True</property>
339 <property name="has_default">True</property>
333 <property name="receives_default">True</property>340 <property name="receives_default">True</property>
334 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>341 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
335 <property name="has_tooltip">True</property>342 <property name="has_tooltip">True</property>
336 <property name="tooltip" translatable="yes" comments="Capturer une image">make a snapshot</property>343 <property name="tooltip" translatable="yes" comments="Capturer une image">make a snapshot</property>
337 <property name="response_id">0</property>
338 <signal name="clicked" handler="on_button_capture_clicked"/>344 <signal name="clicked" handler="on_button_capture_clicked"/>
339 <accelerator key="c" modifiers="" signal="clicked"/>345 <accelerator key="c" signal="clicked"/>
340 <child>346 <child>
341 <widget class="GtkImage" id="image5">347 <widget class="GtkImage" id="image5">
342 <property name="visible">True</property>348 <property name="visible">True</property>
@@ -369,29 +375,31 @@
369 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>375 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
370 <child>376 <child>
371 <widget class="GtkCheckButton" id="mixer_checkbutton">377 <widget class="GtkCheckButton" id="mixer_checkbutton">
378 <property name="label" translatable="yes">Mixer</property>
372 <property name="visible">True</property>379 <property name="visible">True</property>
373 <property name="can_focus">True</property>380 <property name="can_focus">False</property>
381 <property name="receives_default">False</property>
374 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>382 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
375 <property name="has_tooltip">True</property>383 <property name="has_tooltip">True</property>
376 <property name="tooltip" translatable="yes">Mixer activation (onion skin)</property>384 <property name="tooltip" translatable="yes">Mixer activation (onion skin)</property>
377 <property name="label" translatable="yes">Mixer</property>385 <property name="relief">half</property>
378 <property name="relief">GTK_RELIEF_HALF</property>
379 <property name="response_id">0</property>
380 <property name="draw_indicator">True</property>386 <property name="draw_indicator">True</property>
381 <signal name="toggled" handler="on_mixer_checkbutton_toggled"/>387 <signal name="toggled" handler="on_mixer_checkbutton_toggled"/>
382 </widget>388 </widget>
389 <packing>
390 <property name="position">0</property>
391 </packing>
383 </child>392 </child>
384 <child>393 <child>
385 <widget class="GtkHScale" id="alpha_hscale">394 <widget class="GtkHScale" id="alpha_hscale">
386 <property name="visible">True</property>395 <property name="visible">True</property>
387 <property name="can_focus">True</property>
388 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>396 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
389 <property name="has_tooltip">True</property>397 <property name="has_tooltip">True</property>
390 <property name="tooltip" translatable="yes">Transparency level</property>398 <property name="tooltip" translatable="yes">Transparency level</property>
391 <property name="update_policy">GTK_UPDATE_DISCONTINUOUS</property>399 <property name="update_policy">discontinuous</property>
392 <property name="adjustment">1 0 4 1 1 0</property>400 <property name="adjustment">1 0 4 1 1 0</property>
393 <property name="digits">0</property>401 <property name="digits">0</property>
394 <property name="value_pos">GTK_POS_LEFT</property>402 <property name="value_pos">left</property>
395 <signal name="value_changed" handler="on_alpha_hscale_value_changed"/>403 <signal name="value_changed" handler="on_alpha_hscale_value_changed"/>
396 </widget>404 </widget>
397 <packing>405 <packing>
@@ -422,14 +430,16 @@
422 <widget class="GtkLabel" id="label_fpi">430 <widget class="GtkLabel" id="label_fpi">
423 <property name="visible">True</property>431 <property name="visible">True</property>
424 <property name="label" translatable="yes">Image per seconds</property>432 <property name="label" translatable="yes">Image per seconds</property>
425 <property name="justify">GTK_JUSTIFY_CENTER</property>433 <property name="justify">center</property>
426 </widget>434 </widget>
435 <packing>
436 <property name="position">0</property>
437 </packing>
427 </child>438 </child>
428 <child>439 <child>
429 <widget class="GtkHScale" id="hscale_fps">440 <widget class="GtkHScale" id="hscale_fps">
430 <property name="width_request">125</property>441 <property name="width_request">125</property>
431 <property name="visible">True</property>442 <property name="visible">True</property>
432 <property name="can_focus">True</property>
433 <property name="adjustment">1 1 6 1 1 1</property>443 <property name="adjustment">1 1 6 1 1 1</property>
434 <property name="digits">0</property>444 <property name="digits">0</property>
435 <signal name="value_changed" handler="on_hscale_fps_value_changed"/>445 <signal name="value_changed" handler="on_hscale_fps_value_changed"/>
@@ -462,6 +472,9 @@
462 </packing>472 </packing>
463 </child>473 </child>
464 </widget>474 </widget>
475 <packing>
476 <property name="position">0</property>
477 </packing>
465 </child>478 </child>
466 <child>479 <child>
467 <widget class="GtkHBox" id="hbox2">480 <widget class="GtkHBox" id="hbox2">
@@ -473,14 +486,15 @@
473 <packing>486 <packing>
474 <property name="expand">False</property>487 <property name="expand">False</property>
475 <property name="fill">False</property>488 <property name="fill">False</property>
489 <property name="position">0</property>
476 </packing>490 </packing>
477 </child>491 </child>
478 <child>492 <child>
479 <widget class="GtkViewport" id="viewport2">493 <widget class="GtkViewport" id="viewport2">
480 <property name="width_request">215</property>494 <property name="width_request">215</property>
481 <property name="visible">True</property>495 <property name="visible">True</property>
482 <property name="resize_mode">GTK_RESIZE_QUEUE</property>496 <property name="resize_mode">queue</property>
483 <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property>497 <property name="shadow_type">etched-out</property>
484 <child>498 <child>
485 <widget class="GtkVBox" id="vbox5">499 <widget class="GtkVBox" id="vbox5">
486 <property name="width_request">215</property>500 <property name="width_request">215</property>
@@ -490,16 +504,18 @@
490 <property name="width_request">215</property>504 <property name="width_request">215</property>
491 <property name="visible">True</property>505 <property name="visible">True</property>
492 <property name="can_focus">True</property>506 <property name="can_focus">True</property>
493 <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>507 <property name="hscrollbar_policy">automatic</property>
494 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>508 <property name="vscrollbar_policy">automatic</property>
495 <property name="shadow_type">GTK_SHADOW_IN</property>509 <property name="shadow_type">in</property>
496 <child>510 <child>
497 <widget class="GtkTreeView" id="treeview_capture">511 <widget class="GtkTreeView" id="treeview_capture">
498 <property name="visible">True</property>512 <property name="visible">True</property>
499 <property name="can_focus">True</property>
500 </widget>513 </widget>
501 </child>514 </child>
502 </widget>515 </widget>
516 <packing>
517 <property name="position">0</property>
518 </packing>
503 </child>519 </child>
504 <child>520 <child>
505 <widget class="GtkVBox" id="vbox6">521 <widget class="GtkVBox" id="vbox6">
@@ -512,6 +528,7 @@
512 <packing>528 <packing>
513 <property name="expand">False</property>529 <property name="expand">False</property>
514 <property name="fill">False</property>530 <property name="fill">False</property>
531 <property name="position">0</property>
515 </packing>532 </packing>
516 </child>533 </child>
517 <child>534 <child>
@@ -522,25 +539,27 @@
522 <widget class="GtkFixed" id="fixed3">539 <widget class="GtkFixed" id="fixed3">
523 <property name="visible">True</property>540 <property name="visible">True</property>
524 </widget>541 </widget>
542 <packing>
543 <property name="position">0</property>
544 </packing>
525 </child>545 </child>
526 <child>546 <child>
527 <widget class="GtkButton" id="button_import">547 <widget class="GtkButton" id="button_import">
528 <property name="width_request">45</property>548 <property name="width_request">45</property>
529 <property name="height_request">45</property>549 <property name="height_request">45</property>
530 <property name="visible">True</property>550 <property name="visible">True</property>
531 <property name="can_focus">True</property>551 <property name="can_focus">False</property>
532 <property name="receives_default">True</property>552 <property name="receives_default">False</property>
533 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>553 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
534 <property name="has_tooltip">True</property>554 <property name="has_tooltip">True</property>
535 <property name="tooltip" translatable="yes" comments="Caller une image sur le flux video">Import images</property>555 <property name="tooltip" translatable="yes" comments="Caller une image sur le flux video">Import images</property>
536 <property name="response_id">0</property>
537 <signal name="clicked" handler="on_button_import_clicked"/>556 <signal name="clicked" handler="on_button_import_clicked"/>
538 <child>557 <child>
539 <widget class="GtkImage" id="image2">558 <widget class="GtkImage" id="image2">
540 <property name="visible">True</property>559 <property name="visible">True</property>
541 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>560 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
542 <property name="stock">gtk-add</property>561 <property name="stock">gtk-add</property>
543 <property name="icon_size">5</property>562 <property name="icon-size">5</property>
544 </widget>563 </widget>
545 </child>564 </child>
546 </widget>565 </widget>
@@ -562,18 +581,17 @@
562 <widget class="GtkButton" id="button_trash_capture">581 <widget class="GtkButton" id="button_trash_capture">
563 <property name="width_request">45</property>582 <property name="width_request">45</property>
564 <property name="height_request">45</property>583 <property name="height_request">45</property>
565 <property name="can_focus">True</property>584 <property name="can_focus">False</property>
566 <property name="receives_default">True</property>585 <property name="receives_default">False</property>
567 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>586 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
568 <property name="tooltip" translatable="yes" comments="Jeter à la poubelle">To trash</property>587 <property name="tooltip" translatable="yes" comments="Jeter &#xE0; la poubelle">To trash</property>
569 <property name="response_id">0</property>
570 <signal name="clicked" handler="on_button_trash_capture_clicked"/>588 <signal name="clicked" handler="on_button_trash_capture_clicked"/>
571 <child>589 <child>
572 <widget class="GtkImage" id="image1">590 <widget class="GtkImage" id="image1">
573 <property name="visible">True</property>591 <property name="visible">True</property>
574 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>592 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
575 <property name="stock">gtk-delete</property>593 <property name="stock">gtk-delete</property>
576 <property name="icon_size">5</property>594 <property name="icon-size">5</property>
577 </widget>595 </widget>
578 </child>596 </child>
579 </widget>597 </widget>
@@ -596,18 +614,17 @@
596 <property name="width_request">45</property>614 <property name="width_request">45</property>
597 <property name="height_request">45</property>615 <property name="height_request">45</property>
598 <property name="visible">True</property>616 <property name="visible">True</property>
599 <property name="can_focus">True</property>617 <property name="can_focus">False</property>
600 <property name="receives_default">True</property>618 <property name="receives_default">False</property>
601 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>619 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
602 <property name="tooltip" translatable="yes" comments="Déplacer des images capturées dans la zone de montage">Move snapshot to montage area</property>620 <property name="tooltip" translatable="yes" comments="D&#xE9;placer des images captur&#xE9;es dans la zone de montage">Move snapshot to montage area</property>
603 <property name="response_id">0</property>
604 <signal name="clicked" handler="on_button_capture_to_montage_clicked"/>621 <signal name="clicked" handler="on_button_capture_to_montage_clicked"/>
605 <child>622 <child>
606 <widget class="GtkImage" id="image3">623 <widget class="GtkImage" id="image3">
607 <property name="visible">True</property>624 <property name="visible">True</property>
608 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>625 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
609 <property name="stock">gtk-go-forward</property>626 <property name="stock">gtk-go-forward</property>
610 <property name="icon_size">5</property>627 <property name="icon-size">5</property>
611 </widget>628 </widget>
612 </child>629 </child>
613 </widget>630 </widget>
@@ -647,7 +664,7 @@
647 <packing>664 <packing>
648 <property name="expand">False</property>665 <property name="expand">False</property>
649 <property name="fill">False</property>666 <property name="fill">False</property>
650 <property name="pack_type">GTK_PACK_END</property>667 <property name="pack_type">end</property>
651 <property name="position">1</property>668 <property name="position">1</property>
652 </packing>669 </packing>
653 </child>670 </child>
@@ -676,8 +693,8 @@
676 <widget class="GtkViewport" id="viewport1">693 <widget class="GtkViewport" id="viewport1">
677 <property name="width_request">215</property>694 <property name="width_request">215</property>
678 <property name="visible">True</property>695 <property name="visible">True</property>
679 <property name="resize_mode">GTK_RESIZE_QUEUE</property>696 <property name="resize_mode">queue</property>
680 <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property>697 <property name="shadow_type">etched-out</property>
681 <child>698 <child>
682 <widget class="GtkVBox" id="vbox7">699 <widget class="GtkVBox" id="vbox7">
683 <property name="width_request">215</property>700 <property name="width_request">215</property>
@@ -687,9 +704,9 @@
687 <property name="width_request">215</property>704 <property name="width_request">215</property>
688 <property name="visible">True</property>705 <property name="visible">True</property>
689 <property name="can_focus">True</property>706 <property name="can_focus">True</property>
690 <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>707 <property name="hscrollbar_policy">automatic</property>
691 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>708 <property name="vscrollbar_policy">automatic</property>
692 <property name="shadow_type">GTK_SHADOW_IN</property>709 <property name="shadow_type">in</property>
693 <child>710 <child>
694 <widget class="GtkTreeView" id="treeview_montage">711 <widget class="GtkTreeView" id="treeview_montage">
695 <property name="visible">True</property>712 <property name="visible">True</property>
@@ -697,6 +714,9 @@
697 </widget>714 </widget>
698 </child>715 </child>
699 </widget>716 </widget>
717 <packing>
718 <property name="position">0</property>
719 </packing>
700 </child>720 </child>
701 <child>721 <child>
702 <widget class="GtkVBox" id="vbox3">722 <widget class="GtkVBox" id="vbox3">
@@ -709,6 +729,7 @@
709 <packing>729 <packing>
710 <property name="expand">False</property>730 <property name="expand">False</property>
711 <property name="fill">False</property>731 <property name="fill">False</property>
732 <property name="position">0</property>
712 </packing>733 </packing>
713 </child>734 </child>
714 <child>735 <child>
@@ -719,24 +740,26 @@
719 <widget class="GtkFixed" id="fixed17">740 <widget class="GtkFixed" id="fixed17">
720 <property name="visible">True</property>741 <property name="visible">True</property>
721 </widget>742 </widget>
743 <packing>
744 <property name="position">0</property>
745 </packing>
722 </child>746 </child>
723 <child>747 <child>
724 <widget class="GtkButton" id="button_up">748 <widget class="GtkButton" id="button_up">
725 <property name="width_request">45</property>749 <property name="width_request">45</property>
726 <property name="height_request">45</property>750 <property name="height_request">45</property>
727 <property name="visible">True</property>751 <property name="visible">True</property>
728 <property name="can_focus">True</property>752 <property name="can_focus">False</property>
729 <property name="receives_default">True</property>753 <property name="receives_default">False</property>
730 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>754 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
731 <property name="tooltip" translatable="yes" comments="Monter un/ou plusieurs images">Move up one or several images</property>755 <property name="tooltip" translatable="yes" comments="Monter un/ou plusieurs images">Move up one or several images</property>
732 <property name="response_id">0</property>
733 <signal name="clicked" handler="on_button_up_clicked"/>756 <signal name="clicked" handler="on_button_up_clicked"/>
734 <child>757 <child>
735 <widget class="GtkImage" id="image14">758 <widget class="GtkImage" id="image14">
736 <property name="visible">True</property>759 <property name="visible">True</property>
737 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>760 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
738 <property name="stock">gtk-go-up</property>761 <property name="stock">gtk-go-up</property>
739 <property name="icon_size">5</property>762 <property name="icon-size">5</property>
740 </widget>763 </widget>
741 </child>764 </child>
742 </widget>765 </widget>
@@ -759,18 +782,17 @@
759 <property name="width_request">45</property>782 <property name="width_request">45</property>
760 <property name="height_request">45</property>783 <property name="height_request">45</property>
761 <property name="visible">True</property>784 <property name="visible">True</property>
762 <property name="can_focus">True</property>785 <property name="can_focus">False</property>
763 <property name="receives_default">True</property>786 <property name="receives_default">False</property>
764 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>787 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
765 <property name="tooltip" translatable="yes" comments="Descendre un/ou plusieurs images">Move down one or several images</property>788 <property name="tooltip" translatable="yes" comments="Descendre un/ou plusieurs images">Move down one or several images</property>
766 <property name="response_id">0</property>
767 <signal name="clicked" handler="on_button_down_clicked"/>789 <signal name="clicked" handler="on_button_down_clicked"/>
768 <child>790 <child>
769 <widget class="GtkImage" id="image16">791 <widget class="GtkImage" id="image16">
770 <property name="visible">True</property>792 <property name="visible">True</property>
771 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>793 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
772 <property name="stock">gtk-go-down</property>794 <property name="stock">gtk-go-down</property>
773 <property name="icon_size">5</property>795 <property name="icon-size">5</property>
774 </widget>796 </widget>
775 </child>797 </child>
776 </widget>798 </widget>
@@ -793,18 +815,17 @@
793 <property name="width_request">45</property>815 <property name="width_request">45</property>
794 <property name="height_request">45</property>816 <property name="height_request">45</property>
795 <property name="visible">True</property>817 <property name="visible">True</property>
796 <property name="can_focus">True</property>818 <property name="can_focus">False</property>
797 <property name="receives_default">True</property>819 <property name="receives_default">False</property>
798 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>820 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
799 <property name="tooltip" translatable="yes" comments="Jeter à la poubelle">To trash</property>821 <property name="tooltip" translatable="yes" comments="Jeter &#xE0; la poubelle">To trash</property>
800 <property name="response_id">0</property>
801 <signal name="clicked" handler="on_button_trash_clicked"/>822 <signal name="clicked" handler="on_button_trash_clicked"/>
802 <child>823 <child>
803 <widget class="GtkImage" id="image12">824 <widget class="GtkImage" id="image12">
804 <property name="visible">True</property>825 <property name="visible">True</property>
805 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>826 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
806 <property name="stock">gtk-delete</property>827 <property name="stock">gtk-delete</property>
807 <property name="icon_size">5</property>828 <property name="icon-size">5</property>
808 </widget>829 </widget>
809 </child>830 </child>
810 </widget>831 </widget>
@@ -827,16 +848,15 @@
827 <property name="width_request">45</property>848 <property name="width_request">45</property>
828 <property name="height_request">45</property>849 <property name="height_request">45</property>
829 <property name="visible">True</property>850 <property name="visible">True</property>
830 <property name="can_focus">True</property>851 <property name="can_focus">False</property>
831 <property name="receives_default">True</property>852 <property name="receives_default">False</property>
832 <property name="tooltip" translatable="yes">Play video</property>853 <property name="tooltip" translatable="yes">Play video</property>
833 <property name="response_id">0</property>
834 <signal name="toggled" handler="on_button_play_toggled"/>854 <signal name="toggled" handler="on_button_play_toggled"/>
835 <child>855 <child>
836 <widget class="GtkImage" id="image_play_pause">856 <widget class="GtkImage" id="image_play_pause">
837 <property name="visible">True</property>857 <property name="visible">True</property>
838 <property name="stock">gtk-media-play</property>858 <property name="stock">gtk-media-play</property>
839 <property name="icon_size">5</property>859 <property name="icon-size">5</property>
840 </widget>860 </widget>
841 </child>861 </child>
842 </widget>862 </widget>
@@ -874,7 +894,7 @@
874 <packing>894 <packing>
875 <property name="expand">False</property>895 <property name="expand">False</property>
876 <property name="fill">False</property>896 <property name="fill">False</property>
877 <property name="pack_type">GTK_PACK_END</property>897 <property name="pack_type">end</property>
878 <property name="position">1</property>898 <property name="position">1</property>
879 </packing>899 </packing>
880 </child>900 </child>
@@ -918,6 +938,9 @@
918 <property name="visible">True</property>938 <property name="visible">True</property>
919 <property name="spacing">2</property>939 <property name="spacing">2</property>
920 </widget>940 </widget>
941 <packing>
942 <property name="position">0</property>
943 </packing>
921 </child>944 </child>
922 <child>945 <child>
923 <widget class="GtkProgressBar" id="progressbar_status">946 <widget class="GtkProgressBar" id="progressbar_status">
@@ -944,8 +967,8 @@
944 <widget class="GtkFileChooserDialog" id="filechooserdialog_open">967 <widget class="GtkFileChooserDialog" id="filechooserdialog_open">
945 <property name="border_width">5</property>968 <property name="border_width">5</property>
946 <property name="title" translatable="yes">Select a Luciole project</property>969 <property name="title" translatable="yes">Select a Luciole project</property>
947 <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>970 <property name="window_position">center-on-parent</property>
948 <property name="type_hint">GDK_WINDOW_TYPE_HINT_MENU</property>971 <property name="type_hint">menu</property>
949 <property name="has_separator">False</property>972 <property name="has_separator">False</property>
950 <child internal-child="vbox">973 <child internal-child="vbox">
951 <widget class="GtkVBox" id="dialog-vbox1">974 <widget class="GtkVBox" id="dialog-vbox1">
@@ -957,7 +980,7 @@
957 <child internal-child="action_area">980 <child internal-child="action_area">
958 <widget class="GtkHButtonBox" id="dialog-action_area1">981 <widget class="GtkHButtonBox" id="dialog-action_area1">
959 <property name="visible">True</property>982 <property name="visible">True</property>
960 <property name="layout_style">GTK_BUTTONBOX_END</property>983 <property name="layout_style">end</property>
961 <child>984 <child>
962 <placeholder/>985 <placeholder/>
963 </child>986 </child>
@@ -967,7 +990,8 @@
967 </widget>990 </widget>
968 <packing>991 <packing>
969 <property name="expand">False</property>992 <property name="expand">False</property>
970 <property name="pack_type">GTK_PACK_END</property>993 <property name="pack_type">end</property>
994 <property name="position">0</property>
971 </packing>995 </packing>
972 </child>996 </child>
973 </widget>997 </widget>
@@ -978,8 +1002,8 @@
978 <property name="border_width">5</property>1002 <property name="border_width">5</property>
979 <property name="title" translatable="yes">About Luciole</property>1003 <property name="title" translatable="yes">About Luciole</property>
980 <property name="resizable">False</property>1004 <property name="resizable">False</property>
981 <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>1005 <property name="window_position">center-on-parent</property>
982 <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>1006 <property name="type_hint">dialog</property>
983 <property name="has_separator">False</property>1007 <property name="has_separator">False</property>
984 <property name="program_name">Luciole</property>1008 <property name="program_name">Luciole</property>
985 <property name="version">0.7</property>1009 <property name="version">0.7</property>
@@ -1023,11 +1047,12 @@
1023 <widget class="GtkHButtonBox" id="dialog-action_area9">1047 <widget class="GtkHButtonBox" id="dialog-action_area9">
1024 <property name="visible">True</property>1048 <property name="visible">True</property>
1025 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>1049 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1026 <property name="layout_style">GTK_BUTTONBOX_END</property>1050 <property name="layout_style">end</property>
1027 </widget>1051 </widget>
1028 <packing>1052 <packing>
1029 <property name="expand">False</property>1053 <property name="expand">False</property>
1030 <property name="pack_type">GTK_PACK_END</property>1054 <property name="pack_type">end</property>
1055 <property name="position">0</property>
1031 </packing>1056 </packing>
1032 </child>1057 </child>
1033 </widget>1058 </widget>
@@ -1036,8 +1061,9 @@
1036 <widget class="GtkDialog" id="export1">1061 <widget class="GtkDialog" id="export1">
1037 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>1062 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1038 <property name="border_width">5</property>1063 <property name="border_width">5</property>
1039 <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>1064 <property name="title" translatable="yes">Video Export</property>
1040 <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>1065 <property name="window_position">center-on-parent</property>
1066 <property name="type_hint">dialog</property>
1041 <property name="has_separator">False</property>1067 <property name="has_separator">False</property>
1042 <child internal-child="vbox">1068 <child internal-child="vbox">
1043 <widget class="GtkVBox" id="dialog-vbox11">1069 <widget class="GtkVBox" id="dialog-vbox11">
@@ -1061,6 +1087,7 @@
1061 <packing>1087 <packing>
1062 <property name="expand">False</property>1088 <property name="expand">False</property>
1063 <property name="fill">False</property>1089 <property name="fill">False</property>
1090 <property name="position">0</property>
1064 </packing>1091 </packing>
1065 </child>1092 </child>
1066 <child>1093 <child>
@@ -1073,6 +1100,9 @@
1073 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>1100 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1074 <property name="label" translatable="yes">Choose export format.</property>1101 <property name="label" translatable="yes">Choose export format.</property>
1075 </widget>1102 </widget>
1103 <packing>
1104 <property name="position">0</property>
1105 </packing>
1076 </child>1106 </child>
1077 <child>1107 <child>
1078 <widget class="GtkFixed" id="fixed37">1108 <widget class="GtkFixed" id="fixed37">
@@ -1097,7 +1127,7 @@
1097 <widget class="GtkViewport" id="viewport4">1127 <widget class="GtkViewport" id="viewport4">
1098 <property name="visible">True</property>1128 <property name="visible">True</property>
1099 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>1129 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1100 <property name="resize_mode">GTK_RESIZE_QUEUE</property>1130 <property name="resize_mode">queue</property>
1101 <child>1131 <child>
1102 <widget class="GtkVBox" id="vbox15">1132 <widget class="GtkVBox" id="vbox15">
1103 <property name="visible">True</property>1133 <property name="visible">True</property>
@@ -1115,6 +1145,7 @@
1115 <packing>1145 <packing>
1116 <property name="expand">False</property>1146 <property name="expand">False</property>
1117 <property name="fill">False</property>1147 <property name="fill">False</property>
1148 <property name="position">0</property>
1118 </packing>1149 </packing>
1119 </child>1150 </child>
1120 <child>1151 <child>
@@ -1154,6 +1185,7 @@
1154 <property name="expand">False</property>1185 <property name="expand">False</property>
1155 <property name="fill">False</property>1186 <property name="fill">False</property>
1156 <property name="padding">10</property>1187 <property name="padding">10</property>
1188 <property name="position">0</property>
1157 </packing>1189 </packing>
1158 </child>1190 </child>
1159 <child>1191 <child>
@@ -1169,6 +1201,7 @@
1169 <packing>1201 <packing>
1170 <property name="expand">False</property>1202 <property name="expand">False</property>
1171 <property name="fill">False</property>1203 <property name="fill">False</property>
1204 <property name="position">0</property>
1172 </packing>1205 </packing>
1173 </child>1206 </child>
1174 <child>1207 <child>
@@ -1217,7 +1250,7 @@
1217 <packing>1250 <packing>
1218 <property name="expand">False</property>1251 <property name="expand">False</property>
1219 <property name="fill">False</property>1252 <property name="fill">False</property>
1220 <property name="pack_type">GTK_PACK_END</property>1253 <property name="pack_type">end</property>
1221 <property name="position">3</property>1254 <property name="position">3</property>
1222 </packing>1255 </packing>
1223 </child>1256 </child>
@@ -1245,6 +1278,7 @@
1245 <packing>1278 <packing>
1246 <property name="expand">False</property>1279 <property name="expand">False</property>
1247 <property name="fill">False</property>1280 <property name="fill">False</property>
1281 <property name="position">0</property>
1248 </packing>1282 </packing>
1249 </child>1283 </child>
1250 <child>1284 <child>
@@ -1272,6 +1306,9 @@
1272 </packing>1306 </packing>
1273 </child>1307 </child>
1274 </widget>1308 </widget>
1309 <packing>
1310 <property name="position">0</property>
1311 </packing>
1275 </child>1312 </child>
1276 <child>1313 <child>
1277 <widget class="GtkHBox" id="hbox21">1314 <widget class="GtkHBox" id="hbox21">
@@ -1286,6 +1323,7 @@
1286 <packing>1323 <packing>
1287 <property name="expand">False</property>1324 <property name="expand">False</property>
1288 <property name="fill">False</property>1325 <property name="fill">False</property>
1326 <property name="position">0</property>
1289 </packing>1327 </packing>
1290 </child>1328 </child>
1291 <child>1329 <child>
@@ -1305,7 +1343,7 @@
1305 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>1343 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1306 <property name="use_preview_label">False</property>1344 <property name="use_preview_label">False</property>
1307 <property name="do_overwrite_confirmation">True</property>1345 <property name="do_overwrite_confirmation">True</property>
1308 <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>1346 <property name="action">select-folder</property>
1309 <property name="title" translatable="yes">Select a folder</property>1347 <property name="title" translatable="yes">Select a folder</property>
1310 </widget>1348 </widget>
1311 <packing>1349 <packing>
@@ -1318,7 +1356,7 @@
1318 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>1356 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1319 </widget>1357 </widget>
1320 <packing>1358 <packing>
1321 <property name="pack_type">GTK_PACK_END</property>1359 <property name="pack_type">end</property>
1322 <property name="position">3</property>1360 <property name="position">3</property>
1323 </packing>1361 </packing>
1324 </child>1362 </child>
@@ -1368,15 +1406,16 @@
1368 <packing>1406 <packing>
1369 <property name="expand">False</property>1407 <property name="expand">False</property>
1370 <property name="fill">False</property>1408 <property name="fill">False</property>
1409 <property name="position">0</property>
1371 </packing>1410 </packing>
1372 </child>1411 </child>
1373 <child>1412 <child>
1374 <widget class="GtkCheckButton" id="checkbutton1">1413 <widget class="GtkCheckButton" id="checkbutton1">
1414 <property name="label" translatable="yes">Export video with sound.</property>
1375 <property name="visible">True</property>1415 <property name="visible">True</property>
1376 <property name="can_focus">True</property>1416 <property name="can_focus">True</property>
1417 <property name="receives_default">False</property>
1377 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>1418 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1378 <property name="label" translatable="yes">Export video with sound.</property>
1379 <property name="response_id">0</property>
1380 <property name="draw_indicator">True</property>1419 <property name="draw_indicator">True</property>
1381 </widget>1420 </widget>
1382 <packing>1421 <packing>
@@ -1387,6 +1426,9 @@
1387 <placeholder/>1426 <placeholder/>
1388 </child>1427 </child>
1389 </widget>1428 </widget>
1429 <packing>
1430 <property name="position">0</property>
1431 </packing>
1390 </child>1432 </child>
1391 <child>1433 <child>
1392 <widget class="GtkFixed" id="fixed61">1434 <widget class="GtkFixed" id="fixed61">
@@ -1425,7 +1467,7 @@
1425 </widget>1467 </widget>
1426 <packing>1468 <packing>
1427 <property name="expand">False</property>1469 <property name="expand">False</property>
1428 <property name="pack_type">GTK_PACK_END</property>1470 <property name="pack_type">end</property>
1429 <property name="position">5</property>1471 <property name="position">5</property>
1430 </packing>1472 </packing>
1431 </child>1473 </child>
@@ -1448,6 +1490,9 @@
1448 </packing>1490 </packing>
1449 </child>1491 </child>
1450 </widget>1492 </widget>
1493 <packing>
1494 <property name="position">0</property>
1495 </packing>
1451 </child>1496 </child>
1452 </widget>1497 </widget>
1453 <packing>1498 <packing>
@@ -1458,50 +1503,60 @@
1458 <widget class="GtkHButtonBox" id="dialog-action_area11">1503 <widget class="GtkHButtonBox" id="dialog-action_area11">
1459 <property name="visible">True</property>1504 <property name="visible">True</property>
1460 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>1505 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1461 <property name="layout_style">GTK_BUTTONBOX_END</property>1506 <property name="layout_style">end</property>
1462 <child>1507 <child>
1463 <widget class="GtkButton" id="button13">1508 <widget class="GtkButton" id="button13">
1464 <property name="visible">True</property>
1465 <property name="can_focus">True</property>
1466 <property name="receives_default">True</property>
1467 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1468 <property name="label" translatable="yes">gtk-cancel</property>1509 <property name="label" translatable="yes">gtk-cancel</property>
1469 <property name="use_stock">True</property>
1470 <property name="response_id">-6</property>1510 <property name="response_id">-6</property>
1511 <property name="visible">True</property>
1512 <property name="can_focus">True</property>
1513 <property name="receives_default">True</property>
1514 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1515 <property name="use_stock">True</property>
1471 </widget>1516 </widget>
1517 <packing>
1518 <property name="expand">False</property>
1519 <property name="fill">False</property>
1520 <property name="position">0</property>
1521 </packing>
1472 </child>1522 </child>
1473 <child>1523 <child>
1474 <widget class="GtkButton" id="button16">1524 <widget class="GtkButton" id="button16">
1475 <property name="visible">True</property>
1476 <property name="can_focus">True</property>
1477 <property name="receives_default">True</property>
1478 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1479 <property name="label" translatable="yes">gtk-apply</property>1525 <property name="label" translatable="yes">gtk-apply</property>
1480 <property name="use_stock">True</property>
1481 <property name="response_id">-10</property>1526 <property name="response_id">-10</property>
1527 <property name="visible">True</property>
1528 <property name="can_focus">True</property>
1529 <property name="receives_default">True</property>
1530 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1531 <property name="use_stock">True</property>
1482 </widget>1532 </widget>
1483 <packing>1533 <packing>
1534 <property name="expand">False</property>
1535 <property name="fill">False</property>
1484 <property name="position">1</property>1536 <property name="position">1</property>
1485 </packing>1537 </packing>
1486 </child>1538 </child>
1487 <child>1539 <child>
1488 <widget class="GtkButton" id="button18">1540 <widget class="GtkButton" id="button18">
1489 <property name="visible">True</property>
1490 <property name="can_focus">True</property>
1491 <property name="receives_default">True</property>
1492 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1493 <property name="label" translatable="yes">gtk-close</property>1541 <property name="label" translatable="yes">gtk-close</property>
1494 <property name="use_stock">True</property>
1495 <property name="response_id">-7</property>1542 <property name="response_id">-7</property>
1543 <property name="visible">True</property>
1544 <property name="can_focus">True</property>
1545 <property name="receives_default">True</property>
1546 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1547 <property name="use_stock">True</property>
1496 </widget>1548 </widget>
1497 <packing>1549 <packing>
1550 <property name="expand">False</property>
1551 <property name="fill">False</property>
1498 <property name="position">2</property>1552 <property name="position">2</property>
1499 </packing>1553 </packing>
1500 </child>1554 </child>
1501 </widget>1555 </widget>
1502 <packing>1556 <packing>
1503 <property name="expand">False</property>1557 <property name="expand">False</property>
1504 <property name="pack_type">GTK_PACK_END</property>1558 <property name="pack_type">end</property>
1559 <property name="position">0</property>
1505 </packing>1560 </packing>
1506 </child>1561 </child>
1507 </widget>1562 </widget>
@@ -1509,8 +1564,8 @@
1509 </widget>1564 </widget>
1510 <widget class="GtkDialog" id="dialog_project_properties">1565 <widget class="GtkDialog" id="dialog_project_properties">
1511 <property name="border_width">5</property>1566 <property name="border_width">5</property>
1512 <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>1567 <property name="window_position">center-on-parent</property>
1513 <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>1568 <property name="type_hint">dialog</property>
1514 <property name="has_separator">False</property>1569 <property name="has_separator">False</property>
1515 <child internal-child="vbox">1570 <child internal-child="vbox">
1516 <widget class="GtkVBox" id="dialog-vbox4">1571 <widget class="GtkVBox" id="dialog-vbox4">
@@ -1522,7 +1577,7 @@
1522 <child internal-child="action_area">1577 <child internal-child="action_area">
1523 <widget class="GtkHButtonBox" id="dialog-action_area4">1578 <widget class="GtkHButtonBox" id="dialog-action_area4">
1524 <property name="visible">True</property>1579 <property name="visible">True</property>
1525 <property name="layout_style">GTK_BUTTONBOX_END</property>1580 <property name="layout_style">end</property>
1526 <child>1581 <child>
1527 <placeholder/>1582 <placeholder/>
1528 </child>1583 </child>
@@ -1535,7 +1590,8 @@
1535 </widget>1590 </widget>
1536 <packing>1591 <packing>
1537 <property name="expand">False</property>1592 <property name="expand">False</property>
1538 <property name="pack_type">GTK_PACK_END</property>1593 <property name="pack_type">end</property>
1594 <property name="position">0</property>
1539 </packing>1595 </packing>
1540 </child>1596 </child>
1541 </widget>1597 </widget>
@@ -1544,8 +1600,8 @@
1544 <widget class="GtkDialog" id="Dialog_preferences">1600 <widget class="GtkDialog" id="Dialog_preferences">
1545 <property name="border_width">5</property>1601 <property name="border_width">5</property>
1546 <property name="title" translatable="yes">Preferences</property>1602 <property name="title" translatable="yes">Preferences</property>
1547 <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>1603 <property name="window_position">center-on-parent</property>
1548 <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>1604 <property name="type_hint">dialog</property>
1549 <property name="has_separator">False</property>1605 <property name="has_separator">False</property>
1550 <child internal-child="vbox">1606 <child internal-child="vbox">
1551 <widget class="GtkVBox" id="dialog-vbox3">1607 <widget class="GtkVBox" id="dialog-vbox3">
@@ -1559,8 +1615,8 @@
1559 <widget class="GtkViewport" id="viewport3">1615 <widget class="GtkViewport" id="viewport3">
1560 <property name="height_request">40</property>1616 <property name="height_request">40</property>
1561 <property name="visible">True</property>1617 <property name="visible">True</property>
1562 <property name="resize_mode">GTK_RESIZE_QUEUE</property>1618 <property name="resize_mode">queue</property>
1563 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>1619 <property name="shadow_type">etched-in</property>
1564 <child>1620 <child>
1565 <widget class="GtkLabel" id="label_preferences">1621 <widget class="GtkLabel" id="label_preferences">
1566 <property name="visible">True</property>1622 <property name="visible">True</property>
@@ -1570,6 +1626,7 @@
1570 </widget>1626 </widget>
1571 <packing>1627 <packing>
1572 <property name="padding">26</property>1628 <property name="padding">26</property>
1629 <property name="position">0</property>
1573 </packing>1630 </packing>
1574 </child>1631 </child>
1575 <child>1632 <child>
@@ -1581,6 +1638,9 @@
1581 <property name="xalign">0.10000000149011612</property>1638 <property name="xalign">0.10000000149011612</property>
1582 <property name="label" translatable="yes">Select Theme</property>1639 <property name="label" translatable="yes">Select Theme</property>
1583 </widget>1640 </widget>
1641 <packing>
1642 <property name="position">0</property>
1643 </packing>
1584 </child>1644 </child>
1585 <child>1645 <child>
1586 <widget class="GtkComboBox" id="combobox_theme">1646 <widget class="GtkComboBox" id="combobox_theme">
@@ -1602,10 +1662,10 @@
1602 </child>1662 </child>
1603 <child>1663 <child>
1604 <widget class="GtkCheckButton" id="checkbutton_trash">1664 <widget class="GtkCheckButton" id="checkbutton_trash">
1605 <property name="visible">True</property>
1606 <property name="can_focus">True</property>
1607 <property name="label" translatable="yes">Add Trash to montage view</property>1665 <property name="label" translatable="yes">Add Trash to montage view</property>
1608 <property name="response_id">0</property>1666 <property name="visible">True</property>
1667 <property name="can_focus">True</property>
1668 <property name="receives_default">False</property>
1609 <property name="draw_indicator">True</property>1669 <property name="draw_indicator">True</property>
1610 </widget>1670 </widget>
1611 <packing>1671 <packing>
@@ -1621,7 +1681,7 @@
1621 <child internal-child="action_area">1681 <child internal-child="action_area">
1622 <widget class="GtkHButtonBox" id="dialog-action_area3">1682 <widget class="GtkHButtonBox" id="dialog-action_area3">
1623 <property name="visible">True</property>1683 <property name="visible">True</property>
1624 <property name="layout_style">GTK_BUTTONBOX_END</property>1684 <property name="layout_style">end</property>
1625 <child>1685 <child>
1626 <placeholder/>1686 <placeholder/>
1627 </child>1687 </child>
@@ -1631,7 +1691,8 @@
1631 </widget>1691 </widget>
1632 <packing>1692 <packing>
1633 <property name="expand">False</property>1693 <property name="expand">False</property>
1634 <property name="pack_type">GTK_PACK_END</property>1694 <property name="pack_type">end</property>
1695 <property name="position">0</property>
1635 </packing>1696 </packing>
1636 </child>1697 </child>
1637 </widget>1698 </widget>
16381699
=== modified file 'images/luciole.xml'
--- images/luciole.xml 2009-05-01 14:42:17 +0000
+++ images/luciole.xml 2009-05-06 17:15:46 +0000
@@ -1,5 +1,4 @@
1<?xml version="1.0"?>1<?xml version="1.0"?>
2<!--Generated with glade3 3.4.5 on Fri May 1 16:39:49 2009 -->
3<interface>2<interface>
4 <object class="GtkAdjustment" id="adjustment1">3 <object class="GtkAdjustment" id="adjustment1">
5 <property name="upper">4</property>4 <property name="upper">4</property>
@@ -23,13 +22,13 @@
23 </columns>22 </columns>
24 <data>23 <data>
25 <row>24 <row>
26 <col id="0">DV format (raw DV)</col>25 <col id="0" translatable="yes">DV format (raw DV)</col>
27 </row>26 </row>
28 <row>27 <row>
29 <col id="0">Format DVD (mpeg2)</col>28 <col id="0" translatable="yes">Format DVD (mpeg2)</col>
30 </row>29 </row>
31 <row>30 <row>
32 <col id="0">Format divx/xvid (avi)</col>31 <col id="0" translatable="yes">Format divx/xvid (avi)</col>
33 </row>32 </row>
34 </data>33 </data>
35 </object>34 </object>
@@ -39,10 +38,10 @@
39 </columns>38 </columns>
40 <data>39 <data>
41 <row>40 <row>
42 <col id="0">Default</col>41 <col id="0" translatable="yes">Default</col>
43 </row>42 </row>
44 <row>43 <row>
45 <col id="0">Tropical</col>44 <col id="0" translatable="yes">Tropical</col>
46 </row>45 </row>
47 </data>46 </data>
48 </object>47 </object>
@@ -57,14 +56,14 @@
57 </child>56 </child>
58 <child>57 <child>
59 <object class="GtkAction" id="file_new">58 <object class="GtkAction" id="file_new">
60 <property name="stock_id" translatable="yes">gtk-new</property>59 <property name="stock_id">gtk-new</property>
61 <property name="name">file_new</property>60 <property name="name">file_new</property>
62 <signal handler="on_file_new_activate" name="activate"/>61 <signal handler="on_file_new_activate" name="activate"/>
63 </object>62 </object>
64 </child>63 </child>
65 <child>64 <child>
66 <object class="GtkAction" id="file_open">65 <object class="GtkAction" id="file_open">
67 <property name="stock_id" translatable="yes">gtk-open</property>66 <property name="stock_id">gtk-open</property>
68 <property name="name">file_open</property>67 <property name="name">file_open</property>
69 <signal handler="on_file_open_activate" name="activate"/>68 <signal handler="on_file_open_activate" name="activate"/>
70 </object>69 </object>
@@ -107,14 +106,14 @@
107 </child>106 </child>
108 <child>107 <child>
109 <object class="GtkAction" id="file_save">108 <object class="GtkAction" id="file_save">
110 <property name="stock_id" translatable="yes">gtk-save</property>109 <property name="stock_id">gtk-save</property>
111 <property name="name">file_save</property>110 <property name="name">file_save</property>
112 <signal handler="on_file_save_activate" name="activate"/>111 <signal handler="on_file_save_activate" name="activate"/>
113 </object>112 </object>
114 </child>113 </child>
115 <child>114 <child>
116 <object class="GtkAction" id="file_save_as">115 <object class="GtkAction" id="file_save_as">
117 <property name="stock_id" translatable="yes">gtk-save-as</property>116 <property name="stock_id">gtk-save-as</property>
118 <property name="name">file_save_as</property>117 <property name="name">file_save_as</property>
119 <signal handler="on_file_save_as_activate" name="activate"/>118 <signal handler="on_file_save_as_activate" name="activate"/>
120 </object>119 </object>
@@ -137,14 +136,14 @@
137 </child>136 </child>
138 <child>137 <child>
139 <object class="GtkAction" id="file_close">138 <object class="GtkAction" id="file_close">
140 <property name="stock_id" translatable="yes">gtk-close</property>139 <property name="stock_id">gtk-close</property>
141 <property name="name">file_close</property>140 <property name="name">file_close</property>
142 <signal handler="on_file_close_activate" name="activate"/>141 <signal handler="on_file_close_activate" name="activate"/>
143 </object>142 </object>
144 </child>143 </child>
145 <child>144 <child>
146 <object class="GtkAction" id="file_quit">145 <object class="GtkAction" id="file_quit">
147 <property name="stock_id" translatable="yes">gtk-quit</property>146 <property name="stock_id">gtk-quit</property>
148 <property name="name">file_quit</property>147 <property name="name">file_quit</property>
149 <signal handler="on_file_quit_activate" name="activate"/>148 <signal handler="on_file_quit_activate" name="activate"/>
150 </object>149 </object>
@@ -160,7 +159,7 @@
160 <property name="stock_id">gtk-properties</property>159 <property name="stock_id">gtk-properties</property>
161 <property name="name">view_project</property>160 <property name="name">view_project</property>
162 <property name="tooltip" translatable="yes">Project Properties</property>161 <property name="tooltip" translatable="yes">Project Properties</property>
163 <property name="label" translatable="yes">Project Properties</property>162 <property name="label" translatable="yes">Project properties</property>
164 <signal handler="on_view_project_activate" name="activate"/>163 <signal handler="on_view_project_activate" name="activate"/>
165 </object>164 </object>
166 </child>165 </child>
@@ -180,7 +179,7 @@
180 </child>179 </child>
181 <child>180 <child>
182 <object class="GtkAction" id="help_about">181 <object class="GtkAction" id="help_about">
183 <property name="stock_id" translatable="yes">gtk-about</property>182 <property name="stock_id">gtk-about</property>
184 <property name="name">help_about</property>183 <property name="name">help_about</property>
185 <property name="tooltip" translatable="yes">About</property>184 <property name="tooltip" translatable="yes">About</property>
186 <signal handler="on_help_about_activate" name="activate"/>185 <signal handler="on_help_about_activate" name="activate"/>
@@ -219,11 +218,11 @@
219 </menubar>218 </menubar>
220 </ui>219 </ui>
221 </object>220 </object>
221 <!-- interface-requires gtk+ 2.16 -->
222 <!-- interface-naming-policy toplevel-contextual -->
222 <object class="GtkWindow" id="window1">223 <object class="GtkWindow" id="window1">
223 <property name="icon">luciole.png</property>224 <property name="icon">luciole.png</property>
224 <property name="icon_name">Luciole</property>225 <property name="icon_name">Luciole</property>
225 <signal handler="on_window1_delete_event" name="delete_event"/>
226 <signal handler="on_window1_destroy_event" name="destroy_event"/>
227 <child>226 <child>
228 <object class="GtkVBox" id="vbox1">227 <object class="GtkVBox" id="vbox1">
229 <property name="visible">True</property>228 <property name="visible">True</property>
@@ -233,6 +232,7 @@
233 </object>232 </object>
234 <packing>233 <packing>
235 <property name="expand">False</property>234 <property name="expand">False</property>
235 <property name="position">0</property>
236 </packing>236 </packing>
237 </child>237 </child>
238 <child>238 <child>
@@ -249,7 +249,7 @@
249 <property name="border_width">7</property>249 <property name="border_width">7</property>
250 <property name="label_xalign">0</property>250 <property name="label_xalign">0</property>
251 <property name="label_yalign">0</property>251 <property name="label_yalign">0</property>
252 <property name="shadow_type">GTK_SHADOW_IN</property>252 <property name="shadow_type">in</property>
253 <property name="xalign">0.10000000149011612</property>253 <property name="xalign">0.10000000149011612</property>
254 <property name="yalign">0.10000000149011612</property>254 <property name="yalign">0.10000000149011612</property>
255 <property name="ratio">1.25</property>255 <property name="ratio">1.25</property>
@@ -262,6 +262,9 @@
262 </object>262 </object>
263 </child>263 </child>
264 </object>264 </object>
265 <packing>
266 <property name="position">0</property>
267 </packing>
265 </child>268 </child>
266 <child>269 <child>
267 <object class="GtkFixed" id="fixed7">270 <object class="GtkFixed" id="fixed7">
@@ -278,7 +281,7 @@
278 <object class="GtkAspectFrame" id="aspectframe2">281 <object class="GtkAspectFrame" id="aspectframe2">
279 <property name="visible">True</property>282 <property name="visible">True</property>
280 <property name="label_xalign">0</property>283 <property name="label_xalign">0</property>
281 <property name="shadow_type">GTK_SHADOW_NONE</property>284 <property name="shadow_type">none</property>
282 <child>285 <child>
283 <object class="GtkHBox" id="hbox_acquisition">286 <object class="GtkHBox" id="hbox_acquisition">
284 <property name="height_request">51</property>287 <property name="height_request">51</property>
@@ -290,6 +293,9 @@
290 <property name="visible">True</property>293 <property name="visible">True</property>
291 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>294 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
292 </object>295 </object>
296 <packing>
297 <property name="position">0</property>
298 </packing>
293 </child>299 </child>
294 <child>300 <child>
295 <object class="GtkToggleButton" id="acquisition_button">301 <object class="GtkToggleButton" id="acquisition_button">
@@ -297,6 +303,7 @@
297 <property name="height_request">46</property>303 <property name="height_request">46</property>
298 <property name="visible">True</property>304 <property name="visible">True</property>
299 <property name="can_focus">True</property>305 <property name="can_focus">True</property>
306 <property name="receives_default">False</property>
300 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>307 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
301 <property name="has_tooltip">True</property>308 <property name="has_tooltip">True</property>
302 <property name="tooltip-text" translatable="yes">Activate/Deactivate camera preview</property>309 <property name="tooltip-text" translatable="yes">Activate/Deactivate camera preview</property>
@@ -331,12 +338,14 @@
331 <object class="GtkButton" id="snapshot_button">338 <object class="GtkButton" id="snapshot_button">
332 <property name="visible">True</property>339 <property name="visible">True</property>
333 <property name="can_focus">True</property>340 <property name="can_focus">True</property>
341 <property name="can_default">True</property>
342 <property name="has_default">True</property>
334 <property name="receives_default">True</property>343 <property name="receives_default">True</property>
335 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>344 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
336 <property name="has_tooltip">True</property>345 <property name="has_tooltip">True</property>
337 <property comments="Capturer une image" name="tooltip-text" translatable="yes">make a snapshot</property>346 <property comments="Capturer une image" name="tooltip-text" translatable="yes">make a snapshot</property>
338 <signal handler="on_button_capture_clicked" name="clicked"/>347 <signal handler="on_button_capture_clicked" name="clicked"/>
339 <accelerator key="c" modifiers="" signal="clicked"/>348 <accelerator key="c" signal="clicked"/>
340 <child>349 <child>
341 <object class="GtkImage" id="image5">350 <object class="GtkImage" id="image5">
342 <property name="visible">True</property>351 <property name="visible">True</property>
@@ -369,28 +378,31 @@
369 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>378 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
370 <child>379 <child>
371 <object class="GtkCheckButton" id="mixer_checkbutton">380 <object class="GtkCheckButton" id="mixer_checkbutton">
381 <property name="label" translatable="yes">Mixer</property>
372 <property name="visible">True</property>382 <property name="visible">True</property>
373 <property name="can_focus">True</property>383 <property name="can_focus">False</property>
384 <property name="receives_default">False</property>
374 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>385 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
375 <property name="has_tooltip">True</property>386 <property name="has_tooltip">True</property>
376 <property name="tooltip-text" translatable="yes">Mixer activation (onion skin)</property>387 <property name="tooltip-text" translatable="yes">Mixer activation (onion skin)</property>
377 <property name="label" translatable="yes">Mixer</property>388 <property name="relief">half</property>
378 <property name="relief">GTK_RELIEF_HALF</property>
379 <property name="draw_indicator">True</property>389 <property name="draw_indicator">True</property>
380 <signal handler="on_mixer_checkbutton_toggled" name="toggled"/>390 <signal handler="on_mixer_checkbutton_toggled" name="toggled"/>
381 </object>391 </object>
392 <packing>
393 <property name="position">0</property>
394 </packing>
382 </child>395 </child>
383 <child>396 <child>
384 <object class="GtkHScale" id="alpha_hscale">397 <object class="GtkHScale" id="alpha_hscale">
385 <property name="visible">True</property>398 <property name="visible">True</property>
386 <property name="can_focus">True</property>
387 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>399 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
388 <property name="has_tooltip">True</property>400 <property name="has_tooltip">True</property>
389 <property name="tooltip-text" translatable="yes">Transparency level</property>401 <property name="tooltip-text" translatable="yes">Transparency level</property>
390 <property name="update_policy">GTK_UPDATE_DISCONTINUOUS</property>402 <property name="update_policy">discontinuous</property>
391 <property name="adjustment">adjustment1</property>403 <property name="adjustment">adjustment1</property>
392 <property name="digits">0</property>404 <property name="digits">0</property>
393 <property name="value_pos">GTK_POS_LEFT</property>405 <property name="value_pos">left</property>
394 <signal handler="on_alpha_hscale_value_changed" name="value_changed"/>406 <signal handler="on_alpha_hscale_value_changed" name="value_changed"/>
395 </object>407 </object>
396 <packing>408 <packing>
@@ -421,14 +433,16 @@
421 <object class="GtkLabel" id="label_fpi">433 <object class="GtkLabel" id="label_fpi">
422 <property name="visible">True</property>434 <property name="visible">True</property>
423 <property name="label" translatable="yes">Image per seconds</property>435 <property name="label" translatable="yes">Image per seconds</property>
424 <property name="justify">GTK_JUSTIFY_CENTER</property>436 <property name="justify">center</property>
425 </object>437 </object>
438 <packing>
439 <property name="position">0</property>
440 </packing>
426 </child>441 </child>
427 <child>442 <child>
428 <object class="GtkHScale" id="hscale_fps">443 <object class="GtkHScale" id="hscale_fps">
429 <property name="width_request">125</property>444 <property name="width_request">125</property>
430 <property name="visible">True</property>445 <property name="visible">True</property>
431 <property name="can_focus">True</property>
432 <property name="adjustment">adjustment2</property>446 <property name="adjustment">adjustment2</property>
433 <property name="digits">0</property>447 <property name="digits">0</property>
434 <signal handler="on_hscale_fps_value_changed" name="value_changed"/>448 <signal handler="on_hscale_fps_value_changed" name="value_changed"/>
@@ -461,6 +475,9 @@
461 </packing>475 </packing>
462 </child>476 </child>
463 </object>477 </object>
478 <packing>
479 <property name="position">0</property>
480 </packing>
464 </child>481 </child>
465 <child>482 <child>
466 <object class="GtkHBox" id="hbox2">483 <object class="GtkHBox" id="hbox2">
@@ -472,14 +489,15 @@
472 <packing>489 <packing>
473 <property name="expand">False</property>490 <property name="expand">False</property>
474 <property name="fill">False</property>491 <property name="fill">False</property>
492 <property name="position">0</property>
475 </packing>493 </packing>
476 </child>494 </child>
477 <child>495 <child>
478 <object class="GtkViewport" id="viewport2">496 <object class="GtkViewport" id="viewport2">
479 <property name="width_request">215</property>497 <property name="width_request">215</property>
480 <property name="visible">True</property>498 <property name="visible">True</property>
481 <property name="resize_mode">GTK_RESIZE_QUEUE</property>499 <property name="resize_mode">queue</property>
482 <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property>500 <property name="shadow_type">etched-out</property>
483 <child>501 <child>
484 <object class="GtkVBox" id="vbox5">502 <object class="GtkVBox" id="vbox5">
485 <property name="width_request">215</property>503 <property name="width_request">215</property>
@@ -489,16 +507,18 @@
489 <property name="width_request">215</property>507 <property name="width_request">215</property>
490 <property name="visible">True</property>508 <property name="visible">True</property>
491 <property name="can_focus">True</property>509 <property name="can_focus">True</property>
492 <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>510 <property name="hscrollbar_policy">automatic</property>
493 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>511 <property name="vscrollbar_policy">automatic</property>
494 <property name="shadow_type">GTK_SHADOW_IN</property>512 <property name="shadow_type">in</property>
495 <child>513 <child>
496 <object class="GtkTreeView" id="treeview_capture">514 <object class="GtkTreeView" id="treeview_capture">
497 <property name="visible">True</property>515 <property name="visible">True</property>
498 <property name="can_focus">True</property>
499 </object>516 </object>
500 </child>517 </child>
501 </object>518 </object>
519 <packing>
520 <property name="position">0</property>
521 </packing>
502 </child>522 </child>
503 <child>523 <child>
504 <object class="GtkVBox" id="vbox6">524 <object class="GtkVBox" id="vbox6">
@@ -511,6 +531,7 @@
511 <packing>531 <packing>
512 <property name="expand">False</property>532 <property name="expand">False</property>
513 <property name="fill">False</property>533 <property name="fill">False</property>
534 <property name="position">0</property>
514 </packing>535 </packing>
515 </child>536 </child>
516 <child>537 <child>
@@ -521,14 +542,17 @@
521 <object class="GtkFixed" id="fixed3">542 <object class="GtkFixed" id="fixed3">
522 <property name="visible">True</property>543 <property name="visible">True</property>
523 </object>544 </object>
545 <packing>
546 <property name="position">0</property>
547 </packing>
524 </child>548 </child>
525 <child>549 <child>
526 <object class="GtkButton" id="button_import">550 <object class="GtkButton" id="button_import">
527 <property name="width_request">45</property>551 <property name="width_request">45</property>
528 <property name="height_request">45</property>552 <property name="height_request">45</property>
529 <property name="visible">True</property>553 <property name="visible">True</property>
530 <property name="can_focus">True</property>554 <property name="can_focus">False</property>
531 <property name="receives_default">True</property>555 <property name="receives_default">False</property>
532 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>556 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
533 <property name="has_tooltip">True</property>557 <property name="has_tooltip">True</property>
534 <property comments="Caller une image sur le flux video" name="tooltip-text" translatable="yes">Import images</property>558 <property comments="Caller une image sur le flux video" name="tooltip-text" translatable="yes">Import images</property>
@@ -538,7 +562,7 @@
538 <property name="visible">True</property>562 <property name="visible">True</property>
539 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>563 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
540 <property name="stock">gtk-add</property>564 <property name="stock">gtk-add</property>
541 <property name="icon_size">5</property>565 <property name="icon-size">5</property>
542 </object>566 </object>
543 </child>567 </child>
544 </object>568 </object>
@@ -560,8 +584,8 @@
560 <object class="GtkButton" id="button_trash_capture">584 <object class="GtkButton" id="button_trash_capture">
561 <property name="width_request">45</property>585 <property name="width_request">45</property>
562 <property name="height_request">45</property>586 <property name="height_request">45</property>
563 <property name="can_focus">True</property>587 <property name="can_focus">False</property>
564 <property name="receives_default">True</property>588 <property name="receives_default">False</property>
565 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>589 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
566 <property comments="Jeter &#xE0; la poubelle" name="tooltip-text" translatable="yes">To trash</property>590 <property comments="Jeter &#xE0; la poubelle" name="tooltip-text" translatable="yes">To trash</property>
567 <signal handler="on_button_trash_capture_clicked" name="clicked"/>591 <signal handler="on_button_trash_capture_clicked" name="clicked"/>
@@ -570,7 +594,7 @@
570 <property name="visible">True</property>594 <property name="visible">True</property>
571 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>595 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
572 <property name="stock">gtk-delete</property>596 <property name="stock">gtk-delete</property>
573 <property name="icon_size">5</property>597 <property name="icon-size">5</property>
574 </object>598 </object>
575 </child>599 </child>
576 </object>600 </object>
@@ -593,8 +617,8 @@
593 <property name="width_request">45</property>617 <property name="width_request">45</property>
594 <property name="height_request">45</property>618 <property name="height_request">45</property>
595 <property name="visible">True</property>619 <property name="visible">True</property>
596 <property name="can_focus">True</property>620 <property name="can_focus">False</property>
597 <property name="receives_default">True</property>621 <property name="receives_default">False</property>
598 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>622 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
599 <property comments="D&#xE9;placer des images captur&#xE9;es dans la zone de montage" name="tooltip-text" translatable="yes">Move snapshot to montage area</property>623 <property comments="D&#xE9;placer des images captur&#xE9;es dans la zone de montage" name="tooltip-text" translatable="yes">Move snapshot to montage area</property>
600 <signal handler="on_button_capture_to_montage_clicked" name="clicked"/>624 <signal handler="on_button_capture_to_montage_clicked" name="clicked"/>
@@ -603,7 +627,7 @@
603 <property name="visible">True</property>627 <property name="visible">True</property>
604 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>628 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
605 <property name="stock">gtk-go-forward</property>629 <property name="stock">gtk-go-forward</property>
606 <property name="icon_size">5</property>630 <property name="icon-size">5</property>
607 </object>631 </object>
608 </child>632 </child>
609 </object>633 </object>
@@ -643,7 +667,7 @@
643 <packing>667 <packing>
644 <property name="expand">False</property>668 <property name="expand">False</property>
645 <property name="fill">False</property>669 <property name="fill">False</property>
646 <property name="pack_type">GTK_PACK_END</property>670 <property name="pack_type">end</property>
647 <property name="position">1</property>671 <property name="position">1</property>
648 </packing>672 </packing>
649 </child>673 </child>
@@ -672,8 +696,8 @@
672 <object class="GtkViewport" id="viewport1">696 <object class="GtkViewport" id="viewport1">
673 <property name="width_request">215</property>697 <property name="width_request">215</property>
674 <property name="visible">True</property>698 <property name="visible">True</property>
675 <property name="resize_mode">GTK_RESIZE_QUEUE</property>699 <property name="resize_mode">queue</property>
676 <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property>700 <property name="shadow_type">etched-out</property>
677 <child>701 <child>
678 <object class="GtkVBox" id="vbox7">702 <object class="GtkVBox" id="vbox7">
679 <property name="width_request">215</property>703 <property name="width_request">215</property>
@@ -683,9 +707,9 @@
683 <property name="width_request">215</property>707 <property name="width_request">215</property>
684 <property name="visible">True</property>708 <property name="visible">True</property>
685 <property name="can_focus">True</property>709 <property name="can_focus">True</property>
686 <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>710 <property name="hscrollbar_policy">automatic</property>
687 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>711 <property name="vscrollbar_policy">automatic</property>
688 <property name="shadow_type">GTK_SHADOW_IN</property>712 <property name="shadow_type">in</property>
689 <child>713 <child>
690 <object class="GtkTreeView" id="treeview_montage">714 <object class="GtkTreeView" id="treeview_montage">
691 <property name="visible">True</property>715 <property name="visible">True</property>
@@ -693,6 +717,9 @@
693 </object>717 </object>
694 </child>718 </child>
695 </object>719 </object>
720 <packing>
721 <property name="position">0</property>
722 </packing>
696 </child>723 </child>
697 <child>724 <child>
698 <object class="GtkVBox" id="vbox3">725 <object class="GtkVBox" id="vbox3">
@@ -705,6 +732,7 @@
705 <packing>732 <packing>
706 <property name="expand">False</property>733 <property name="expand">False</property>
707 <property name="fill">False</property>734 <property name="fill">False</property>
735 <property name="position">0</property>
708 </packing>736 </packing>
709 </child>737 </child>
710 <child>738 <child>
@@ -715,14 +743,17 @@
715 <object class="GtkFixed" id="fixed17">743 <object class="GtkFixed" id="fixed17">
716 <property name="visible">True</property>744 <property name="visible">True</property>
717 </object>745 </object>
746 <packing>
747 <property name="position">0</property>
748 </packing>
718 </child>749 </child>
719 <child>750 <child>
720 <object class="GtkButton" id="button_up">751 <object class="GtkButton" id="button_up">
721 <property name="width_request">45</property>752 <property name="width_request">45</property>
722 <property name="height_request">45</property>753 <property name="height_request">45</property>
723 <property name="visible">True</property>754 <property name="visible">True</property>
724 <property name="can_focus">True</property>755 <property name="can_focus">False</property>
725 <property name="receives_default">True</property>756 <property name="receives_default">False</property>
726 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>757 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
727 <property comments="Monter un/ou plusieurs images" name="tooltip-text" translatable="yes">Move up one or several images</property>758 <property comments="Monter un/ou plusieurs images" name="tooltip-text" translatable="yes">Move up one or several images</property>
728 <signal handler="on_button_up_clicked" name="clicked"/>759 <signal handler="on_button_up_clicked" name="clicked"/>
@@ -731,7 +762,7 @@
731 <property name="visible">True</property>762 <property name="visible">True</property>
732 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>763 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
733 <property name="stock">gtk-go-up</property>764 <property name="stock">gtk-go-up</property>
734 <property name="icon_size">5</property>765 <property name="icon-size">5</property>
735 </object>766 </object>
736 </child>767 </child>
737 </object>768 </object>
@@ -754,8 +785,8 @@
754 <property name="width_request">45</property>785 <property name="width_request">45</property>
755 <property name="height_request">45</property>786 <property name="height_request">45</property>
756 <property name="visible">True</property>787 <property name="visible">True</property>
757 <property name="can_focus">True</property>788 <property name="can_focus">False</property>
758 <property name="receives_default">True</property>789 <property name="receives_default">False</property>
759 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>790 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
760 <property comments="Descendre un/ou plusieurs images" name="tooltip-text" translatable="yes">Move down one or several images</property>791 <property comments="Descendre un/ou plusieurs images" name="tooltip-text" translatable="yes">Move down one or several images</property>
761 <signal handler="on_button_down_clicked" name="clicked"/>792 <signal handler="on_button_down_clicked" name="clicked"/>
@@ -764,7 +795,7 @@
764 <property name="visible">True</property>795 <property name="visible">True</property>
765 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>796 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
766 <property name="stock">gtk-go-down</property>797 <property name="stock">gtk-go-down</property>
767 <property name="icon_size">5</property>798 <property name="icon-size">5</property>
768 </object>799 </object>
769 </child>800 </child>
770 </object>801 </object>
@@ -787,8 +818,8 @@
787 <property name="width_request">45</property>818 <property name="width_request">45</property>
788 <property name="height_request">45</property>819 <property name="height_request">45</property>
789 <property name="visible">True</property>820 <property name="visible">True</property>
790 <property name="can_focus">True</property>821 <property name="can_focus">False</property>
791 <property name="receives_default">True</property>822 <property name="receives_default">False</property>
792 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>823 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
793 <property comments="Jeter &#xE0; la poubelle" name="tooltip-text" translatable="yes">To trash</property>824 <property comments="Jeter &#xE0; la poubelle" name="tooltip-text" translatable="yes">To trash</property>
794 <signal handler="on_button_trash_clicked" name="clicked"/>825 <signal handler="on_button_trash_clicked" name="clicked"/>
@@ -797,7 +828,7 @@
797 <property name="visible">True</property>828 <property name="visible">True</property>
798 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>829 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
799 <property name="stock">gtk-delete</property>830 <property name="stock">gtk-delete</property>
800 <property name="icon_size">5</property>831 <property name="icon-size">5</property>
801 </object>832 </object>
802 </child>833 </child>
803 </object>834 </object>
@@ -820,15 +851,15 @@
820 <property name="width_request">45</property>851 <property name="width_request">45</property>
821 <property name="height_request">45</property>852 <property name="height_request">45</property>
822 <property name="visible">True</property>853 <property name="visible">True</property>
823 <property name="can_focus">True</property>854 <property name="can_focus">False</property>
824 <property name="receives_default">True</property>855 <property name="receives_default">False</property>
825 <property name="tooltip-text" translatable="yes">Play video</property>856 <property name="tooltip-text" translatable="yes">Play video</property>
826 <signal handler="on_button_play_toggled" name="toggled"/>857 <signal handler="on_button_play_toggled" name="toggled"/>
827 <child>858 <child>
828 <object class="GtkImage" id="image_play_pause">859 <object class="GtkImage" id="image_play_pause">
829 <property name="visible">True</property>860 <property name="visible">True</property>
830 <property name="stock">gtk-media-play</property>861 <property name="stock">gtk-media-play</property>
831 <property name="icon_size">5</property>862 <property name="icon-size">5</property>
832 </object>863 </object>
833 </child>864 </child>
834 </object>865 </object>
@@ -866,7 +897,7 @@
866 <packing>897 <packing>
867 <property name="expand">False</property>898 <property name="expand">False</property>
868 <property name="fill">False</property>899 <property name="fill">False</property>
869 <property name="pack_type">GTK_PACK_END</property>900 <property name="pack_type">end</property>
870 <property name="position">1</property>901 <property name="position">1</property>
871 </packing>902 </packing>
872 </child>903 </child>
@@ -910,6 +941,9 @@
910 <property name="visible">True</property>941 <property name="visible">True</property>
911 <property name="spacing">2</property>942 <property name="spacing">2</property>
912 </object>943 </object>
944 <packing>
945 <property name="position">0</property>
946 </packing>
913 </child>947 </child>
914 <child>948 <child>
915 <object class="GtkProgressBar" id="progressbar_status">949 <object class="GtkProgressBar" id="progressbar_status">
@@ -936,8 +970,8 @@
936 <object class="GtkFileChooserDialog" id="filechooserdialog_open">970 <object class="GtkFileChooserDialog" id="filechooserdialog_open">
937 <property name="border_width">5</property>971 <property name="border_width">5</property>
938 <property name="title" translatable="yes">Select a Luciole project</property>972 <property name="title" translatable="yes">Select a Luciole project</property>
939 <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>973 <property name="window_position">center-on-parent</property>
940 <property name="type_hint">GDK_WINDOW_TYPE_HINT_MENU</property>974 <property name="type_hint">menu</property>
941 <property name="has_separator">False</property>975 <property name="has_separator">False</property>
942 <child internal-child="vbox">976 <child internal-child="vbox">
943 <object class="GtkVBox" id="dialog-vbox1">977 <object class="GtkVBox" id="dialog-vbox1">
@@ -949,7 +983,7 @@
949 <child internal-child="action_area">983 <child internal-child="action_area">
950 <object class="GtkHButtonBox" id="dialog-action_area1">984 <object class="GtkHButtonBox" id="dialog-action_area1">
951 <property name="visible">True</property>985 <property name="visible">True</property>
952 <property name="layout_style">GTK_BUTTONBOX_END</property>986 <property name="layout_style">end</property>
953 <child>987 <child>
954 <placeholder/>988 <placeholder/>
955 </child>989 </child>
@@ -959,7 +993,8 @@
959 </object>993 </object>
960 <packing>994 <packing>
961 <property name="expand">False</property>995 <property name="expand">False</property>
962 <property name="pack_type">GTK_PACK_END</property>996 <property name="pack_type">end</property>
997 <property name="position">0</property>
963 </packing>998 </packing>
964 </child>999 </child>
965 </object>1000 </object>
@@ -970,8 +1005,8 @@
970 <property name="border_width">5</property>1005 <property name="border_width">5</property>
971 <property name="title" translatable="yes">About Luciole</property>1006 <property name="title" translatable="yes">About Luciole</property>
972 <property name="resizable">False</property>1007 <property name="resizable">False</property>
973 <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>1008 <property name="window_position">center-on-parent</property>
974 <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>1009 <property name="type_hint">dialog</property>
975 <property name="has_separator">False</property>1010 <property name="has_separator">False</property>
976 <property name="program_name">Luciole</property>1011 <property name="program_name">Luciole</property>
977 <property name="version">0.7</property>1012 <property name="version">0.7</property>
@@ -1015,11 +1050,12 @@
1015 <object class="GtkHButtonBox" id="dialog-action_area9">1050 <object class="GtkHButtonBox" id="dialog-action_area9">
1016 <property name="visible">True</property>1051 <property name="visible">True</property>
1017 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>1052 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1018 <property name="layout_style">GTK_BUTTONBOX_END</property>1053 <property name="layout_style">end</property>
1019 </object>1054 </object>
1020 <packing>1055 <packing>
1021 <property name="expand">False</property>1056 <property name="expand">False</property>
1022 <property name="pack_type">GTK_PACK_END</property>1057 <property name="pack_type">end</property>
1058 <property name="position">0</property>
1023 </packing>1059 </packing>
1024 </child>1060 </child>
1025 </object>1061 </object>
@@ -1028,8 +1064,9 @@
1028 <object class="GtkDialog" id="export1">1064 <object class="GtkDialog" id="export1">
1029 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>1065 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1030 <property name="border_width">5</property>1066 <property name="border_width">5</property>
1031 <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>1067 <property name="title" translatable="yes">Video Export</property>
1032 <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>1068 <property name="window_position">center-on-parent</property>
1069 <property name="type_hint">dialog</property>
1033 <property name="has_separator">False</property>1070 <property name="has_separator">False</property>
1034 <child internal-child="vbox">1071 <child internal-child="vbox">
1035 <object class="GtkVBox" id="dialog-vbox11">1072 <object class="GtkVBox" id="dialog-vbox11">
@@ -1053,6 +1090,7 @@
1053 <packing>1090 <packing>
1054 <property name="expand">False</property>1091 <property name="expand">False</property>
1055 <property name="fill">False</property>1092 <property name="fill">False</property>
1093 <property name="position">0</property>
1056 </packing>1094 </packing>
1057 </child>1095 </child>
1058 <child>1096 <child>
@@ -1065,6 +1103,9 @@
1065 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>1103 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1066 <property name="label" translatable="yes">Choose export format.</property>1104 <property name="label" translatable="yes">Choose export format.</property>
1067 </object>1105 </object>
1106 <packing>
1107 <property name="position">0</property>
1108 </packing>
1068 </child>1109 </child>
1069 <child>1110 <child>
1070 <object class="GtkFixed" id="fixed37">1111 <object class="GtkFixed" id="fixed37">
@@ -1089,7 +1130,7 @@
1089 <object class="GtkViewport" id="viewport4">1130 <object class="GtkViewport" id="viewport4">
1090 <property name="visible">True</property>1131 <property name="visible">True</property>
1091 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>1132 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1092 <property name="resize_mode">GTK_RESIZE_QUEUE</property>1133 <property name="resize_mode">queue</property>
1093 <child>1134 <child>
1094 <object class="GtkVBox" id="vbox15">1135 <object class="GtkVBox" id="vbox15">
1095 <property name="visible">True</property>1136 <property name="visible">True</property>
@@ -1107,6 +1148,7 @@
1107 <packing>1148 <packing>
1108 <property name="expand">False</property>1149 <property name="expand">False</property>
1109 <property name="fill">False</property>1150 <property name="fill">False</property>
1151 <property name="position">0</property>
1110 </packing>1152 </packing>
1111 </child>1153 </child>
1112 <child>1154 <child>
@@ -1150,6 +1192,7 @@
1150 <property name="expand">False</property>1192 <property name="expand">False</property>
1151 <property name="fill">False</property>1193 <property name="fill">False</property>
1152 <property name="padding">10</property>1194 <property name="padding">10</property>
1195 <property name="position">0</property>
1153 </packing>1196 </packing>
1154 </child>1197 </child>
1155 <child>1198 <child>
@@ -1165,6 +1208,7 @@
1165 <packing>1208 <packing>
1166 <property name="expand">False</property>1209 <property name="expand">False</property>
1167 <property name="fill">False</property>1210 <property name="fill">False</property>
1211 <property name="position">0</property>
1168 </packing>1212 </packing>
1169 </child>1213 </child>
1170 <child>1214 <child>
@@ -1213,7 +1257,7 @@
1213 <packing>1257 <packing>
1214 <property name="expand">False</property>1258 <property name="expand">False</property>
1215 <property name="fill">False</property>1259 <property name="fill">False</property>
1216 <property name="pack_type">GTK_PACK_END</property>1260 <property name="pack_type">end</property>
1217 <property name="position">3</property>1261 <property name="position">3</property>
1218 </packing>1262 </packing>
1219 </child>1263 </child>
@@ -1241,6 +1285,7 @@
1241 <packing>1285 <packing>
1242 <property name="expand">False</property>1286 <property name="expand">False</property>
1243 <property name="fill">False</property>1287 <property name="fill">False</property>
1288 <property name="position">0</property>
1244 </packing>1289 </packing>
1245 </child>1290 </child>
1246 <child>1291 <child>
@@ -1268,6 +1313,9 @@
1268 </packing>1313 </packing>
1269 </child>1314 </child>
1270 </object>1315 </object>
1316 <packing>
1317 <property name="position">0</property>
1318 </packing>
1271 </child>1319 </child>
1272 <child>1320 <child>
1273 <object class="GtkHBox" id="hbox21">1321 <object class="GtkHBox" id="hbox21">
@@ -1282,6 +1330,7 @@
1282 <packing>1330 <packing>
1283 <property name="expand">False</property>1331 <property name="expand">False</property>
1284 <property name="fill">False</property>1332 <property name="fill">False</property>
1333 <property name="position">0</property>
1285 </packing>1334 </packing>
1286 </child>1335 </child>
1287 <child>1336 <child>
@@ -1301,7 +1350,7 @@
1301 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>1350 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1302 <property name="use_preview_label">False</property>1351 <property name="use_preview_label">False</property>
1303 <property name="do_overwrite_confirmation">True</property>1352 <property name="do_overwrite_confirmation">True</property>
1304 <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>1353 <property name="action">select-folder</property>
1305 <property name="title" translatable="yes">Select a folder</property>1354 <property name="title" translatable="yes">Select a folder</property>
1306 </object>1355 </object>
1307 <packing>1356 <packing>
@@ -1314,7 +1363,7 @@
1314 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>1363 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1315 </object>1364 </object>
1316 <packing>1365 <packing>
1317 <property name="pack_type">GTK_PACK_END</property>1366 <property name="pack_type">end</property>
1318 <property name="position">3</property>1367 <property name="position">3</property>
1319 </packing>1368 </packing>
1320 </child>1369 </child>
@@ -1364,14 +1413,16 @@
1364 <packing>1413 <packing>
1365 <property name="expand">False</property>1414 <property name="expand">False</property>
1366 <property name="fill">False</property>1415 <property name="fill">False</property>
1416 <property name="position">0</property>
1367 </packing>1417 </packing>
1368 </child>1418 </child>
1369 <child>1419 <child>
1370 <object class="GtkCheckButton" id="checkbutton1">1420 <object class="GtkCheckButton" id="checkbutton1">
1421 <property name="label" translatable="yes">Export video with sound.</property>
1371 <property name="visible">True</property>1422 <property name="visible">True</property>
1372 <property name="can_focus">True</property>1423 <property name="can_focus">True</property>
1424 <property name="receives_default">False</property>
1373 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>1425 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1374 <property name="label" translatable="yes">Export video with sound.</property>
1375 <property name="draw_indicator">True</property>1426 <property name="draw_indicator">True</property>
1376 </object>1427 </object>
1377 <packing>1428 <packing>
@@ -1382,6 +1433,9 @@
1382 <placeholder/>1433 <placeholder/>
1383 </child>1434 </child>
1384 </object>1435 </object>
1436 <packing>
1437 <property name="position">0</property>
1438 </packing>
1385 </child>1439 </child>
1386 <child>1440 <child>
1387 <object class="GtkFixed" id="fixed61">1441 <object class="GtkFixed" id="fixed61">
@@ -1417,7 +1471,7 @@
1417 </object>1471 </object>
1418 <packing>1472 <packing>
1419 <property name="expand">False</property>1473 <property name="expand">False</property>
1420 <property name="pack_type">GTK_PACK_END</property>1474 <property name="pack_type">end</property>
1421 <property name="position">5</property>1475 <property name="position">5</property>
1422 </packing>1476 </packing>
1423 </child>1477 </child>
@@ -1440,6 +1494,9 @@
1440 </packing>1494 </packing>
1441 </child>1495 </child>
1442 </object>1496 </object>
1497 <packing>
1498 <property name="position">0</property>
1499 </packing>
1443 </child>1500 </child>
1444 </object>1501 </object>
1445 <packing>1502 <packing>
@@ -1450,53 +1507,62 @@
1450 <object class="GtkHButtonBox" id="dialog-action_area11">1507 <object class="GtkHButtonBox" id="dialog-action_area11">
1451 <property name="visible">True</property>1508 <property name="visible">True</property>
1452 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>1509 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1453 <property name="layout_style">GTK_BUTTONBOX_END</property>1510 <property name="layout_style">end</property>
1454 <child>1511 <child>
1455 <object class="GtkButton" id="button13">1512 <object class="GtkButton" id="button13">
1456 <property name="visible">True</property>
1457 <property name="can_focus">True</property>
1458 <property name="receives_default">True</property>
1459 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1460 <property name="label" translatable="yes">gtk-cancel</property>1513 <property name="label" translatable="yes">gtk-cancel</property>
1514 <property name="visible">True</property>
1515 <property name="can_focus">True</property>
1516 <property name="receives_default">True</property>
1517 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1461 <property name="use_stock">True</property>1518 <property name="use_stock">True</property>
1462 </object>1519 </object>
1520 <packing>
1521 <property name="expand">False</property>
1522 <property name="fill">False</property>
1523 <property name="position">0</property>
1524 </packing>
1463 </child>1525 </child>
1464 <child>1526 <child>
1465 <object class="GtkButton" id="button16">1527 <object class="GtkButton" id="button16">
1466 <property name="visible">True</property>
1467 <property name="can_focus">True</property>
1468 <property name="receives_default">True</property>
1469 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1470 <property name="label" translatable="yes">gtk-apply</property>1528 <property name="label" translatable="yes">gtk-apply</property>
1529 <property name="visible">True</property>
1530 <property name="can_focus">True</property>
1531 <property name="receives_default">True</property>
1532 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1471 <property name="use_stock">True</property>1533 <property name="use_stock">True</property>
1472 </object>1534 </object>
1473 <packing>1535 <packing>
1536 <property name="expand">False</property>
1537 <property name="fill">False</property>
1474 <property name="position">1</property>1538 <property name="position">1</property>
1475 </packing>1539 </packing>
1476 </child>1540 </child>
1477 <child>1541 <child>
1478 <object class="GtkButton" id="button18">1542 <object class="GtkButton" id="button18">
1479 <property name="visible">True</property>
1480 <property name="can_focus">True</property>
1481 <property name="receives_default">True</property>
1482 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1483 <property name="label" translatable="yes">gtk-close</property>1543 <property name="label" translatable="yes">gtk-close</property>
1544 <property name="visible">True</property>
1545 <property name="can_focus">True</property>
1546 <property name="receives_default">True</property>
1547 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1484 <property name="use_stock">True</property>1548 <property name="use_stock">True</property>
1485 </object>1549 </object>
1486 <packing>1550 <packing>
1551 <property name="expand">False</property>
1552 <property name="fill">False</property>
1487 <property name="position">2</property>1553 <property name="position">2</property>
1488 </packing>1554 </packing>
1489 </child>1555 </child>
1490 </object>1556 </object>
1491 <packing>1557 <packing>
1492 <property name="expand">False</property>1558 <property name="expand">False</property>
1493 <property name="pack_type">GTK_PACK_END</property>1559 <property name="pack_type">end</property>
1560 <property name="position">0</property>
1494 </packing>1561 </packing>
1495 </child>1562 </child>
1496 </object>1563 </object>
1497 </child>1564 </child>
1498 <action-widgets>1565 <action-widgets>
1499 <action-widget response="0">checkbutton1</action-widget>
1500 <action-widget response="-6">button13</action-widget>1566 <action-widget response="-6">button13</action-widget>
1501 <action-widget response="-10">button16</action-widget>1567 <action-widget response="-10">button16</action-widget>
1502 <action-widget response="-7">button18</action-widget>1568 <action-widget response="-7">button18</action-widget>
@@ -1504,8 +1570,8 @@
1504 </object>1570 </object>
1505 <object class="GtkDialog" id="dialog_project_properties">1571 <object class="GtkDialog" id="dialog_project_properties">
1506 <property name="border_width">5</property>1572 <property name="border_width">5</property>
1507 <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>1573 <property name="window_position">center-on-parent</property>
1508 <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>1574 <property name="type_hint">dialog</property>
1509 <property name="has_separator">False</property>1575 <property name="has_separator">False</property>
1510 <child internal-child="vbox">1576 <child internal-child="vbox">
1511 <object class="GtkVBox" id="dialog-vbox4">1577 <object class="GtkVBox" id="dialog-vbox4">
@@ -1517,7 +1583,7 @@
1517 <child internal-child="action_area">1583 <child internal-child="action_area">
1518 <object class="GtkHButtonBox" id="dialog-action_area4">1584 <object class="GtkHButtonBox" id="dialog-action_area4">
1519 <property name="visible">True</property>1585 <property name="visible">True</property>
1520 <property name="layout_style">GTK_BUTTONBOX_END</property>1586 <property name="layout_style">end</property>
1521 <child>1587 <child>
1522 <placeholder/>1588 <placeholder/>
1523 </child>1589 </child>
@@ -1530,7 +1596,8 @@
1530 </object>1596 </object>
1531 <packing>1597 <packing>
1532 <property name="expand">False</property>1598 <property name="expand">False</property>
1533 <property name="pack_type">GTK_PACK_END</property>1599 <property name="pack_type">end</property>
1600 <property name="position">0</property>
1534 </packing>1601 </packing>
1535 </child>1602 </child>
1536 </object>1603 </object>
@@ -1539,8 +1606,8 @@
1539 <object class="GtkDialog" id="Dialog_preferences">1606 <object class="GtkDialog" id="Dialog_preferences">
1540 <property name="border_width">5</property>1607 <property name="border_width">5</property>
1541 <property name="title" translatable="yes">Preferences</property>1608 <property name="title" translatable="yes">Preferences</property>
1542 <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>1609 <property name="window_position">center-on-parent</property>
1543 <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>1610 <property name="type_hint">dialog</property>
1544 <property name="has_separator">False</property>1611 <property name="has_separator">False</property>
1545 <child internal-child="vbox">1612 <child internal-child="vbox">
1546 <object class="GtkVBox" id="dialog-vbox3">1613 <object class="GtkVBox" id="dialog-vbox3">
@@ -1554,8 +1621,8 @@
1554 <object class="GtkViewport" id="viewport3">1621 <object class="GtkViewport" id="viewport3">
1555 <property name="height_request">40</property>1622 <property name="height_request">40</property>
1556 <property name="visible">True</property>1623 <property name="visible">True</property>
1557 <property name="resize_mode">GTK_RESIZE_QUEUE</property>1624 <property name="resize_mode">queue</property>
1558 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>1625 <property name="shadow_type">etched-in</property>
1559 <child>1626 <child>
1560 <object class="GtkLabel" id="label_preferences">1627 <object class="GtkLabel" id="label_preferences">
1561 <property name="visible">True</property>1628 <property name="visible">True</property>
@@ -1565,6 +1632,7 @@
1565 </object>1632 </object>
1566 <packing>1633 <packing>
1567 <property name="padding">26</property>1634 <property name="padding">26</property>
1635 <property name="position">0</property>
1568 </packing>1636 </packing>
1569 </child>1637 </child>
1570 <child>1638 <child>
@@ -1576,6 +1644,9 @@
1576 <property name="xalign">0.10000000149011612</property>1644 <property name="xalign">0.10000000149011612</property>
1577 <property name="label" translatable="yes">Select Theme</property>1645 <property name="label" translatable="yes">Select Theme</property>
1578 </object>1646 </object>
1647 <packing>
1648 <property name="position">0</property>
1649 </packing>
1579 </child>1650 </child>
1580 <child>1651 <child>
1581 <object class="GtkComboBox" id="combobox_theme">1652 <object class="GtkComboBox" id="combobox_theme">
@@ -1602,9 +1673,10 @@
1602 </child>1673 </child>
1603 <child>1674 <child>
1604 <object class="GtkCheckButton" id="checkbutton_trash">1675 <object class="GtkCheckButton" id="checkbutton_trash">
1605 <property name="visible">True</property>
1606 <property name="can_focus">True</property>
1607 <property name="label" translatable="yes">Add Trash to montage view</property>1676 <property name="label" translatable="yes">Add Trash to montage view</property>
1677 <property name="visible">True</property>
1678 <property name="can_focus">True</property>
1679 <property name="receives_default">False</property>
1608 <property name="draw_indicator">True</property>1680 <property name="draw_indicator">True</property>
1609 </object>1681 </object>
1610 <packing>1682 <packing>
@@ -1620,7 +1692,7 @@
1620 <child internal-child="action_area">1692 <child internal-child="action_area">
1621 <object class="GtkHButtonBox" id="dialog-action_area3">1693 <object class="GtkHButtonBox" id="dialog-action_area3">
1622 <property name="visible">True</property>1694 <property name="visible">True</property>
1623 <property name="layout_style">GTK_BUTTONBOX_END</property>1695 <property name="layout_style">end</property>
1624 <child>1696 <child>
1625 <placeholder/>1697 <placeholder/>
1626 </child>1698 </child>
@@ -1630,14 +1702,12 @@
1630 </object>1702 </object>
1631 <packing>1703 <packing>
1632 <property name="expand">False</property>1704 <property name="expand">False</property>
1633 <property name="pack_type">GTK_PACK_END</property>1705 <property name="pack_type">end</property>
1706 <property name="position">0</property>
1634 </packing>1707 </packing>
1635 </child>1708 </child>
1636 </object>1709 </object>
1637 </child>1710 </child>
1638 <action-widgets>
1639 <action-widget response="0">checkbutton_trash</action-widget>
1640 </action-widgets>
1641 </object>1711 </object>
1642 <object class="GtkWindow" id="window2">1712 <object class="GtkWindow" id="window2">
1643 <child>1713 <child>
16441714
=== modified file 'lucioLib/controller/controller_load_project.py'
--- lucioLib/controller/controller_load_project.py 2009-04-28 13:36:55 +0000
+++ lucioLib/controller/controller_load_project.py 2009-05-07 09:27:18 +0000
@@ -77,12 +77,13 @@
77 """77 """
78 _TIMEOUT = 10 # 10 ms timer78 _TIMEOUT = 10 # 10 ms timer
7979
80 def __init__(self, project, gui, cb_on_finish, cb_acq_error) : 80 def __init__(self, project, gui, cb_on_finish, cb_acq_error, cb_image_capture_done) :
81 """ Init Thread, init gobject timer and clear progressbar """81 """ Init Thread, init gobject timer and clear progressbar """
82 self.project = project82 self.project = project
83 self.gui = gui83 self.gui = gui
84 self._cb_on_finish = cb_on_finish 84 self._cb_on_finish = cb_on_finish
85 self._cb_acq_error = cb_acq_error85 self._cb_acq_error = cb_acq_error
86 self._cb_image_capture_done = cb_image_capture_done
8687
87 self._progress_bar_widget = self.gui.status_progress_bar88 self._progress_bar_widget = self.gui.status_progress_bar
88 89
@@ -155,18 +156,16 @@
155 156
156 # update acquisition object157 # update acquisition object
157 if self.project['hardtype'] == LCONST.DIGICAM :158 if self.project['hardtype'] == LCONST.DIGICAM :
158 # acquisition for digital camera159 # No acquisition for digital camera
159 acq_obj = LACQ.luciole_acquisition_digicam(160 acq_obj = None
160 self.gui.display,
161 project_dir = self.project['project_dir']
162 )
163 elif self.project['hardtype'] == LCONST.WEBCAM :161 elif self.project['hardtype'] == LCONST.WEBCAM :
164 # acquisition for WEBCAM162 # acquisition for WEBCAM
165 acq_obj = LACQ.luciole_acquisition_webcam(163 acq_obj = LACQ.luciole_acquisition_webcam(
166 self.gui.display,164 self.gui.display,
167 data = self.project['webcam_data'],165 data = self.project['webcam_data'],
168 project_dir = self.project['project_dir'],166 project_dir = self.project['project_dir'],
169 cb_error = self._cb_acq_error)167 cb_error = self._cb_acq_error,
168 cb_capture_done = self._cb_image_capture_done)
170 else :169 else :
171 # default acquisition load i.e. DVCAM170 # default acquisition load i.e. DVCAM
172 acq_obj = LACQ.luciole_acquisition(171 acq_obj = LACQ.luciole_acquisition(
@@ -174,8 +173,9 @@
174 False,173 False,
175 self.project['hardtype'],174 self.project['hardtype'],
176 project_dir = self.project['project_dir'],175 project_dir = self.project['project_dir'],
177 cb_error = self._cb_acq_error)176 cb_error = self._cb_acq_error,
178 177 cb_capture_done = self._cb_image_capture_done)
178
179179
180 180
181 # for mixer initialisation set image to miw with the last image of the capture view. only if capture image is not empty181 # for mixer initialisation set image to miw with the last image of the capture view. only if capture image is not empty
182182
=== modified file 'lucioLib/gui/assistant_new_project.py'
--- lucioLib/gui/assistant_new_project.py 2009-04-20 13:11:10 +0000
+++ lucioLib/gui/assistant_new_project.py 2009-05-07 09:27:18 +0000
@@ -28,15 +28,13 @@
2828
29from .. import luciole_constants as LCONST29from .. import luciole_constants as LCONST
30from .. import luciole_image as LIMG30from .. import luciole_image as LIMG
31import webcam_detection_widget as LWDW
31import dialog as GMSG32import dialog as GMSG
3233
33
34
35import gtk34import gtk
36import os.path35import os.path
37import re36import re
38import threading37import threading
39import webcam_detection_widget as LWDW
40from gettext import gettext as _38from gettext import gettext as _
4139
4240
@@ -120,7 +118,6 @@
120 118
121 def project_name_changed(self,widget):119 def project_name_changed(self,widget):
122 """ indicate project name change. Set page complete if non blank text is set."""120 """ indicate project name change. Set page complete if non blank text is set."""
123 print type(widget)
124 if widget.get_text() == "" :121 if widget.get_text() == "" :
125 self.assistant.set_page_complete(self,False)122 self.assistant.set_page_complete(self,False)
126 else :123 else :
@@ -147,7 +144,7 @@
147 l_state = True 144 l_state = True
148 else :145 else :
149 l_state = False146 l_state = False
150 msg = _("%s is noy valid. Not valid project name. Should be a combination of alhanumeric and '_' characters "%l_project_name) 147 msg = _("%s is not valid. Not valid project name. Should be a combination of alhanumeric and '_' characters "%l_project_name)
151 #GMSG.Dialog.ErrorMessage(assistant,msg)148 #GMSG.Dialog.ErrorMessage(assistant,msg)
152 print msg149 print msg
153 if (l_state==True) : 150 if (l_state==True) :
@@ -223,7 +220,8 @@
223 HBox.add(radiobutton)220 HBox.add(radiobutton)
224 221
225 l_hardtype = LCONST.DIGICAM222 l_hardtype = LCONST.DIGICAM
226 radiobutton = gtk.RadioButton(group=radiobutton1, label= LCONST.HardTypeName[l_hardtype])223 desc=_(" Other device.\n(Manual import)")
224 radiobutton = gtk.RadioButton(group=radiobutton1, label= desc )
227 # conect toggled signal to button225 # conect toggled signal to button
228 radiobutton.connect('toggled',self.radiobutton_toggled,l_hardtype)226 radiobutton.connect('toggled',self.radiobutton_toggled,l_hardtype)
229 HBox.add(radiobutton)227 HBox.add(radiobutton)
@@ -307,12 +305,12 @@
307 305
308 def _on_webcam_detect_complete(self,webcam_obj) :306 def _on_webcam_detect_complete(self,webcam_obj) :
309 """ callback , executed when webcam detection is complete """307 """ callback , executed when webcam detection is complete """
310 # assisant page can now be set as complete
311 self.assistant.set_page_complete(self,True)
312308
313 super(Page_webcam,self)._on_webcam_detect_complete(webcam_obj) 309 nb_webcam = super(Page_webcam,self)._on_webcam_detect_complete(webcam_obj)
314 310 if nb_webcam > 0 :
315 311 # almost one webcam detected
312 # assisant page can now be set as complete
313 self.assistant.set_page_complete(self,True)
316class Page_summary(gtk.VBox) :314class Page_summary(gtk.VBox) :
317 """ Asistant summary page : show lucuile project info"""315 """ Asistant summary page : show lucuile project info"""
318 316
@@ -354,7 +352,7 @@
354 string = "%s : %s "%( _('Number of frames per seconds'), fps)352 string = "%s : %s "%( _('Number of frames per seconds'), fps)
355 text_list.append(string)353 text_list.append(string)
356 354
357 # display Hardware type 355 # display Hardware type
358 string = "%s : %s "%( _('Hardware type'), LCONST.HardTypeName[self.project_data['hardtype']] )356 string = "%s : %s "%( _('Hardware type'), LCONST.HardTypeName[self.project_data['hardtype']] )
359 text_list.append(string)357 text_list.append(string)
360 358
@@ -412,8 +410,8 @@
412 410
413 self.assistant.set_property('title',_('Luciole project assistant'))411 self.assistant.set_property('title',_('Luciole project assistant'))
414 412
415 # assistant logo413 # assistant logo with no text
416 image = LIMG.Image('images/luciole_logo.png',True,2)414 image = LIMG.Image('images/luciole_logo.png',True,2,False)
417 415
418416
419 #417 #
@@ -441,7 +439,8 @@
441 self.p3 = Page_webcam( self.assistant, self.project_data) 439 self.p3 = Page_webcam( self.assistant, self.project_data)
442 self.assistant.append_page(self.p3)440 self.assistant.append_page(self.p3)
443 self.assistant.set_page_title( self.p3, _(' Webcam detection '))441 self.assistant.set_page_title( self.p3, _(' Webcam detection '))
444 self.assistant.set_page_type( self.p3, gtk.ASSISTANT_PAGE_PROGRESS)442 #self.assistant.set_page_type( self.p3, gtk.ASSISTANT_PAGE_PROGRESS)
443 self.assistant.set_page_type( self.p3, gtk.ASSISTANT_PAGE_CONTENT)
445 self.assistant.set_page_side_image(self.p1,image.pixbuf_thumb)444 self.assistant.set_page_side_image(self.p1,image.pixbuf_thumb)
446 445
447 #446 #
@@ -470,7 +469,6 @@
470469
471 def page_func(self,page_num) :470 def page_func(self,page_num) :
472 """ call back to verify the validity of the pages """471 """ call back to verify the validity of the pages """
473 print "entering page func , page id : ",page_num
474 page_out = page_num472 page_out = page_num
475 if (self.verify_page_ok(page_num)) : 473 if (self.verify_page_ok(page_num)) :
476 if (page_out == 1 ) and (self.project_data['hardtype'] != LCONST.WEBCAM) :474 if (page_out == 1 ) and (self.project_data['hardtype'] != LCONST.WEBCAM) :
477475
=== modified file 'lucioLib/gui/gui_controller.py'
--- lucioLib/gui/gui_controller.py 2009-04-28 10:37:08 +0000
+++ lucioLib/gui/gui_controller.py 2009-05-04 22:24:14 +0000
@@ -134,6 +134,15 @@
134134
135 def f_get_status_progress_bar(self) : return Gui_status_controller(self._status_bar,self._status_progress_bar)135 def f_get_status_progress_bar(self) : return Gui_status_controller(self._status_bar,self._status_progress_bar)
136 status_progress_bar = property(f_get_status_progress_bar,None,None, 'The status progress bar')136 status_progress_bar = property(f_get_status_progress_bar,None,None, 'The status progress bar')
137
138
139 def f_get_is_button_snapshot_sensitive(self) :
140 return self._snapshot_button.get_property('sensitive')
141 def f_set_is_button_snapshot_sensitive(self, value) :
142 if type(value) == bool :
143 self._snapshot_button.set_sensitive(value)
144 self._snapshot_button.grab_focus()
145 is_button_snapshot_sensitive = property(f_get_is_button_snapshot_sensitive,f_set_is_button_snapshot_sensitive,None, 'Snapshot button sensitivity')
137146
138 def __init__(self, ctrl_obj) :147 def __init__(self, ctrl_obj) :
139148
140149
=== modified file 'lucioLib/gui/webcam_detection_widget.py'
--- lucioLib/gui/webcam_detection_widget.py 2009-04-20 08:50:43 +0000
+++ lucioLib/gui/webcam_detection_widget.py 2009-05-07 08:24:31 +0000
@@ -155,14 +155,16 @@
155 def prepare_webcam_detection(self) :155 def prepare_webcam_detection(self) :
156 """ prepare assistant page for the webcam detection page """156 """ prepare assistant page for the webcam detection page """
157 157
158 # destroy label for webcam status 158 # Hide label for webcam status
159 self.label.destroy()159 self.label.hide()
160160
161 # launch webcam detection thread161 # launch webcam detection thread
162 t_webcam = Webcam_detection_thread(self.progressbar,self._on_webcam_detect_complete)162 t_webcam = Webcam_detection_thread(self.progressbar,self._on_webcam_detect_complete)
163 163
164 def _on_webcam_detect_complete(self,webcam_obj) :164 def _on_webcam_detect_complete(self,webcam_obj) :
165 """ callback , executed when webcam detection is complete """165 """ callback , executed when webcam detection is complete
166 Return the number of detected webcams"""
167 status = 0
166168
167 if webcam_obj != None and webcam_obj.webcam_devices != None:169 if webcam_obj != None and webcam_obj.webcam_devices != None:
168 vbox = self.VBox170 vbox = self.VBox
@@ -183,10 +185,13 @@
183 if webcam_index == 0 :185 if webcam_index == 0 :
184 # select by default. 186 # select by default.
185 self.project_data['webcam_data'] = webcam_obj.get_gst_best_input(webcam_index) 187 self.project_data['webcam_data'] = webcam_obj.get_gst_best_input(webcam_index)
186 self.label.set_text(_('Detected webcam'))188 self.label.set_text(_('Detected webcam(s)'))
189 status = len(webcam_obj.webcam_devices)
187 else :190 else :
191 self.project_data['webcam_data'] = None
188 self.label.set_text(_('No webcam detected'))192 self.label.set_text(_('No webcam detected'))
189 self.label.show()193 self.label.show()
194 return status
190 195
191 def on_webcam_radio_button_clicked(self,widget,webcam_index,webcam_obj):196 def on_webcam_radio_button_clicked(self,widget,webcam_index,webcam_obj):
192 """ callback for webcam rasdio button.197 """ callback for webcam rasdio button.
193198
=== modified file 'lucioLib/lucioWebCamDetect/luciole_webcam_detection.py'
--- lucioLib/lucioWebCamDetect/luciole_webcam_detection.py 2009-03-08 18:06:41 +0000
+++ lucioLib/lucioWebCamDetect/luciole_webcam_detection.py 2009-05-06 16:38:41 +0000
@@ -101,7 +101,7 @@
101 # a format was detected : prepare pipeline info101 # a format was detected : prepare pipeline info
102 webcam_bin_data['width'] = width 102 webcam_bin_data['width'] = width
103 webcam_bin_data['height'] = height103 webcam_bin_data['height'] = height
104 webcam_bin_data['source_input'] = self._webcam_devices[webcam_device_index]['webcam_data']['gstreamer_src']104 webcam_bin_data['source_input'] = self._webcam_devices[webcam_device_index]['v4l_driver']
105 webcam_bin_data['device'] = self._webcam_devices[webcam_device_index]['device'] 105 webcam_bin_data['device'] = self._webcam_devices[webcam_device_index]['device']
106 webcam_bin_data['name'] = self._webcam_devices[webcam_device_index]['name'] 106 webcam_bin_data['name'] = self._webcam_devices[webcam_device_index]['name']
107107
@@ -142,6 +142,15 @@
142 webcam_device["name"] = dev.GetProperty ('info.product')142 webcam_device["name"] = dev.GetProperty ('info.product')
143 if webcam_device["name"] == None : webcam_device["name"] = "Unknown"143 if webcam_device["name"] == None : webcam_device["name"] = "Unknown"
144 webcam_device["device"] = dev.GetProperty ('video4linux.device')144 webcam_device["device"] = dev.GetProperty ('video4linux.device')
145
146 # detect if need to use v4lsrc or v4l2sec ; property :video4linux.version
147 # for robustness if version = 1 , than use v4lsrc else use v4l2src
148 version = dev.GetProperty ('video4linux.version')
149 # default is v4l2src
150 webcam_device['v4l_driver'] = 'v4l2src'
151 if version != None and int(version) == 1 :
152 webcam_device['v4l_driver'] = 'v4lsrc'
153
145154
146 if (not webcam_device["device"] == None) and ( self.__is_device_readable(webcam_device["device"]) ) :155 if (not webcam_device["device"] == None) and ( self.__is_device_readable(webcam_device["device"]) ) :
147 self._webcam_devices.append(webcam_device)156 self._webcam_devices.append(webcam_device)
@@ -162,7 +171,7 @@
162 nb_device_detected = 0171 nb_device_detected = 0
163 for webcam_device in self._webcam_devices :172 for webcam_device in self._webcam_devices :
164 # for each detected device get the data (source type, mimetype, resolution) 173 # for each detected device get the data (source type, mimetype, resolution)
165 webcam_device_data = self.__get_gst_webcam_data(webcam_device["device"])174 webcam_device_data = self.__get_gst_webcam_data(webcam_device["device"], webcam_device["v4l_driver"])
166 if webcam_device_data != None : 175 if webcam_device_data != None :
167 webcam_device["webcam_data"] = webcam_device_data176 webcam_device["webcam_data"] = webcam_device_data
168 nb_device_detected = nb_device_detected +1177 nb_device_detected = nb_device_detected +1
@@ -185,40 +194,37 @@
185 return is_readable194 return is_readable
186 __is_device_readable = staticmethod(__is_device_readable)195 __is_device_readable = staticmethod(__is_device_readable)
187196
188 def __get_gst_webcam_data(device_name) :197 def __get_gst_webcam_data(device_name,driver) :
189 """ get data from the webcam test compatible sources198 """ get data from the webcam test compatible sources
190 input device_name is the file path ( ex. /dev/video0)199 input device_name is the file path ( ex. /dev/video0)
191 """200 """
201 # creation of a fake gstreamer to test webcam with v4lsrc ot v4l2src
192 webcam_device=dict()202 webcam_device=dict()
193 for videoSource in GSTREAMER_VIDEO_SOURCES :203
194 # creation of a fake gstreamer to test webcam with v4lsrc ot v4l2src204 pipeline_desc = "%s name=source device =%s ! fakesink" %(driver, device_name)
195 pipeline_desc = "%s name=source device =%s ! fakesink" %(videoSource, device_name)205 pipeline = gst.parse_launch(pipeline_desc)
196 pipeline = gst.parse_launch(pipeline_desc)206
197 207 #Start pipeline and check for state
198 #Start pipeline and check for state 208 pipeline.set_state(gst.STATE_PLAYING)
199 pipeline.set_state(gst.STATE_PLAYING)209 ret = pipeline.get_state(timeout=10000*gst.MSECOND)
200 ret = pipeline.get_state(timeout=10000*gst.MSECOND)210
201 211 if ret[0] == gst.STATE_CHANGE_SUCCESS :
202 if ret[0] == gst.STATE_CHANGE_SUCCESS :212 # webcam is detected succefully
203 # webcam is detected succefully213 pipeline.set_state(gst.STATE_PAUSED)
204 pipeline.set_state(gst.STATE_PAUSED)214
205 215 # get source element name and webcam name
206 # get source element name and webcam name 216 src = pipeline.get_by_name('source')
207 src = pipeline.get_by_name('source')217 name = src.get_property('device-name')
208 name = src.get_property('device-name')218
209 219
210 # store video source to use220 # start detection of source video formats
211 webcam_device["gstreamer_src"] = videoSource221 # video formats are accesible in the capabilities
212 222 # of the source "src" pad
213 # start detection of source video formats223 pad = src.get_pad("src")
214 # video formats are accesible in the capabilities224 caps = pad.get_caps()
215 # of the source "src" pad 225 luciole_webcam_detection.gst_get_supported_video_formats(webcam_device,caps)
216 pad = src.get_pad("src")
217 caps = pad.get_caps()
218 luciole_webcam_detection.gst_get_supported_video_formats(webcam_device,caps)
219 # stop playing with webcam226 # stop playing with webcam
220 pipeline.set_state(gst.STATE_NULL)227 pipeline.set_state(gst.STATE_NULL)
221 #for k,v in webcam_device.iteritems() : print "%s : %s"%(k,v)
222 return webcam_device228 return webcam_device
223 __get_gst_webcam_data = staticmethod(__get_gst_webcam_data)229 __get_gst_webcam_data = staticmethod(__get_gst_webcam_data)
224230
@@ -294,13 +300,17 @@
294 gst_get_supported_video_formats = staticmethod(__gst_get_supported_video_formats)300 gst_get_supported_video_formats = staticmethod(__gst_get_supported_video_formats)
295301
296302
297#CamObj = luciole_webcam_detection()303
298#val = CamObj.detect_webcam()304if __name__ == '__main__' :
299#print " found %s webCam device "%val305 # TEST PURPOSE : for webcam detection
300306 CamObj = luciole_webcam_detection()
301#if val >0 :307 val = CamObj.detect_webcam()
302# for device in CamObj.webcam_devices : 308 print " found %s webCam device "%val
303# for k,j in device.iteritems() : print "%s : %s"%(k,j)309
310 if val >0 :
311 for device in CamObj.webcam_devices :
312 for k,j in device.iteritems() : print "%s : %s"%(k,j)
313 print "----------------------------------------------------------------"
304314
305315
306316
307317
=== modified file 'lucioLib/luciole_acquisition.py'
--- lucioLib/luciole_acquisition.py 2009-04-16 11:55:24 +0000
+++ lucioLib/luciole_acquisition.py 2009-05-07 09:27:18 +0000
@@ -59,21 +59,26 @@
59 def get_HardType(self) : return self.__HardType59 def get_HardType(self) : return self.__HardType
60 HardType = property(get_HardType,None,None,"Hard type for acquisition " )60 HardType = property(get_HardType,None,None,"Hard type for acquisition " )
61 61
62 def __init__(self,displayWidget,IsOnionSkinActive = False,HardType=LCONST.FAKE, project_dir = None, cb_error = None ): 62 def __init__(self,displayWidget,IsOnionSkinActive = False,HardType=LCONST.FAKE, project_dir = None, cb_error = None, cb_capture_done = None ):
63 """ Init of class luciole_acquisition :63 """ Init of class luciole_acquisition :
64 inputs :64 inputs :
65 - displayWidget : The gtk.DrawingArea object for display the acquired stream from video65 - displayWidget : The gtk.DrawingArea object for display the acquired stream from video
66 - IsOnionSkinActive : Is onion skin need to be activated66 - IsOnionSkinActive : Is onion skin need to be activated
67 - HardType : Type of video to acquire 67 - HardType : Type of video to acquire
68 - project_dir : path to the project dir68 - project_dir : path to the project dir
69 - cb_error : callback to indicate gstreamer error
70 - cb_capture_done : callback to indicate is done and a file is available
69 """71 """
70 self.__HardType = HardType72 self.__HardType = HardType
71 self.__project_dir = project_dir73 self.__project_dir = project_dir
7274
73 self._ctrller_on_error = cb_error75 self._ctrller_on_error = cb_error
76 self._cb_capture_done = cb_capture_done
77
78
74 if self.__HardType != LCONST.DIGICAM :79 if self.__HardType != LCONST.DIGICAM :
75 # Acquistion is gstreamer based80 # Acquistion is gstreamer based
76 self.GstObj = MGST.LucioleGstreamer(displayWidget,self.__project_dir,self._cb_on_error)81 self.GstObj = MGST.LucioleGstreamer(displayWidget,self.__project_dir,self._cb_on_error, self._cb_capture_done)
7782
78 self.Image2save = os.path.join(project_dir, LCONST.ACQUIRED_IMAGE_NAME)83 self.Image2save = os.path.join(project_dir, LCONST.ACQUIRED_IMAGE_NAME)
79 self.__Image2Mix = None #No image to mix at creation84 self.__Image2Mix = None #No image to mix at creation
@@ -121,7 +126,7 @@
121 126
122 def capture_image(self) :127 def capture_image(self) :
123 """ capture/snapshot of an image from video device """ 128 """ capture/snapshot of an image from video device """
124 pass129 self.GstObj.capture()
125 # commented by nbd@grape : Now job of controller130 # commented by nbd@grape : Now job of controller
126 # if self.GstObj.is_playing():131 # if self.GstObj.is_playing():
127 # # copy of snapshot on capture Treeview132 # # copy of snapshot on capture Treeview
@@ -183,33 +188,20 @@
183 188
184 189
185class luciole_acquisition_digicam(luciole_acquisition) :190class luciole_acquisition_digicam(luciole_acquisition) :
186 """ Heritage of luciole_acquisition class to handle digicam device """191 """ Heritage of luciole_acquisition class to handle digicam device : Dummy class dor debug purpose only. """
187 192
188 def __init__(self,display):193 def __init__(self,display):
189 """ constructor :194 """ constructor :
190 - display : The gtk.DrawingArea object for display the image acquired from digicam. REMARK Is this needed ??195 - display : The gtk.DrawingArea object for display the image acquired from digicam. REMARK Is this needed ??
191 """196 """
192 luciole_acquisition.__init__(self,display,False,LCONST.DIGICAM,None)197 luciole_acquisition.__init__(self,display,False,LCONST.DIGICAM,None)
193 try :
194 pass
195 # tbd
196 except M_EXCEP.LucioException, err:
197 print err.message
198
199 def start_acquisition(self) :
200 """ open only the menu dialog to import images from digicam source """
201 fileList = self.importObj.get_images_from_source()
202 # nbd@grape : ????? what is the job here
203 # map(lambda x :self.tvCapture.AppendFromCapture(x), fileList)
204
205
206 198
207class luciole_acquisition_webcam(luciole_acquisition) :199class luciole_acquisition_webcam(luciole_acquisition) :
208 """ Heritage of luciole acquisition for webcam usage """200 """ Heritage of luciole acquisition for webcam usage """
209201
210 def __init__(self,displayWidget,IsOnionSkinActive = False,data=None, project_dir = None, cb_error = None ): 202 def __init__(self,displayWidget,IsOnionSkinActive = False,data=None, project_dir = None, cb_error = None, cb_capture_done = None):
211 """ module init as parent + new param (data) """203 """ module init as parent + new param (data) """
212 luciole_acquisition.__init__( self, displayWidget, HardType = LCONST.WEBCAM ,project_dir = project_dir, cb_error = cb_error )204 luciole_acquisition.__init__( self, displayWidget, HardType = LCONST.WEBCAM ,project_dir = project_dir, cb_error = cb_error , cb_capture_done = cb_capture_done )
213205
214 # add webcam data info to gst obj206 # add webcam data info to gst obj
215 self.GstObj.webcam_data = data207 self.GstObj.webcam_data = data
216208
=== modified file 'lucioLib/luciole_constants.py'
--- lucioLib/luciole_constants.py 2009-04-27 13:12:50 +0000
+++ lucioLib/luciole_constants.py 2009-05-07 09:27:18 +0000
@@ -25,6 +25,7 @@
2525
26# Luciole constants file26# Luciole constants file
2727
28from gettext import gettext as _
2829
29########################################30########################################
30# Hardware constants31# Hardware constants
@@ -34,7 +35,12 @@
34WEBCAM = 235WEBCAM = 2
35DIGICAM= 336DIGICAM= 3
36HardType=(FAKE,DVCAM,WEBCAM,DIGICAM)37HardType=(FAKE,DVCAM,WEBCAM,DIGICAM)
37HardTypeName=("FAKE","DVCAM","WEBCAM","DIGICAM")38HardTypeName=(
39 "FAKE",
40 "DVCAM",
41 "WEBCAM",
42 _("OTHER DEVICE"),
43 )
3844
39########################################45########################################
40# Image screen display constants46# Image screen display constants
4147
=== modified file 'lucioLib/luciole_controller.py'
--- lucioLib/luciole_controller.py 2009-05-01 16:18:25 +0000
+++ lucioLib/luciole_controller.py 2009-05-07 09:27:18 +0000
@@ -41,7 +41,7 @@
4141
42import gui as LTK42import gui as LTK
43import time43import time
4444import threading
45import os.path45import os.path
4646
47from gettext import gettext as _47from gettext import gettext as _
@@ -190,21 +190,28 @@
190 def image_capture(self) :190 def image_capture(self) :
191 """ add an image from capture """191 """ add an image from capture """
192 if self._acquirer_active == True and self.acq_obj.IsStreamingActive == True :192 if self._acquirer_active == True and self.acq_obj.IsStreamingActive == True :
193 # streaming is active video capture can be made is active
194
195 # play sound 193 # play sound
196 self.sound_player.play()194 self.sound_player.play()
197 try :
198 # 1. copy it to rush dir and rename it
199 l_rush_imagename = self.__move_capture_to_rush_folder()
200 except L_EXCEP.LucioException,err :
201 print " DEBUG ERROR in image capture :", err
202 else :
203 #2.append it to rush and capture obj
204 self.__append_image_to_project(l_rush_imagename)
205 195
206 196 #inactive(sentitivity) snapshot button
207 197 self.gui.is_button_snapshot_sensitive = False
198
199 # streaming is active video capture can be made is active
200 self.acq_obj.capture_image()
201
202 def _cb_image_catpure_done(self):
203 """ callback to indicate capture is done. Now image can be proccessed into poject"""
204 try :
205 # 1. copy it to rush dir and rename it
206 l_rush_imagename = self.__move_capture_to_rush_folder()
207 except L_EXCEP.LucioException,err :
208 print " DEBUG ERROR in image capture :", err
209 else :
210 #2.append it to rush and capture obj
211 self.__append_image_to_project(l_rush_imagename)
212
213 #active(sentitivity) snapshot button
214 self.gui.is_button_snapshot_sensitive = True
208 215
209 def image_import(self) :216 def image_import(self) :
210 """ import images from external source """217 """ import images from external source """
@@ -409,6 +416,14 @@
409 self._set_acquirer(False) # stop acquirer416 self._set_acquirer(False) # stop acquirer
410 self._set_imager(True) # allow imager 417 self._set_imager(True) # allow imager
411 self._set_player(False) # diasallow player418 self._set_player(False) # diasallow player
419 else :
420 # check if ack obj is None due to DIGICAM hardware
421 if self.project['hardtype'] == LCONST.DIGICAM :
422 self.gui.acquisition_widget_hide()
423 self._set_acquirer(False) # stop acquirer
424 msg = _("No acquisition available. Use 'import image' button to load images in project.")
425 LTK.Dialog.ErrorMessage(self.gui.window, msg)
426
412 else :427 else :
413 # deactivate acqusition button acquisition not allowed when palyer is active428 # deactivate acqusition button acquisition not allowed when palyer is active
414 self.gui.acquisition_widget_hide()429 self.gui.acquisition_widget_hide()
@@ -582,7 +597,7 @@
582 for item in intersect :597 for item in intersect :
583 if item == 'Theme' :598 if item == 'Theme' :
584 self.conf_obj.conf_options[item] = modif_options[item]599 self.conf_obj.conf_options[item] = modif_options[item]
585 msg = _('Please restart luciole to take into acount the new theme ')600 msg = _('Please restart luciole to take into account the new theme ')
586 self.status_bar.display_message(msg)601 self.status_bar.display_message(msg)
587 602
588 if item == 'CaptureTrashDisplay' :603 if item == 'CaptureTrashDisplay' :
@@ -606,20 +621,20 @@
606 """ load treview, pepare acquiistion rush list , etc .."""621 """ load treview, pepare acquiistion rush list , etc .."""
607 self.time = time.time()622 self.time = time.time()
608 if self.project != None :623 if self.project != None :
609 #print "---------------------------------------------------------------------"624 print "---------------------------------------------------------------------"
610 #print "TEST Luciole_controller project info: "625 print "TEST Luciole_controller project info: "
611 #print "---------------------------------------------------------------------"626 print "---------------------------------------------------------------------"
612 #for k,v in self.project.iteritems() :627 for k,v in self.project.iteritems() :
613 # print "**%s** : %s "%(k,v)628 print "**%s** : %s "%(k,v)
614 #print "---------------------------------------------------------------------"629 print "---------------------------------------------------------------------"
615630
616 # Initilaisation of rush ogbj is threaded because its take a while (generation of images pixbufs)631 # Initilaisation of rush ogbj is threaded because its take a while (generation of images pixbufs)
617 # When rush load is finish : __on_rush_finish is called 632 # When rush load is finish : __on_rush_finish is called
618 633
619 LC_LOAD.Controller_load_project(self.project, self.gui, self.__cb_project_load_finsih, self._cb_acq_error)634 LC_LOAD.Controller_load_project(self.project, self.gui, self.__cb_project_load_finsih, self._cb_acq_error, self._cb_image_catpure_done)
620635
621 def __cb_project_load_finsih(self,rush_obj,acq_obj) :636 def __cb_project_load_finsih(self,rush_obj,acq_obj) :
622 if (rush_obj != None) and ( acq_obj != None) : 637 if (rush_obj != None) :
623 638
624 self.rush_obj = rush_obj639 self.rush_obj = rush_obj
625 self.acq_obj = acq_obj640 self.acq_obj = acq_obj
@@ -632,7 +647,7 @@
632647
633 print ' DEBUG load time = %s'%( time.time() - self.time )648 print ' DEBUG load time = %s'%( time.time() - self.time )
634 else :649 else :
635 msg = _("Failed to load project ")650 msg = _("Failed to load project ")
636 LTK.Dialog.ErrorMessage(self.gui.window, msg)651 LTK.Dialog.ErrorMessage(self.gui.window, msg)
637652
638653
639654
=== modified file 'lucioLib/luciole_gstreamer.py'
--- lucioLib/luciole_gstreamer.py 2009-05-01 15:22:38 +0000
+++ lucioLib/luciole_gstreamer.py 2009-05-06 15:57:30 +0000
@@ -39,28 +39,27 @@
39import luciole_tools as MT39import luciole_tools as MT
40import os.path40import os.path
4141
42class SaveCapturedImageBin(gst.Bin) :42
43 """ Bin Pad to save in jpeg format image from stream"""43class PhotoSaveBin(gst.Bin) :
44 44 """ Bin Pad to save in jpeg format image from stream. Stream alyays encoded but the result will be saved to file only when a capture is done """
45 def __init__(self, imagePath) :45 def __init__(self) :
46 """ Bin Pad to save in jpeg format image from stream"""46 """ Pilpeline desc : jpegenc + fakseink """
47
47 self.__gobject_init__()48 self.__gobject_init__()
48 ImageBinElems=[]49 ImageBinElems=[]
4950
50 MyJpegenc = gst.element_factory_make("jpegenc","MyJpegenc") # jpeg encoding51 MyJpegenc = gst.element_factory_make("jpegenc","MyJpegenc") # jpeg encoding
51 ImageBinElems.append(MyJpegenc) 52 ImageBinElems.append(MyJpegenc)
52 53
53 MyFilesink = gst.element_factory_make("multifilesink","MyFilesink") # save to file54 photosink = gst.element_factory_make("fakesink","PhotoSink")
54 MyFilesink.set_property('location', imagePath)55 ImageBinElems.append(photosink)
55 ImageBinElems.append(MyFilesink)56
56
57 for elem in ImageBinElems : self.add(elem)57 for elem in ImageBinElems : self.add(elem)
58 58
59 gst.element_link_many(MyJpegenc,MyFilesink)59 gst.element_link_many(MyJpegenc,photosink)
60 60
61 # ghost pad only sink pad as this bin is an output one
62 self.add_pad(gst.GhostPad('sink', MyJpegenc.get_pad('sink')))61 self.add_pad(gst.GhostPad('sink', MyJpegenc.get_pad('sink')))
63 62
6463
65class InputImageBin(gst.Bin):64class InputImageBin(gst.Bin):
66 """ Load image to mix with stream"""65 """ Load image to mix with stream"""
@@ -216,7 +215,7 @@
216 ImageBinElems.append(Myvideoscale)215 ImageBinElems.append(Myvideoscale)
217 216
218 MyVideoFilter = gst.element_factory_make("capsfilter")217 MyVideoFilter = gst.element_factory_make("capsfilter")
219 caps = gst.Caps("video/x-raw-yuv, framerate=(fraction)10/1, width=%s,height=%s"%(image_size_d['width'],image_size_d['height'])) # scale image with caps218 caps = gst.Caps("video/x-raw-yuv,width=%s,height=%s"%(image_size_d['width'],image_size_d['height'])) # scale image with caps
220 MyVideoFilter.set_property("caps", caps)219 MyVideoFilter.set_property("caps", caps)
221 ImageBinElems.append(MyVideoFilter)220 ImageBinElems.append(MyVideoFilter)
222 221
@@ -483,12 +482,13 @@
483 def del_webcam_data(self): del self.__webcam_data482 def del_webcam_data(self): del self.__webcam_data
484 webcam_data = property(get_webcam_data, set_webcam_data, del_webcam_data, " webcam parameters for gstreamer : source_input,device,height, width ")483 webcam_data = property(get_webcam_data, set_webcam_data, del_webcam_data, " webcam parameters for gstreamer : source_input,device,height, width ")
485 484
486 def __init__(self,videowidget,baseDirPath="/dev/tmp", on_error = None) :485 def __init__(self,videowidget,baseDirPath="/dev/tmp", on_error = None, cb_capture_done = None) :
487 """ Initialisation of class LucioleGstreamer 486 """ Initialisation of class LucioleGstreamer
488 Input parameters :487 Input parameters :
489 - videowidget : the widget into display acquisition488 - videowidget : the widget into display acquisition
490 - baseDirPath : a base path to store the image to mix489 - baseDirPath : a base path to store the image to mix
491 - cb_on_error : callback to inidicate error490 - cb_on_error : callback to inidicate error
491 - cb_capture_done : callback to indicate that capture is done.
492 """492 """
493 493
494 self.__inputType = MCONST.FAKE494 self.__inputType = MCONST.FAKE
@@ -500,6 +500,7 @@
500 #self.DispWidget = videowidget500 #self.DispWidget = videowidget
501 self.videowidget = VideoWidget(videowidget) 501 self.videowidget = VideoWidget(videowidget)
502 self._on_error = on_error502 self._on_error = on_error
503 self._cb_capture_done = cb_capture_done
503504
504 self.playing = False505 self.playing = False
505 self.MixBin=None506 self.MixBin=None
@@ -548,7 +549,8 @@
548 # 549 #
549 queueFile = gst.element_factory_make("queue","queueFile") 550 queueFile = gst.element_factory_make("queue","queueFile")
550 ElementList.append(queueFile)551 ElementList.append(queueFile)
551 fileSink = SaveCapturedImageBin(self.__CaptureImagePath)552 #fileSink = SaveCapturedImageBin(self.__CaptureImagePath)
553 fileSink = PhotoSaveBin()
552 ElementList.append(fileSink)554 ElementList.append(fileSink)
553 555
554 556
@@ -643,4 +645,30 @@
643645
644 def is_playing(self):646 def is_playing(self):
645 return self.playing647 return self.playing
646 648
649 def capture(self) :
650 """ capture is requested :
651 - get jpegnec src pad (output pad of jpege enc)
652 - and add a buffer probe with callback when frame is encoded
653 """
654 # only one src pad with jpegenc
655 pad = self.pipe.get_by_name("MyJpegenc").src_pads().next()
656 # add the probe
657 self.grabprobe = pad.add_buffer_probe(self._cb_process_frame)
658
659
660 def _cb_process_frame(self, pad, buffer):
661 """ Callbak to inidicate that buffer is available from probe """
662 # remove the prove
663 pad.remove_buffer_probe(self.grabprobe)
664
665 # save to file
666 file = open(self.__CaptureImagePath,'w')
667 file.write(buffer)
668 file.close()
669
670 # callback to indicate that job is done
671 # the execution here is not in the same thread as gui , so call capture_done with idle add
672 if self._cb_capture_done != None : gobject.idle_add(self._cb_capture_done)
673
674 return True
647675
=== modified file 'lucioLib/luciole_image.py'
--- lucioLib/luciole_image.py 2009-05-01 16:18:25 +0000
+++ lucioLib/luciole_image.py 2009-05-06 17:33:04 +0000
@@ -43,7 +43,7 @@
43 # thumb_ratio43 # thumb_ratio
4444
4545
46 def __init__(self, image_path = None, generate_pixbuf = False, thumb_ratio = LCONST.THUMB_RATIO ):46 def __init__(self, image_path = None, generate_pixbuf = False, thumb_ratio = LCONST.THUMB_RATIO, generate_text = True ):
47 """ init Image object47 """ init Image object
48 image_path : absolute imapge path48 image_path : absolute imapge path
49 generate_pixbuf : set to True to generate pixbuf during init49 generate_pixbuf : set to True to generate pixbuf during init
@@ -55,8 +55,10 @@
55 self._pixbuf_normal = None55 self._pixbuf_normal = None
56 self._pixbuf_thumb = None56 self._pixbuf_thumb = None
57 self._thumb_ratio = thumb_ratio57 self._thumb_ratio = thumb_ratio
58 self._generate_text = generate_text
58 self.generated = False59 self.generated = False
59 60
61
60 if generate_pixbuf == True :62 if generate_pixbuf == True :
61 # launch generation of poixbuf at init. Not threaded 63 # launch generation of poixbuf at init. Not threaded
62 self._generare_pixbuf()64 self._generare_pixbuf()
@@ -81,8 +83,8 @@
81 self._pixbuf_thumb = self._pixbuf_normal.scale_simple( width , 83 self._pixbuf_thumb = self._pixbuf_normal.scale_simple( width ,
82 height ,84 height ,
83 gtk.gdk.INTERP_BILINEAR)85 gtk.gdk.INTERP_BILINEAR)
84 86 if self._generate_text == True :
85 self._generate_thumb_with_text()87 self._generate_thumb_with_text()
8688
87 self.generated =True89 self.generated =True
88 return False90 return False
8991
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in 2009-04-24 10:24:03 +0000
+++ po/POTFILES.in 2009-05-07 09:27:18 +0000
@@ -10,6 +10,7 @@
10lucioLib/gui/gui_controller.py10lucioLib/gui/gui_controller.py
11lucioLib/gui/webcam_detection_widget.py11lucioLib/gui/webcam_detection_widget.py
12lucioLib/gui/dialog.py12lucioLib/gui/dialog.py
13lucioLib/luciole_constants.py
13lucioLib/luciole_controller.py14lucioLib/luciole_controller.py
14lucioLib/luciole_image.py15lucioLib/luciole_image.py
15lucioLib/lucioExport/luciole_export.py16lucioLib/lucioExport/luciole_export.py
1617
=== added directory 'po/de_DE'
=== added file 'po/de_DE.po'
--- po/de_DE.po 1970-01-01 00:00:00 +0000
+++ po/de_DE.po 2009-05-07 09:27:18 +0000
@@ -0,0 +1,613 @@
1# German translations for nico package.
2# Copyright (C) 2009 THE nico'S COPYRIGHT HOLDER
3# This file is distributed under the same license as the nico package.
4# nico <nico@inattendu.org>, 2009.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: nico 3\n"
9"Report-Msgid-Bugs-To: \n"
10"POT-Creation-Date: 2009-05-07 11:21+0200\n"
11"PO-Revision-Date: 2009-05-06 01:02+0200\n"
12"Last-Translator: nico <nico@inattendu.org>\n"
13"Language-Team: German\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=ASCII\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=(n != 1);\n"
18
19#: ../images/luciole.glade.h:1
20msgid ""
21"\n"
22"Tool for video capture, for making animated cartoon from image per "
23"image \n"
24msgstr ""
25
26#: ../images/luciole.glade.h:4
27msgid " "
28msgstr ""
29
30#: ../images/luciole.glade.h:5
31msgid " Export file name (without extension) :"
32msgstr ""
33
34#: ../images/luciole.glade.h:6
35msgid "About"
36msgstr ""
37
38#: ../images/luciole.glade.h:7
39msgid "About Luciole"
40msgstr ""
41
42#: ../images/luciole.glade.h:8
43msgid "Activate/Deactivate camera preview"
44msgstr ""
45
46#: ../images/luciole.glade.h:9
47msgid "Add Trash to montage view"
48msgstr ""
49
50#: ../images/luciole.glade.h:10
51msgid "Choose export format."
52msgstr ""
53
54#: ../images/luciole.glade.h:11
55msgid "Copyright 2009 Nicolas Bertrand /GRAPE"
56msgstr ""
57
58#: ../images/luciole.glade.h:12
59msgid ""
60"DV format (raw DV)\n"
61"Format DVD (mpeg2)\n"
62"Format divx/xvid (avi)"
63msgstr ""
64
65#: ../images/luciole.glade.h:15
66msgid ""
67"Default\n"
68"Tropical"
69msgstr ""
70
71#: ../images/luciole.glade.h:17
72msgid ""
73"Elise : elise@inattendu.org\n"
74"Nico : nico@inattendu.org"
75msgstr ""
76
77#: ../images/luciole.glade.h:19
78msgid "Export"
79msgstr ""
80
81#: ../images/luciole.glade.h:20
82msgid "Export path:"
83msgstr ""
84
85#: ../images/luciole.glade.h:21
86msgid "Export video with sound."
87msgstr ""
88
89#: ../images/luciole.glade.h:22
90msgid "File format :"
91msgstr ""
92
93#: ../images/luciole.glade.h:23
94msgid "Image per seconds"
95msgstr ""
96
97#. Caller une image sur le flux video
98#: ../images/luciole.glade.h:25
99msgid "Import images"
100msgstr ""
101
102#: ../images/luciole.glade.h:26
103msgid "Luciole on line"
104msgstr ""
105
106#: ../images/luciole.glade.h:27
107msgid "Mixer"
108msgstr ""
109
110#: ../images/luciole.glade.h:28
111msgid "Mixer activation (onion skin)"
112msgstr ""
113
114#. Descendre un/ou plusieurs images
115#: ../images/luciole.glade.h:30
116msgid "Move down one or several images"
117msgstr ""
118
119#. D&#xE9;placer des images captur&#xE9;es dans la zone de montage
120#: ../images/luciole.glade.h:32
121msgid "Move snapshot to montage area"
122msgstr ""
123
124#. Monter un/ou plusieurs images
125#: ../images/luciole.glade.h:34
126msgid "Move up one or several images"
127msgstr ""
128
129#: ../images/luciole.glade.h:35
130msgid "Open recent"
131msgstr ""
132
133#: ../images/luciole.glade.h:36
134msgid "Play video"
135msgstr ""
136
137#: ../images/luciole.glade.h:37
138msgid "Preferences"
139msgstr ""
140
141#: ../images/luciole.glade.h:38
142msgid "Project Properties"
143msgstr ""
144
145#: ../images/luciole.glade.h:39
146#: ../lucioLib/gui/dialog_project_properties.py:89
147msgid "Project properties"
148msgstr ""
149
150#: ../images/luciole.glade.h:40
151msgid "Select Theme"
152msgstr ""
153
154#: ../images/luciole.glade.h:41
155msgid "Select a Luciole project"
156msgstr ""
157
158#: ../images/luciole.glade.h:42 ../lucioLib/gui/assistant_new_project.py:100
159msgid "Select a folder"
160msgstr ""
161
162#: ../images/luciole.glade.h:43
163msgid ""
164"This program is free software; you can redistribute it and/or\n"
165"modify it under the terms of the GNU General Public License\n"
166"as published by the Free Software Foundation; either \n"
167"version 2 of the License, or (at your option) any later version.\n"
168"\n"
169"This program is distributed in the hope that it will be useful,\n"
170"but WITHOUT ANY WARRANTY; without even the implied \n"
171"warranty of MERCHANTABILITY or FITNESS FOR A \n"
172"PARTICULAR PURPOSE. See the GNU General Public \n"
173"License for more details.\n"
174"\n"
175"You should have received a copy of the GNU General Public\n"
176"License along with this program; if not, write to the \n"
177"Free Software Foundation, \n"
178"Inc., 59 Temple Place - \n"
179"Suite 330, Boston, MA 02111-1307, USA."
180msgstr ""
181
182#. Jeter &#xE0; la poubelle
183#: ../images/luciole.glade.h:60
184msgid "To trash"
185msgstr ""
186
187#: ../images/luciole.glade.h:61
188msgid "Transparency level"
189msgstr ""
190
191#: ../images/luciole.glade.h:62
192msgid "Video Export"
193msgstr ""
194
195#: ../images/luciole.glade.h:63
196msgid "_File"
197msgstr ""
198
199#: ../images/luciole.glade.h:64
200msgid "_Help"
201msgstr ""
202
203#: ../images/luciole.glade.h:65
204msgid "_View"
205msgstr ""
206
207#: ../images/luciole.glade.h:66
208msgid "gtk-apply"
209msgstr ""
210
211#: ../images/luciole.glade.h:67
212msgid "gtk-cancel"
213msgstr ""
214
215#: ../images/luciole.glade.h:68
216msgid "gtk-close"
217msgstr ""
218
219#. Capturer une image
220#: ../images/luciole.glade.h:70
221msgid "make a snapshot"
222msgstr ""
223
224#: ../images/luciole.glade.h:71
225msgid "options"
226msgstr ""
227
228#: ../images/luciole.glade.h:72
229msgid "project1"
230msgstr ""
231
232#: ../images/luciole.glade.h:73
233msgid "project2"
234msgstr ""
235
236#: ../images/luciole.glade.h:74
237msgid "project3"
238msgstr ""
239
240#: ../images/luciole.glade.h:75
241msgid "project4"
242msgstr ""
243
244#: ../images/luciole.glade.h:76
245msgid "project5"
246msgstr ""
247
248#: ../lucioLib/controller/controller_load_project.py:134
249msgid "Project Load started"
250msgstr ""
251
252#: ../lucioLib/controller/controller_load_project.py:139
253#, python-format
254msgid "Project %s is loaded"
255msgstr ""
256
257#: ../lucioLib/controller/controller_load_project.py:145
258#, python-format
259msgid "Project %s is loading"
260msgstr ""
261
262#: ../lucioLib/controller/controller_import.py:178
263msgid "Import started"
264msgstr ""
265
266#: ../lucioLib/controller/controller_import.py:183
267msgid "All images imported"
268msgstr ""
269
270#: ../lucioLib/controller/controller_import.py:189
271msgid "Importing images ..."
272msgstr ""
273
274#: ../lucioLib/gui/dialog_project_properties.py:41
275msgid "Project folder :"
276msgstr ""
277
278#: ../lucioLib/gui/dialog_project_properties.py:45
279msgid "Project name :"
280msgstr ""
281
282#: ../lucioLib/gui/dialog_project_properties.py:49
283msgid "XML file :"
284msgstr ""
285
286#: ../lucioLib/gui/dialog_project_properties.py:54
287msgid "Number of frames / image"
288msgstr ""
289
290#: ../lucioLib/gui/dialog_project_properties.py:58
291msgid "Device type"
292msgstr ""
293
294#: ../lucioLib/gui/dialog_project_properties.py:66
295msgid "Device :"
296msgstr ""
297
298#: ../lucioLib/gui/dialog_project_properties.py:70
299msgid "Webcam name :"
300msgstr ""
301
302#: ../lucioLib/gui/dialog_project_properties.py:75
303msgid "Video capture driver :"
304msgstr ""
305
306#: ../lucioLib/gui/dialog_project_properties.py:79
307msgid "Video width :"
308msgstr ""
309
310#: ../lucioLib/gui/dialog_project_properties.py:83
311msgid "Video height :"
312msgstr ""
313
314#: ../lucioLib/gui/dialog_project_properties.py:177
315#: ../lucioLib/gui/dialog_project_properties.py:193
316msgid "desc"
317msgstr ""
318
319#: ../lucioLib/gui/dialog_project_properties.py:220
320msgid "Webcam properties"
321msgstr ""
322
323#.
324#. Display Button fo webcam detetction
325#.
326#: ../lucioLib/gui/dialog_project_properties.py:247
327msgid "Webcam detection"
328msgstr ""
329
330#: ../lucioLib/gui/luciole_export_window.py:164
331#, python-format
332msgid ""
333"%s is not valid. Not valid video name. Should be a combination of "
334"alhanumeric and '_' characters "
335msgstr ""
336
337#: ../lucioLib/gui/luciole_export_window.py:184
338msgid "unknown video export command"
339msgstr ""
340
341#. Launch Dialog window to ask if export file can be overide
342#: ../lucioLib/gui/luciole_export_window.py:195
343#, python-format
344msgid "File %s exists. Replace file ?"
345msgstr ""
346
347#.
348#. Initailize widgets for first page
349#.
350#. A label
351#: ../lucioLib/gui/assistant_new_project.py:59
352msgid "This assistant will help you on configuration of a new luciole project."
353msgstr ""
354
355#. A label
356#: ../lucioLib/gui/assistant_new_project.py:72
357msgid "Select project name and destination folder."
358msgstr ""
359
360#. display project name
361#: ../lucioLib/gui/assistant_new_project.py:82
362#: ../lucioLib/gui/assistant_new_project.py:339
363msgid "Project Name"
364msgstr ""
365
366#: ../lucioLib/gui/assistant_new_project.py:93
367msgid "Folder"
368msgstr ""
369
370#: ../lucioLib/gui/assistant_new_project.py:147
371#, python-format
372msgid ""
373"%s is not valid. Not valid project name. Should be a combination of "
374"alhanumeric and '_' characters "
375msgstr ""
376
377#: ../lucioLib/gui/assistant_new_project.py:158
378#, python-format
379msgid "The project %s exists !"
380msgstr ""
381
382#: ../lucioLib/gui/assistant_new_project.py:203
383msgid "Select a device"
384msgstr ""
385
386#: ../lucioLib/gui/assistant_new_project.py:223
387msgid ""
388" Other device.\n"
389"(Manual import)"
390msgstr ""
391
392#: ../lucioLib/gui/assistant_new_project.py:240
393msgid "Images per second"
394msgstr ""
395
396#. display project path
397#: ../lucioLib/gui/assistant_new_project.py:343
398msgid "Project Path"
399msgstr ""
400
401#: ../lucioLib/gui/assistant_new_project.py:352
402msgid "Number of frames per seconds"
403msgstr ""
404
405#. display Hardware type
406#: ../lucioLib/gui/assistant_new_project.py:356
407msgid "Hardware type"
408msgstr ""
409
410#. webcam name
411#: ../lucioLib/gui/assistant_new_project.py:362
412msgid "Webcam name"
413msgstr ""
414
415#. webcam device
416#: ../lucioLib/gui/assistant_new_project.py:366
417msgid "Webcam device"
418msgstr ""
419
420#. webcam resolution
421#: ../lucioLib/gui/assistant_new_project.py:370
422msgid "Webcam resolution used"
423msgstr ""
424
425#. webcam device
426#: ../lucioLib/gui/assistant_new_project.py:376
427msgid "Webcam driver used"
428msgstr ""
429
430#. Final message
431#: ../lucioLib/gui/assistant_new_project.py:381
432msgid "Have fun with luciole !"
433msgstr ""
434
435#: ../lucioLib/gui/assistant_new_project.py:411
436msgid "Luciole project assistant"
437msgstr ""
438
439#: ../lucioLib/gui/assistant_new_project.py:422
440msgid " Select a project path "
441msgstr ""
442
443#: ../lucioLib/gui/assistant_new_project.py:431
444msgid " Select hardware "
445msgstr ""
446
447#: ../lucioLib/gui/assistant_new_project.py:441
448msgid " Webcam detection "
449msgstr ""
450
451#: ../lucioLib/gui/assistant_new_project.py:451
452msgid " Project overview "
453msgstr ""
454
455#. create New button project
456#: ../lucioLib/gui/open_project_widget.py:50
457msgid "Create a new project"
458msgstr ""
459
460#. create open button project
461#: ../lucioLib/gui/open_project_widget.py:59
462msgid "Open an existing project"
463msgstr ""
464
465#: ../lucioLib/gui/webcam_detection_widget.py:98
466msgid "Please wait for webcam detection"
467msgstr ""
468
469#: ../lucioLib/gui/webcam_detection_widget.py:103
470msgid "Webcam detection done"
471msgstr ""
472
473#: ../lucioLib/gui/webcam_detection_widget.py:188
474msgid "Detected webcam(s)"
475msgstr ""
476
477#: ../lucioLib/gui/webcam_detection_widget.py:192
478msgid "No webcam detected"
479msgstr ""
480
481#: ../lucioLib/gui/dialog.py:73
482msgid "Select files to import"
483msgstr ""
484
485#: ../lucioLib/gui/dialog.py:114
486msgid "Select a Folder"
487msgstr ""
488
489#: ../lucioLib/luciole_constants.py:42
490msgid "OTHER DEVICE"
491msgstr ""
492
493#: ../lucioLib/luciole_controller.py:157
494#, python-format
495msgid "Project %s saved"
496msgstr ""
497
498#: ../lucioLib/luciole_controller.py:185
499#, python-format
500msgid "Project saved as %s"
501msgstr ""
502
503#: ../lucioLib/luciole_controller.py:229
504msgid "No file or valid file choosen for image import."
505msgstr ""
506
507#: ../lucioLib/luciole_controller.py:233
508msgid "Impossible to import images when no project are loaded."
509msgstr ""
510
511#. nbd@grape to transform as error message
512#: ../lucioLib/luciole_controller.py:262
513msgid "Nothing to export. No project loaded"
514msgstr ""
515
516#. nbd@grape specify action to do err message or raise exception ?
517#: ../lucioLib/luciole_controller.py:280
518msgid "Imposible to initialize player."
519msgstr ""
520
521#. nbd@grape to transform as error message
522#: ../lucioLib/luciole_controller.py:302
523msgid "Can not play animantion : No image on montage view "
524msgstr ""
525
526#. nbd@grape to transform as error message
527#: ../lucioLib/luciole_controller.py:311
528msgid "Can not play animantion : No project loaded "
529msgstr ""
530
531#. nbd@grape : ask for save if save set status as loaded
532#: ../lucioLib/luciole_controller.py:360
533msgid "Save Project before closing"
534msgstr ""
535
536#: ../lucioLib/luciole_controller.py:386
537#, python-format
538msgid "Project %s is closed"
539msgstr ""
540
541#. clear message status bar
542#: ../lucioLib/luciole_controller.py:407
543msgid "Acquiring"
544msgstr ""
545
546#. stop acquirer
547#: ../lucioLib/luciole_controller.py:424
548msgid ""
549"No acquisition available. Use 'import image' button to load images in "
550"project."
551msgstr ""
552
553#: ../lucioLib/luciole_controller.py:436
554msgid " Can not start acquisition when no project are loaded."
555msgstr ""
556
557#: ../lucioLib/luciole_controller.py:445
558#, python-format
559msgid "Acquisition error. %s"
560msgstr ""
561
562#: ../lucioLib/luciole_controller.py:459
563msgid "No Acquistion"
564msgstr ""
565
566#. nbd@grape : ask for save if save set status as loaded
567#: ../lucioLib/luciole_controller.py:548
568msgid "Project modified. Save project before exit ?"
569msgstr ""
570
571#: ../lucioLib/luciole_controller.py:600
572msgid "Please restart luciole to take into account the new theme "
573msgstr ""
574
575#: ../lucioLib/luciole_controller.py:650
576msgid "Failed to load project "
577msgstr ""
578
579#: ../lucioLib/luciole_image.py:137
580#, python-format
581msgid "Not a file : %s"
582msgstr ""
583
584#: ../lucioLib/luciole_image.py:185
585msgid "rush folder not valid"
586msgstr ""
587
588#. error to raise
589#: ../lucioLib/luciole_image.py:280
590#, python-format
591msgid "Error path does not exist : %s"
592msgstr ""
593
594#: ../lucioLib/lucioExport/luciole_export.py:90
595msgid "Pass 1/2"
596msgstr ""
597
598#: ../lucioLib/lucioExport/luciole_export.py:99
599msgid "Pass 2/2"
600msgstr ""
601
602#. Terminated normaly
603#: ../lucioLib/lucioExport/luciole_export.py:202
604msgid "Export Done"
605msgstr ""
606
607#: ../lucioLib/lucioExport/luciole_export.py:205
608msgid "Export Canceled"
609msgstr ""
610
611#: ../lucioLib/lucioExport/luciole_export.py:507
612msgid "Unable to erase"
613msgstr ""
0614
=== added directory 'po/de_DE/LC_MESSAGES'
=== added file 'po/de_DE/LC_MESSAGES/luciole.mo'
1Binary files po/de_DE/LC_MESSAGES/luciole.mo 1970-01-01 00:00:00 +0000 and po/de_DE/LC_MESSAGES/luciole.mo 2009-05-06 17:15:46 +0000 differ615Binary files po/de_DE/LC_MESSAGES/luciole.mo 1970-01-01 00:00:00 +0000 and po/de_DE/LC_MESSAGES/luciole.mo 2009-05-06 17:15:46 +0000 differ
=== modified file 'po/en_EN.po'
--- po/en_EN.po 2009-05-01 16:34:13 +0000
+++ po/en_EN.po 2009-05-07 09:27:18 +0000
@@ -7,7 +7,7 @@
7msgstr ""7msgstr ""
8"Project-Id-Version: myrtille-i 18n\n"8"Project-Id-Version: myrtille-i 18n\n"
9"Report-Msgid-Bugs-To: \n"9"Report-Msgid-Bugs-To: \n"
10"POT-Creation-Date: 2009-05-01 18:31+0200\n"10"POT-Creation-Date: 2009-05-07 11:21+0200\n"
11"PO-Revision-Date: 2008-05-08 18:51+0200\n"11"PO-Revision-Date: 2008-05-08 18:51+0200\n"
12"Last-Translator: nico <nico@inattendu.org>\n"12"Last-Translator: nico <nico@inattendu.org>\n"
13"Language-Team: English\n"13"Language-Team: English\n"
@@ -79,8 +79,9 @@
79msgstr ""79msgstr ""
8080
81#: ../images/luciole.glade.h:1981#: ../images/luciole.glade.h:19
82#, fuzzy
82msgid "Export"83msgid "Export"
83msgstr "Export"84msgstr "Export ..."
8485
85#: ../images/luciole.glade.h:2086#: ../images/luciole.glade.h:20
86#, fuzzy87#, fuzzy
@@ -124,7 +125,7 @@
124msgid "Move down one or several images"125msgid "Move down one or several images"
125msgstr ""126msgstr ""
126127
127#. Déplacer des images capturées dans la zone de montage128#. D&#xE9;placer des images captur&#xE9;es dans la zone de montage
128#: ../images/luciole.glade.h:32129#: ../images/luciole.glade.h:32
129msgid "Move snapshot to montage area"130msgid "Move snapshot to montage area"
130msgstr ""131msgstr ""
@@ -151,19 +152,24 @@
151msgstr ""152msgstr ""
152153
153#: ../images/luciole.glade.h:39154#: ../images/luciole.glade.h:39
155#: ../lucioLib/gui/dialog_project_properties.py:89
156msgid "Project properties"
157msgstr ""
158
159#: ../images/luciole.glade.h:40
154msgid "Select Theme"160msgid "Select Theme"
155msgstr ""161msgstr ""
156162
157#: ../images/luciole.glade.h:40163#: ../images/luciole.glade.h:41
158#, fuzzy164#, fuzzy
159msgid "Select a Luciole project"165msgid "Select a Luciole project"
160msgstr "Select a myrtille project file"166msgstr "Select a myrtille project file"
161167
162#: ../images/luciole.glade.h:41 ../lucioLib/gui/assistant_new_project.py:102168#: ../images/luciole.glade.h:42 ../lucioLib/gui/assistant_new_project.py:100
163msgid "Select a folder"169msgid "Select a folder"
164msgstr ""170msgstr ""
165171
166#: ../images/luciole.glade.h:42172#: ../images/luciole.glade.h:43
167msgid ""173msgid ""
168"This program is free software; you can redistribute it and/or\n"174"This program is free software; you can redistribute it and/or\n"
169"modify it under the terms of the GNU General Public License\n"175"modify it under the terms of the GNU General Public License\n"
@@ -199,108 +205,85 @@
199"Inc., 59 Temple Place - \n"205"Inc., 59 Temple Place - \n"
200"Suite 330, Boston, MA 02111-1307, USA."206"Suite 330, Boston, MA 02111-1307, USA."
201207
202#. Jeter à la poubelle208#. Jeter &#xE0; la poubelle
203#: ../images/luciole.glade.h:59209#: ../images/luciole.glade.h:60
204msgid "To trash"210msgid "To trash"
205msgstr ""211msgstr ""
206212
207#: ../images/luciole.glade.h:60213#: ../images/luciole.glade.h:61
208msgid "Transparency level"214msgid "Transparency level"
209msgstr ""215msgstr ""
210216
211#: ../images/luciole.glade.h:61217#: ../images/luciole.glade.h:62
218#, fuzzy
219msgid "Video Export"
220msgstr "Export"
221
222#: ../images/luciole.glade.h:63
212#, fuzzy223#, fuzzy
213msgid "_File"224msgid "_File"
214msgstr "_Fichier"225msgstr "_Fichier"
215226
216#: ../images/luciole.glade.h:62227#: ../images/luciole.glade.h:64
217msgid "_Help"228msgid "_Help"
218msgstr ""229msgstr ""
219230
220#: ../images/luciole.glade.h:63231#: ../images/luciole.glade.h:65
221msgid "_View"232msgid "_View"
222msgstr ""233msgstr ""
223234
224#: ../images/luciole.glade.h:64235#: ../images/luciole.glade.h:66
225msgid "gtk-about"
226msgstr "gtk-about"
227
228#: ../images/luciole.glade.h:65
229msgid "gtk-apply"236msgid "gtk-apply"
230msgstr "gtk-apply"237msgstr "gtk-apply"
231238
232#: ../images/luciole.glade.h:66239#: ../images/luciole.glade.h:67
233msgid "gtk-cancel"240msgid "gtk-cancel"
234msgstr "gtk-cancel"241msgstr "gtk-cancel"
235242
236#: ../images/luciole.glade.h:67243#: ../images/luciole.glade.h:68
237#, fuzzy244#, fuzzy
238msgid "gtk-close"245msgid "gtk-close"
239msgstr "gtk-open"246msgstr "gtk-open"
240247
241#: ../images/luciole.glade.h:68248#. Capturer une image
242msgid "gtk-new"
243msgstr "gtk-new"
244
245#: ../images/luciole.glade.h:69
246msgid "gtk-open"
247msgstr "gtk-open"
248
249#: ../images/luciole.glade.h:70249#: ../images/luciole.glade.h:70
250msgid "gtk-quit"250msgid "make a snapshot"
251msgstr "gtk-quit"251msgstr ""
252252
253#: ../images/luciole.glade.h:71253#: ../images/luciole.glade.h:71
254msgid "gtk-save"254msgid "options"
255msgstr "gtk-save"255msgstr ""
256256
257#: ../images/luciole.glade.h:72257#: ../images/luciole.glade.h:72
258msgid "gtk-save-as"
259msgstr "gtk-save-as"
260
261#. Capturer une image
262#: ../images/luciole.glade.h:74
263msgid "make a snapshot"
264msgstr ""
265
266#: ../images/luciole.glade.h:75
267msgid "menuitem1"
268msgstr ""
269
270#: ../images/luciole.glade.h:76
271msgid "options"
272msgstr ""
273
274#: ../images/luciole.glade.h:77
275msgid "project1"258msgid "project1"
276msgstr ""259msgstr ""
277260
278#: ../images/luciole.glade.h:78261#: ../images/luciole.glade.h:73
279msgid "project2"262msgid "project2"
280msgstr ""263msgstr ""
281264
282#: ../images/luciole.glade.h:79265#: ../images/luciole.glade.h:74
283msgid "project3"266msgid "project3"
284msgstr ""267msgstr ""
285268
286#: ../images/luciole.glade.h:80269#: ../images/luciole.glade.h:75
287msgid "project4"270msgid "project4"
288msgstr ""271msgstr ""
289272
290#: ../images/luciole.glade.h:81273#: ../images/luciole.glade.h:76
291msgid "project5"274msgid "project5"
292msgstr ""275msgstr ""
293276
294#: ../lucioLib/controller/controller_load_project.py:133277#: ../lucioLib/controller/controller_load_project.py:134
295msgid "Project Load started"278msgid "Project Load started"
296msgstr ""279msgstr ""
297280
298#: ../lucioLib/controller/controller_load_project.py:138281#: ../lucioLib/controller/controller_load_project.py:139
299#, python-format282#, python-format
300msgid "Project %s is loaded"283msgid "Project %s is loaded"
301msgstr ""284msgstr ""
302285
303#: ../lucioLib/controller/controller_load_project.py:144286#: ../lucioLib/controller/controller_load_project.py:145
304#, python-format287#, python-format
305msgid "Project %s is loading"288msgid "Project %s is loading"
306msgstr ""289msgstr ""
@@ -361,10 +344,6 @@
361msgid "Video height :"344msgid "Video height :"
362msgstr ""345msgstr ""
363346
364#: ../lucioLib/gui/dialog_project_properties.py:89
365msgid "Project properties"
366msgstr ""
367
368#: ../lucioLib/gui/dialog_project_properties.py:177347#: ../lucioLib/gui/dialog_project_properties.py:177
369#: ../lucioLib/gui/dialog_project_properties.py:193348#: ../lucioLib/gui/dialog_project_properties.py:193
370msgid "desc"349msgid "desc"
@@ -404,107 +383,113 @@
404#. Initailize widgets for first page383#. Initailize widgets for first page
405#.384#.
406#. A label385#. A label
407#: ../lucioLib/gui/assistant_new_project.py:61386#: ../lucioLib/gui/assistant_new_project.py:59
408msgid "This assistant will help you on configuration of a new luciole project."387msgid "This assistant will help you on configuration of a new luciole project."
409msgstr ""388msgstr ""
410389
411#. A label390#. A label
412#: ../lucioLib/gui/assistant_new_project.py:74391#: ../lucioLib/gui/assistant_new_project.py:72
413msgid "Select project name and destination folder."392msgid "Select project name and destination folder."
414msgstr ""393msgstr ""
415394
416#. display project name395#. display project name
417#: ../lucioLib/gui/assistant_new_project.py:84396#: ../lucioLib/gui/assistant_new_project.py:82
418#: ../lucioLib/gui/assistant_new_project.py:341397#: ../lucioLib/gui/assistant_new_project.py:339
419msgid "Project Name"398msgid "Project Name"
420msgstr ""399msgstr ""
421400
422#: ../lucioLib/gui/assistant_new_project.py:95401#: ../lucioLib/gui/assistant_new_project.py:93
423msgid "Folder"402msgid "Folder"
424msgstr ""403msgstr ""
425404
426#: ../lucioLib/gui/assistant_new_project.py:150405#: ../lucioLib/gui/assistant_new_project.py:147
427#, python-format406#, python-format
428msgid ""407msgid ""
429"%s is noy valid. Not valid project name. Should be a combination of "408"%s is not valid. Not valid project name. Should be a combination of "
430"alhanumeric and '_' characters "409"alhanumeric and '_' characters "
431msgstr ""410msgstr ""
432411
433#: ../lucioLib/gui/assistant_new_project.py:161412#: ../lucioLib/gui/assistant_new_project.py:158
434#, python-format413#, python-format
435msgid "The project %s exists !"414msgid "The project %s exists !"
436msgstr ""415msgstr ""
437416
438#: ../lucioLib/gui/assistant_new_project.py:206417#: ../lucioLib/gui/assistant_new_project.py:203
439msgid "Select a device"418msgid "Select a device"
440msgstr ""419msgstr ""
441420
442#: ../lucioLib/gui/assistant_new_project.py:242421#: ../lucioLib/gui/assistant_new_project.py:223
422msgid ""
423" Other device.\n"
424"(Manual import)"
425msgstr ""
426
427#: ../lucioLib/gui/assistant_new_project.py:240
443#, fuzzy428#, fuzzy
444msgid "Images per second"429msgid "Images per second"
445msgstr "Images par secondes"430msgstr "Images par secondes"
446431
447#. display project path432#. display project path
448#: ../lucioLib/gui/assistant_new_project.py:345433#: ../lucioLib/gui/assistant_new_project.py:343
449msgid "Project Path"434msgid "Project Path"
450msgstr ""435msgstr ""
451436
452#: ../lucioLib/gui/assistant_new_project.py:354437#: ../lucioLib/gui/assistant_new_project.py:352
453#, fuzzy438#, fuzzy
454msgid "Number of frames per seconds"439msgid "Number of frames per seconds"
455msgstr "Images par secondes"440msgstr "Images par secondes"
456441
457#. display Hardware type442#. display Hardware type
458#: ../lucioLib/gui/assistant_new_project.py:358443#: ../lucioLib/gui/assistant_new_project.py:356
459msgid "Hardware type"444msgid "Hardware type"
460msgstr ""445msgstr ""
461446
462#. webcam name447#. webcam name
463#: ../lucioLib/gui/assistant_new_project.py:364448#: ../lucioLib/gui/assistant_new_project.py:362
464#, fuzzy449#, fuzzy
465msgid "Webcam name"450msgid "Webcam name"
466msgstr "Web Cam"451msgstr "Web Cam"
467452
468#. webcam device453#. webcam device
469#: ../lucioLib/gui/assistant_new_project.py:368454#: ../lucioLib/gui/assistant_new_project.py:366
470#, fuzzy455#, fuzzy
471msgid "Webcam device"456msgid "Webcam device"
472msgstr "Web Cam"457msgstr "Web Cam"
473458
474#. webcam resolution459#. webcam resolution
475#: ../lucioLib/gui/assistant_new_project.py:372460#: ../lucioLib/gui/assistant_new_project.py:370
476msgid "Webcam resolution used"461msgid "Webcam resolution used"
477msgstr ""462msgstr ""
478463
479#. webcam device464#. webcam device
480#: ../lucioLib/gui/assistant_new_project.py:378465#: ../lucioLib/gui/assistant_new_project.py:376
481msgid "Webcam driver used"466msgid "Webcam driver used"
482msgstr ""467msgstr ""
483468
484#. Final message469#. Final message
485#: ../lucioLib/gui/assistant_new_project.py:383470#: ../lucioLib/gui/assistant_new_project.py:381
486msgid "Have fun with luciole !"471msgid "Have fun with luciole !"
487msgstr ""472msgstr ""
488473
489#: ../lucioLib/gui/assistant_new_project.py:413474#: ../lucioLib/gui/assistant_new_project.py:411
490#, fuzzy475#, fuzzy
491msgid "Luciole project assistant"476msgid "Luciole project assistant"
492msgstr "Select a myrtille project file"477msgstr "Select a myrtille project file"
493478
494#: ../lucioLib/gui/assistant_new_project.py:424479#: ../lucioLib/gui/assistant_new_project.py:422
495#, fuzzy480#, fuzzy
496msgid " Select a project path "481msgid " Select a project path "
497msgstr "Select a myrtille project file"482msgstr "Select a myrtille project file"
498483
499#: ../lucioLib/gui/assistant_new_project.py:433484#: ../lucioLib/gui/assistant_new_project.py:431
500msgid " Select hardware "485msgid " Select hardware "
501msgstr ""486msgstr ""
502487
503#: ../lucioLib/gui/assistant_new_project.py:443488#: ../lucioLib/gui/assistant_new_project.py:441
504msgid " Webcam detection "489msgid " Webcam detection "
505msgstr ""490msgstr ""
506491
507#: ../lucioLib/gui/assistant_new_project.py:452492#: ../lucioLib/gui/assistant_new_project.py:451
508msgid " Project overview "493msgid " Project overview "
509msgstr ""494msgstr ""
510495
@@ -527,11 +512,11 @@
527msgid "Webcam detection done"512msgid "Webcam detection done"
528msgstr ""513msgstr ""
529514
530#: ../lucioLib/gui/webcam_detection_widget.py:186
531msgid "Detected webcam"
532msgstr ""
533
534#: ../lucioLib/gui/webcam_detection_widget.py:188515#: ../lucioLib/gui/webcam_detection_widget.py:188
516msgid "Detected webcam(s)"
517msgstr ""
518
519#: ../lucioLib/gui/webcam_detection_widget.py:192
535msgid "No webcam detected"520msgid "No webcam detected"
536msgstr ""521msgstr ""
537522
@@ -545,6 +530,10 @@
545msgid "Select a Folder"530msgid "Select a Folder"
546msgstr "Select a myrtille project file"531msgstr "Select a myrtille project file"
547532
533#: ../lucioLib/luciole_constants.py:42
534msgid "OTHER DEVICE"
535msgstr ""
536
548#: ../lucioLib/luciole_controller.py:157537#: ../lucioLib/luciole_controller.py:157
549#, python-format538#, python-format
550msgid "Project %s saved"539msgid "Project %s saved"
@@ -555,87 +544,94 @@
555msgid "Project saved as %s"544msgid "Project saved as %s"
556msgstr ""545msgstr ""
557546
558#: ../lucioLib/luciole_controller.py:222547#: ../lucioLib/luciole_controller.py:229
559msgid "No file or valid file choosen for image import."548msgid "No file or valid file choosen for image import."
560msgstr ""549msgstr ""
561550
562#: ../lucioLib/luciole_controller.py:226551#: ../lucioLib/luciole_controller.py:233
563msgid "Impossible to import images when no project are loaded."552msgid "Impossible to import images when no project are loaded."
564msgstr ""553msgstr ""
565554
566#. nbd@grape to transform as error message555#. nbd@grape to transform as error message
567#: ../lucioLib/luciole_controller.py:255556#: ../lucioLib/luciole_controller.py:262
568msgid "Nothing to export. No project loaded"557msgid "Nothing to export. No project loaded"
569msgstr ""558msgstr ""
570559
571#. nbd@grape specify action to do err message or raise exception ?560#. nbd@grape specify action to do err message or raise exception ?
572#: ../lucioLib/luciole_controller.py:273561#: ../lucioLib/luciole_controller.py:280
573msgid "Imposible to initialize player."562msgid "Imposible to initialize player."
574msgstr ""563msgstr ""
575564
576#. nbd@grape to transform as error message565#. nbd@grape to transform as error message
577#: ../lucioLib/luciole_controller.py:295566#: ../lucioLib/luciole_controller.py:302
578msgid "Can not play animantion : No image on montage view "567msgid "Can not play animantion : No image on montage view "
579msgstr ""568msgstr ""
580569
581#. nbd@grape to transform as error message570#. nbd@grape to transform as error message
582#: ../lucioLib/luciole_controller.py:304571#: ../lucioLib/luciole_controller.py:311
583msgid "Can not play animantion : No project loaded "572msgid "Can not play animantion : No project loaded "
584msgstr ""573msgstr ""
585574
586#. nbd@grape : ask for save if save set status as loaded575#. nbd@grape : ask for save if save set status as loaded
587#: ../lucioLib/luciole_controller.py:353576#: ../lucioLib/luciole_controller.py:360
588msgid "Save Project before closing"577msgid "Save Project before closing"
589msgstr ""578msgstr ""
590579
591#: ../lucioLib/luciole_controller.py:379580#: ../lucioLib/luciole_controller.py:386
592#, python-format581#, python-format
593msgid "Project %s is closed"582msgid "Project %s is closed"
594msgstr ""583msgstr ""
595584
596#. clear message status bar585#. clear message status bar
597#: ../lucioLib/luciole_controller.py:400586#: ../lucioLib/luciole_controller.py:407
598msgid "Acquiring"587msgid "Acquiring"
599msgstr ""588msgstr ""
600589
601#: ../lucioLib/luciole_controller.py:421590#. stop acquirer
591#: ../lucioLib/luciole_controller.py:424
592msgid ""
593"No acquisition available. Use 'import image' button to load images in "
594"project."
595msgstr ""
596
597#: ../lucioLib/luciole_controller.py:436
602msgid " Can not start acquisition when no project are loaded."598msgid " Can not start acquisition when no project are loaded."
603msgstr ""599msgstr ""
604600
605#: ../lucioLib/luciole_controller.py:430601#: ../lucioLib/luciole_controller.py:445
606#, python-format602#, python-format
607msgid "Acquisition error. %s"603msgid "Acquisition error. %s"
608msgstr ""604msgstr ""
609605
610#: ../lucioLib/luciole_controller.py:444606#: ../lucioLib/luciole_controller.py:459
611msgid "No Acquistion"607msgid "No Acquistion"
612msgstr ""608msgstr ""
613609
614#. nbd@grape : ask for save if save set status as loaded610#. nbd@grape : ask for save if save set status as loaded
615#: ../lucioLib/luciole_controller.py:533611#: ../lucioLib/luciole_controller.py:548
616msgid "Project modified. Save project before exit ?"612msgid "Project modified. Save project before exit ?"
617msgstr ""613msgstr ""
618614
619#: ../lucioLib/luciole_controller.py:585615#: ../lucioLib/luciole_controller.py:600
620msgid "Please restart luciole to take into acount the new theme "616msgid "Please restart luciole to take into account the new theme "
621msgstr ""617msgstr ""
622618
623#: ../lucioLib/luciole_controller.py:635619#: ../lucioLib/luciole_controller.py:650
624#, fuzzy620#, fuzzy
625msgid "Failed to load project "621msgid "Failed to load project "
626msgstr "Select a myrtille project file"622msgstr "Select a myrtille project file"
627623
628#: ../lucioLib/luciole_image.py:135624#: ../lucioLib/luciole_image.py:137
629#, python-format625#, python-format
630msgid "Not a file : %s"626msgid "Not a file : %s"
631msgstr ""627msgstr ""
632628
633#: ../lucioLib/luciole_image.py:183629#: ../lucioLib/luciole_image.py:185
634msgid "rush folder not valid"630msgid "rush folder not valid"
635msgstr ""631msgstr ""
636632
637#. error to raise633#. error to raise
638#: ../lucioLib/luciole_image.py:278634#: ../lucioLib/luciole_image.py:280
639#, python-format635#, python-format
640msgid "Error path does not exist : %s"636msgid "Error path does not exist : %s"
641msgstr ""637msgstr ""
@@ -663,6 +659,24 @@
663msgid "Unable to erase"659msgid "Unable to erase"
664msgstr ""660msgstr ""
665661
662#~ msgid "gtk-about"
663#~ msgstr "gtk-about"
664
665#~ msgid "gtk-new"
666#~ msgstr "gtk-new"
667
668#~ msgid "gtk-open"
669#~ msgstr "gtk-open"
670
671#~ msgid "gtk-quit"
672#~ msgstr "gtk-quit"
673
674#~ msgid "gtk-save"
675#~ msgstr "gtk-save"
676
677#~ msgid "gtk-save-as"
678#~ msgstr "gtk-save-as"
679
666#, fuzzy680#, fuzzy
667#~ msgid "Import"681#~ msgid "Import"
668#~ msgstr "Export"682#~ msgstr "Export"
@@ -696,9 +710,6 @@
696#~ msgid "DV cam"710#~ msgid "DV cam"
697#~ msgstr "DV cam"711#~ msgstr "DV cam"
698712
699#~ msgid "Export ..."
700#~ msgstr "Export ..."
701
702#, fuzzy713#, fuzzy
703#~ msgid "Images per second number"714#~ msgid "Images per second number"
704#~ msgstr "Images par seconde"715#~ msgstr "Images par seconde"
705716
=== modified file 'po/en_EN/LC_MESSAGES/luciole.mo'
706Binary files po/en_EN/LC_MESSAGES/luciole.mo 2009-05-01 16:34:13 +0000 and po/en_EN/LC_MESSAGES/luciole.mo 2009-05-06 17:15:46 +0000 differ717Binary files po/en_EN/LC_MESSAGES/luciole.mo 2009-05-01 16:34:13 +0000 and po/en_EN/LC_MESSAGES/luciole.mo 2009-05-06 17:15:46 +0000 differ
=== modified file 'po/en_US.po'
--- po/en_US.po 2009-05-01 16:34:13 +0000
+++ po/en_US.po 2009-05-07 09:27:18 +0000
@@ -7,7 +7,7 @@
7msgstr ""7msgstr ""
8"Project-Id-Version: myrtille-i 18n\n"8"Project-Id-Version: myrtille-i 18n\n"
9"Report-Msgid-Bugs-To: \n"9"Report-Msgid-Bugs-To: \n"
10"POT-Creation-Date: 2009-05-01 18:31+0200\n"10"POT-Creation-Date: 2009-05-07 11:21+0200\n"
11"PO-Revision-Date: 2008-06-22 10:32+0200\n"11"PO-Revision-Date: 2008-06-22 10:32+0200\n"
12"Last-Translator: nico <nico@inattendu.org>\n"12"Last-Translator: nico <nico@inattendu.org>\n"
13"Language-Team: English\n"13"Language-Team: English\n"
@@ -126,7 +126,7 @@
126msgid "Move down one or several images"126msgid "Move down one or several images"
127msgstr ""127msgstr ""
128128
129#. Déplacer des images capturées dans la zone de montage129#. D&#xE9;placer des images captur&#xE9;es dans la zone de montage
130#: ../images/luciole.glade.h:32130#: ../images/luciole.glade.h:32
131msgid "Move snapshot to montage area"131msgid "Move snapshot to montage area"
132msgstr ""132msgstr ""
@@ -154,20 +154,26 @@
154msgstr "Project name"154msgstr "Project name"
155155
156#: ../images/luciole.glade.h:39156#: ../images/luciole.glade.h:39
157#: ../lucioLib/gui/dialog_project_properties.py:89
158#, fuzzy
159msgid "Project properties"
160msgstr "Project name"
161
162#: ../images/luciole.glade.h:40
157#, fuzzy163#, fuzzy
158msgid "Select Theme"164msgid "Select Theme"
159msgstr "Select a folder"165msgstr "Select a folder"
160166
161#: ../images/luciole.glade.h:40167#: ../images/luciole.glade.h:41
162#, fuzzy168#, fuzzy
163msgid "Select a Luciole project"169msgid "Select a Luciole project"
164msgstr "Select a myrtille project file"170msgstr "Select a myrtille project file"
165171
166#: ../images/luciole.glade.h:41 ../lucioLib/gui/assistant_new_project.py:102172#: ../images/luciole.glade.h:42 ../lucioLib/gui/assistant_new_project.py:100
167msgid "Select a folder"173msgid "Select a folder"
168msgstr "Select a folder"174msgstr "Select a folder"
169175
170#: ../images/luciole.glade.h:42176#: ../images/luciole.glade.h:43
171msgid ""177msgid ""
172"This program is free software; you can redistribute it and/or\n"178"This program is free software; you can redistribute it and/or\n"
173"modify it under the terms of the GNU General Public License\n"179"modify it under the terms of the GNU General Public License\n"
@@ -203,115 +209,92 @@
203"Inc., 59 Temple Place - \n"209"Inc., 59 Temple Place - \n"
204"Suite 330, Boston, MA 02111-1307, USA."210"Suite 330, Boston, MA 02111-1307, USA."
205211
206#. Jeter à la poubelle212#. Jeter &#xE0; la poubelle
207#: ../images/luciole.glade.h:59213#: ../images/luciole.glade.h:60
208msgid "To trash"214msgid "To trash"
209msgstr ""215msgstr ""
210216
211#: ../images/luciole.glade.h:60217#: ../images/luciole.glade.h:61
212msgid "Transparency level"218msgid "Transparency level"
213msgstr "Transparency level"219msgstr "Transparency level"
214220
215#: ../images/luciole.glade.h:61221#: ../images/luciole.glade.h:62
222#, fuzzy
223msgid "Video Export"
224msgstr "File export"
225
226#: ../images/luciole.glade.h:63
216#, fuzzy227#, fuzzy
217msgid "_File"228msgid "_File"
218msgstr "_File"229msgstr "_File"
219230
220#: ../images/luciole.glade.h:62231#: ../images/luciole.glade.h:64
221msgid "_Help"232msgid "_Help"
222msgstr "_Help"233msgstr "_Help"
223234
224#: ../images/luciole.glade.h:63235#: ../images/luciole.glade.h:65
225msgid "_View"236msgid "_View"
226msgstr ""237msgstr ""
227238
228#: ../images/luciole.glade.h:64239#: ../images/luciole.glade.h:66
229msgid "gtk-about"
230msgstr "gtk-about"
231
232#: ../images/luciole.glade.h:65
233msgid "gtk-apply"240msgid "gtk-apply"
234msgstr "gtk-apply"241msgstr "gtk-apply"
235242
236#: ../images/luciole.glade.h:66243#: ../images/luciole.glade.h:67
237msgid "gtk-cancel"244msgid "gtk-cancel"
238msgstr "gtk-cancel"245msgstr "gtk-cancel"
239246
240#: ../images/luciole.glade.h:67247#: ../images/luciole.glade.h:68
241#, fuzzy248#, fuzzy
242msgid "gtk-close"249msgid "gtk-close"
243msgstr "gtk-open"250msgstr "gtk-open"
244251
245#: ../images/luciole.glade.h:68252#. Capturer une image
246msgid "gtk-new"
247msgstr "gtk-new"
248
249#: ../images/luciole.glade.h:69
250msgid "gtk-open"
251msgstr "gtk-open"
252
253#: ../images/luciole.glade.h:70253#: ../images/luciole.glade.h:70
254msgid "gtk-quit"
255msgstr "gtk-quit"
256
257#: ../images/luciole.glade.h:71
258msgid "gtk-save"
259msgstr "gtk-save"
260
261#: ../images/luciole.glade.h:72
262msgid "gtk-save-as"
263msgstr "gtk-save-as"
264
265#. Capturer une image
266#: ../images/luciole.glade.h:74
267#, fuzzy254#, fuzzy
268msgid "make a snapshot"255msgid "make a snapshot"
269msgstr "Snapshot"256msgstr "Snapshot"
270257
271#: ../images/luciole.glade.h:75258#: ../images/luciole.glade.h:71
272msgid "menuitem1"
273msgstr ""
274
275#: ../images/luciole.glade.h:76
276msgid "options"259msgid "options"
277msgstr ""260msgstr ""
278261
279#: ../images/luciole.glade.h:77262#: ../images/luciole.glade.h:72
280#, fuzzy263#, fuzzy
281msgid "project1"264msgid "project1"
282msgstr "Project name"265msgstr "Project name"
283266
284#: ../images/luciole.glade.h:78267#: ../images/luciole.glade.h:73
285#, fuzzy268#, fuzzy
286msgid "project2"269msgid "project2"
287msgstr "Project name"270msgstr "Project name"
288271
289#: ../images/luciole.glade.h:79272#: ../images/luciole.glade.h:74
290#, fuzzy273#, fuzzy
291msgid "project3"274msgid "project3"
292msgstr "Project name"275msgstr "Project name"
293276
294#: ../images/luciole.glade.h:80277#: ../images/luciole.glade.h:75
295#, fuzzy278#, fuzzy
296msgid "project4"279msgid "project4"
297msgstr "Project name"280msgstr "Project name"
298281
299#: ../images/luciole.glade.h:81282#: ../images/luciole.glade.h:76
300#, fuzzy283#, fuzzy
301msgid "project5"284msgid "project5"
302msgstr "Project name"285msgstr "Project name"
303286
304#: ../lucioLib/controller/controller_load_project.py:133287#: ../lucioLib/controller/controller_load_project.py:134
305#, fuzzy288#, fuzzy
306msgid "Project Load started"289msgid "Project Load started"
307msgstr "Project name"290msgstr "Project name"
308291
309#: ../lucioLib/controller/controller_load_project.py:138292#: ../lucioLib/controller/controller_load_project.py:139
310#, fuzzy, python-format293#, fuzzy, python-format
311msgid "Project %s is loaded"294msgid "Project %s is loaded"
312msgstr "Project name"295msgstr "Project name"
313296
314#: ../lucioLib/controller/controller_load_project.py:144297#: ../lucioLib/controller/controller_load_project.py:145
315#, python-format298#, python-format
316msgid "Project %s is loading"299msgid "Project %s is loading"
317msgstr ""300msgstr ""
@@ -374,11 +357,6 @@
374msgid "Video height :"357msgid "Video height :"
375msgstr ""358msgstr ""
376359
377#: ../lucioLib/gui/dialog_project_properties.py:89
378#, fuzzy
379msgid "Project properties"
380msgstr "Project name"
381
382#: ../lucioLib/gui/dialog_project_properties.py:177360#: ../lucioLib/gui/dialog_project_properties.py:177
383#: ../lucioLib/gui/dialog_project_properties.py:193361#: ../lucioLib/gui/dialog_project_properties.py:193
384msgid "desc"362msgid "desc"
@@ -418,114 +396,120 @@
418#. Initailize widgets for first page396#. Initailize widgets for first page
419#.397#.
420#. A label398#. A label
421#: ../lucioLib/gui/assistant_new_project.py:61399#: ../lucioLib/gui/assistant_new_project.py:59
422#, fuzzy400#, fuzzy
423msgid "This assistant will help you on configuration of a new luciole project."401msgid "This assistant will help you on configuration of a new luciole project."
424msgstr ""402msgstr ""
425"This assistant will help you on configuration of a new myrtille project."403"This assistant will help you on configuration of a new myrtille project."
426404
427#. A label405#. A label
428#: ../lucioLib/gui/assistant_new_project.py:74406#: ../lucioLib/gui/assistant_new_project.py:72
429#, fuzzy407#, fuzzy
430msgid "Select project name and destination folder."408msgid "Select project name and destination folder."
431msgstr "Select project name and destination folder.\n"409msgstr "Select project name and destination folder.\n"
432410
433#. display project name411#. display project name
434#: ../lucioLib/gui/assistant_new_project.py:84412#: ../lucioLib/gui/assistant_new_project.py:82
435#: ../lucioLib/gui/assistant_new_project.py:341413#: ../lucioLib/gui/assistant_new_project.py:339
436#, fuzzy414#, fuzzy
437msgid "Project Name"415msgid "Project Name"
438msgstr "Project name"416msgstr "Project name"
439417
440#: ../lucioLib/gui/assistant_new_project.py:95418#: ../lucioLib/gui/assistant_new_project.py:93
441msgid "Folder"419msgid "Folder"
442msgstr "Folder"420msgstr "Folder"
443421
444#: ../lucioLib/gui/assistant_new_project.py:150422#: ../lucioLib/gui/assistant_new_project.py:147
445#, python-format423#, python-format
446msgid ""424msgid ""
447"%s is noy valid. Not valid project name. Should be a combination of "425"%s is not valid. Not valid project name. Should be a combination of "
448"alhanumeric and '_' characters "426"alhanumeric and '_' characters "
449msgstr ""427msgstr ""
450428
451#: ../lucioLib/gui/assistant_new_project.py:161429#: ../lucioLib/gui/assistant_new_project.py:158
452#, python-format430#, python-format
453msgid "The project %s exists !"431msgid "The project %s exists !"
454msgstr ""432msgstr ""
455433
456#: ../lucioLib/gui/assistant_new_project.py:206434#: ../lucioLib/gui/assistant_new_project.py:203
457#, fuzzy435#, fuzzy
458msgid "Select a device"436msgid "Select a device"
459msgstr "Select a folder"437msgstr "Select a folder"
460438
461#: ../lucioLib/gui/assistant_new_project.py:242439#: ../lucioLib/gui/assistant_new_project.py:223
440msgid ""
441" Other device.\n"
442"(Manual import)"
443msgstr ""
444
445#: ../lucioLib/gui/assistant_new_project.py:240
462#, fuzzy446#, fuzzy
463msgid "Images per second"447msgid "Images per second"
464msgstr "Images per seconds"448msgstr "Images per seconds"
465449
466#. display project path450#. display project path
467#: ../lucioLib/gui/assistant_new_project.py:345451#: ../lucioLib/gui/assistant_new_project.py:343
468#, fuzzy452#, fuzzy
469msgid "Project Path"453msgid "Project Path"
470msgstr "Project name"454msgstr "Project name"
471455
472#: ../lucioLib/gui/assistant_new_project.py:354456#: ../lucioLib/gui/assistant_new_project.py:352
473#, fuzzy457#, fuzzy
474msgid "Number of frames per seconds"458msgid "Number of frames per seconds"
475msgstr "Images per seconds"459msgstr "Images per seconds"
476460
477#. display Hardware type461#. display Hardware type
478#: ../lucioLib/gui/assistant_new_project.py:358462#: ../lucioLib/gui/assistant_new_project.py:356
479msgid "Hardware type"463msgid "Hardware type"
480msgstr ""464msgstr ""
481465
482#. webcam name466#. webcam name
483#: ../lucioLib/gui/assistant_new_project.py:364467#: ../lucioLib/gui/assistant_new_project.py:362
484#, fuzzy468#, fuzzy
485msgid "Webcam name"469msgid "Webcam name"
486msgstr "Web Cam"470msgstr "Web Cam"
487471
488#. webcam device472#. webcam device
489#: ../lucioLib/gui/assistant_new_project.py:368473#: ../lucioLib/gui/assistant_new_project.py:366
490#, fuzzy474#, fuzzy
491msgid "Webcam device"475msgid "Webcam device"
492msgstr "Web Cam"476msgstr "Web Cam"
493477
494#. webcam resolution478#. webcam resolution
495#: ../lucioLib/gui/assistant_new_project.py:372479#: ../lucioLib/gui/assistant_new_project.py:370
496msgid "Webcam resolution used"480msgid "Webcam resolution used"
497msgstr ""481msgstr ""
498482
499#. webcam device483#. webcam device
500#: ../lucioLib/gui/assistant_new_project.py:378484#: ../lucioLib/gui/assistant_new_project.py:376
501msgid "Webcam driver used"485msgid "Webcam driver used"
502msgstr ""486msgstr ""
503487
504#. Final message488#. Final message
505#: ../lucioLib/gui/assistant_new_project.py:383489#: ../lucioLib/gui/assistant_new_project.py:381
506msgid "Have fun with luciole !"490msgid "Have fun with luciole !"
507msgstr ""491msgstr ""
508492
509#: ../lucioLib/gui/assistant_new_project.py:413493#: ../lucioLib/gui/assistant_new_project.py:411
510#, fuzzy494#, fuzzy
511msgid "Luciole project assistant"495msgid "Luciole project assistant"
512msgstr "Select a myrtille project file"496msgstr "Select a myrtille project file"
513497
514#: ../lucioLib/gui/assistant_new_project.py:424498#: ../lucioLib/gui/assistant_new_project.py:422
515#, fuzzy499#, fuzzy
516msgid " Select a project path "500msgid " Select a project path "
517msgstr "Select a myrtille project file"501msgstr "Select a myrtille project file"
518502
519#: ../lucioLib/gui/assistant_new_project.py:433503#: ../lucioLib/gui/assistant_new_project.py:431
520#, fuzzy504#, fuzzy
521msgid " Select hardware "505msgid " Select hardware "
522msgstr "Select a folder"506msgstr "Select a folder"
523507
524#: ../lucioLib/gui/assistant_new_project.py:443508#: ../lucioLib/gui/assistant_new_project.py:441
525msgid " Webcam detection "509msgid " Webcam detection "
526msgstr ""510msgstr ""
527511
528#: ../lucioLib/gui/assistant_new_project.py:452512#: ../lucioLib/gui/assistant_new_project.py:451
529#, fuzzy513#, fuzzy
530msgid " Project overview "514msgid " Project overview "
531msgstr "Project name"515msgstr "Project name"
@@ -549,11 +533,11 @@
549msgid "Webcam detection done"533msgid "Webcam detection done"
550msgstr ""534msgstr ""
551535
552#: ../lucioLib/gui/webcam_detection_widget.py:186
553msgid "Detected webcam"
554msgstr ""
555
556#: ../lucioLib/gui/webcam_detection_widget.py:188536#: ../lucioLib/gui/webcam_detection_widget.py:188
537msgid "Detected webcam(s)"
538msgstr ""
539
540#: ../lucioLib/gui/webcam_detection_widget.py:192
557msgid "No webcam detected"541msgid "No webcam detected"
558msgstr ""542msgstr ""
559543
@@ -567,6 +551,10 @@
567msgid "Select a Folder"551msgid "Select a Folder"
568msgstr "Select a folder"552msgstr "Select a folder"
569553
554#: ../lucioLib/luciole_constants.py:42
555msgid "OTHER DEVICE"
556msgstr ""
557
570#: ../lucioLib/luciole_controller.py:157558#: ../lucioLib/luciole_controller.py:157
571#, fuzzy, python-format559#, fuzzy, python-format
572msgid "Project %s saved"560msgid "Project %s saved"
@@ -577,87 +565,94 @@
577msgid "Project saved as %s"565msgid "Project saved as %s"
578msgstr "Project name"566msgstr "Project name"
579567
580#: ../lucioLib/luciole_controller.py:222568#: ../lucioLib/luciole_controller.py:229
581msgid "No file or valid file choosen for image import."569msgid "No file or valid file choosen for image import."
582msgstr ""570msgstr ""
583571
584#: ../lucioLib/luciole_controller.py:226572#: ../lucioLib/luciole_controller.py:233
585msgid "Impossible to import images when no project are loaded."573msgid "Impossible to import images when no project are loaded."
586msgstr ""574msgstr ""
587575
588#. nbd@grape to transform as error message576#. nbd@grape to transform as error message
589#: ../lucioLib/luciole_controller.py:255577#: ../lucioLib/luciole_controller.py:262
590msgid "Nothing to export. No project loaded"578msgid "Nothing to export. No project loaded"
591msgstr ""579msgstr ""
592580
593#. nbd@grape specify action to do err message or raise exception ?581#. nbd@grape specify action to do err message or raise exception ?
594#: ../lucioLib/luciole_controller.py:273582#: ../lucioLib/luciole_controller.py:280
595msgid "Imposible to initialize player."583msgid "Imposible to initialize player."
596msgstr ""584msgstr ""
597585
598#. nbd@grape to transform as error message586#. nbd@grape to transform as error message
599#: ../lucioLib/luciole_controller.py:295587#: ../lucioLib/luciole_controller.py:302
600msgid "Can not play animantion : No image on montage view "588msgid "Can not play animantion : No image on montage view "
601msgstr ""589msgstr ""
602590
603#. nbd@grape to transform as error message591#. nbd@grape to transform as error message
604#: ../lucioLib/luciole_controller.py:304592#: ../lucioLib/luciole_controller.py:311
605msgid "Can not play animantion : No project loaded "593msgid "Can not play animantion : No project loaded "
606msgstr ""594msgstr ""
607595
608#. nbd@grape : ask for save if save set status as loaded596#. nbd@grape : ask for save if save set status as loaded
609#: ../lucioLib/luciole_controller.py:353597#: ../lucioLib/luciole_controller.py:360
610msgid "Save Project before closing"598msgid "Save Project before closing"
611msgstr ""599msgstr ""
612600
613#: ../lucioLib/luciole_controller.py:379601#: ../lucioLib/luciole_controller.py:386
614#, python-format602#, python-format
615msgid "Project %s is closed"603msgid "Project %s is closed"
616msgstr ""604msgstr ""
617605
618#. clear message status bar606#. clear message status bar
619#: ../lucioLib/luciole_controller.py:400607#: ../lucioLib/luciole_controller.py:407
620msgid "Acquiring"608msgid "Acquiring"
621msgstr ""609msgstr ""
622610
623#: ../lucioLib/luciole_controller.py:421611#. stop acquirer
612#: ../lucioLib/luciole_controller.py:424
613msgid ""
614"No acquisition available. Use 'import image' button to load images in "
615"project."
616msgstr ""
617
618#: ../lucioLib/luciole_controller.py:436
624msgid " Can not start acquisition when no project are loaded."619msgid " Can not start acquisition when no project are loaded."
625msgstr ""620msgstr ""
626621
627#: ../lucioLib/luciole_controller.py:430622#: ../lucioLib/luciole_controller.py:445
628#, python-format623#, python-format
629msgid "Acquisition error. %s"624msgid "Acquisition error. %s"
630msgstr ""625msgstr ""
631626
632#: ../lucioLib/luciole_controller.py:444627#: ../lucioLib/luciole_controller.py:459
633msgid "No Acquistion"628msgid "No Acquistion"
634msgstr ""629msgstr ""
635630
636#. nbd@grape : ask for save if save set status as loaded631#. nbd@grape : ask for save if save set status as loaded
637#: ../lucioLib/luciole_controller.py:533632#: ../lucioLib/luciole_controller.py:548
638msgid "Project modified. Save project before exit ?"633msgid "Project modified. Save project before exit ?"
639msgstr ""634msgstr ""
640635
641#: ../lucioLib/luciole_controller.py:585636#: ../lucioLib/luciole_controller.py:600
642msgid "Please restart luciole to take into acount the new theme "637msgid "Please restart luciole to take into account the new theme "
643msgstr ""638msgstr ""
644639
645#: ../lucioLib/luciole_controller.py:635640#: ../lucioLib/luciole_controller.py:650
646#, fuzzy641#, fuzzy
647msgid "Failed to load project "642msgid "Failed to load project "
648msgstr "Select a myrtille project file"643msgstr "Select a myrtille project file"
649644
650#: ../lucioLib/luciole_image.py:135645#: ../lucioLib/luciole_image.py:137
651#, python-format646#, python-format
652msgid "Not a file : %s"647msgid "Not a file : %s"
653msgstr ""648msgstr ""
654649
655#: ../lucioLib/luciole_image.py:183650#: ../lucioLib/luciole_image.py:185
656msgid "rush folder not valid"651msgid "rush folder not valid"
657msgstr ""652msgstr ""
658653
659#. error to raise654#. error to raise
660#: ../lucioLib/luciole_image.py:278655#: ../lucioLib/luciole_image.py:280
661#, python-format656#, python-format
662msgid "Error path does not exist : %s"657msgid "Error path does not exist : %s"
663msgstr ""658msgstr ""
@@ -685,6 +680,24 @@
685msgid "Unable to erase"680msgid "Unable to erase"
686msgstr ""681msgstr ""
687682
683#~ msgid "gtk-about"
684#~ msgstr "gtk-about"
685
686#~ msgid "gtk-new"
687#~ msgstr "gtk-new"
688
689#~ msgid "gtk-open"
690#~ msgstr "gtk-open"
691
692#~ msgid "gtk-quit"
693#~ msgstr "gtk-quit"
694
695#~ msgid "gtk-save"
696#~ msgstr "gtk-save"
697
698#~ msgid "gtk-save-as"
699#~ msgstr "gtk-save-as"
700
688#, fuzzy701#, fuzzy
689#~ msgid "project_name"702#~ msgid "project_name"
690#~ msgstr "Project name"703#~ msgstr "Project name"
@@ -728,9 +741,6 @@
728#~ msgid "Export ..."741#~ msgid "Export ..."
729#~ msgstr "Export ..."742#~ msgstr "Export ..."
730743
731#~ msgid "File export"
732#~ msgstr "File export"
733
734#, fuzzy744#, fuzzy
735#~ msgid "Images per second number"745#~ msgid "Images per second number"
736#~ msgstr "Images per seconds"746#~ msgstr "Images per seconds"
737747
=== modified file 'po/en_US/LC_MESSAGES/luciole.mo'
738Binary files po/en_US/LC_MESSAGES/luciole.mo 2009-05-01 16:34:13 +0000 and po/en_US/LC_MESSAGES/luciole.mo 2009-05-06 17:15:46 +0000 differ748Binary files po/en_US/LC_MESSAGES/luciole.mo 2009-05-01 16:34:13 +0000 and po/en_US/LC_MESSAGES/luciole.mo 2009-05-06 17:15:46 +0000 differ
=== modified file 'po/fr_FR.po'
--- po/fr_FR.po 2009-05-01 16:34:13 +0000
+++ po/fr_FR.po 2009-05-07 09:27:18 +0000
@@ -9,7 +9,7 @@
9msgstr ""9msgstr ""
10"Project-Id-Version: myrtille export\n"10"Project-Id-Version: myrtille export\n"
11"Report-Msgid-Bugs-To: \n"11"Report-Msgid-Bugs-To: \n"
12"POT-Creation-Date: 2009-05-01 18:31+0200\n"12"POT-Creation-Date: 2009-05-07 11:21+0200\n"
13"PO-Revision-Date: 2009-04-30 18:04+0000\n"13"PO-Revision-Date: 2009-04-30 18:04+0000\n"
14"Last-Translator: Lili <Unknown>\n"14"Last-Translator: Lili <Unknown>\n"
15"Language-Team: French <gnomefr@traduc.org>\n"15"Language-Team: French <gnomefr@traduc.org>\n"
@@ -59,7 +59,7 @@
59#: ../images/luciole.glade.h:1159#: ../images/luciole.glade.h:11
60#, fuzzy60#, fuzzy
61msgid "Copyright 2009 Nicolas Bertrand /GRAPE"61msgid "Copyright 2009 Nicolas Bertrand /GRAPE"
62msgstr "Copyright 2009 GRAPE"62msgstr "Copyright 2009 Nicolas Bertrand/GRAPE"
6363
64#: ../images/luciole.glade.h:1264#: ../images/luciole.glade.h:12
65msgid ""65msgid ""
@@ -75,7 +75,7 @@
75msgid ""75msgid ""
76"Default\n"76"Default\n"
77"Tropical"77"Tropical"
78msgstr "Tropical"78msgstr ""
7979
80#: ../images/luciole.glade.h:1780#: ../images/luciole.glade.h:17
81msgid ""81msgid ""
@@ -83,10 +83,10 @@
83"Nico : nico@inattendu.org"83"Nico : nico@inattendu.org"
84msgstr ""84msgstr ""
8585
86# msgstr "Le Fichier %s existe. Ecraser ce fichier ?"
87#: ../images/luciole.glade.h:1986#: ../images/luciole.glade.h:19
87#, fuzzy
88msgid "Export"88msgid "Export"
89msgstr "Export"89msgstr "Export terminé"
9090
91#: ../images/luciole.glade.h:2091#: ../images/luciole.glade.h:20
92msgid "Export path:"92msgid "Export path:"
@@ -126,7 +126,7 @@
126msgid "Move down one or several images"126msgid "Move down one or several images"
127msgstr "Descendre une ou plusieurs images"127msgstr "Descendre une ou plusieurs images"
128128
129#. Déplacer des images capturées dans la zone de montage129#. D&#xE9;placer des images captur&#xE9;es dans la zone de montage
130#: ../images/luciole.glade.h:32130#: ../images/luciole.glade.h:32
131msgid "Move snapshot to montage area"131msgid "Move snapshot to montage area"
132msgstr "Déplacer des images capturées dans la zone de montage"132msgstr "Déplacer des images capturées dans la zone de montage"
@@ -134,7 +134,7 @@
134#. Monter un/ou plusieurs images134#. Monter un/ou plusieurs images
135#: ../images/luciole.glade.h:34135#: ../images/luciole.glade.h:34
136msgid "Move up one or several images"136msgid "Move up one or several images"
137msgstr "Monter une ou plusieurs images"137msgstr "Monter une ou plusieurs images"
138138
139#: ../images/luciole.glade.h:35139#: ../images/luciole.glade.h:35
140msgid "Open recent"140msgid "Open recent"
@@ -153,18 +153,23 @@
153msgstr "Propriétés du projet"153msgstr "Propriétés du projet"
154154
155#: ../images/luciole.glade.h:39155#: ../images/luciole.glade.h:39
156#: ../lucioLib/gui/dialog_project_properties.py:89
157msgid "Project properties"
158msgstr "Propriétés du projet"
159
160#: ../images/luciole.glade.h:40
156msgid "Select Theme"161msgid "Select Theme"
157msgstr "Choisir un thème"162msgstr "Choisir un thème"
158163
159#: ../images/luciole.glade.h:40164#: ../images/luciole.glade.h:41
160msgid "Select a Luciole project"165msgid "Select a Luciole project"
161msgstr "Choisir un projet Luciole"166msgstr "Choisir un projet Luciole"
162167
163#: ../images/luciole.glade.h:41 ../lucioLib/gui/assistant_new_project.py:102168#: ../images/luciole.glade.h:42 ../lucioLib/gui/assistant_new_project.py:100
164msgid "Select a folder"169msgid "Select a folder"
165msgstr "Sélectionner un dossier"170msgstr "Sélectionner un dossier"
166171
167#: ../images/luciole.glade.h:42172#: ../images/luciole.glade.h:43
168msgid ""173msgid ""
169"This program is free software; you can redistribute it and/or\n"174"This program is free software; you can redistribute it and/or\n"
170"modify it under the terms of the GNU General Public License\n"175"modify it under the terms of the GNU General Public License\n"
@@ -183,120 +188,99 @@
183"Inc., 59 Temple Place - \n"188"Inc., 59 Temple Place - \n"
184"Suite 330, Boston, MA 02111-1307, USA."189"Suite 330, Boston, MA 02111-1307, USA."
185msgstr ""190msgstr ""
186"Ce programme est un logiciel libre, vous pouvez le redistribuer et / ou le "191"Ce programme est un logiciel libre, vous pouvez le redistribuer et / ou le \n"
187"modifier selon les termes de la GNU General Public License publiée par la "192"modifier selon les termes de la GNU General Public License publiée par la \n"
188"Free Software Foundation ; soit la version 2 de la Licence, ou (à votre "193"Free Software Foundation ; soit la version 2 de la Licence, ou (à votre \n"
189"convenance) toute version ultérieure.\n"194"convenance) toute version ultérieure.\n"
190"Ce programme est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE "195"Ce programme est distribué dans l'espoir qu'il sera utile, mais SANS "
191"GARANTIE ; sans même une garantie implicite de commercialisation ou "196"AUCUNE \n"
197"GARANTIE ; sans même une garantie implicite de commercialisation ou \n"
192"d'adaptation à un USAGE PARTICULIER. Voir la GNU General Public\n"198"d'adaptation à un USAGE PARTICULIER. Voir la GNU General Public\n"
193"License pour plus de détails.\n"199"License pour plus de détails.\n"
194"Vous devriez avoir reçu une copie de la GNU General Public License avec ce "200"Vous devriez avoir reçu une copie de la GNU General Public License avec ce \n"
195"programme ; sinon, écrivez à la\n"201"programme ; sinon, écrivez à la\n"
196"Free Software Foundation,\n"202"Free Software Foundation,\n"
197"Inc, 59 Temple Place -\n"203"Inc, 59 Temple Place -\n"
198"Suite 330, Boston, MA 02111-1307, USA."204"Suite 330, Boston, MA 02111-1307, USA.\n"
199205
200#. Jeter à la poubelle206#. Jeter &#xE0; la poubelle
201#: ../images/luciole.glade.h:59207#: ../images/luciole.glade.h:60
202msgid "To trash"208msgid "To trash"
203msgstr "Mettre à la poubelle"209msgstr "Mettre à la poubelle"
204210
205#: ../images/luciole.glade.h:60211#: ../images/luciole.glade.h:61
206msgid "Transparency level"212msgid "Transparency level"
207msgstr "Niveau de transparence"213msgstr "Niveau de transparence"
208214
209#: ../images/luciole.glade.h:61215# msgstr "Le Fichier %s existe. Ecraser ce fichier ?"
216#: ../images/luciole.glade.h:62
217#, fuzzy
218msgid "Video Export"
219msgstr "Export"
220
221#: ../images/luciole.glade.h:63
210msgid "_File"222msgid "_File"
211msgstr "_Fichier"223msgstr "_Fichier"
212224
213#: ../images/luciole.glade.h:62225#: ../images/luciole.glade.h:64
214msgid "_Help"226msgid "_Help"
215msgstr "Aide"227msgstr "_Aide"
216228
217#: ../images/luciole.glade.h:63229#: ../images/luciole.glade.h:65
218msgid "_View"230msgid "_View"
219msgstr "_Affichage"231msgstr "_Options"
220232
221#: ../images/luciole.glade.h:64233#: ../images/luciole.glade.h:66
222msgid "gtk-about"
223msgstr ""
224
225#: ../images/luciole.glade.h:65
226msgid "gtk-apply"234msgid "gtk-apply"
227msgstr ""235msgstr ""
228236
229#: ../images/luciole.glade.h:66237#: ../images/luciole.glade.h:67
230msgid "gtk-cancel"238msgid "gtk-cancel"
231msgstr ""239msgstr ""
232240
233#: ../images/luciole.glade.h:67241#: ../images/luciole.glade.h:68
234msgid "gtk-close"242msgid "gtk-close"
235msgstr ""243msgstr ""
236244
237#: ../images/luciole.glade.h:68245#. Capturer une image
238msgid "gtk-new"
239msgstr ""
240
241#: ../images/luciole.glade.h:69
242msgid "gtk-open"
243msgstr ""
244
245#: ../images/luciole.glade.h:70246#: ../images/luciole.glade.h:70
246msgid "gtk-quit"
247msgstr ""
248
249#: ../images/luciole.glade.h:71
250msgid "gtk-save"
251msgstr ""
252
253#: ../images/luciole.glade.h:72
254msgid "gtk-save-as"
255msgstr ""
256
257#. Capturer une image
258#: ../images/luciole.glade.h:74
259msgid "make a snapshot"247msgid "make a snapshot"
260msgstr "Capturer une image"248msgstr "Capturer une image"
261249
262#: ../images/luciole.glade.h:75250#: ../images/luciole.glade.h:71
263msgid "menuitem1"
264msgstr ""
265
266#: ../images/luciole.glade.h:76
267msgid "options"251msgid "options"
268msgstr "Options"252msgstr "Options"
269253
270#: ../images/luciole.glade.h:77254#: ../images/luciole.glade.h:72
271msgid "project1"255msgid "project1"
272msgstr ""256msgstr ""
273257
274#: ../images/luciole.glade.h:78258#: ../images/luciole.glade.h:73
275msgid "project2"259msgid "project2"
276msgstr ""260msgstr ""
277261
278#: ../images/luciole.glade.h:79262#: ../images/luciole.glade.h:74
279msgid "project3"263msgid "project3"
280msgstr ""264msgstr ""
281265
282#: ../images/luciole.glade.h:80266#: ../images/luciole.glade.h:75
283msgid "project4"267msgid "project4"
284msgstr ""268msgstr ""
285269
286#: ../images/luciole.glade.h:81270#: ../images/luciole.glade.h:76
287msgid "project5"271msgid "project5"
288msgstr ""272msgstr ""
289273
290#: ../lucioLib/controller/controller_load_project.py:133274#: ../lucioLib/controller/controller_load_project.py:134
291msgid "Project Load started"275msgid "Project Load started"
292msgstr "Chargement du projet démarré"276msgstr "Chargement du projet démarré"
293277
294#: ../lucioLib/controller/controller_load_project.py:138278#: ../lucioLib/controller/controller_load_project.py:139
295#, python-format279#, python-format
296msgid "Project %s is loaded"280msgid "Project %s is loaded"
297msgstr "Le projet %s est chargé"281msgstr "Le projet %s est chargé"
298282
299#: ../lucioLib/controller/controller_load_project.py:144283#: ../lucioLib/controller/controller_load_project.py:145
300#, python-format284#, python-format
301msgid "Project %s is loading"285msgid "Project %s is loading"
302msgstr "Le projet %s est en cours de chargement"286msgstr "Le projet %s est en cours de chargement"
@@ -310,8 +294,9 @@
310msgstr "Toutes les images ont été importées"294msgstr "Toutes les images ont été importées"
311295
312#: ../lucioLib/controller/controller_import.py:189296#: ../lucioLib/controller/controller_import.py:189
297#, fuzzy
313msgid "Importing images ..."298msgid "Importing images ..."
314msgstr "Images en cours d'import ..."299msgstr "Images en cours d'import..."
315300
316#: ../lucioLib/gui/dialog_project_properties.py:41301#: ../lucioLib/gui/dialog_project_properties.py:41
317msgid "Project folder :"302msgid "Project folder :"
@@ -353,10 +338,6 @@
353msgid "Video height :"338msgid "Video height :"
354msgstr "Hauteur :"339msgstr "Hauteur :"
355340
356#: ../lucioLib/gui/dialog_project_properties.py:89
357msgid "Project properties"
358msgstr "Propriétés du projet"
359
360#: ../lucioLib/gui/dialog_project_properties.py:177341#: ../lucioLib/gui/dialog_project_properties.py:177
361#: ../lucioLib/gui/dialog_project_properties.py:193342#: ../lucioLib/gui/dialog_project_properties.py:193
362msgid "desc"343msgid "desc"
@@ -396,105 +377,111 @@
396#. Initailize widgets for first page377#. Initailize widgets for first page
397#.378#.
398#. A label379#. A label
399#: ../lucioLib/gui/assistant_new_project.py:61380#: ../lucioLib/gui/assistant_new_project.py:59
400msgid "This assistant will help you on configuration of a new luciole project."381msgid "This assistant will help you on configuration of a new luciole project."
401msgstr ""382msgstr ""
402"Cet assistant va vous aider dans la configuration d'un nouveau projet "383"Cet assistant va vous aider dans la configuration d'un nouveau projet "
403"luciole."384"luciole."
404385
405#. A label386#. A label
406#: ../lucioLib/gui/assistant_new_project.py:74387#: ../lucioLib/gui/assistant_new_project.py:72
407msgid "Select project name and destination folder."388msgid "Select project name and destination folder."
408msgstr "Choisir un nom de projet et un répertoire."389msgstr "Choisir un nom de projet et un répertoire."
409390
410#. display project name391#. display project name
411#: ../lucioLib/gui/assistant_new_project.py:84392#: ../lucioLib/gui/assistant_new_project.py:82
412#: ../lucioLib/gui/assistant_new_project.py:341393#: ../lucioLib/gui/assistant_new_project.py:339
413msgid "Project Name"394msgid "Project Name"
414msgstr "Nom de projet"395msgstr "Nom de projet"
415396
416#: ../lucioLib/gui/assistant_new_project.py:95397#: ../lucioLib/gui/assistant_new_project.py:93
417msgid "Folder"398msgid "Folder"
418msgstr "Répertoire"399msgstr "Répertoire"
419400
420#: ../lucioLib/gui/assistant_new_project.py:150401#: ../lucioLib/gui/assistant_new_project.py:147
421#, python-format402#, python-format
422msgid ""403msgid ""
423"%s is noy valid. Not valid project name. Should be a combination of "404"%s is not valid. Not valid project name. Should be a combination of "
424"alhanumeric and '_' characters "405"alhanumeric and '_' characters "
425msgstr ""406msgstr ""
426"%s n'est pas valide. Nom de projet invalide. Utilisez une combinaison de "407"%s n'est pas valide. Nom de projet invalide. Utilisez une combinaison de "
427"caractères alphanumériques et '_' "408"caractères alphanumériques et '_' "
428409
429#: ../lucioLib/gui/assistant_new_project.py:161410#: ../lucioLib/gui/assistant_new_project.py:158
430#, python-format411#, python-format
431msgid "The project %s exists !"412msgid "The project %s exists !"
432msgstr "Le projet %s existe déjà !"413msgstr "Le projet %s existe déjà !"
433414
434#: ../lucioLib/gui/assistant_new_project.py:206415#: ../lucioLib/gui/assistant_new_project.py:203
435msgid "Select a device"416msgid "Select a device"
436msgstr "Choisir un périphérique"417msgstr "Choisir un périphérique"
437418
438#: ../lucioLib/gui/assistant_new_project.py:242419#: ../lucioLib/gui/assistant_new_project.py:223
420msgid ""
421" Other device.\n"
422"(Manual import)"
423msgstr ""
424
425#: ../lucioLib/gui/assistant_new_project.py:240
439msgid "Images per second"426msgid "Images per second"
440msgstr "Images par seconde"427msgstr "Images par seconde"
441428
442#. display project path429#. display project path
443#: ../lucioLib/gui/assistant_new_project.py:345430#: ../lucioLib/gui/assistant_new_project.py:343
444msgid "Project Path"431msgid "Project Path"
445msgstr "Chemin du projet"432msgstr "Chemin du projet"
446433
447#: ../lucioLib/gui/assistant_new_project.py:354434#: ../lucioLib/gui/assistant_new_project.py:352
448msgid "Number of frames per seconds"435msgid "Number of frames per seconds"
449msgstr "Nombre de frames par seconde"436msgstr "Nombre de frames par seconde"
450437
451#. display Hardware type438#. display Hardware type
452#: ../lucioLib/gui/assistant_new_project.py:358439#: ../lucioLib/gui/assistant_new_project.py:356
453msgid "Hardware type"440msgid "Hardware type"
454msgstr "Type de matériel"441msgstr "Type de matériel"
455442
456#. webcam name443#. webcam name
457#: ../lucioLib/gui/assistant_new_project.py:364444#: ../lucioLib/gui/assistant_new_project.py:362
458msgid "Webcam name"445msgid "Webcam name"
459msgstr "Nom de la webcam"446msgstr "Nom de la webcam"
460447
461#. webcam device448#. webcam device
462#: ../lucioLib/gui/assistant_new_project.py:368449#: ../lucioLib/gui/assistant_new_project.py:366
463msgid "Webcam device"450msgid "Webcam device"
464msgstr "Webcam driver"451msgstr "Webcam driver"
465452
466#. webcam resolution453#. webcam resolution
467#: ../lucioLib/gui/assistant_new_project.py:372454#: ../lucioLib/gui/assistant_new_project.py:370
468msgid "Webcam resolution used"455msgid "Webcam resolution used"
469msgstr "Résolution utilisée par la webcam"456msgstr "Résolution utilisée par la webcam"
470457
471#. webcam device458#. webcam device
472#: ../lucioLib/gui/assistant_new_project.py:378459#: ../lucioLib/gui/assistant_new_project.py:376
473msgid "Webcam driver used"460msgid "Webcam driver used"
474msgstr "Driver de webcam utilisé"461msgstr "Driver de webcam utilisé"
475462
476#. Final message463#. Final message
477#: ../lucioLib/gui/assistant_new_project.py:383464#: ../lucioLib/gui/assistant_new_project.py:381
478msgid "Have fun with luciole !"465msgid "Have fun with luciole !"
479msgstr "Amusez-vous bien avec luciole !"466msgstr "Amusez-vous bien avec luciole !"
480467
481#: ../lucioLib/gui/assistant_new_project.py:413468#: ../lucioLib/gui/assistant_new_project.py:411
482msgid "Luciole project assistant"469msgid "Luciole project assistant"
483msgstr "Assistant de projet luciole"470msgstr "Assistant de projet luciole"
484471
485#: ../lucioLib/gui/assistant_new_project.py:424472#: ../lucioLib/gui/assistant_new_project.py:422
486msgid " Select a project path "473msgid " Select a project path "
487msgstr " Choisir un chemin de projet "474msgstr " Choisir un chemin de projet "
488475
489#: ../lucioLib/gui/assistant_new_project.py:433476#: ../lucioLib/gui/assistant_new_project.py:431
490msgid " Select hardware "477msgid " Select hardware "
491msgstr " Choisir un matériel "478msgstr " Choisir un matériel "
492479
493#: ../lucioLib/gui/assistant_new_project.py:443480#: ../lucioLib/gui/assistant_new_project.py:441
494msgid " Webcam detection "481msgid " Webcam detection "
495msgstr " Détection de webcam "482msgstr " Détection de webcam "
496483
497#: ../lucioLib/gui/assistant_new_project.py:452484#: ../lucioLib/gui/assistant_new_project.py:451
498msgid " Project overview "485msgid " Project overview "
499msgstr " Propriétés du projet "486msgstr " Propriétés du projet "
500487
@@ -516,11 +503,12 @@
516msgid "Webcam detection done"503msgid "Webcam detection done"
517msgstr "Détection de webcam terminée"504msgstr "Détection de webcam terminée"
518505
519#: ../lucioLib/gui/webcam_detection_widget.py:186506#: ../lucioLib/gui/webcam_detection_widget.py:188
520msgid "Detected webcam"507#, fuzzy
508msgid "Detected webcam(s)"
521msgstr "Webcam détectée(s)"509msgstr "Webcam détectée(s)"
522510
523#: ../lucioLib/gui/webcam_detection_widget.py:188511#: ../lucioLib/gui/webcam_detection_widget.py:192
524msgid "No webcam detected"512msgid "No webcam detected"
525msgstr "Pas de webcam détectée"513msgstr "Pas de webcam détectée"
526514
@@ -532,6 +520,10 @@
532msgid "Select a Folder"520msgid "Select a Folder"
533msgstr "Sélectionner un dossier"521msgstr "Sélectionner un dossier"
534522
523#: ../lucioLib/luciole_constants.py:42
524msgid "OTHER DEVICE"
525msgstr ""
526
535#: ../lucioLib/luciole_controller.py:157527#: ../lucioLib/luciole_controller.py:157
536#, python-format528#, python-format
537msgid "Project %s saved"529msgid "Project %s saved"
@@ -542,86 +534,94 @@
542msgid "Project saved as %s"534msgid "Project saved as %s"
543msgstr "Projet sauvegardé en tant que %s"535msgstr "Projet sauvegardé en tant que %s"
544536
545#: ../lucioLib/luciole_controller.py:222537#: ../lucioLib/luciole_controller.py:229
546msgid "No file or valid file choosen for image import."538msgid "No file or valid file choosen for image import."
547msgstr "Pas d'image ou d'images valides choisies pour l'import."539msgstr "Pas d'image ou d'images valides choisies pour l'import."
548540
549#: ../lucioLib/luciole_controller.py:226541#: ../lucioLib/luciole_controller.py:233
550msgid "Impossible to import images when no project are loaded."542msgid "Impossible to import images when no project are loaded."
551msgstr "Impossible d'importer des images. Aucun projet chargé."543msgstr "Impossible d'importer des images. Aucun projet chargé."
552544
553#. nbd@grape to transform as error message545#. nbd@grape to transform as error message
554#: ../lucioLib/luciole_controller.py:255546#: ../lucioLib/luciole_controller.py:262
555msgid "Nothing to export. No project loaded"547msgid "Nothing to export. No project loaded"
556msgstr "Rien à exporter. Il n'y a pas de projet chargé."548msgstr "Rien à exporter. Il n'y a pas de projet chargé."
557549
558#. nbd@grape specify action to do err message or raise exception ?550#. nbd@grape specify action to do err message or raise exception ?
559#: ../lucioLib/luciole_controller.py:273551#: ../lucioLib/luciole_controller.py:280
560msgid "Imposible to initialize player."552msgid "Imposible to initialize player."
561msgstr "Impossible d'initialiser la lecture de la vidéo."553msgstr "Impossible d'initialiser la lecture de la vidéo."
562554
563#. nbd@grape to transform as error message555#. nbd@grape to transform as error message
564#: ../lucioLib/luciole_controller.py:295556#: ../lucioLib/luciole_controller.py:302
565msgid "Can not play animantion : No image on montage view "557msgid "Can not play animantion : No image on montage view "
566msgstr "Impossible de lire la vidéo : pas d'image dans la zone de montage. "558msgstr "Impossible de lire la vidéo : pas d'image dans la zone de montage. "
567559
568#. nbd@grape to transform as error message560#. nbd@grape to transform as error message
569#: ../lucioLib/luciole_controller.py:304561#: ../lucioLib/luciole_controller.py:311
570msgid "Can not play animantion : No project loaded "562msgid "Can not play animantion : No project loaded "
571msgstr "Impossible de lire la vidéo : pas de projet chargé "563msgstr "Impossible de lire la vidéo : pas de projet chargé "
572564
573#. nbd@grape : ask for save if save set status as loaded565#. nbd@grape : ask for save if save set status as loaded
574#: ../lucioLib/luciole_controller.py:353566#: ../lucioLib/luciole_controller.py:360
575msgid "Save Project before closing"567msgid "Save Project before closing"
576msgstr "Sauvegardez le projet avant de fermer ?"568msgstr "Sauvegardez le projet avant de fermer ?"
577569
578#: ../lucioLib/luciole_controller.py:379570#: ../lucioLib/luciole_controller.py:386
579#, python-format571#, python-format
580msgid "Project %s is closed"572msgid "Project %s is closed"
581msgstr "Le projet %s est fermé"573msgstr "Le projet %s est fermé"
582574
583#. clear message status bar575#. clear message status bar
584#: ../lucioLib/luciole_controller.py:400576#: ../lucioLib/luciole_controller.py:407
585msgid "Acquiring"577msgid "Acquiring"
586msgstr "En cours d'acquisition"578msgstr "En cours d'acquisition"
587579
588#: ../lucioLib/luciole_controller.py:421580#. stop acquirer
581#: ../lucioLib/luciole_controller.py:424
582msgid ""
583"No acquisition available. Use 'import image' button to load images in "
584"project."
585msgstr ""
586
587#: ../lucioLib/luciole_controller.py:436
589msgid " Can not start acquisition when no project are loaded."588msgid " Can not start acquisition when no project are loaded."
590msgstr " Impossible de démarrer l'acquisition. Pas de projet chargé."589msgstr " Impossible de démarrer l'acquisition. Pas de projet chargé."
591590
592#: ../lucioLib/luciole_controller.py:430591#: ../lucioLib/luciole_controller.py:445
593#, python-format592#, python-format
594msgid "Acquisition error. %s"593msgid "Acquisition error. %s"
595msgstr "Erreur d'acquisition : %s"594msgstr "Erreur d'acquisition : %s"
596595
597#: ../lucioLib/luciole_controller.py:444596#: ../lucioLib/luciole_controller.py:459
598msgid "No Acquistion"597msgid "No Acquistion"
599msgstr "Pas d'acquisition."598msgstr "Pas d'acquisition."
600599
601#. nbd@grape : ask for save if save set status as loaded600#. nbd@grape : ask for save if save set status as loaded
602#: ../lucioLib/luciole_controller.py:533601#: ../lucioLib/luciole_controller.py:548
603msgid "Project modified. Save project before exit ?"602msgid "Project modified. Save project before exit ?"
604msgstr "Le projet a été modifié. Le sauvegarder avant de quitter ?"603msgstr "Le projet a été modifié. Le sauvegarder avant de quitter ?"
605604
606#: ../lucioLib/luciole_controller.py:585605#: ../lucioLib/luciole_controller.py:600
607msgid "Please restart luciole to take into acount the new theme "606msgid "Please restart luciole to take into account the new theme "
608msgstr "Merci de redémarrer Luciole pour prendre en compte le nouveau thème. "607msgstr "Merci de redémarrer Luciole pour prendre en compte le nouveau thème. "
609608
610#: ../lucioLib/luciole_controller.py:635609#: ../lucioLib/luciole_controller.py:650
611msgid "Failed to load project "610#, fuzzy
612msgstr "Impossible de charger le projet "611msgid "Failed to load project "
612msgstr "Impossible de charger le projet "
613613
614#: ../lucioLib/luciole_image.py:135614#: ../lucioLib/luciole_image.py:137
615#, python-format615#, python-format
616msgid "Not a file : %s"616msgid "Not a file : %s"
617msgstr "%s n'est pas un fichier"617msgstr "%s n'est pas un fichier"
618618
619#: ../lucioLib/luciole_image.py:183619#: ../lucioLib/luciole_image.py:185
620msgid "rush folder not valid"620msgid "rush folder not valid"
621msgstr "Répertoire 'rush' invalide"621msgstr "Répertoire 'rush' invalide"
622622
623#. error to raise623#. error to raise
624#: ../lucioLib/luciole_image.py:278624#: ../lucioLib/luciole_image.py:280
625#, python-format625#, python-format
626msgid "Error path does not exist : %s"626msgid "Error path does not exist : %s"
627msgstr "Erreur. Le chemin %s n'existe pas."627msgstr "Erreur. Le chemin %s n'existe pas."
628628
=== modified file 'po/fr_FR/LC_MESSAGES/luciole.mo'
629Binary files po/fr_FR/LC_MESSAGES/luciole.mo 2009-05-01 16:34:13 +0000 and po/fr_FR/LC_MESSAGES/luciole.mo 2009-05-06 17:15:46 +0000 differ629Binary files po/fr_FR/LC_MESSAGES/luciole.mo 2009-05-01 16:34:13 +0000 and po/fr_FR/LC_MESSAGES/luciole.mo 2009-05-06 17:15:46 +0000 differ
=== modified file 'po/luciole.pot'
--- po/luciole.pot 2009-05-01 16:34:13 +0000
+++ po/luciole.pot 2009-05-07 09:27:18 +0000
@@ -8,12 +8,12 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: PACKAGE VERSION\n"9"Project-Id-Version: PACKAGE VERSION\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2009-05-01 18:31+0200\n"11"POT-Creation-Date: 2009-05-07 11:21+0200\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
15"MIME-Version: 1.0\n"15"MIME-Version: 1.0\n"
16"Content-Type: text/plain; charset=UTF-8\n"16"Content-Type: text/plain; charset=CHARSET\n"
17"Content-Transfer-Encoding: 8bit\n"17"Content-Transfer-Encoding: 8bit\n"
1818
19#: ../images/luciole.glade.h:119#: ../images/luciole.glade.h:1
@@ -116,7 +116,7 @@
116msgid "Move down one or several images"116msgid "Move down one or several images"
117msgstr ""117msgstr ""
118118
119#. Déplacer des images capturées dans la zone de montage119#. D&#xE9;placer des images captur&#xE9;es dans la zone de montage
120#: ../images/luciole.glade.h:32120#: ../images/luciole.glade.h:32
121msgid "Move snapshot to montage area"121msgid "Move snapshot to montage area"
122msgstr ""122msgstr ""
@@ -143,18 +143,23 @@
143msgstr ""143msgstr ""
144144
145#: ../images/luciole.glade.h:39145#: ../images/luciole.glade.h:39
146#: ../lucioLib/gui/dialog_project_properties.py:89
147msgid "Project properties"
148msgstr ""
149
150#: ../images/luciole.glade.h:40
146msgid "Select Theme"151msgid "Select Theme"
147msgstr ""152msgstr ""
148153
149#: ../images/luciole.glade.h:40154#: ../images/luciole.glade.h:41
150msgid "Select a Luciole project"155msgid "Select a Luciole project"
151msgstr ""156msgstr ""
152157
153#: ../images/luciole.glade.h:41 ../lucioLib/gui/assistant_new_project.py:102158#: ../images/luciole.glade.h:42 ../lucioLib/gui/assistant_new_project.py:100
154msgid "Select a folder"159msgid "Select a folder"
155msgstr ""160msgstr ""
156161
157#: ../images/luciole.glade.h:42162#: ../images/luciole.glade.h:43
158msgid ""163msgid ""
159"This program is free software; you can redistribute it and/or\n"164"This program is free software; you can redistribute it and/or\n"
160"modify it under the terms of the GNU General Public License\n"165"modify it under the terms of the GNU General Public License\n"
@@ -174,106 +179,82 @@
174"Suite 330, Boston, MA 02111-1307, USA."179"Suite 330, Boston, MA 02111-1307, USA."
175msgstr ""180msgstr ""
176181
177#. Jeter à la poubelle182#. Jeter &#xE0; la poubelle
178#: ../images/luciole.glade.h:59183#: ../images/luciole.glade.h:60
179msgid "To trash"184msgid "To trash"
180msgstr ""185msgstr ""
181186
182#: ../images/luciole.glade.h:60187#: ../images/luciole.glade.h:61
183msgid "Transparency level"188msgid "Transparency level"
184msgstr ""189msgstr ""
185190
186#: ../images/luciole.glade.h:61
187msgid "_File"
188msgstr ""
189
190#: ../images/luciole.glade.h:62191#: ../images/luciole.glade.h:62
191msgid "_Help"192msgid "Video Export"
192msgstr ""193msgstr ""
193194
194#: ../images/luciole.glade.h:63195#: ../images/luciole.glade.h:63
195msgid "_View"196msgid "_File"
196msgstr ""197msgstr ""
197198
198#: ../images/luciole.glade.h:64199#: ../images/luciole.glade.h:64
199msgid "gtk-about"200msgid "_Help"
200msgstr ""201msgstr ""
201202
202#: ../images/luciole.glade.h:65203#: ../images/luciole.glade.h:65
204msgid "_View"
205msgstr ""
206
207#: ../images/luciole.glade.h:66
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes: