Merge lp:~nico-inattendu/luciole/nico-3 into lp:luciole/0.7
- nico-3
- Merge into main
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 | ||||||||||||||||||||||||||||
Related bugs: |
|
||||||||||||||||||||||||||||
Related blueprints: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
NicoInattendu | Pending | ||
Review via email: mp+6287@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
NicoInattendu (nico-inattendu) wrote : | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'images/capture.png' | |||
2 | 0 | Binary files images/capture.png 2009-03-08 18:06:41 +0000 and images/capture.png 2009-05-05 22:52:48 +0000 differ | 0 | Binary files images/capture.png 2009-03-08 18:06:41 +0000 and images/capture.png 2009-05-05 22:52:48 +0000 differ |
3 | === modified file 'images/luciole.glade' | |||
4 | --- images/luciole.glade 2009-05-01 14:42:17 +0000 | |||
5 | +++ images/luciole.glade 2009-05-06 17:15:46 +0000 | |||
6 | @@ -1,12 +1,10 @@ | |||
10 | 1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> | 1 | <?xml version="1.0"?> |
8 | 2 | <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> | ||
9 | 3 | <!--Generated with glade3 3.4.5 on Fri May 1 16:39:49 2009 --> | ||
11 | 4 | <glade-interface> | 2 | <glade-interface> |
12 | 3 | <!-- interface-requires gtk+ 2.16 --> | ||
13 | 4 | <!-- interface-naming-policy toplevel-contextual --> | ||
14 | 5 | <widget class="GtkWindow" id="window1"> | 5 | <widget class="GtkWindow" id="window1"> |
15 | 6 | <property name="icon">luciole.png</property> | 6 | <property name="icon">luciole.png</property> |
16 | 7 | <property name="icon_name">Luciole</property> | 7 | <property name="icon_name">Luciole</property> |
17 | 8 | <signal name="delete_event" handler="on_window1_delete_event"/> | ||
18 | 9 | <signal name="destroy_event" handler="on_window1_destroy_event"/> | ||
19 | 10 | <child> | 8 | <child> |
20 | 11 | <widget class="GtkVBox" id="vbox1"> | 9 | <widget class="GtkVBox" id="vbox1"> |
21 | 12 | <property name="visible">True</property> | 10 | <property name="visible">True</property> |
22 | @@ -23,8 +21,8 @@ | |||
23 | 23 | <property name="visible">True</property> | 21 | <property name="visible">True</property> |
24 | 24 | <child> | 22 | <child> |
25 | 25 | <widget class="GtkImageMenuItem" id="file_new"> | 23 | <widget class="GtkImageMenuItem" id="file_new"> |
26 | 24 | <property name="label">gtk-new</property> | ||
27 | 26 | <property name="visible">True</property> | 25 | <property name="visible">True</property> |
28 | 27 | <property name="label" translatable="yes">gtk-new</property> | ||
29 | 28 | <property name="use_underline">True</property> | 26 | <property name="use_underline">True</property> |
30 | 29 | <property name="use_stock">True</property> | 27 | <property name="use_stock">True</property> |
31 | 30 | <signal name="activate" handler="on_file_new_activate"/> | 28 | <signal name="activate" handler="on_file_new_activate"/> |
32 | @@ -32,8 +30,8 @@ | |||
33 | 32 | </child> | 30 | </child> |
34 | 33 | <child> | 31 | <child> |
35 | 34 | <widget class="GtkImageMenuItem" id="file_open"> | 32 | <widget class="GtkImageMenuItem" id="file_open"> |
36 | 33 | <property name="label">gtk-open</property> | ||
37 | 35 | <property name="visible">True</property> | 34 | <property name="visible">True</property> |
38 | 36 | <property name="label" translatable="yes">gtk-open</property> | ||
39 | 37 | <property name="use_underline">True</property> | 35 | <property name="use_underline">True</property> |
40 | 38 | <property name="use_stock">True</property> | 36 | <property name="use_stock">True</property> |
41 | 39 | <signal name="activate" handler="on_file_open_activate"/> | 37 | <signal name="activate" handler="on_file_open_activate"/> |
42 | @@ -88,8 +86,8 @@ | |||
43 | 88 | </child> | 86 | </child> |
44 | 89 | <child> | 87 | <child> |
45 | 90 | <widget class="GtkImageMenuItem" id="file_save"> | 88 | <widget class="GtkImageMenuItem" id="file_save"> |
46 | 89 | <property name="label">gtk-save</property> | ||
47 | 91 | <property name="visible">True</property> | 90 | <property name="visible">True</property> |
48 | 92 | <property name="label" translatable="yes">gtk-save</property> | ||
49 | 93 | <property name="use_underline">True</property> | 91 | <property name="use_underline">True</property> |
50 | 94 | <property name="use_stock">True</property> | 92 | <property name="use_stock">True</property> |
51 | 95 | <signal name="activate" handler="on_file_save_activate"/> | 93 | <signal name="activate" handler="on_file_save_activate"/> |
52 | @@ -97,8 +95,8 @@ | |||
53 | 97 | </child> | 95 | </child> |
54 | 98 | <child> | 96 | <child> |
55 | 99 | <widget class="GtkImageMenuItem" id="file_save_as"> | 97 | <widget class="GtkImageMenuItem" id="file_save_as"> |
56 | 98 | <property name="label">gtk-save-as</property> | ||
57 | 100 | <property name="visible">True</property> | 99 | <property name="visible">True</property> |
58 | 101 | <property name="label" translatable="yes">gtk-save-as</property> | ||
59 | 102 | <property name="use_underline">True</property> | 100 | <property name="use_underline">True</property> |
60 | 103 | <property name="use_stock">True</property> | 101 | <property name="use_stock">True</property> |
61 | 104 | <signal name="activate" handler="on_file_save_as_activate"/> | 102 | <signal name="activate" handler="on_file_save_as_activate"/> |
62 | @@ -111,13 +109,14 @@ | |||
63 | 111 | </child> | 109 | </child> |
64 | 112 | <child> | 110 | <child> |
65 | 113 | <widget class="GtkImageMenuItem" id="file_import"> | 111 | <widget class="GtkImageMenuItem" id="file_import"> |
66 | 114 | <property name="visible">True</property> | ||
67 | 115 | <property name="label" translatable="yes">Import images</property> | 112 | <property name="label" translatable="yes">Import images</property> |
69 | 116 | <property name="use_underline">True</property> | 113 | <property name="visible">True</property> |
70 | 114 | <property name="use_stock">False</property> | ||
71 | 117 | <signal name="activate" handler="on_file_import_activate"/> | 115 | <signal name="activate" handler="on_file_import_activate"/> |
72 | 118 | <child internal-child="image"> | 116 | <child internal-child="image"> |
74 | 119 | <widget class="GtkImage" id="menu-item-image1"> | 117 | <widget class="GtkImage" id="image7"> |
75 | 120 | <property name="visible">True</property> | 118 | <property name="visible">True</property> |
76 | 119 | <property name="xalign">0.47999998927116394</property> | ||
77 | 121 | <property name="stock">gtk-add</property> | 120 | <property name="stock">gtk-add</property> |
78 | 122 | </widget> | 121 | </widget> |
79 | 123 | </child> | 122 | </child> |
80 | @@ -125,12 +124,12 @@ | |||
81 | 125 | </child> | 124 | </child> |
82 | 126 | <child> | 125 | <child> |
83 | 127 | <widget class="GtkImageMenuItem" id="file_export"> | 126 | <widget class="GtkImageMenuItem" id="file_export"> |
84 | 128 | <property name="visible">True</property> | ||
85 | 129 | <property name="label" translatable="yes">Export</property> | 127 | <property name="label" translatable="yes">Export</property> |
87 | 130 | <property name="use_underline">True</property> | 128 | <property name="visible">True</property> |
88 | 129 | <property name="use_stock">False</property> | ||
89 | 131 | <signal name="activate" handler="on_file_export_activate"/> | 130 | <signal name="activate" handler="on_file_export_activate"/> |
90 | 132 | <child internal-child="image"> | 131 | <child internal-child="image"> |
92 | 133 | <widget class="GtkImage" id="menu-item-image2"> | 132 | <widget class="GtkImage" id="image8"> |
93 | 134 | <property name="visible">True</property> | 133 | <property name="visible">True</property> |
94 | 135 | <property name="stock">gtk-convert</property> | 134 | <property name="stock">gtk-convert</property> |
95 | 136 | </widget> | 135 | </widget> |
96 | @@ -140,14 +139,12 @@ | |||
97 | 140 | <child> | 139 | <child> |
98 | 141 | <widget class="GtkSeparatorMenuItem" id="menuitem1"> | 140 | <widget class="GtkSeparatorMenuItem" id="menuitem1"> |
99 | 142 | <property name="visible">True</property> | 141 | <property name="visible">True</property> |
100 | 143 | <property name="label" translatable="yes">menuitem1</property> | ||
101 | 144 | <property name="use_underline">True</property> | ||
102 | 145 | </widget> | 142 | </widget> |
103 | 146 | </child> | 143 | </child> |
104 | 147 | <child> | 144 | <child> |
105 | 148 | <widget class="GtkImageMenuItem" id="file_close"> | 145 | <widget class="GtkImageMenuItem" id="file_close"> |
106 | 146 | <property name="label">gtk-close</property> | ||
107 | 149 | <property name="visible">True</property> | 147 | <property name="visible">True</property> |
108 | 150 | <property name="label" translatable="yes">gtk-close</property> | ||
109 | 151 | <property name="use_underline">True</property> | 148 | <property name="use_underline">True</property> |
110 | 152 | <property name="use_stock">True</property> | 149 | <property name="use_stock">True</property> |
111 | 153 | <signal name="activate" handler="on_file_close_activate"/> | 150 | <signal name="activate" handler="on_file_close_activate"/> |
112 | @@ -155,8 +152,8 @@ | |||
113 | 155 | </child> | 152 | </child> |
114 | 156 | <child> | 153 | <child> |
115 | 157 | <widget class="GtkImageMenuItem" id="file_quit"> | 154 | <widget class="GtkImageMenuItem" id="file_quit"> |
116 | 155 | <property name="label">gtk-quit</property> | ||
117 | 158 | <property name="visible">True</property> | 156 | <property name="visible">True</property> |
118 | 159 | <property name="label" translatable="yes">gtk-quit</property> | ||
119 | 160 | <property name="use_underline">True</property> | 157 | <property name="use_underline">True</property> |
120 | 161 | <property name="use_stock">True</property> | 158 | <property name="use_stock">True</property> |
121 | 162 | <signal name="activate" handler="on_file_quit_activate"/> | 159 | <signal name="activate" handler="on_file_quit_activate"/> |
122 | @@ -176,13 +173,13 @@ | |||
123 | 176 | <property name="visible">True</property> | 173 | <property name="visible">True</property> |
124 | 177 | <child> | 174 | <child> |
125 | 178 | <widget class="GtkImageMenuItem" id="view_project"> | 175 | <widget class="GtkImageMenuItem" id="view_project"> |
126 | 176 | <property name="label" translatable="yes">Project properties</property> | ||
127 | 179 | <property name="visible">True</property> | 177 | <property name="visible">True</property> |
128 | 180 | <property name="tooltip" translatable="yes">Project Properties</property> | 178 | <property name="tooltip" translatable="yes">Project Properties</property> |
131 | 181 | <property name="label" translatable="yes">Project Properties</property> | 179 | <property name="use_stock">False</property> |
130 | 182 | <property name="use_underline">True</property> | ||
132 | 183 | <signal name="activate" handler="on_view_project_activate"/> | 180 | <signal name="activate" handler="on_view_project_activate"/> |
133 | 184 | <child internal-child="image"> | 181 | <child internal-child="image"> |
135 | 185 | <widget class="GtkImage" id="menu-item-image3"> | 182 | <widget class="GtkImage" id="image4"> |
136 | 186 | <property name="visible">True</property> | 183 | <property name="visible">True</property> |
137 | 187 | <property name="stock">gtk-properties</property> | 184 | <property name="stock">gtk-properties</property> |
138 | 188 | </widget> | 185 | </widget> |
139 | @@ -191,12 +188,13 @@ | |||
140 | 191 | </child> | 188 | </child> |
141 | 192 | <child> | 189 | <child> |
142 | 193 | <widget class="GtkImageMenuItem" id="Preferences"> | 190 | <widget class="GtkImageMenuItem" id="Preferences"> |
143 | 194 | <property name="visible">True</property> | ||
144 | 195 | <property name="label" translatable="yes">Preferences</property> | 191 | <property name="label" translatable="yes">Preferences</property> |
146 | 196 | <property name="use_underline">True</property> | 192 | <property name="visible">True</property> |
147 | 193 | <property name="use_stock">False</property> | ||
148 | 197 | <signal name="activate" handler="on_Preferences_activate"/> | 194 | <signal name="activate" handler="on_Preferences_activate"/> |
149 | 198 | <child internal-child="image"> | 195 | <child internal-child="image"> |
151 | 199 | <widget class="GtkImage" id="menu-item-image4"> | 196 | <widget class="GtkImage" id="image6"> |
152 | 197 | <property name="visible">True</property> | ||
153 | 200 | <property name="stock">gtk-preferences</property> | 198 | <property name="stock">gtk-preferences</property> |
154 | 201 | </widget> | 199 | </widget> |
155 | 202 | </child> | 200 | </child> |
156 | @@ -216,9 +214,9 @@ | |||
157 | 216 | <property name="visible">True</property> | 214 | <property name="visible">True</property> |
158 | 217 | <child> | 215 | <child> |
159 | 218 | <widget class="GtkImageMenuItem" id="help_about"> | 216 | <widget class="GtkImageMenuItem" id="help_about"> |
160 | 217 | <property name="label">gtk-about</property> | ||
161 | 219 | <property name="visible">True</property> | 218 | <property name="visible">True</property> |
162 | 220 | <property name="tooltip" translatable="yes">About</property> | 219 | <property name="tooltip" translatable="yes">About</property> |
163 | 221 | <property name="label" translatable="yes">gtk-about</property> | ||
164 | 222 | <property name="use_underline">True</property> | 220 | <property name="use_underline">True</property> |
165 | 223 | <property name="use_stock">True</property> | 221 | <property name="use_stock">True</property> |
166 | 224 | <signal name="activate" handler="on_help_about_activate"/> | 222 | <signal name="activate" handler="on_help_about_activate"/> |
167 | @@ -231,6 +229,7 @@ | |||
168 | 231 | </widget> | 229 | </widget> |
169 | 232 | <packing> | 230 | <packing> |
170 | 233 | <property name="expand">False</property> | 231 | <property name="expand">False</property> |
171 | 232 | <property name="position">0</property> | ||
172 | 234 | </packing> | 233 | </packing> |
173 | 235 | </child> | 234 | </child> |
174 | 236 | <child> | 235 | <child> |
175 | @@ -247,7 +246,7 @@ | |||
176 | 247 | <property name="border_width">7</property> | 246 | <property name="border_width">7</property> |
177 | 248 | <property name="label_xalign">0</property> | 247 | <property name="label_xalign">0</property> |
178 | 249 | <property name="label_yalign">0</property> | 248 | <property name="label_yalign">0</property> |
180 | 250 | <property name="shadow_type">GTK_SHADOW_IN</property> | 249 | <property name="shadow_type">in</property> |
181 | 251 | <property name="xalign">0.10000000149011612</property> | 250 | <property name="xalign">0.10000000149011612</property> |
182 | 252 | <property name="yalign">0.10000000149011612</property> | 251 | <property name="yalign">0.10000000149011612</property> |
183 | 253 | <property name="ratio">1.25</property> | 252 | <property name="ratio">1.25</property> |
184 | @@ -260,6 +259,9 @@ | |||
185 | 260 | </widget> | 259 | </widget> |
186 | 261 | </child> | 260 | </child> |
187 | 262 | </widget> | 261 | </widget> |
188 | 262 | <packing> | ||
189 | 263 | <property name="position">0</property> | ||
190 | 264 | </packing> | ||
191 | 263 | </child> | 265 | </child> |
192 | 264 | <child> | 266 | <child> |
193 | 265 | <widget class="GtkFixed" id="fixed7"> | 267 | <widget class="GtkFixed" id="fixed7"> |
194 | @@ -276,7 +278,7 @@ | |||
195 | 276 | <widget class="GtkAspectFrame" id="aspectframe2"> | 278 | <widget class="GtkAspectFrame" id="aspectframe2"> |
196 | 277 | <property name="visible">True</property> | 279 | <property name="visible">True</property> |
197 | 278 | <property name="label_xalign">0</property> | 280 | <property name="label_xalign">0</property> |
199 | 279 | <property name="shadow_type">GTK_SHADOW_NONE</property> | 281 | <property name="shadow_type">none</property> |
200 | 280 | <child> | 282 | <child> |
201 | 281 | <widget class="GtkHBox" id="hbox_acquisition"> | 283 | <widget class="GtkHBox" id="hbox_acquisition"> |
202 | 282 | <property name="height_request">51</property> | 284 | <property name="height_request">51</property> |
203 | @@ -288,6 +290,9 @@ | |||
204 | 288 | <property name="visible">True</property> | 290 | <property name="visible">True</property> |
205 | 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> |
206 | 290 | </widget> | 292 | </widget> |
207 | 293 | <packing> | ||
208 | 294 | <property name="position">0</property> | ||
209 | 295 | </packing> | ||
210 | 291 | </child> | 296 | </child> |
211 | 292 | <child> | 297 | <child> |
212 | 293 | <widget class="GtkToggleButton" id="acquisition_button"> | 298 | <widget class="GtkToggleButton" id="acquisition_button"> |
213 | @@ -295,11 +300,11 @@ | |||
214 | 295 | <property name="height_request">46</property> | 300 | <property name="height_request">46</property> |
215 | 296 | <property name="visible">True</property> | 301 | <property name="visible">True</property> |
216 | 297 | <property name="can_focus">True</property> | 302 | <property name="can_focus">True</property> |
217 | 303 | <property name="receives_default">False</property> | ||
218 | 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> |
219 | 299 | <property name="has_tooltip">True</property> | 305 | <property name="has_tooltip">True</property> |
220 | 300 | <property name="tooltip" translatable="yes">Activate/Deactivate camera preview</property> | 306 | <property name="tooltip" translatable="yes">Activate/Deactivate camera preview</property> |
221 | 301 | <property name="focus_on_click">False</property> | 307 | <property name="focus_on_click">False</property> |
222 | 302 | <property name="response_id">0</property> | ||
223 | 303 | <signal name="toggled" handler="on_acquisition_button_toggled"/> | 308 | <signal name="toggled" handler="on_acquisition_button_toggled"/> |
224 | 304 | <child> | 309 | <child> |
225 | 305 | <widget class="GtkImage" id="acquisition_button_image"> | 310 | <widget class="GtkImage" id="acquisition_button_image"> |
226 | @@ -330,13 +335,14 @@ | |||
227 | 330 | <widget class="GtkButton" id="snapshot_button"> | 335 | <widget class="GtkButton" id="snapshot_button"> |
228 | 331 | <property name="visible">True</property> | 336 | <property name="visible">True</property> |
229 | 332 | <property name="can_focus">True</property> | 337 | <property name="can_focus">True</property> |
230 | 338 | <property name="can_default">True</property> | ||
231 | 339 | <property name="has_default">True</property> | ||
232 | 333 | <property name="receives_default">True</property> | 340 | <property name="receives_default">True</property> |
233 | 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> |
234 | 335 | <property name="has_tooltip">True</property> | 342 | <property name="has_tooltip">True</property> |
235 | 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> |
236 | 337 | <property name="response_id">0</property> | ||
237 | 338 | <signal name="clicked" handler="on_button_capture_clicked"/> | 344 | <signal name="clicked" handler="on_button_capture_clicked"/> |
239 | 339 | <accelerator key="c" modifiers="" signal="clicked"/> | 345 | <accelerator key="c" signal="clicked"/> |
240 | 340 | <child> | 346 | <child> |
241 | 341 | <widget class="GtkImage" id="image5"> | 347 | <widget class="GtkImage" id="image5"> |
242 | 342 | <property name="visible">True</property> | 348 | <property name="visible">True</property> |
243 | @@ -369,29 +375,31 @@ | |||
244 | 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> |
245 | 370 | <child> | 376 | <child> |
246 | 371 | <widget class="GtkCheckButton" id="mixer_checkbutton"> | 377 | <widget class="GtkCheckButton" id="mixer_checkbutton"> |
247 | 378 | <property name="label" translatable="yes">Mixer</property> | ||
248 | 372 | <property name="visible">True</property> | 379 | <property name="visible">True</property> |
250 | 373 | <property name="can_focus">True</property> | 380 | <property name="can_focus">False</property> |
251 | 381 | <property name="receives_default">False</property> | ||
252 | 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> |
253 | 375 | <property name="has_tooltip">True</property> | 383 | <property name="has_tooltip">True</property> |
254 | 376 | <property name="tooltip" translatable="yes">Mixer activation (onion skin)</property> | 384 | <property name="tooltip" translatable="yes">Mixer activation (onion skin)</property> |
258 | 377 | <property name="label" translatable="yes">Mixer</property> | 385 | <property name="relief">half</property> |
256 | 378 | <property name="relief">GTK_RELIEF_HALF</property> | ||
257 | 379 | <property name="response_id">0</property> | ||
259 | 380 | <property name="draw_indicator">True</property> | 386 | <property name="draw_indicator">True</property> |
260 | 381 | <signal name="toggled" handler="on_mixer_checkbutton_toggled"/> | 387 | <signal name="toggled" handler="on_mixer_checkbutton_toggled"/> |
261 | 382 | </widget> | 388 | </widget> |
262 | 389 | <packing> | ||
263 | 390 | <property name="position">0</property> | ||
264 | 391 | </packing> | ||
265 | 383 | </child> | 392 | </child> |
266 | 384 | <child> | 393 | <child> |
267 | 385 | <widget class="GtkHScale" id="alpha_hscale"> | 394 | <widget class="GtkHScale" id="alpha_hscale"> |
268 | 386 | <property name="visible">True</property> | 395 | <property name="visible">True</property> |
269 | 387 | <property name="can_focus">True</property> | ||
270 | 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> |
271 | 389 | <property name="has_tooltip">True</property> | 397 | <property name="has_tooltip">True</property> |
272 | 390 | <property name="tooltip" translatable="yes">Transparency level</property> | 398 | <property name="tooltip" translatable="yes">Transparency level</property> |
274 | 391 | <property name="update_policy">GTK_UPDATE_DISCONTINUOUS</property> | 399 | <property name="update_policy">discontinuous</property> |
275 | 392 | <property name="adjustment">1 0 4 1 1 0</property> | 400 | <property name="adjustment">1 0 4 1 1 0</property> |
276 | 393 | <property name="digits">0</property> | 401 | <property name="digits">0</property> |
278 | 394 | <property name="value_pos">GTK_POS_LEFT</property> | 402 | <property name="value_pos">left</property> |
279 | 395 | <signal name="value_changed" handler="on_alpha_hscale_value_changed"/> | 403 | <signal name="value_changed" handler="on_alpha_hscale_value_changed"/> |
280 | 396 | </widget> | 404 | </widget> |
281 | 397 | <packing> | 405 | <packing> |
282 | @@ -422,14 +430,16 @@ | |||
283 | 422 | <widget class="GtkLabel" id="label_fpi"> | 430 | <widget class="GtkLabel" id="label_fpi"> |
284 | 423 | <property name="visible">True</property> | 431 | <property name="visible">True</property> |
285 | 424 | <property name="label" translatable="yes">Image per seconds</property> | 432 | <property name="label" translatable="yes">Image per seconds</property> |
287 | 425 | <property name="justify">GTK_JUSTIFY_CENTER</property> | 433 | <property name="justify">center</property> |
288 | 426 | </widget> | 434 | </widget> |
289 | 435 | <packing> | ||
290 | 436 | <property name="position">0</property> | ||
291 | 437 | </packing> | ||
292 | 427 | </child> | 438 | </child> |
293 | 428 | <child> | 439 | <child> |
294 | 429 | <widget class="GtkHScale" id="hscale_fps"> | 440 | <widget class="GtkHScale" id="hscale_fps"> |
295 | 430 | <property name="width_request">125</property> | 441 | <property name="width_request">125</property> |
296 | 431 | <property name="visible">True</property> | 442 | <property name="visible">True</property> |
297 | 432 | <property name="can_focus">True</property> | ||
298 | 433 | <property name="adjustment">1 1 6 1 1 1</property> | 443 | <property name="adjustment">1 1 6 1 1 1</property> |
299 | 434 | <property name="digits">0</property> | 444 | <property name="digits">0</property> |
300 | 435 | <signal name="value_changed" handler="on_hscale_fps_value_changed"/> | 445 | <signal name="value_changed" handler="on_hscale_fps_value_changed"/> |
301 | @@ -462,6 +472,9 @@ | |||
302 | 462 | </packing> | 472 | </packing> |
303 | 463 | </child> | 473 | </child> |
304 | 464 | </widget> | 474 | </widget> |
305 | 475 | <packing> | ||
306 | 476 | <property name="position">0</property> | ||
307 | 477 | </packing> | ||
308 | 465 | </child> | 478 | </child> |
309 | 466 | <child> | 479 | <child> |
310 | 467 | <widget class="GtkHBox" id="hbox2"> | 480 | <widget class="GtkHBox" id="hbox2"> |
311 | @@ -473,14 +486,15 @@ | |||
312 | 473 | <packing> | 486 | <packing> |
313 | 474 | <property name="expand">False</property> | 487 | <property name="expand">False</property> |
314 | 475 | <property name="fill">False</property> | 488 | <property name="fill">False</property> |
315 | 489 | <property name="position">0</property> | ||
316 | 476 | </packing> | 490 | </packing> |
317 | 477 | </child> | 491 | </child> |
318 | 478 | <child> | 492 | <child> |
319 | 479 | <widget class="GtkViewport" id="viewport2"> | 493 | <widget class="GtkViewport" id="viewport2"> |
320 | 480 | <property name="width_request">215</property> | 494 | <property name="width_request">215</property> |
321 | 481 | <property name="visible">True</property> | 495 | <property name="visible">True</property> |
324 | 482 | <property name="resize_mode">GTK_RESIZE_QUEUE</property> | 496 | <property name="resize_mode">queue</property> |
325 | 483 | <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property> | 497 | <property name="shadow_type">etched-out</property> |
326 | 484 | <child> | 498 | <child> |
327 | 485 | <widget class="GtkVBox" id="vbox5"> | 499 | <widget class="GtkVBox" id="vbox5"> |
328 | 486 | <property name="width_request">215</property> | 500 | <property name="width_request">215</property> |
329 | @@ -490,16 +504,18 @@ | |||
330 | 490 | <property name="width_request">215</property> | 504 | <property name="width_request">215</property> |
331 | 491 | <property name="visible">True</property> | 505 | <property name="visible">True</property> |
332 | 492 | <property name="can_focus">True</property> | 506 | <property name="can_focus">True</property> |
336 | 493 | <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> | 507 | <property name="hscrollbar_policy">automatic</property> |
337 | 494 | <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> | 508 | <property name="vscrollbar_policy">automatic</property> |
338 | 495 | <property name="shadow_type">GTK_SHADOW_IN</property> | 509 | <property name="shadow_type">in</property> |
339 | 496 | <child> | 510 | <child> |
340 | 497 | <widget class="GtkTreeView" id="treeview_capture"> | 511 | <widget class="GtkTreeView" id="treeview_capture"> |
341 | 498 | <property name="visible">True</property> | 512 | <property name="visible">True</property> |
342 | 499 | <property name="can_focus">True</property> | ||
343 | 500 | </widget> | 513 | </widget> |
344 | 501 | </child> | 514 | </child> |
345 | 502 | </widget> | 515 | </widget> |
346 | 516 | <packing> | ||
347 | 517 | <property name="position">0</property> | ||
348 | 518 | </packing> | ||
349 | 503 | </child> | 519 | </child> |
350 | 504 | <child> | 520 | <child> |
351 | 505 | <widget class="GtkVBox" id="vbox6"> | 521 | <widget class="GtkVBox" id="vbox6"> |
352 | @@ -512,6 +528,7 @@ | |||
353 | 512 | <packing> | 528 | <packing> |
354 | 513 | <property name="expand">False</property> | 529 | <property name="expand">False</property> |
355 | 514 | <property name="fill">False</property> | 530 | <property name="fill">False</property> |
356 | 531 | <property name="position">0</property> | ||
357 | 515 | </packing> | 532 | </packing> |
358 | 516 | </child> | 533 | </child> |
359 | 517 | <child> | 534 | <child> |
360 | @@ -522,25 +539,27 @@ | |||
361 | 522 | <widget class="GtkFixed" id="fixed3"> | 539 | <widget class="GtkFixed" id="fixed3"> |
362 | 523 | <property name="visible">True</property> | 540 | <property name="visible">True</property> |
363 | 524 | </widget> | 541 | </widget> |
364 | 542 | <packing> | ||
365 | 543 | <property name="position">0</property> | ||
366 | 544 | </packing> | ||
367 | 525 | </child> | 545 | </child> |
368 | 526 | <child> | 546 | <child> |
369 | 527 | <widget class="GtkButton" id="button_import"> | 547 | <widget class="GtkButton" id="button_import"> |
370 | 528 | <property name="width_request">45</property> | 548 | <property name="width_request">45</property> |
371 | 529 | <property name="height_request">45</property> | 549 | <property name="height_request">45</property> |
372 | 530 | <property name="visible">True</property> | 550 | <property name="visible">True</property> |
375 | 531 | <property name="can_focus">True</property> | 551 | <property name="can_focus">False</property> |
376 | 532 | <property name="receives_default">True</property> | 552 | <property name="receives_default">False</property> |
377 | 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> |
378 | 534 | <property name="has_tooltip">True</property> | 554 | <property name="has_tooltip">True</property> |
379 | 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> |
380 | 536 | <property name="response_id">0</property> | ||
381 | 537 | <signal name="clicked" handler="on_button_import_clicked"/> | 556 | <signal name="clicked" handler="on_button_import_clicked"/> |
382 | 538 | <child> | 557 | <child> |
383 | 539 | <widget class="GtkImage" id="image2"> | 558 | <widget class="GtkImage" id="image2"> |
384 | 540 | <property name="visible">True</property> | 559 | <property name="visible">True</property> |
385 | 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> |
386 | 542 | <property name="stock">gtk-add</property> | 561 | <property name="stock">gtk-add</property> |
388 | 543 | <property name="icon_size">5</property> | 562 | <property name="icon-size">5</property> |
389 | 544 | </widget> | 563 | </widget> |
390 | 545 | </child> | 564 | </child> |
391 | 546 | </widget> | 565 | </widget> |
392 | @@ -562,18 +581,17 @@ | |||
393 | 562 | <widget class="GtkButton" id="button_trash_capture"> | 581 | <widget class="GtkButton" id="button_trash_capture"> |
394 | 563 | <property name="width_request">45</property> | 582 | <property name="width_request">45</property> |
395 | 564 | <property name="height_request">45</property> | 583 | <property name="height_request">45</property> |
398 | 565 | <property name="can_focus">True</property> | 584 | <property name="can_focus">False</property> |
399 | 566 | <property name="receives_default">True</property> | 585 | <property name="receives_default">False</property> |
400 | 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> |
403 | 568 | <property name="tooltip" translatable="yes" comments="Jeter à la poubelle">To trash</property> | 587 | <property name="tooltip" translatable="yes" comments="Jeter à la poubelle">To trash</property> |
402 | 569 | <property name="response_id">0</property> | ||
404 | 570 | <signal name="clicked" handler="on_button_trash_capture_clicked"/> | 588 | <signal name="clicked" handler="on_button_trash_capture_clicked"/> |
405 | 571 | <child> | 589 | <child> |
406 | 572 | <widget class="GtkImage" id="image1"> | 590 | <widget class="GtkImage" id="image1"> |
407 | 573 | <property name="visible">True</property> | 591 | <property name="visible">True</property> |
408 | 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> |
409 | 575 | <property name="stock">gtk-delete</property> | 593 | <property name="stock">gtk-delete</property> |
411 | 576 | <property name="icon_size">5</property> | 594 | <property name="icon-size">5</property> |
412 | 577 | </widget> | 595 | </widget> |
413 | 578 | </child> | 596 | </child> |
414 | 579 | </widget> | 597 | </widget> |
415 | @@ -596,18 +614,17 @@ | |||
416 | 596 | <property name="width_request">45</property> | 614 | <property name="width_request">45</property> |
417 | 597 | <property name="height_request">45</property> | 615 | <property name="height_request">45</property> |
418 | 598 | <property name="visible">True</property> | 616 | <property name="visible">True</property> |
421 | 599 | <property name="can_focus">True</property> | 617 | <property name="can_focus">False</property> |
422 | 600 | <property name="receives_default">True</property> | 618 | <property name="receives_default">False</property> |
423 | 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> |
426 | 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éplacer des images capturées dans la zone de montage">Move snapshot to montage area</property> |
425 | 603 | <property name="response_id">0</property> | ||
427 | 604 | <signal name="clicked" handler="on_button_capture_to_montage_clicked"/> | 621 | <signal name="clicked" handler="on_button_capture_to_montage_clicked"/> |
428 | 605 | <child> | 622 | <child> |
429 | 606 | <widget class="GtkImage" id="image3"> | 623 | <widget class="GtkImage" id="image3"> |
430 | 607 | <property name="visible">True</property> | 624 | <property name="visible">True</property> |
431 | 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> |
432 | 609 | <property name="stock">gtk-go-forward</property> | 626 | <property name="stock">gtk-go-forward</property> |
434 | 610 | <property name="icon_size">5</property> | 627 | <property name="icon-size">5</property> |
435 | 611 | </widget> | 628 | </widget> |
436 | 612 | </child> | 629 | </child> |
437 | 613 | </widget> | 630 | </widget> |
438 | @@ -647,7 +664,7 @@ | |||
439 | 647 | <packing> | 664 | <packing> |
440 | 648 | <property name="expand">False</property> | 665 | <property name="expand">False</property> |
441 | 649 | <property name="fill">False</property> | 666 | <property name="fill">False</property> |
443 | 650 | <property name="pack_type">GTK_PACK_END</property> | 667 | <property name="pack_type">end</property> |
444 | 651 | <property name="position">1</property> | 668 | <property name="position">1</property> |
445 | 652 | </packing> | 669 | </packing> |
446 | 653 | </child> | 670 | </child> |
447 | @@ -676,8 +693,8 @@ | |||
448 | 676 | <widget class="GtkViewport" id="viewport1"> | 693 | <widget class="GtkViewport" id="viewport1"> |
449 | 677 | <property name="width_request">215</property> | 694 | <property name="width_request">215</property> |
450 | 678 | <property name="visible">True</property> | 695 | <property name="visible">True</property> |
453 | 679 | <property name="resize_mode">GTK_RESIZE_QUEUE</property> | 696 | <property name="resize_mode">queue</property> |
454 | 680 | <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property> | 697 | <property name="shadow_type">etched-out</property> |
455 | 681 | <child> | 698 | <child> |
456 | 682 | <widget class="GtkVBox" id="vbox7"> | 699 | <widget class="GtkVBox" id="vbox7"> |
457 | 683 | <property name="width_request">215</property> | 700 | <property name="width_request">215</property> |
458 | @@ -687,9 +704,9 @@ | |||
459 | 687 | <property name="width_request">215</property> | 704 | <property name="width_request">215</property> |
460 | 688 | <property name="visible">True</property> | 705 | <property name="visible">True</property> |
461 | 689 | <property name="can_focus">True</property> | 706 | <property name="can_focus">True</property> |
465 | 690 | <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> | 707 | <property name="hscrollbar_policy">automatic</property> |
466 | 691 | <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> | 708 | <property name="vscrollbar_policy">automatic</property> |
467 | 692 | <property name="shadow_type">GTK_SHADOW_IN</property> | 709 | <property name="shadow_type">in</property> |
468 | 693 | <child> | 710 | <child> |
469 | 694 | <widget class="GtkTreeView" id="treeview_montage"> | 711 | <widget class="GtkTreeView" id="treeview_montage"> |
470 | 695 | <property name="visible">True</property> | 712 | <property name="visible">True</property> |
471 | @@ -697,6 +714,9 @@ | |||
472 | 697 | </widget> | 714 | </widget> |
473 | 698 | </child> | 715 | </child> |
474 | 699 | </widget> | 716 | </widget> |
475 | 717 | <packing> | ||
476 | 718 | <property name="position">0</property> | ||
477 | 719 | </packing> | ||
478 | 700 | </child> | 720 | </child> |
479 | 701 | <child> | 721 | <child> |
480 | 702 | <widget class="GtkVBox" id="vbox3"> | 722 | <widget class="GtkVBox" id="vbox3"> |
481 | @@ -709,6 +729,7 @@ | |||
482 | 709 | <packing> | 729 | <packing> |
483 | 710 | <property name="expand">False</property> | 730 | <property name="expand">False</property> |
484 | 711 | <property name="fill">False</property> | 731 | <property name="fill">False</property> |
485 | 732 | <property name="position">0</property> | ||
486 | 712 | </packing> | 733 | </packing> |
487 | 713 | </child> | 734 | </child> |
488 | 714 | <child> | 735 | <child> |
489 | @@ -719,24 +740,26 @@ | |||
490 | 719 | <widget class="GtkFixed" id="fixed17"> | 740 | <widget class="GtkFixed" id="fixed17"> |
491 | 720 | <property name="visible">True</property> | 741 | <property name="visible">True</property> |
492 | 721 | </widget> | 742 | </widget> |
493 | 743 | <packing> | ||
494 | 744 | <property name="position">0</property> | ||
495 | 745 | </packing> | ||
496 | 722 | </child> | 746 | </child> |
497 | 723 | <child> | 747 | <child> |
498 | 724 | <widget class="GtkButton" id="button_up"> | 748 | <widget class="GtkButton" id="button_up"> |
499 | 725 | <property name="width_request">45</property> | 749 | <property name="width_request">45</property> |
500 | 726 | <property name="height_request">45</property> | 750 | <property name="height_request">45</property> |
501 | 727 | <property name="visible">True</property> | 751 | <property name="visible">True</property> |
504 | 728 | <property name="can_focus">True</property> | 752 | <property name="can_focus">False</property> |
505 | 729 | <property name="receives_default">True</property> | 753 | <property name="receives_default">False</property> |
506 | 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> |
507 | 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> |
508 | 732 | <property name="response_id">0</property> | ||
509 | 733 | <signal name="clicked" handler="on_button_up_clicked"/> | 756 | <signal name="clicked" handler="on_button_up_clicked"/> |
510 | 734 | <child> | 757 | <child> |
511 | 735 | <widget class="GtkImage" id="image14"> | 758 | <widget class="GtkImage" id="image14"> |
512 | 736 | <property name="visible">True</property> | 759 | <property name="visible">True</property> |
513 | 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> |
514 | 738 | <property name="stock">gtk-go-up</property> | 761 | <property name="stock">gtk-go-up</property> |
516 | 739 | <property name="icon_size">5</property> | 762 | <property name="icon-size">5</property> |
517 | 740 | </widget> | 763 | </widget> |
518 | 741 | </child> | 764 | </child> |
519 | 742 | </widget> | 765 | </widget> |
520 | @@ -759,18 +782,17 @@ | |||
521 | 759 | <property name="width_request">45</property> | 782 | <property name="width_request">45</property> |
522 | 760 | <property name="height_request">45</property> | 783 | <property name="height_request">45</property> |
523 | 761 | <property name="visible">True</property> | 784 | <property name="visible">True</property> |
526 | 762 | <property name="can_focus">True</property> | 785 | <property name="can_focus">False</property> |
527 | 763 | <property name="receives_default">True</property> | 786 | <property name="receives_default">False</property> |
528 | 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> |
529 | 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> |
530 | 766 | <property name="response_id">0</property> | ||
531 | 767 | <signal name="clicked" handler="on_button_down_clicked"/> | 789 | <signal name="clicked" handler="on_button_down_clicked"/> |
532 | 768 | <child> | 790 | <child> |
533 | 769 | <widget class="GtkImage" id="image16"> | 791 | <widget class="GtkImage" id="image16"> |
534 | 770 | <property name="visible">True</property> | 792 | <property name="visible">True</property> |
535 | 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> |
536 | 772 | <property name="stock">gtk-go-down</property> | 794 | <property name="stock">gtk-go-down</property> |
538 | 773 | <property name="icon_size">5</property> | 795 | <property name="icon-size">5</property> |
539 | 774 | </widget> | 796 | </widget> |
540 | 775 | </child> | 797 | </child> |
541 | 776 | </widget> | 798 | </widget> |
542 | @@ -793,18 +815,17 @@ | |||
543 | 793 | <property name="width_request">45</property> | 815 | <property name="width_request">45</property> |
544 | 794 | <property name="height_request">45</property> | 816 | <property name="height_request">45</property> |
545 | 795 | <property name="visible">True</property> | 817 | <property name="visible">True</property> |
548 | 796 | <property name="can_focus">True</property> | 818 | <property name="can_focus">False</property> |
549 | 797 | <property name="receives_default">True</property> | 819 | <property name="receives_default">False</property> |
550 | 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> |
553 | 799 | <property name="tooltip" translatable="yes" comments="Jeter à la poubelle">To trash</property> | 821 | <property name="tooltip" translatable="yes" comments="Jeter à la poubelle">To trash</property> |
552 | 800 | <property name="response_id">0</property> | ||
554 | 801 | <signal name="clicked" handler="on_button_trash_clicked"/> | 822 | <signal name="clicked" handler="on_button_trash_clicked"/> |
555 | 802 | <child> | 823 | <child> |
556 | 803 | <widget class="GtkImage" id="image12"> | 824 | <widget class="GtkImage" id="image12"> |
557 | 804 | <property name="visible">True</property> | 825 | <property name="visible">True</property> |
558 | 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> |
559 | 806 | <property name="stock">gtk-delete</property> | 827 | <property name="stock">gtk-delete</property> |
561 | 807 | <property name="icon_size">5</property> | 828 | <property name="icon-size">5</property> |
562 | 808 | </widget> | 829 | </widget> |
563 | 809 | </child> | 830 | </child> |
564 | 810 | </widget> | 831 | </widget> |
565 | @@ -827,16 +848,15 @@ | |||
566 | 827 | <property name="width_request">45</property> | 848 | <property name="width_request">45</property> |
567 | 828 | <property name="height_request">45</property> | 849 | <property name="height_request">45</property> |
568 | 829 | <property name="visible">True</property> | 850 | <property name="visible">True</property> |
571 | 830 | <property name="can_focus">True</property> | 851 | <property name="can_focus">False</property> |
572 | 831 | <property name="receives_default">True</property> | 852 | <property name="receives_default">False</property> |
573 | 832 | <property name="tooltip" translatable="yes">Play video</property> | 853 | <property name="tooltip" translatable="yes">Play video</property> |
574 | 833 | <property name="response_id">0</property> | ||
575 | 834 | <signal name="toggled" handler="on_button_play_toggled"/> | 854 | <signal name="toggled" handler="on_button_play_toggled"/> |
576 | 835 | <child> | 855 | <child> |
577 | 836 | <widget class="GtkImage" id="image_play_pause"> | 856 | <widget class="GtkImage" id="image_play_pause"> |
578 | 837 | <property name="visible">True</property> | 857 | <property name="visible">True</property> |
579 | 838 | <property name="stock">gtk-media-play</property> | 858 | <property name="stock">gtk-media-play</property> |
581 | 839 | <property name="icon_size">5</property> | 859 | <property name="icon-size">5</property> |
582 | 840 | </widget> | 860 | </widget> |
583 | 841 | </child> | 861 | </child> |
584 | 842 | </widget> | 862 | </widget> |
585 | @@ -874,7 +894,7 @@ | |||
586 | 874 | <packing> | 894 | <packing> |
587 | 875 | <property name="expand">False</property> | 895 | <property name="expand">False</property> |
588 | 876 | <property name="fill">False</property> | 896 | <property name="fill">False</property> |
590 | 877 | <property name="pack_type">GTK_PACK_END</property> | 897 | <property name="pack_type">end</property> |
591 | 878 | <property name="position">1</property> | 898 | <property name="position">1</property> |
592 | 879 | </packing> | 899 | </packing> |
593 | 880 | </child> | 900 | </child> |
594 | @@ -918,6 +938,9 @@ | |||
595 | 918 | <property name="visible">True</property> | 938 | <property name="visible">True</property> |
596 | 919 | <property name="spacing">2</property> | 939 | <property name="spacing">2</property> |
597 | 920 | </widget> | 940 | </widget> |
598 | 941 | <packing> | ||
599 | 942 | <property name="position">0</property> | ||
600 | 943 | </packing> | ||
601 | 921 | </child> | 944 | </child> |
602 | 922 | <child> | 945 | <child> |
603 | 923 | <widget class="GtkProgressBar" id="progressbar_status"> | 946 | <widget class="GtkProgressBar" id="progressbar_status"> |
604 | @@ -944,8 +967,8 @@ | |||
605 | 944 | <widget class="GtkFileChooserDialog" id="filechooserdialog_open"> | 967 | <widget class="GtkFileChooserDialog" id="filechooserdialog_open"> |
606 | 945 | <property name="border_width">5</property> | 968 | <property name="border_width">5</property> |
607 | 946 | <property name="title" translatable="yes">Select a Luciole project</property> | 969 | <property name="title" translatable="yes">Select a Luciole project</property> |
610 | 947 | <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> | 970 | <property name="window_position">center-on-parent</property> |
611 | 948 | <property name="type_hint">GDK_WINDOW_TYPE_HINT_MENU</property> | 971 | <property name="type_hint">menu</property> |
612 | 949 | <property name="has_separator">False</property> | 972 | <property name="has_separator">False</property> |
613 | 950 | <child internal-child="vbox"> | 973 | <child internal-child="vbox"> |
614 | 951 | <widget class="GtkVBox" id="dialog-vbox1"> | 974 | <widget class="GtkVBox" id="dialog-vbox1"> |
615 | @@ -957,7 +980,7 @@ | |||
616 | 957 | <child internal-child="action_area"> | 980 | <child internal-child="action_area"> |
617 | 958 | <widget class="GtkHButtonBox" id="dialog-action_area1"> | 981 | <widget class="GtkHButtonBox" id="dialog-action_area1"> |
618 | 959 | <property name="visible">True</property> | 982 | <property name="visible">True</property> |
620 | 960 | <property name="layout_style">GTK_BUTTONBOX_END</property> | 983 | <property name="layout_style">end</property> |
621 | 961 | <child> | 984 | <child> |
622 | 962 | <placeholder/> | 985 | <placeholder/> |
623 | 963 | </child> | 986 | </child> |
624 | @@ -967,7 +990,8 @@ | |||
625 | 967 | </widget> | 990 | </widget> |
626 | 968 | <packing> | 991 | <packing> |
627 | 969 | <property name="expand">False</property> | 992 | <property name="expand">False</property> |
629 | 970 | <property name="pack_type">GTK_PACK_END</property> | 993 | <property name="pack_type">end</property> |
630 | 994 | <property name="position">0</property> | ||
631 | 971 | </packing> | 995 | </packing> |
632 | 972 | </child> | 996 | </child> |
633 | 973 | </widget> | 997 | </widget> |
634 | @@ -978,8 +1002,8 @@ | |||
635 | 978 | <property name="border_width">5</property> | 1002 | <property name="border_width">5</property> |
636 | 979 | <property name="title" translatable="yes">About Luciole</property> | 1003 | <property name="title" translatable="yes">About Luciole</property> |
637 | 980 | <property name="resizable">False</property> | 1004 | <property name="resizable">False</property> |
640 | 981 | <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> | 1005 | <property name="window_position">center-on-parent</property> |
641 | 982 | <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> | 1006 | <property name="type_hint">dialog</property> |
642 | 983 | <property name="has_separator">False</property> | 1007 | <property name="has_separator">False</property> |
643 | 984 | <property name="program_name">Luciole</property> | 1008 | <property name="program_name">Luciole</property> |
644 | 985 | <property name="version">0.7</property> | 1009 | <property name="version">0.7</property> |
645 | @@ -1023,11 +1047,12 @@ | |||
646 | 1023 | <widget class="GtkHButtonBox" id="dialog-action_area9"> | 1047 | <widget class="GtkHButtonBox" id="dialog-action_area9"> |
647 | 1024 | <property name="visible">True</property> | 1048 | <property name="visible">True</property> |
648 | 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> |
650 | 1026 | <property name="layout_style">GTK_BUTTONBOX_END</property> | 1050 | <property name="layout_style">end</property> |
651 | 1027 | </widget> | 1051 | </widget> |
652 | 1028 | <packing> | 1052 | <packing> |
653 | 1029 | <property name="expand">False</property> | 1053 | <property name="expand">False</property> |
655 | 1030 | <property name="pack_type">GTK_PACK_END</property> | 1054 | <property name="pack_type">end</property> |
656 | 1055 | <property name="position">0</property> | ||
657 | 1031 | </packing> | 1056 | </packing> |
658 | 1032 | </child> | 1057 | </child> |
659 | 1033 | </widget> | 1058 | </widget> |
660 | @@ -1036,8 +1061,9 @@ | |||
661 | 1036 | <widget class="GtkDialog" id="export1"> | 1061 | <widget class="GtkDialog" id="export1"> |
662 | 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> |
663 | 1038 | <property name="border_width">5</property> | 1063 | <property name="border_width">5</property> |
666 | 1039 | <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> | 1064 | <property name="title" translatable="yes">Video Export</property> |
667 | 1040 | <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> | 1065 | <property name="window_position">center-on-parent</property> |
668 | 1066 | <property name="type_hint">dialog</property> | ||
669 | 1041 | <property name="has_separator">False</property> | 1067 | <property name="has_separator">False</property> |
670 | 1042 | <child internal-child="vbox"> | 1068 | <child internal-child="vbox"> |
671 | 1043 | <widget class="GtkVBox" id="dialog-vbox11"> | 1069 | <widget class="GtkVBox" id="dialog-vbox11"> |
672 | @@ -1061,6 +1087,7 @@ | |||
673 | 1061 | <packing> | 1087 | <packing> |
674 | 1062 | <property name="expand">False</property> | 1088 | <property name="expand">False</property> |
675 | 1063 | <property name="fill">False</property> | 1089 | <property name="fill">False</property> |
676 | 1090 | <property name="position">0</property> | ||
677 | 1064 | </packing> | 1091 | </packing> |
678 | 1065 | </child> | 1092 | </child> |
679 | 1066 | <child> | 1093 | <child> |
680 | @@ -1073,6 +1100,9 @@ | |||
681 | 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> |
682 | 1074 | <property name="label" translatable="yes">Choose export format.</property> | 1101 | <property name="label" translatable="yes">Choose export format.</property> |
683 | 1075 | </widget> | 1102 | </widget> |
684 | 1103 | <packing> | ||
685 | 1104 | <property name="position">0</property> | ||
686 | 1105 | </packing> | ||
687 | 1076 | </child> | 1106 | </child> |
688 | 1077 | <child> | 1107 | <child> |
689 | 1078 | <widget class="GtkFixed" id="fixed37"> | 1108 | <widget class="GtkFixed" id="fixed37"> |
690 | @@ -1097,7 +1127,7 @@ | |||
691 | 1097 | <widget class="GtkViewport" id="viewport4"> | 1127 | <widget class="GtkViewport" id="viewport4"> |
692 | 1098 | <property name="visible">True</property> | 1128 | <property name="visible">True</property> |
693 | 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> |
695 | 1100 | <property name="resize_mode">GTK_RESIZE_QUEUE</property> | 1130 | <property name="resize_mode">queue</property> |
696 | 1101 | <child> | 1131 | <child> |
697 | 1102 | <widget class="GtkVBox" id="vbox15"> | 1132 | <widget class="GtkVBox" id="vbox15"> |
698 | 1103 | <property name="visible">True</property> | 1133 | <property name="visible">True</property> |
699 | @@ -1115,6 +1145,7 @@ | |||
700 | 1115 | <packing> | 1145 | <packing> |
701 | 1116 | <property name="expand">False</property> | 1146 | <property name="expand">False</property> |
702 | 1117 | <property name="fill">False</property> | 1147 | <property name="fill">False</property> |
703 | 1148 | <property name="position">0</property> | ||
704 | 1118 | </packing> | 1149 | </packing> |
705 | 1119 | </child> | 1150 | </child> |
706 | 1120 | <child> | 1151 | <child> |
707 | @@ -1154,6 +1185,7 @@ | |||
708 | 1154 | <property name="expand">False</property> | 1185 | <property name="expand">False</property> |
709 | 1155 | <property name="fill">False</property> | 1186 | <property name="fill">False</property> |
710 | 1156 | <property name="padding">10</property> | 1187 | <property name="padding">10</property> |
711 | 1188 | <property name="position">0</property> | ||
712 | 1157 | </packing> | 1189 | </packing> |
713 | 1158 | </child> | 1190 | </child> |
714 | 1159 | <child> | 1191 | <child> |
715 | @@ -1169,6 +1201,7 @@ | |||
716 | 1169 | <packing> | 1201 | <packing> |
717 | 1170 | <property name="expand">False</property> | 1202 | <property name="expand">False</property> |
718 | 1171 | <property name="fill">False</property> | 1203 | <property name="fill">False</property> |
719 | 1204 | <property name="position">0</property> | ||
720 | 1172 | </packing> | 1205 | </packing> |
721 | 1173 | </child> | 1206 | </child> |
722 | 1174 | <child> | 1207 | <child> |
723 | @@ -1217,7 +1250,7 @@ | |||
724 | 1217 | <packing> | 1250 | <packing> |
725 | 1218 | <property name="expand">False</property> | 1251 | <property name="expand">False</property> |
726 | 1219 | <property name="fill">False</property> | 1252 | <property name="fill">False</property> |
728 | 1220 | <property name="pack_type">GTK_PACK_END</property> | 1253 | <property name="pack_type">end</property> |
729 | 1221 | <property name="position">3</property> | 1254 | <property name="position">3</property> |
730 | 1222 | </packing> | 1255 | </packing> |
731 | 1223 | </child> | 1256 | </child> |
732 | @@ -1245,6 +1278,7 @@ | |||
733 | 1245 | <packing> | 1278 | <packing> |
734 | 1246 | <property name="expand">False</property> | 1279 | <property name="expand">False</property> |
735 | 1247 | <property name="fill">False</property> | 1280 | <property name="fill">False</property> |
736 | 1281 | <property name="position">0</property> | ||
737 | 1248 | </packing> | 1282 | </packing> |
738 | 1249 | </child> | 1283 | </child> |
739 | 1250 | <child> | 1284 | <child> |
740 | @@ -1272,6 +1306,9 @@ | |||
741 | 1272 | </packing> | 1306 | </packing> |
742 | 1273 | </child> | 1307 | </child> |
743 | 1274 | </widget> | 1308 | </widget> |
744 | 1309 | <packing> | ||
745 | 1310 | <property name="position">0</property> | ||
746 | 1311 | </packing> | ||
747 | 1275 | </child> | 1312 | </child> |
748 | 1276 | <child> | 1313 | <child> |
749 | 1277 | <widget class="GtkHBox" id="hbox21"> | 1314 | <widget class="GtkHBox" id="hbox21"> |
750 | @@ -1286,6 +1323,7 @@ | |||
751 | 1286 | <packing> | 1323 | <packing> |
752 | 1287 | <property name="expand">False</property> | 1324 | <property name="expand">False</property> |
753 | 1288 | <property name="fill">False</property> | 1325 | <property name="fill">False</property> |
754 | 1326 | <property name="position">0</property> | ||
755 | 1289 | </packing> | 1327 | </packing> |
756 | 1290 | </child> | 1328 | </child> |
757 | 1291 | <child> | 1329 | <child> |
758 | @@ -1305,7 +1343,7 @@ | |||
759 | 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> |
760 | 1306 | <property name="use_preview_label">False</property> | 1344 | <property name="use_preview_label">False</property> |
761 | 1307 | <property name="do_overwrite_confirmation">True</property> | 1345 | <property name="do_overwrite_confirmation">True</property> |
763 | 1308 | <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property> | 1346 | <property name="action">select-folder</property> |
764 | 1309 | <property name="title" translatable="yes">Select a folder</property> | 1347 | <property name="title" translatable="yes">Select a folder</property> |
765 | 1310 | </widget> | 1348 | </widget> |
766 | 1311 | <packing> | 1349 | <packing> |
767 | @@ -1318,7 +1356,7 @@ | |||
768 | 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> |
769 | 1319 | </widget> | 1357 | </widget> |
770 | 1320 | <packing> | 1358 | <packing> |
772 | 1321 | <property name="pack_type">GTK_PACK_END</property> | 1359 | <property name="pack_type">end</property> |
773 | 1322 | <property name="position">3</property> | 1360 | <property name="position">3</property> |
774 | 1323 | </packing> | 1361 | </packing> |
775 | 1324 | </child> | 1362 | </child> |
776 | @@ -1368,15 +1406,16 @@ | |||
777 | 1368 | <packing> | 1406 | <packing> |
778 | 1369 | <property name="expand">False</property> | 1407 | <property name="expand">False</property> |
779 | 1370 | <property name="fill">False</property> | 1408 | <property name="fill">False</property> |
780 | 1409 | <property name="position">0</property> | ||
781 | 1371 | </packing> | 1410 | </packing> |
782 | 1372 | </child> | 1411 | </child> |
783 | 1373 | <child> | 1412 | <child> |
784 | 1374 | <widget class="GtkCheckButton" id="checkbutton1"> | 1413 | <widget class="GtkCheckButton" id="checkbutton1"> |
785 | 1414 | <property name="label" translatable="yes">Export video with sound.</property> | ||
786 | 1375 | <property name="visible">True</property> | 1415 | <property name="visible">True</property> |
787 | 1376 | <property name="can_focus">True</property> | 1416 | <property name="can_focus">True</property> |
788 | 1417 | <property name="receives_default">False</property> | ||
789 | 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> |
790 | 1378 | <property name="label" translatable="yes">Export video with sound.</property> | ||
791 | 1379 | <property name="response_id">0</property> | ||
792 | 1380 | <property name="draw_indicator">True</property> | 1419 | <property name="draw_indicator">True</property> |
793 | 1381 | </widget> | 1420 | </widget> |
794 | 1382 | <packing> | 1421 | <packing> |
795 | @@ -1387,6 +1426,9 @@ | |||
796 | 1387 | <placeholder/> | 1426 | <placeholder/> |
797 | 1388 | </child> | 1427 | </child> |
798 | 1389 | </widget> | 1428 | </widget> |
799 | 1429 | <packing> | ||
800 | 1430 | <property name="position">0</property> | ||
801 | 1431 | </packing> | ||
802 | 1390 | </child> | 1432 | </child> |
803 | 1391 | <child> | 1433 | <child> |
804 | 1392 | <widget class="GtkFixed" id="fixed61"> | 1434 | <widget class="GtkFixed" id="fixed61"> |
805 | @@ -1425,7 +1467,7 @@ | |||
806 | 1425 | </widget> | 1467 | </widget> |
807 | 1426 | <packing> | 1468 | <packing> |
808 | 1427 | <property name="expand">False</property> | 1469 | <property name="expand">False</property> |
810 | 1428 | <property name="pack_type">GTK_PACK_END</property> | 1470 | <property name="pack_type">end</property> |
811 | 1429 | <property name="position">5</property> | 1471 | <property name="position">5</property> |
812 | 1430 | </packing> | 1472 | </packing> |
813 | 1431 | </child> | 1473 | </child> |
814 | @@ -1448,6 +1490,9 @@ | |||
815 | 1448 | </packing> | 1490 | </packing> |
816 | 1449 | </child> | 1491 | </child> |
817 | 1450 | </widget> | 1492 | </widget> |
818 | 1493 | <packing> | ||
819 | 1494 | <property name="position">0</property> | ||
820 | 1495 | </packing> | ||
821 | 1451 | </child> | 1496 | </child> |
822 | 1452 | </widget> | 1497 | </widget> |
823 | 1453 | <packing> | 1498 | <packing> |
824 | @@ -1458,50 +1503,60 @@ | |||
825 | 1458 | <widget class="GtkHButtonBox" id="dialog-action_area11"> | 1503 | <widget class="GtkHButtonBox" id="dialog-action_area11"> |
826 | 1459 | <property name="visible">True</property> | 1504 | <property name="visible">True</property> |
827 | 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> |
829 | 1461 | <property name="layout_style">GTK_BUTTONBOX_END</property> | 1506 | <property name="layout_style">end</property> |
830 | 1462 | <child> | 1507 | <child> |
831 | 1463 | <widget class="GtkButton" id="button13"> | 1508 | <widget class="GtkButton" id="button13"> |
832 | 1464 | <property name="visible">True</property> | ||
833 | 1465 | <property name="can_focus">True</property> | ||
834 | 1466 | <property name="receives_default">True</property> | ||
835 | 1467 | <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> | ||
836 | 1468 | <property name="label" translatable="yes">gtk-cancel</property> | 1509 | <property name="label" translatable="yes">gtk-cancel</property> |
837 | 1469 | <property name="use_stock">True</property> | ||
838 | 1470 | <property name="response_id">-6</property> | 1510 | <property name="response_id">-6</property> |
839 | 1511 | <property name="visible">True</property> | ||
840 | 1512 | <property name="can_focus">True</property> | ||
841 | 1513 | <property name="receives_default">True</property> | ||
842 | 1514 | <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> | ||
843 | 1515 | <property name="use_stock">True</property> | ||
844 | 1471 | </widget> | 1516 | </widget> |
845 | 1517 | <packing> | ||
846 | 1518 | <property name="expand">False</property> | ||
847 | 1519 | <property name="fill">False</property> | ||
848 | 1520 | <property name="position">0</property> | ||
849 | 1521 | </packing> | ||
850 | 1472 | </child> | 1522 | </child> |
851 | 1473 | <child> | 1523 | <child> |
852 | 1474 | <widget class="GtkButton" id="button16"> | 1524 | <widget class="GtkButton" id="button16"> |
853 | 1475 | <property name="visible">True</property> | ||
854 | 1476 | <property name="can_focus">True</property> | ||
855 | 1477 | <property name="receives_default">True</property> | ||
856 | 1478 | <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> | ||
857 | 1479 | <property name="label" translatable="yes">gtk-apply</property> | 1525 | <property name="label" translatable="yes">gtk-apply</property> |
858 | 1480 | <property name="use_stock">True</property> | ||
859 | 1481 | <property name="response_id">-10</property> | 1526 | <property name="response_id">-10</property> |
860 | 1527 | <property name="visible">True</property> | ||
861 | 1528 | <property name="can_focus">True</property> | ||
862 | 1529 | <property name="receives_default">True</property> | ||
863 | 1530 | <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> | ||
864 | 1531 | <property name="use_stock">True</property> | ||
865 | 1482 | </widget> | 1532 | </widget> |
866 | 1483 | <packing> | 1533 | <packing> |
867 | 1534 | <property name="expand">False</property> | ||
868 | 1535 | <property name="fill">False</property> | ||
869 | 1484 | <property name="position">1</property> | 1536 | <property name="position">1</property> |
870 | 1485 | </packing> | 1537 | </packing> |
871 | 1486 | </child> | 1538 | </child> |
872 | 1487 | <child> | 1539 | <child> |
873 | 1488 | <widget class="GtkButton" id="button18"> | 1540 | <widget class="GtkButton" id="button18"> |
874 | 1489 | <property name="visible">True</property> | ||
875 | 1490 | <property name="can_focus">True</property> | ||
876 | 1491 | <property name="receives_default">True</property> | ||
877 | 1492 | <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> | ||
878 | 1493 | <property name="label" translatable="yes">gtk-close</property> | 1541 | <property name="label" translatable="yes">gtk-close</property> |
879 | 1494 | <property name="use_stock">True</property> | ||
880 | 1495 | <property name="response_id">-7</property> | 1542 | <property name="response_id">-7</property> |
881 | 1543 | <property name="visible">True</property> | ||
882 | 1544 | <property name="can_focus">True</property> | ||
883 | 1545 | <property name="receives_default">True</property> | ||
884 | 1546 | <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> | ||
885 | 1547 | <property name="use_stock">True</property> | ||
886 | 1496 | </widget> | 1548 | </widget> |
887 | 1497 | <packing> | 1549 | <packing> |
888 | 1550 | <property name="expand">False</property> | ||
889 | 1551 | <property name="fill">False</property> | ||
890 | 1498 | <property name="position">2</property> | 1552 | <property name="position">2</property> |
891 | 1499 | </packing> | 1553 | </packing> |
892 | 1500 | </child> | 1554 | </child> |
893 | 1501 | </widget> | 1555 | </widget> |
894 | 1502 | <packing> | 1556 | <packing> |
895 | 1503 | <property name="expand">False</property> | 1557 | <property name="expand">False</property> |
897 | 1504 | <property name="pack_type">GTK_PACK_END</property> | 1558 | <property name="pack_type">end</property> |
898 | 1559 | <property name="position">0</property> | ||
899 | 1505 | </packing> | 1560 | </packing> |
900 | 1506 | </child> | 1561 | </child> |
901 | 1507 | </widget> | 1562 | </widget> |
902 | @@ -1509,8 +1564,8 @@ | |||
903 | 1509 | </widget> | 1564 | </widget> |
904 | 1510 | <widget class="GtkDialog" id="dialog_project_properties"> | 1565 | <widget class="GtkDialog" id="dialog_project_properties"> |
905 | 1511 | <property name="border_width">5</property> | 1566 | <property name="border_width">5</property> |
908 | 1512 | <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> | 1567 | <property name="window_position">center-on-parent</property> |
909 | 1513 | <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> | 1568 | <property name="type_hint">dialog</property> |
910 | 1514 | <property name="has_separator">False</property> | 1569 | <property name="has_separator">False</property> |
911 | 1515 | <child internal-child="vbox"> | 1570 | <child internal-child="vbox"> |
912 | 1516 | <widget class="GtkVBox" id="dialog-vbox4"> | 1571 | <widget class="GtkVBox" id="dialog-vbox4"> |
913 | @@ -1522,7 +1577,7 @@ | |||
914 | 1522 | <child internal-child="action_area"> | 1577 | <child internal-child="action_area"> |
915 | 1523 | <widget class="GtkHButtonBox" id="dialog-action_area4"> | 1578 | <widget class="GtkHButtonBox" id="dialog-action_area4"> |
916 | 1524 | <property name="visible">True</property> | 1579 | <property name="visible">True</property> |
918 | 1525 | <property name="layout_style">GTK_BUTTONBOX_END</property> | 1580 | <property name="layout_style">end</property> |
919 | 1526 | <child> | 1581 | <child> |
920 | 1527 | <placeholder/> | 1582 | <placeholder/> |
921 | 1528 | </child> | 1583 | </child> |
922 | @@ -1535,7 +1590,8 @@ | |||
923 | 1535 | </widget> | 1590 | </widget> |
924 | 1536 | <packing> | 1591 | <packing> |
925 | 1537 | <property name="expand">False</property> | 1592 | <property name="expand">False</property> |
927 | 1538 | <property name="pack_type">GTK_PACK_END</property> | 1593 | <property name="pack_type">end</property> |
928 | 1594 | <property name="position">0</property> | ||
929 | 1539 | </packing> | 1595 | </packing> |
930 | 1540 | </child> | 1596 | </child> |
931 | 1541 | </widget> | 1597 | </widget> |
932 | @@ -1544,8 +1600,8 @@ | |||
933 | 1544 | <widget class="GtkDialog" id="Dialog_preferences"> | 1600 | <widget class="GtkDialog" id="Dialog_preferences"> |
934 | 1545 | <property name="border_width">5</property> | 1601 | <property name="border_width">5</property> |
935 | 1546 | <property name="title" translatable="yes">Preferences</property> | 1602 | <property name="title" translatable="yes">Preferences</property> |
938 | 1547 | <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> | 1603 | <property name="window_position">center-on-parent</property> |
939 | 1548 | <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> | 1604 | <property name="type_hint">dialog</property> |
940 | 1549 | <property name="has_separator">False</property> | 1605 | <property name="has_separator">False</property> |
941 | 1550 | <child internal-child="vbox"> | 1606 | <child internal-child="vbox"> |
942 | 1551 | <widget class="GtkVBox" id="dialog-vbox3"> | 1607 | <widget class="GtkVBox" id="dialog-vbox3"> |
943 | @@ -1559,8 +1615,8 @@ | |||
944 | 1559 | <widget class="GtkViewport" id="viewport3"> | 1615 | <widget class="GtkViewport" id="viewport3"> |
945 | 1560 | <property name="height_request">40</property> | 1616 | <property name="height_request">40</property> |
946 | 1561 | <property name="visible">True</property> | 1617 | <property name="visible">True</property> |
949 | 1562 | <property name="resize_mode">GTK_RESIZE_QUEUE</property> | 1618 | <property name="resize_mode">queue</property> |
950 | 1563 | <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> | 1619 | <property name="shadow_type">etched-in</property> |
951 | 1564 | <child> | 1620 | <child> |
952 | 1565 | <widget class="GtkLabel" id="label_preferences"> | 1621 | <widget class="GtkLabel" id="label_preferences"> |
953 | 1566 | <property name="visible">True</property> | 1622 | <property name="visible">True</property> |
954 | @@ -1570,6 +1626,7 @@ | |||
955 | 1570 | </widget> | 1626 | </widget> |
956 | 1571 | <packing> | 1627 | <packing> |
957 | 1572 | <property name="padding">26</property> | 1628 | <property name="padding">26</property> |
958 | 1629 | <property name="position">0</property> | ||
959 | 1573 | </packing> | 1630 | </packing> |
960 | 1574 | </child> | 1631 | </child> |
961 | 1575 | <child> | 1632 | <child> |
962 | @@ -1581,6 +1638,9 @@ | |||
963 | 1581 | <property name="xalign">0.10000000149011612</property> | 1638 | <property name="xalign">0.10000000149011612</property> |
964 | 1582 | <property name="label" translatable="yes">Select Theme</property> | 1639 | <property name="label" translatable="yes">Select Theme</property> |
965 | 1583 | </widget> | 1640 | </widget> |
966 | 1641 | <packing> | ||
967 | 1642 | <property name="position">0</property> | ||
968 | 1643 | </packing> | ||
969 | 1584 | </child> | 1644 | </child> |
970 | 1585 | <child> | 1645 | <child> |
971 | 1586 | <widget class="GtkComboBox" id="combobox_theme"> | 1646 | <widget class="GtkComboBox" id="combobox_theme"> |
972 | @@ -1602,10 +1662,10 @@ | |||
973 | 1602 | </child> | 1662 | </child> |
974 | 1603 | <child> | 1663 | <child> |
975 | 1604 | <widget class="GtkCheckButton" id="checkbutton_trash"> | 1664 | <widget class="GtkCheckButton" id="checkbutton_trash"> |
976 | 1605 | <property name="visible">True</property> | ||
977 | 1606 | <property name="can_focus">True</property> | ||
978 | 1607 | <property name="label" translatable="yes">Add Trash to montage view</property> | 1665 | <property name="label" translatable="yes">Add Trash to montage view</property> |
980 | 1608 | <property name="response_id">0</property> | 1666 | <property name="visible">True</property> |
981 | 1667 | <property name="can_focus">True</property> | ||
982 | 1668 | <property name="receives_default">False</property> | ||
983 | 1609 | <property name="draw_indicator">True</property> | 1669 | <property name="draw_indicator">True</property> |
984 | 1610 | </widget> | 1670 | </widget> |
985 | 1611 | <packing> | 1671 | <packing> |
986 | @@ -1621,7 +1681,7 @@ | |||
987 | 1621 | <child internal-child="action_area"> | 1681 | <child internal-child="action_area"> |
988 | 1622 | <widget class="GtkHButtonBox" id="dialog-action_area3"> | 1682 | <widget class="GtkHButtonBox" id="dialog-action_area3"> |
989 | 1623 | <property name="visible">True</property> | 1683 | <property name="visible">True</property> |
991 | 1624 | <property name="layout_style">GTK_BUTTONBOX_END</property> | 1684 | <property name="layout_style">end</property> |
992 | 1625 | <child> | 1685 | <child> |
993 | 1626 | <placeholder/> | 1686 | <placeholder/> |
994 | 1627 | </child> | 1687 | </child> |
995 | @@ -1631,7 +1691,8 @@ | |||
996 | 1631 | </widget> | 1691 | </widget> |
997 | 1632 | <packing> | 1692 | <packing> |
998 | 1633 | <property name="expand">False</property> | 1693 | <property name="expand">False</property> |
1000 | 1634 | <property name="pack_type">GTK_PACK_END</property> | 1694 | <property name="pack_type">end</property> |
1001 | 1695 | <property name="position">0</property> | ||
1002 | 1635 | </packing> | 1696 | </packing> |
1003 | 1636 | </child> | 1697 | </child> |
1004 | 1637 | </widget> | 1698 | </widget> |
1005 | 1638 | 1699 | ||
1006 | === modified file 'images/luciole.xml' | |||
1007 | --- images/luciole.xml 2009-05-01 14:42:17 +0000 | |||
1008 | +++ images/luciole.xml 2009-05-06 17:15:46 +0000 | |||
1009 | @@ -1,5 +1,4 @@ | |||
1010 | 1 | <?xml version="1.0"?> | 1 | <?xml version="1.0"?> |
1011 | 2 | <!--Generated with glade3 3.4.5 on Fri May 1 16:39:49 2009 --> | ||
1012 | 3 | <interface> | 2 | <interface> |
1013 | 4 | <object class="GtkAdjustment" id="adjustment1"> | 3 | <object class="GtkAdjustment" id="adjustment1"> |
1014 | 5 | <property name="upper">4</property> | 4 | <property name="upper">4</property> |
1015 | @@ -23,13 +22,13 @@ | |||
1016 | 23 | </columns> | 22 | </columns> |
1017 | 24 | <data> | 23 | <data> |
1018 | 25 | <row> | 24 | <row> |
1026 | 26 | <col id="0">DV format (raw DV)</col> | 25 | <col id="0" translatable="yes">DV format (raw DV)</col> |
1027 | 27 | </row> | 26 | </row> |
1028 | 28 | <row> | 27 | <row> |
1029 | 29 | <col id="0">Format DVD (mpeg2)</col> | 28 | <col id="0" translatable="yes">Format DVD (mpeg2)</col> |
1030 | 30 | </row> | 29 | </row> |
1031 | 31 | <row> | 30 | <row> |
1032 | 32 | <col id="0">Format divx/xvid (avi)</col> | 31 | <col id="0" translatable="yes">Format divx/xvid (avi)</col> |
1033 | 33 | </row> | 32 | </row> |
1034 | 34 | </data> | 33 | </data> |
1035 | 35 | </object> | 34 | </object> |
1036 | @@ -39,10 +38,10 @@ | |||
1037 | 39 | </columns> | 38 | </columns> |
1038 | 40 | <data> | 39 | <data> |
1039 | 41 | <row> | 40 | <row> |
1041 | 42 | <col id="0">Default</col> | 41 | <col id="0" translatable="yes">Default</col> |
1042 | 43 | </row> | 42 | </row> |
1043 | 44 | <row> | 43 | <row> |
1045 | 45 | <col id="0">Tropical</col> | 44 | <col id="0" translatable="yes">Tropical</col> |
1046 | 46 | </row> | 45 | </row> |
1047 | 47 | </data> | 46 | </data> |
1048 | 48 | </object> | 47 | </object> |
1049 | @@ -57,14 +56,14 @@ | |||
1050 | 57 | </child> | 56 | </child> |
1051 | 58 | <child> | 57 | <child> |
1052 | 59 | <object class="GtkAction" id="file_new"> | 58 | <object class="GtkAction" id="file_new"> |
1054 | 60 | <property name="stock_id" translatable="yes">gtk-new</property> | 59 | <property name="stock_id">gtk-new</property> |
1055 | 61 | <property name="name">file_new</property> | 60 | <property name="name">file_new</property> |
1056 | 62 | <signal handler="on_file_new_activate" name="activate"/> | 61 | <signal handler="on_file_new_activate" name="activate"/> |
1057 | 63 | </object> | 62 | </object> |
1058 | 64 | </child> | 63 | </child> |
1059 | 65 | <child> | 64 | <child> |
1060 | 66 | <object class="GtkAction" id="file_open"> | 65 | <object class="GtkAction" id="file_open"> |
1062 | 67 | <property name="stock_id" translatable="yes">gtk-open</property> | 66 | <property name="stock_id">gtk-open</property> |
1063 | 68 | <property name="name">file_open</property> | 67 | <property name="name">file_open</property> |
1064 | 69 | <signal handler="on_file_open_activate" name="activate"/> | 68 | <signal handler="on_file_open_activate" name="activate"/> |
1065 | 70 | </object> | 69 | </object> |
1066 | @@ -107,14 +106,14 @@ | |||
1067 | 107 | </child> | 106 | </child> |
1068 | 108 | <child> | 107 | <child> |
1069 | 109 | <object class="GtkAction" id="file_save"> | 108 | <object class="GtkAction" id="file_save"> |
1071 | 110 | <property name="stock_id" translatable="yes">gtk-save</property> | 109 | <property name="stock_id">gtk-save</property> |
1072 | 111 | <property name="name">file_save</property> | 110 | <property name="name">file_save</property> |
1073 | 112 | <signal handler="on_file_save_activate" name="activate"/> | 111 | <signal handler="on_file_save_activate" name="activate"/> |
1074 | 113 | </object> | 112 | </object> |
1075 | 114 | </child> | 113 | </child> |
1076 | 115 | <child> | 114 | <child> |
1077 | 116 | <object class="GtkAction" id="file_save_as"> | 115 | <object class="GtkAction" id="file_save_as"> |
1079 | 117 | <property name="stock_id" translatable="yes">gtk-save-as</property> | 116 | <property name="stock_id">gtk-save-as</property> |
1080 | 118 | <property name="name">file_save_as</property> | 117 | <property name="name">file_save_as</property> |
1081 | 119 | <signal handler="on_file_save_as_activate" name="activate"/> | 118 | <signal handler="on_file_save_as_activate" name="activate"/> |
1082 | 120 | </object> | 119 | </object> |
1083 | @@ -137,14 +136,14 @@ | |||
1084 | 137 | </child> | 136 | </child> |
1085 | 138 | <child> | 137 | <child> |
1086 | 139 | <object class="GtkAction" id="file_close"> | 138 | <object class="GtkAction" id="file_close"> |
1088 | 140 | <property name="stock_id" translatable="yes">gtk-close</property> | 139 | <property name="stock_id">gtk-close</property> |
1089 | 141 | <property name="name">file_close</property> | 140 | <property name="name">file_close</property> |
1090 | 142 | <signal handler="on_file_close_activate" name="activate"/> | 141 | <signal handler="on_file_close_activate" name="activate"/> |
1091 | 143 | </object> | 142 | </object> |
1092 | 144 | </child> | 143 | </child> |
1093 | 145 | <child> | 144 | <child> |
1094 | 146 | <object class="GtkAction" id="file_quit"> | 145 | <object class="GtkAction" id="file_quit"> |
1096 | 147 | <property name="stock_id" translatable="yes">gtk-quit</property> | 146 | <property name="stock_id">gtk-quit</property> |
1097 | 148 | <property name="name">file_quit</property> | 147 | <property name="name">file_quit</property> |
1098 | 149 | <signal handler="on_file_quit_activate" name="activate"/> | 148 | <signal handler="on_file_quit_activate" name="activate"/> |
1099 | 150 | </object> | 149 | </object> |
1100 | @@ -160,7 +159,7 @@ | |||
1101 | 160 | <property name="stock_id">gtk-properties</property> | 159 | <property name="stock_id">gtk-properties</property> |
1102 | 161 | <property name="name">view_project</property> | 160 | <property name="name">view_project</property> |
1103 | 162 | <property name="tooltip" translatable="yes">Project Properties</property> | 161 | <property name="tooltip" translatable="yes">Project Properties</property> |
1105 | 163 | <property name="label" translatable="yes">Project Properties</property> | 162 | <property name="label" translatable="yes">Project properties</property> |
1106 | 164 | <signal handler="on_view_project_activate" name="activate"/> | 163 | <signal handler="on_view_project_activate" name="activate"/> |
1107 | 165 | </object> | 164 | </object> |
1108 | 166 | </child> | 165 | </child> |
1109 | @@ -180,7 +179,7 @@ | |||
1110 | 180 | </child> | 179 | </child> |
1111 | 181 | <child> | 180 | <child> |
1112 | 182 | <object class="GtkAction" id="help_about"> | 181 | <object class="GtkAction" id="help_about"> |
1114 | 183 | <property name="stock_id" translatable="yes">gtk-about</property> | 182 | <property name="stock_id">gtk-about</property> |
1115 | 184 | <property name="name">help_about</property> | 183 | <property name="name">help_about</property> |
1116 | 185 | <property name="tooltip" translatable="yes">About</property> | 184 | <property name="tooltip" translatable="yes">About</property> |
1117 | 186 | <signal handler="on_help_about_activate" name="activate"/> | 185 | <signal handler="on_help_about_activate" name="activate"/> |
1118 | @@ -219,11 +218,11 @@ | |||
1119 | 219 | </menubar> | 218 | </menubar> |
1120 | 220 | </ui> | 219 | </ui> |
1121 | 221 | </object> | 220 | </object> |
1122 | 221 | <!-- interface-requires gtk+ 2.16 --> | ||
1123 | 222 | <!-- interface-naming-policy toplevel-contextual --> | ||
1124 | 222 | <object class="GtkWindow" id="window1"> | 223 | <object class="GtkWindow" id="window1"> |
1125 | 223 | <property name="icon">luciole.png</property> | 224 | <property name="icon">luciole.png</property> |
1126 | 224 | <property name="icon_name">Luciole</property> | 225 | <property name="icon_name">Luciole</property> |
1127 | 225 | <signal handler="on_window1_delete_event" name="delete_event"/> | ||
1128 | 226 | <signal handler="on_window1_destroy_event" name="destroy_event"/> | ||
1129 | 227 | <child> | 226 | <child> |
1130 | 228 | <object class="GtkVBox" id="vbox1"> | 227 | <object class="GtkVBox" id="vbox1"> |
1131 | 229 | <property name="visible">True</property> | 228 | <property name="visible">True</property> |
1132 | @@ -233,6 +232,7 @@ | |||
1133 | 233 | </object> | 232 | </object> |
1134 | 234 | <packing> | 233 | <packing> |
1135 | 235 | <property name="expand">False</property> | 234 | <property name="expand">False</property> |
1136 | 235 | <property name="position">0</property> | ||
1137 | 236 | </packing> | 236 | </packing> |
1138 | 237 | </child> | 237 | </child> |
1139 | 238 | <child> | 238 | <child> |
1140 | @@ -249,7 +249,7 @@ | |||
1141 | 249 | <property name="border_width">7</property> | 249 | <property name="border_width">7</property> |
1142 | 250 | <property name="label_xalign">0</property> | 250 | <property name="label_xalign">0</property> |
1143 | 251 | <property name="label_yalign">0</property> | 251 | <property name="label_yalign">0</property> |
1145 | 252 | <property name="shadow_type">GTK_SHADOW_IN</property> | 252 | <property name="shadow_type">in</property> |
1146 | 253 | <property name="xalign">0.10000000149011612</property> | 253 | <property name="xalign">0.10000000149011612</property> |
1147 | 254 | <property name="yalign">0.10000000149011612</property> | 254 | <property name="yalign">0.10000000149011612</property> |
1148 | 255 | <property name="ratio">1.25</property> | 255 | <property name="ratio">1.25</property> |
1149 | @@ -262,6 +262,9 @@ | |||
1150 | 262 | </object> | 262 | </object> |
1151 | 263 | </child> | 263 | </child> |
1152 | 264 | </object> | 264 | </object> |
1153 | 265 | <packing> | ||
1154 | 266 | <property name="position">0</property> | ||
1155 | 267 | </packing> | ||
1156 | 265 | </child> | 268 | </child> |
1157 | 266 | <child> | 269 | <child> |
1158 | 267 | <object class="GtkFixed" id="fixed7"> | 270 | <object class="GtkFixed" id="fixed7"> |
1159 | @@ -278,7 +281,7 @@ | |||
1160 | 278 | <object class="GtkAspectFrame" id="aspectframe2"> | 281 | <object class="GtkAspectFrame" id="aspectframe2"> |
1161 | 279 | <property name="visible">True</property> | 282 | <property name="visible">True</property> |
1162 | 280 | <property name="label_xalign">0</property> | 283 | <property name="label_xalign">0</property> |
1164 | 281 | <property name="shadow_type">GTK_SHADOW_NONE</property> | 284 | <property name="shadow_type">none</property> |
1165 | 282 | <child> | 285 | <child> |
1166 | 283 | <object class="GtkHBox" id="hbox_acquisition"> | 286 | <object class="GtkHBox" id="hbox_acquisition"> |
1167 | 284 | <property name="height_request">51</property> | 287 | <property name="height_request">51</property> |
1168 | @@ -290,6 +293,9 @@ | |||
1169 | 290 | <property name="visible">True</property> | 293 | <property name="visible">True</property> |
1170 | 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> |
1171 | 292 | </object> | 295 | </object> |
1172 | 296 | <packing> | ||
1173 | 297 | <property name="position">0</property> | ||
1174 | 298 | </packing> | ||
1175 | 293 | </child> | 299 | </child> |
1176 | 294 | <child> | 300 | <child> |
1177 | 295 | <object class="GtkToggleButton" id="acquisition_button"> | 301 | <object class="GtkToggleButton" id="acquisition_button"> |
1178 | @@ -297,6 +303,7 @@ | |||
1179 | 297 | <property name="height_request">46</property> | 303 | <property name="height_request">46</property> |
1180 | 298 | <property name="visible">True</property> | 304 | <property name="visible">True</property> |
1181 | 299 | <property name="can_focus">True</property> | 305 | <property name="can_focus">True</property> |
1182 | 306 | <property name="receives_default">False</property> | ||
1183 | 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> |
1184 | 301 | <property name="has_tooltip">True</property> | 308 | <property name="has_tooltip">True</property> |
1185 | 302 | <property name="tooltip-text" translatable="yes">Activate/Deactivate camera preview</property> | 309 | <property name="tooltip-text" translatable="yes">Activate/Deactivate camera preview</property> |
1186 | @@ -331,12 +338,14 @@ | |||
1187 | 331 | <object class="GtkButton" id="snapshot_button"> | 338 | <object class="GtkButton" id="snapshot_button"> |
1188 | 332 | <property name="visible">True</property> | 339 | <property name="visible">True</property> |
1189 | 333 | <property name="can_focus">True</property> | 340 | <property name="can_focus">True</property> |
1190 | 341 | <property name="can_default">True</property> | ||
1191 | 342 | <property name="has_default">True</property> | ||
1192 | 334 | <property name="receives_default">True</property> | 343 | <property name="receives_default">True</property> |
1193 | 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> |
1194 | 336 | <property name="has_tooltip">True</property> | 345 | <property name="has_tooltip">True</property> |
1195 | 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> |
1196 | 338 | <signal handler="on_button_capture_clicked" name="clicked"/> | 347 | <signal handler="on_button_capture_clicked" name="clicked"/> |
1198 | 339 | <accelerator key="c" modifiers="" signal="clicked"/> | 348 | <accelerator key="c" signal="clicked"/> |
1199 | 340 | <child> | 349 | <child> |
1200 | 341 | <object class="GtkImage" id="image5"> | 350 | <object class="GtkImage" id="image5"> |
1201 | 342 | <property name="visible">True</property> | 351 | <property name="visible">True</property> |
1202 | @@ -369,28 +378,31 @@ | |||
1203 | 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> |
1204 | 370 | <child> | 379 | <child> |
1205 | 371 | <object class="GtkCheckButton" id="mixer_checkbutton"> | 380 | <object class="GtkCheckButton" id="mixer_checkbutton"> |
1206 | 381 | <property name="label" translatable="yes">Mixer</property> | ||
1207 | 372 | <property name="visible">True</property> | 382 | <property name="visible">True</property> |
1209 | 373 | <property name="can_focus">True</property> | 383 | <property name="can_focus">False</property> |
1210 | 384 | <property name="receives_default">False</property> | ||
1211 | 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> |
1212 | 375 | <property name="has_tooltip">True</property> | 386 | <property name="has_tooltip">True</property> |
1213 | 376 | <property name="tooltip-text" translatable="yes">Mixer activation (onion skin)</property> | 387 | <property name="tooltip-text" translatable="yes">Mixer activation (onion skin)</property> |
1216 | 377 | <property name="label" translatable="yes">Mixer</property> | 388 | <property name="relief">half</property> |
1215 | 378 | <property name="relief">GTK_RELIEF_HALF</property> | ||
1217 | 379 | <property name="draw_indicator">True</property> | 389 | <property name="draw_indicator">True</property> |
1218 | 380 | <signal handler="on_mixer_checkbutton_toggled" name="toggled"/> | 390 | <signal handler="on_mixer_checkbutton_toggled" name="toggled"/> |
1219 | 381 | </object> | 391 | </object> |
1220 | 392 | <packing> | ||
1221 | 393 | <property name="position">0</property> | ||
1222 | 394 | </packing> | ||
1223 | 382 | </child> | 395 | </child> |
1224 | 383 | <child> | 396 | <child> |
1225 | 384 | <object class="GtkHScale" id="alpha_hscale"> | 397 | <object class="GtkHScale" id="alpha_hscale"> |
1226 | 385 | <property name="visible">True</property> | 398 | <property name="visible">True</property> |
1227 | 386 | <property name="can_focus">True</property> | ||
1228 | 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> |
1229 | 388 | <property name="has_tooltip">True</property> | 400 | <property name="has_tooltip">True</property> |
1230 | 389 | <property name="tooltip-text" translatable="yes">Transparency level</property> | 401 | <property name="tooltip-text" translatable="yes">Transparency level</property> |
1232 | 390 | <property name="update_policy">GTK_UPDATE_DISCONTINUOUS</property> | 402 | <property name="update_policy">discontinuous</property> |
1233 | 391 | <property name="adjustment">adjustment1</property> | 403 | <property name="adjustment">adjustment1</property> |
1234 | 392 | <property name="digits">0</property> | 404 | <property name="digits">0</property> |
1236 | 393 | <property name="value_pos">GTK_POS_LEFT</property> | 405 | <property name="value_pos">left</property> |
1237 | 394 | <signal handler="on_alpha_hscale_value_changed" name="value_changed"/> | 406 | <signal handler="on_alpha_hscale_value_changed" name="value_changed"/> |
1238 | 395 | </object> | 407 | </object> |
1239 | 396 | <packing> | 408 | <packing> |
1240 | @@ -421,14 +433,16 @@ | |||
1241 | 421 | <object class="GtkLabel" id="label_fpi"> | 433 | <object class="GtkLabel" id="label_fpi"> |
1242 | 422 | <property name="visible">True</property> | 434 | <property name="visible">True</property> |
1243 | 423 | <property name="label" translatable="yes">Image per seconds</property> | 435 | <property name="label" translatable="yes">Image per seconds</property> |
1245 | 424 | <property name="justify">GTK_JUSTIFY_CENTER</property> | 436 | <property name="justify">center</property> |
1246 | 425 | </object> | 437 | </object> |
1247 | 438 | <packing> | ||
1248 | 439 | <property name="position">0</property> | ||
1249 | 440 | </packing> | ||
1250 | 426 | </child> | 441 | </child> |
1251 | 427 | <child> | 442 | <child> |
1252 | 428 | <object class="GtkHScale" id="hscale_fps"> | 443 | <object class="GtkHScale" id="hscale_fps"> |
1253 | 429 | <property name="width_request">125</property> | 444 | <property name="width_request">125</property> |
1254 | 430 | <property name="visible">True</property> | 445 | <property name="visible">True</property> |
1255 | 431 | <property name="can_focus">True</property> | ||
1256 | 432 | <property name="adjustment">adjustment2</property> | 446 | <property name="adjustment">adjustment2</property> |
1257 | 433 | <property name="digits">0</property> | 447 | <property name="digits">0</property> |
1258 | 434 | <signal handler="on_hscale_fps_value_changed" name="value_changed"/> | 448 | <signal handler="on_hscale_fps_value_changed" name="value_changed"/> |
1259 | @@ -461,6 +475,9 @@ | |||
1260 | 461 | </packing> | 475 | </packing> |
1261 | 462 | </child> | 476 | </child> |
1262 | 463 | </object> | 477 | </object> |
1263 | 478 | <packing> | ||
1264 | 479 | <property name="position">0</property> | ||
1265 | 480 | </packing> | ||
1266 | 464 | </child> | 481 | </child> |
1267 | 465 | <child> | 482 | <child> |
1268 | 466 | <object class="GtkHBox" id="hbox2"> | 483 | <object class="GtkHBox" id="hbox2"> |
1269 | @@ -472,14 +489,15 @@ | |||
1270 | 472 | <packing> | 489 | <packing> |
1271 | 473 | <property name="expand">False</property> | 490 | <property name="expand">False</property> |
1272 | 474 | <property name="fill">False</property> | 491 | <property name="fill">False</property> |
1273 | 492 | <property name="position">0</property> | ||
1274 | 475 | </packing> | 493 | </packing> |
1275 | 476 | </child> | 494 | </child> |
1276 | 477 | <child> | 495 | <child> |
1277 | 478 | <object class="GtkViewport" id="viewport2"> | 496 | <object class="GtkViewport" id="viewport2"> |
1278 | 479 | <property name="width_request">215</property> | 497 | <property name="width_request">215</property> |
1279 | 480 | <property name="visible">True</property> | 498 | <property name="visible">True</property> |
1282 | 481 | <property name="resize_mode">GTK_RESIZE_QUEUE</property> | 499 | <property name="resize_mode">queue</property> |
1283 | 482 | <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property> | 500 | <property name="shadow_type">etched-out</property> |
1284 | 483 | <child> | 501 | <child> |
1285 | 484 | <object class="GtkVBox" id="vbox5"> | 502 | <object class="GtkVBox" id="vbox5"> |
1286 | 485 | <property name="width_request">215</property> | 503 | <property name="width_request">215</property> |
1287 | @@ -489,16 +507,18 @@ | |||
1288 | 489 | <property name="width_request">215</property> | 507 | <property name="width_request">215</property> |
1289 | 490 | <property name="visible">True</property> | 508 | <property name="visible">True</property> |
1290 | 491 | <property name="can_focus">True</property> | 509 | <property name="can_focus">True</property> |
1294 | 492 | <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> | 510 | <property name="hscrollbar_policy">automatic</property> |
1295 | 493 | <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> | 511 | <property name="vscrollbar_policy">automatic</property> |
1296 | 494 | <property name="shadow_type">GTK_SHADOW_IN</property> | 512 | <property name="shadow_type">in</property> |
1297 | 495 | <child> | 513 | <child> |
1298 | 496 | <object class="GtkTreeView" id="treeview_capture"> | 514 | <object class="GtkTreeView" id="treeview_capture"> |
1299 | 497 | <property name="visible">True</property> | 515 | <property name="visible">True</property> |
1300 | 498 | <property name="can_focus">True</property> | ||
1301 | 499 | </object> | 516 | </object> |
1302 | 500 | </child> | 517 | </child> |
1303 | 501 | </object> | 518 | </object> |
1304 | 519 | <packing> | ||
1305 | 520 | <property name="position">0</property> | ||
1306 | 521 | </packing> | ||
1307 | 502 | </child> | 522 | </child> |
1308 | 503 | <child> | 523 | <child> |
1309 | 504 | <object class="GtkVBox" id="vbox6"> | 524 | <object class="GtkVBox" id="vbox6"> |
1310 | @@ -511,6 +531,7 @@ | |||
1311 | 511 | <packing> | 531 | <packing> |
1312 | 512 | <property name="expand">False</property> | 532 | <property name="expand">False</property> |
1313 | 513 | <property name="fill">False</property> | 533 | <property name="fill">False</property> |
1314 | 534 | <property name="position">0</property> | ||
1315 | 514 | </packing> | 535 | </packing> |
1316 | 515 | </child> | 536 | </child> |
1317 | 516 | <child> | 537 | <child> |
1318 | @@ -521,14 +542,17 @@ | |||
1319 | 521 | <object class="GtkFixed" id="fixed3"> | 542 | <object class="GtkFixed" id="fixed3"> |
1320 | 522 | <property name="visible">True</property> | 543 | <property name="visible">True</property> |
1321 | 523 | </object> | 544 | </object> |
1322 | 545 | <packing> | ||
1323 | 546 | <property name="position">0</property> | ||
1324 | 547 | </packing> | ||
1325 | 524 | </child> | 548 | </child> |
1326 | 525 | <child> | 549 | <child> |
1327 | 526 | <object class="GtkButton" id="button_import"> | 550 | <object class="GtkButton" id="button_import"> |
1328 | 527 | <property name="width_request">45</property> | 551 | <property name="width_request">45</property> |
1329 | 528 | <property name="height_request">45</property> | 552 | <property name="height_request">45</property> |
1330 | 529 | <property name="visible">True</property> | 553 | <property name="visible">True</property> |
1333 | 530 | <property name="can_focus">True</property> | 554 | <property name="can_focus">False</property> |
1334 | 531 | <property name="receives_default">True</property> | 555 | <property name="receives_default">False</property> |
1335 | 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> |
1336 | 533 | <property name="has_tooltip">True</property> | 557 | <property name="has_tooltip">True</property> |
1337 | 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> |
1338 | @@ -538,7 +562,7 @@ | |||
1339 | 538 | <property name="visible">True</property> | 562 | <property name="visible">True</property> |
1340 | 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> |
1341 | 540 | <property name="stock">gtk-add</property> | 564 | <property name="stock">gtk-add</property> |
1343 | 541 | <property name="icon_size">5</property> | 565 | <property name="icon-size">5</property> |
1344 | 542 | </object> | 566 | </object> |
1345 | 543 | </child> | 567 | </child> |
1346 | 544 | </object> | 568 | </object> |
1347 | @@ -560,8 +584,8 @@ | |||
1348 | 560 | <object class="GtkButton" id="button_trash_capture"> | 584 | <object class="GtkButton" id="button_trash_capture"> |
1349 | 561 | <property name="width_request">45</property> | 585 | <property name="width_request">45</property> |
1350 | 562 | <property name="height_request">45</property> | 586 | <property name="height_request">45</property> |
1353 | 563 | <property name="can_focus">True</property> | 587 | <property name="can_focus">False</property> |
1354 | 564 | <property name="receives_default">True</property> | 588 | <property name="receives_default">False</property> |
1355 | 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> |
1356 | 566 | <property comments="Jeter à la poubelle" name="tooltip-text" translatable="yes">To trash</property> | 590 | <property comments="Jeter à la poubelle" name="tooltip-text" translatable="yes">To trash</property> |
1357 | 567 | <signal handler="on_button_trash_capture_clicked" name="clicked"/> | 591 | <signal handler="on_button_trash_capture_clicked" name="clicked"/> |
1358 | @@ -570,7 +594,7 @@ | |||
1359 | 570 | <property name="visible">True</property> | 594 | <property name="visible">True</property> |
1360 | 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> |
1361 | 572 | <property name="stock">gtk-delete</property> | 596 | <property name="stock">gtk-delete</property> |
1363 | 573 | <property name="icon_size">5</property> | 597 | <property name="icon-size">5</property> |
1364 | 574 | </object> | 598 | </object> |
1365 | 575 | </child> | 599 | </child> |
1366 | 576 | </object> | 600 | </object> |
1367 | @@ -593,8 +617,8 @@ | |||
1368 | 593 | <property name="width_request">45</property> | 617 | <property name="width_request">45</property> |
1369 | 594 | <property name="height_request">45</property> | 618 | <property name="height_request">45</property> |
1370 | 595 | <property name="visible">True</property> | 619 | <property name="visible">True</property> |
1373 | 596 | <property name="can_focus">True</property> | 620 | <property name="can_focus">False</property> |
1374 | 597 | <property name="receives_default">True</property> | 621 | <property name="receives_default">False</property> |
1375 | 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> |
1376 | 599 | <property comments="Déplacer des images capturées dans la zone de montage" name="tooltip-text" translatable="yes">Move snapshot to montage area</property> | 623 | <property comments="Déplacer des images capturées dans la zone de montage" name="tooltip-text" translatable="yes">Move snapshot to montage area</property> |
1377 | 600 | <signal handler="on_button_capture_to_montage_clicked" name="clicked"/> | 624 | <signal handler="on_button_capture_to_montage_clicked" name="clicked"/> |
1378 | @@ -603,7 +627,7 @@ | |||
1379 | 603 | <property name="visible">True</property> | 627 | <property name="visible">True</property> |
1380 | 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> |
1381 | 605 | <property name="stock">gtk-go-forward</property> | 629 | <property name="stock">gtk-go-forward</property> |
1383 | 606 | <property name="icon_size">5</property> | 630 | <property name="icon-size">5</property> |
1384 | 607 | </object> | 631 | </object> |
1385 | 608 | </child> | 632 | </child> |
1386 | 609 | </object> | 633 | </object> |
1387 | @@ -643,7 +667,7 @@ | |||
1388 | 643 | <packing> | 667 | <packing> |
1389 | 644 | <property name="expand">False</property> | 668 | <property name="expand">False</property> |
1390 | 645 | <property name="fill">False</property> | 669 | <property name="fill">False</property> |
1392 | 646 | <property name="pack_type">GTK_PACK_END</property> | 670 | <property name="pack_type">end</property> |
1393 | 647 | <property name="position">1</property> | 671 | <property name="position">1</property> |
1394 | 648 | </packing> | 672 | </packing> |
1395 | 649 | </child> | 673 | </child> |
1396 | @@ -672,8 +696,8 @@ | |||
1397 | 672 | <object class="GtkViewport" id="viewport1"> | 696 | <object class="GtkViewport" id="viewport1"> |
1398 | 673 | <property name="width_request">215</property> | 697 | <property name="width_request">215</property> |
1399 | 674 | <property name="visible">True</property> | 698 | <property name="visible">True</property> |
1402 | 675 | <property name="resize_mode">GTK_RESIZE_QUEUE</property> | 699 | <property name="resize_mode">queue</property> |
1403 | 676 | <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property> | 700 | <property name="shadow_type">etched-out</property> |
1404 | 677 | <child> | 701 | <child> |
1405 | 678 | <object class="GtkVBox" id="vbox7"> | 702 | <object class="GtkVBox" id="vbox7"> |
1406 | 679 | <property name="width_request">215</property> | 703 | <property name="width_request">215</property> |
1407 | @@ -683,9 +707,9 @@ | |||
1408 | 683 | <property name="width_request">215</property> | 707 | <property name="width_request">215</property> |
1409 | 684 | <property name="visible">True</property> | 708 | <property name="visible">True</property> |
1410 | 685 | <property name="can_focus">True</property> | 709 | <property name="can_focus">True</property> |
1414 | 686 | <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> | 710 | <property name="hscrollbar_policy">automatic</property> |
1415 | 687 | <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> | 711 | <property name="vscrollbar_policy">automatic</property> |
1416 | 688 | <property name="shadow_type">GTK_SHADOW_IN</property> | 712 | <property name="shadow_type">in</property> |
1417 | 689 | <child> | 713 | <child> |
1418 | 690 | <object class="GtkTreeView" id="treeview_montage"> | 714 | <object class="GtkTreeView" id="treeview_montage"> |
1419 | 691 | <property name="visible">True</property> | 715 | <property name="visible">True</property> |
1420 | @@ -693,6 +717,9 @@ | |||
1421 | 693 | </object> | 717 | </object> |
1422 | 694 | </child> | 718 | </child> |
1423 | 695 | </object> | 719 | </object> |
1424 | 720 | <packing> | ||
1425 | 721 | <property name="position">0</property> | ||
1426 | 722 | </packing> | ||
1427 | 696 | </child> | 723 | </child> |
1428 | 697 | <child> | 724 | <child> |
1429 | 698 | <object class="GtkVBox" id="vbox3"> | 725 | <object class="GtkVBox" id="vbox3"> |
1430 | @@ -705,6 +732,7 @@ | |||
1431 | 705 | <packing> | 732 | <packing> |
1432 | 706 | <property name="expand">False</property> | 733 | <property name="expand">False</property> |
1433 | 707 | <property name="fill">False</property> | 734 | <property name="fill">False</property> |
1434 | 735 | <property name="position">0</property> | ||
1435 | 708 | </packing> | 736 | </packing> |
1436 | 709 | </child> | 737 | </child> |
1437 | 710 | <child> | 738 | <child> |
1438 | @@ -715,14 +743,17 @@ | |||
1439 | 715 | <object class="GtkFixed" id="fixed17"> | 743 | <object class="GtkFixed" id="fixed17"> |
1440 | 716 | <property name="visible">True</property> | 744 | <property name="visible">True</property> |
1441 | 717 | </object> | 745 | </object> |
1442 | 746 | <packing> | ||
1443 | 747 | <property name="position">0</property> | ||
1444 | 748 | </packing> | ||
1445 | 718 | </child> | 749 | </child> |
1446 | 719 | <child> | 750 | <child> |
1447 | 720 | <object class="GtkButton" id="button_up"> | 751 | <object class="GtkButton" id="button_up"> |
1448 | 721 | <property name="width_request">45</property> | 752 | <property name="width_request">45</property> |
1449 | 722 | <property name="height_request">45</property> | 753 | <property name="height_request">45</property> |
1450 | 723 | <property name="visible">True</property> | 754 | <property name="visible">True</property> |
1453 | 724 | <property name="can_focus">True</property> | 755 | <property name="can_focus">False</property> |
1454 | 725 | <property name="receives_default">True</property> | 756 | <property name="receives_default">False</property> |
1455 | 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> |
1456 | 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> |
1457 | 728 | <signal handler="on_button_up_clicked" name="clicked"/> | 759 | <signal handler="on_button_up_clicked" name="clicked"/> |
1458 | @@ -731,7 +762,7 @@ | |||
1459 | 731 | <property name="visible">True</property> | 762 | <property name="visible">True</property> |
1460 | 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> |
1461 | 733 | <property name="stock">gtk-go-up</property> | 764 | <property name="stock">gtk-go-up</property> |
1463 | 734 | <property name="icon_size">5</property> | 765 | <property name="icon-size">5</property> |
1464 | 735 | </object> | 766 | </object> |
1465 | 736 | </child> | 767 | </child> |
1466 | 737 | </object> | 768 | </object> |
1467 | @@ -754,8 +785,8 @@ | |||
1468 | 754 | <property name="width_request">45</property> | 785 | <property name="width_request">45</property> |
1469 | 755 | <property name="height_request">45</property> | 786 | <property name="height_request">45</property> |
1470 | 756 | <property name="visible">True</property> | 787 | <property name="visible">True</property> |
1473 | 757 | <property name="can_focus">True</property> | 788 | <property name="can_focus">False</property> |
1474 | 758 | <property name="receives_default">True</property> | 789 | <property name="receives_default">False</property> |
1475 | 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> |
1476 | 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> |
1477 | 761 | <signal handler="on_button_down_clicked" name="clicked"/> | 792 | <signal handler="on_button_down_clicked" name="clicked"/> |
1478 | @@ -764,7 +795,7 @@ | |||
1479 | 764 | <property name="visible">True</property> | 795 | <property name="visible">True</property> |
1480 | 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> |
1481 | 766 | <property name="stock">gtk-go-down</property> | 797 | <property name="stock">gtk-go-down</property> |
1483 | 767 | <property name="icon_size">5</property> | 798 | <property name="icon-size">5</property> |
1484 | 768 | </object> | 799 | </object> |
1485 | 769 | </child> | 800 | </child> |
1486 | 770 | </object> | 801 | </object> |
1487 | @@ -787,8 +818,8 @@ | |||
1488 | 787 | <property name="width_request">45</property> | 818 | <property name="width_request">45</property> |
1489 | 788 | <property name="height_request">45</property> | 819 | <property name="height_request">45</property> |
1490 | 789 | <property name="visible">True</property> | 820 | <property name="visible">True</property> |
1493 | 790 | <property name="can_focus">True</property> | 821 | <property name="can_focus">False</property> |
1494 | 791 | <property name="receives_default">True</property> | 822 | <property name="receives_default">False</property> |
1495 | 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> |
1496 | 793 | <property comments="Jeter à la poubelle" name="tooltip-text" translatable="yes">To trash</property> | 824 | <property comments="Jeter à la poubelle" name="tooltip-text" translatable="yes">To trash</property> |
1497 | 794 | <signal handler="on_button_trash_clicked" name="clicked"/> | 825 | <signal handler="on_button_trash_clicked" name="clicked"/> |
1498 | @@ -797,7 +828,7 @@ | |||
1499 | 797 | <property name="visible">True</property> | 828 | <property name="visible">True</property> |
1500 | 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> |
1501 | 799 | <property name="stock">gtk-delete</property> | 830 | <property name="stock">gtk-delete</property> |
1503 | 800 | <property name="icon_size">5</property> | 831 | <property name="icon-size">5</property> |
1504 | 801 | </object> | 832 | </object> |
1505 | 802 | </child> | 833 | </child> |
1506 | 803 | </object> | 834 | </object> |
1507 | @@ -820,15 +851,15 @@ | |||
1508 | 820 | <property name="width_request">45</property> | 851 | <property name="width_request">45</property> |
1509 | 821 | <property name="height_request">45</property> | 852 | <property name="height_request">45</property> |
1510 | 822 | <property name="visible">True</property> | 853 | <property name="visible">True</property> |
1513 | 823 | <property name="can_focus">True</property> | 854 | <property name="can_focus">False</property> |
1514 | 824 | <property name="receives_default">True</property> | 855 | <property name="receives_default">False</property> |
1515 | 825 | <property name="tooltip-text" translatable="yes">Play video</property> | 856 | <property name="tooltip-text" translatable="yes">Play video</property> |
1516 | 826 | <signal handler="on_button_play_toggled" name="toggled"/> | 857 | <signal handler="on_button_play_toggled" name="toggled"/> |
1517 | 827 | <child> | 858 | <child> |
1518 | 828 | <object class="GtkImage" id="image_play_pause"> | 859 | <object class="GtkImage" id="image_play_pause"> |
1519 | 829 | <property name="visible">True</property> | 860 | <property name="visible">True</property> |
1520 | 830 | <property name="stock">gtk-media-play</property> | 861 | <property name="stock">gtk-media-play</property> |
1522 | 831 | <property name="icon_size">5</property> | 862 | <property name="icon-size">5</property> |
1523 | 832 | </object> | 863 | </object> |
1524 | 833 | </child> | 864 | </child> |
1525 | 834 | </object> | 865 | </object> |
1526 | @@ -866,7 +897,7 @@ | |||
1527 | 866 | <packing> | 897 | <packing> |
1528 | 867 | <property name="expand">False</property> | 898 | <property name="expand">False</property> |
1529 | 868 | <property name="fill">False</property> | 899 | <property name="fill">False</property> |
1531 | 869 | <property name="pack_type">GTK_PACK_END</property> | 900 | <property name="pack_type">end</property> |
1532 | 870 | <property name="position">1</property> | 901 | <property name="position">1</property> |
1533 | 871 | </packing> | 902 | </packing> |
1534 | 872 | </child> | 903 | </child> |
1535 | @@ -910,6 +941,9 @@ | |||
1536 | 910 | <property name="visible">True</property> | 941 | <property name="visible">True</property> |
1537 | 911 | <property name="spacing">2</property> | 942 | <property name="spacing">2</property> |
1538 | 912 | </object> | 943 | </object> |
1539 | 944 | <packing> | ||
1540 | 945 | <property name="position">0</property> | ||
1541 | 946 | </packing> | ||
1542 | 913 | </child> | 947 | </child> |
1543 | 914 | <child> | 948 | <child> |
1544 | 915 | <object class="GtkProgressBar" id="progressbar_status"> | 949 | <object class="GtkProgressBar" id="progressbar_status"> |
1545 | @@ -936,8 +970,8 @@ | |||
1546 | 936 | <object class="GtkFileChooserDialog" id="filechooserdialog_open"> | 970 | <object class="GtkFileChooserDialog" id="filechooserdialog_open"> |
1547 | 937 | <property name="border_width">5</property> | 971 | <property name="border_width">5</property> |
1548 | 938 | <property name="title" translatable="yes">Select a Luciole project</property> | 972 | <property name="title" translatable="yes">Select a Luciole project</property> |
1551 | 939 | <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> | 973 | <property name="window_position">center-on-parent</property> |
1552 | 940 | <property name="type_hint">GDK_WINDOW_TYPE_HINT_MENU</property> | 974 | <property name="type_hint">menu</property> |
1553 | 941 | <property name="has_separator">False</property> | 975 | <property name="has_separator">False</property> |
1554 | 942 | <child internal-child="vbox"> | 976 | <child internal-child="vbox"> |
1555 | 943 | <object class="GtkVBox" id="dialog-vbox1"> | 977 | <object class="GtkVBox" id="dialog-vbox1"> |
1556 | @@ -949,7 +983,7 @@ | |||
1557 | 949 | <child internal-child="action_area"> | 983 | <child internal-child="action_area"> |
1558 | 950 | <object class="GtkHButtonBox" id="dialog-action_area1"> | 984 | <object class="GtkHButtonBox" id="dialog-action_area1"> |
1559 | 951 | <property name="visible">True</property> | 985 | <property name="visible">True</property> |
1561 | 952 | <property name="layout_style">GTK_BUTTONBOX_END</property> | 986 | <property name="layout_style">end</property> |
1562 | 953 | <child> | 987 | <child> |
1563 | 954 | <placeholder/> | 988 | <placeholder/> |
1564 | 955 | </child> | 989 | </child> |
1565 | @@ -959,7 +993,8 @@ | |||
1566 | 959 | </object> | 993 | </object> |
1567 | 960 | <packing> | 994 | <packing> |
1568 | 961 | <property name="expand">False</property> | 995 | <property name="expand">False</property> |
1570 | 962 | <property name="pack_type">GTK_PACK_END</property> | 996 | <property name="pack_type">end</property> |
1571 | 997 | <property name="position">0</property> | ||
1572 | 963 | </packing> | 998 | </packing> |
1573 | 964 | </child> | 999 | </child> |
1574 | 965 | </object> | 1000 | </object> |
1575 | @@ -970,8 +1005,8 @@ | |||
1576 | 970 | <property name="border_width">5</property> | 1005 | <property name="border_width">5</property> |
1577 | 971 | <property name="title" translatable="yes">About Luciole</property> | 1006 | <property name="title" translatable="yes">About Luciole</property> |
1578 | 972 | <property name="resizable">False</property> | 1007 | <property name="resizable">False</property> |
1581 | 973 | <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> | 1008 | <property name="window_position">center-on-parent</property> |
1582 | 974 | <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> | 1009 | <property name="type_hint">dialog</property> |
1583 | 975 | <property name="has_separator">False</property> | 1010 | <property name="has_separator">False</property> |
1584 | 976 | <property name="program_name">Luciole</property> | 1011 | <property name="program_name">Luciole</property> |
1585 | 977 | <property name="version">0.7</property> | 1012 | <property name="version">0.7</property> |
1586 | @@ -1015,11 +1050,12 @@ | |||
1587 | 1015 | <object class="GtkHButtonBox" id="dialog-action_area9"> | 1050 | <object class="GtkHButtonBox" id="dialog-action_area9"> |
1588 | 1016 | <property name="visible">True</property> | 1051 | <property name="visible">True</property> |
1589 | 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> |
1591 | 1018 | <property name="layout_style">GTK_BUTTONBOX_END</property> | 1053 | <property name="layout_style">end</property> |
1592 | 1019 | </object> | 1054 | </object> |
1593 | 1020 | <packing> | 1055 | <packing> |
1594 | 1021 | <property name="expand">False</property> | 1056 | <property name="expand">False</property> |
1596 | 1022 | <property name="pack_type">GTK_PACK_END</property> | 1057 | <property name="pack_type">end</property> |
1597 | 1058 | <property name="position">0</property> | ||
1598 | 1023 | </packing> | 1059 | </packing> |
1599 | 1024 | </child> | 1060 | </child> |
1600 | 1025 | </object> | 1061 | </object> |
1601 | @@ -1028,8 +1064,9 @@ | |||
1602 | 1028 | <object class="GtkDialog" id="export1"> | 1064 | <object class="GtkDialog" id="export1"> |
1603 | 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> |
1604 | 1030 | <property name="border_width">5</property> | 1066 | <property name="border_width">5</property> |
1607 | 1031 | <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> | 1067 | <property name="title" translatable="yes">Video Export</property> |
1608 | 1032 | <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> | 1068 | <property name="window_position">center-on-parent</property> |
1609 | 1069 | <property name="type_hint">dialog</property> | ||
1610 | 1033 | <property name="has_separator">False</property> | 1070 | <property name="has_separator">False</property> |
1611 | 1034 | <child internal-child="vbox"> | 1071 | <child internal-child="vbox"> |
1612 | 1035 | <object class="GtkVBox" id="dialog-vbox11"> | 1072 | <object class="GtkVBox" id="dialog-vbox11"> |
1613 | @@ -1053,6 +1090,7 @@ | |||
1614 | 1053 | <packing> | 1090 | <packing> |
1615 | 1054 | <property name="expand">False</property> | 1091 | <property name="expand">False</property> |
1616 | 1055 | <property name="fill">False</property> | 1092 | <property name="fill">False</property> |
1617 | 1093 | <property name="position">0</property> | ||
1618 | 1056 | </packing> | 1094 | </packing> |
1619 | 1057 | </child> | 1095 | </child> |
1620 | 1058 | <child> | 1096 | <child> |
1621 | @@ -1065,6 +1103,9 @@ | |||
1622 | 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> |
1623 | 1066 | <property name="label" translatable="yes">Choose export format.</property> | 1104 | <property name="label" translatable="yes">Choose export format.</property> |
1624 | 1067 | </object> | 1105 | </object> |
1625 | 1106 | <packing> | ||
1626 | 1107 | <property name="position">0</property> | ||
1627 | 1108 | </packing> | ||
1628 | 1068 | </child> | 1109 | </child> |
1629 | 1069 | <child> | 1110 | <child> |
1630 | 1070 | <object class="GtkFixed" id="fixed37"> | 1111 | <object class="GtkFixed" id="fixed37"> |
1631 | @@ -1089,7 +1130,7 @@ | |||
1632 | 1089 | <object class="GtkViewport" id="viewport4"> | 1130 | <object class="GtkViewport" id="viewport4"> |
1633 | 1090 | <property name="visible">True</property> | 1131 | <property name="visible">True</property> |
1634 | 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> |
1636 | 1092 | <property name="resize_mode">GTK_RESIZE_QUEUE</property> | 1133 | <property name="resize_mode">queue</property> |
1637 | 1093 | <child> | 1134 | <child> |
1638 | 1094 | <object class="GtkVBox" id="vbox15"> | 1135 | <object class="GtkVBox" id="vbox15"> |
1639 | 1095 | <property name="visible">True</property> | 1136 | <property name="visible">True</property> |
1640 | @@ -1107,6 +1148,7 @@ | |||
1641 | 1107 | <packing> | 1148 | <packing> |
1642 | 1108 | <property name="expand">False</property> | 1149 | <property name="expand">False</property> |
1643 | 1109 | <property name="fill">False</property> | 1150 | <property name="fill">False</property> |
1644 | 1151 | <property name="position">0</property> | ||
1645 | 1110 | </packing> | 1152 | </packing> |
1646 | 1111 | </child> | 1153 | </child> |
1647 | 1112 | <child> | 1154 | <child> |
1648 | @@ -1150,6 +1192,7 @@ | |||
1649 | 1150 | <property name="expand">False</property> | 1192 | <property name="expand">False</property> |
1650 | 1151 | <property name="fill">False</property> | 1193 | <property name="fill">False</property> |
1651 | 1152 | <property name="padding">10</property> | 1194 | <property name="padding">10</property> |
1652 | 1195 | <property name="position">0</property> | ||
1653 | 1153 | </packing> | 1196 | </packing> |
1654 | 1154 | </child> | 1197 | </child> |
1655 | 1155 | <child> | 1198 | <child> |
1656 | @@ -1165,6 +1208,7 @@ | |||
1657 | 1165 | <packing> | 1208 | <packing> |
1658 | 1166 | <property name="expand">False</property> | 1209 | <property name="expand">False</property> |
1659 | 1167 | <property name="fill">False</property> | 1210 | <property name="fill">False</property> |
1660 | 1211 | <property name="position">0</property> | ||
1661 | 1168 | </packing> | 1212 | </packing> |
1662 | 1169 | </child> | 1213 | </child> |
1663 | 1170 | <child> | 1214 | <child> |
1664 | @@ -1213,7 +1257,7 @@ | |||
1665 | 1213 | <packing> | 1257 | <packing> |
1666 | 1214 | <property name="expand">False</property> | 1258 | <property name="expand">False</property> |
1667 | 1215 | <property name="fill">False</property> | 1259 | <property name="fill">False</property> |
1669 | 1216 | <property name="pack_type">GTK_PACK_END</property> | 1260 | <property name="pack_type">end</property> |
1670 | 1217 | <property name="position">3</property> | 1261 | <property name="position">3</property> |
1671 | 1218 | </packing> | 1262 | </packing> |
1672 | 1219 | </child> | 1263 | </child> |
1673 | @@ -1241,6 +1285,7 @@ | |||
1674 | 1241 | <packing> | 1285 | <packing> |
1675 | 1242 | <property name="expand">False</property> | 1286 | <property name="expand">False</property> |
1676 | 1243 | <property name="fill">False</property> | 1287 | <property name="fill">False</property> |
1677 | 1288 | <property name="position">0</property> | ||
1678 | 1244 | </packing> | 1289 | </packing> |
1679 | 1245 | </child> | 1290 | </child> |
1680 | 1246 | <child> | 1291 | <child> |
1681 | @@ -1268,6 +1313,9 @@ | |||
1682 | 1268 | </packing> | 1313 | </packing> |
1683 | 1269 | </child> | 1314 | </child> |
1684 | 1270 | </object> | 1315 | </object> |
1685 | 1316 | <packing> | ||
1686 | 1317 | <property name="position">0</property> | ||
1687 | 1318 | </packing> | ||
1688 | 1271 | </child> | 1319 | </child> |
1689 | 1272 | <child> | 1320 | <child> |
1690 | 1273 | <object class="GtkHBox" id="hbox21"> | 1321 | <object class="GtkHBox" id="hbox21"> |
1691 | @@ -1282,6 +1330,7 @@ | |||
1692 | 1282 | <packing> | 1330 | <packing> |
1693 | 1283 | <property name="expand">False</property> | 1331 | <property name="expand">False</property> |
1694 | 1284 | <property name="fill">False</property> | 1332 | <property name="fill">False</property> |
1695 | 1333 | <property name="position">0</property> | ||
1696 | 1285 | </packing> | 1334 | </packing> |
1697 | 1286 | </child> | 1335 | </child> |
1698 | 1287 | <child> | 1336 | <child> |
1699 | @@ -1301,7 +1350,7 @@ | |||
1700 | 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> |
1701 | 1302 | <property name="use_preview_label">False</property> | 1351 | <property name="use_preview_label">False</property> |
1702 | 1303 | <property name="do_overwrite_confirmation">True</property> | 1352 | <property name="do_overwrite_confirmation">True</property> |
1704 | 1304 | <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property> | 1353 | <property name="action">select-folder</property> |
1705 | 1305 | <property name="title" translatable="yes">Select a folder</property> | 1354 | <property name="title" translatable="yes">Select a folder</property> |
1706 | 1306 | </object> | 1355 | </object> |
1707 | 1307 | <packing> | 1356 | <packing> |
1708 | @@ -1314,7 +1363,7 @@ | |||
1709 | 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> |
1710 | 1315 | </object> | 1364 | </object> |
1711 | 1316 | <packing> | 1365 | <packing> |
1713 | 1317 | <property name="pack_type">GTK_PACK_END</property> | 1366 | <property name="pack_type">end</property> |
1714 | 1318 | <property name="position">3</property> | 1367 | <property name="position">3</property> |
1715 | 1319 | </packing> | 1368 | </packing> |
1716 | 1320 | </child> | 1369 | </child> |
1717 | @@ -1364,14 +1413,16 @@ | |||
1718 | 1364 | <packing> | 1413 | <packing> |
1719 | 1365 | <property name="expand">False</property> | 1414 | <property name="expand">False</property> |
1720 | 1366 | <property name="fill">False</property> | 1415 | <property name="fill">False</property> |
1721 | 1416 | <property name="position">0</property> | ||
1722 | 1367 | </packing> | 1417 | </packing> |
1723 | 1368 | </child> | 1418 | </child> |
1724 | 1369 | <child> | 1419 | <child> |
1725 | 1370 | <object class="GtkCheckButton" id="checkbutton1"> | 1420 | <object class="GtkCheckButton" id="checkbutton1"> |
1726 | 1421 | <property name="label" translatable="yes">Export video with sound.</property> | ||
1727 | 1371 | <property name="visible">True</property> | 1422 | <property name="visible">True</property> |
1728 | 1372 | <property name="can_focus">True</property> | 1423 | <property name="can_focus">True</property> |
1729 | 1424 | <property name="receives_default">False</property> | ||
1730 | 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> |
1731 | 1374 | <property name="label" translatable="yes">Export video with sound.</property> | ||
1732 | 1375 | <property name="draw_indicator">True</property> | 1426 | <property name="draw_indicator">True</property> |
1733 | 1376 | </object> | 1427 | </object> |
1734 | 1377 | <packing> | 1428 | <packing> |
1735 | @@ -1382,6 +1433,9 @@ | |||
1736 | 1382 | <placeholder/> | 1433 | <placeholder/> |
1737 | 1383 | </child> | 1434 | </child> |
1738 | 1384 | </object> | 1435 | </object> |
1739 | 1436 | <packing> | ||
1740 | 1437 | <property name="position">0</property> | ||
1741 | 1438 | </packing> | ||
1742 | 1385 | </child> | 1439 | </child> |
1743 | 1386 | <child> | 1440 | <child> |
1744 | 1387 | <object class="GtkFixed" id="fixed61"> | 1441 | <object class="GtkFixed" id="fixed61"> |
1745 | @@ -1417,7 +1471,7 @@ | |||
1746 | 1417 | </object> | 1471 | </object> |
1747 | 1418 | <packing> | 1472 | <packing> |
1748 | 1419 | <property name="expand">False</property> | 1473 | <property name="expand">False</property> |
1750 | 1420 | <property name="pack_type">GTK_PACK_END</property> | 1474 | <property name="pack_type">end</property> |
1751 | 1421 | <property name="position">5</property> | 1475 | <property name="position">5</property> |
1752 | 1422 | </packing> | 1476 | </packing> |
1753 | 1423 | </child> | 1477 | </child> |
1754 | @@ -1440,6 +1494,9 @@ | |||
1755 | 1440 | </packing> | 1494 | </packing> |
1756 | 1441 | </child> | 1495 | </child> |
1757 | 1442 | </object> | 1496 | </object> |
1758 | 1497 | <packing> | ||
1759 | 1498 | <property name="position">0</property> | ||
1760 | 1499 | </packing> | ||
1761 | 1443 | </child> | 1500 | </child> |
1762 | 1444 | </object> | 1501 | </object> |
1763 | 1445 | <packing> | 1502 | <packing> |
1764 | @@ -1450,53 +1507,62 @@ | |||
1765 | 1450 | <object class="GtkHButtonBox" id="dialog-action_area11"> | 1507 | <object class="GtkHButtonBox" id="dialog-action_area11"> |
1766 | 1451 | <property name="visible">True</property> | 1508 | <property name="visible">True</property> |
1767 | 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> |
1769 | 1453 | <property name="layout_style">GTK_BUTTONBOX_END</property> | 1510 | <property name="layout_style">end</property> |
1770 | 1454 | <child> | 1511 | <child> |
1771 | 1455 | <object class="GtkButton" id="button13"> | 1512 | <object class="GtkButton" id="button13"> |
1772 | 1456 | <property name="visible">True</property> | ||
1773 | 1457 | <property name="can_focus">True</property> | ||
1774 | 1458 | <property name="receives_default">True</property> | ||
1775 | 1459 | <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> | ||
1776 | 1460 | <property name="label" translatable="yes">gtk-cancel</property> | 1513 | <property name="label" translatable="yes">gtk-cancel</property> |
1777 | 1514 | <property name="visible">True</property> | ||
1778 | 1515 | <property name="can_focus">True</property> | ||
1779 | 1516 | <property name="receives_default">True</property> | ||
1780 | 1517 | <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> | ||
1781 | 1461 | <property name="use_stock">True</property> | 1518 | <property name="use_stock">True</property> |
1782 | 1462 | </object> | 1519 | </object> |
1783 | 1520 | <packing> | ||
1784 | 1521 | <property name="expand">False</property> | ||
1785 | 1522 | <property name="fill">False</property> | ||
1786 | 1523 | <property name="position">0</property> | ||
1787 | 1524 | </packing> | ||
1788 | 1463 | </child> | 1525 | </child> |
1789 | 1464 | <child> | 1526 | <child> |
1790 | 1465 | <object class="GtkButton" id="button16"> | 1527 | <object class="GtkButton" id="button16"> |
1791 | 1466 | <property name="visible">True</property> | ||
1792 | 1467 | <property name="can_focus">True</property> | ||
1793 | 1468 | <property name="receives_default">True</property> | ||
1794 | 1469 | <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> | ||
1795 | 1470 | <property name="label" translatable="yes">gtk-apply</property> | 1528 | <property name="label" translatable="yes">gtk-apply</property> |
1796 | 1529 | <property name="visible">True</property> | ||
1797 | 1530 | <property name="can_focus">True</property> | ||
1798 | 1531 | <property name="receives_default">True</property> | ||
1799 | 1532 | <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> | ||
1800 | 1471 | <property name="use_stock">True</property> | 1533 | <property name="use_stock">True</property> |
1801 | 1472 | </object> | 1534 | </object> |
1802 | 1473 | <packing> | 1535 | <packing> |
1803 | 1536 | <property name="expand">False</property> | ||
1804 | 1537 | <property name="fill">False</property> | ||
1805 | 1474 | <property name="position">1</property> | 1538 | <property name="position">1</property> |
1806 | 1475 | </packing> | 1539 | </packing> |
1807 | 1476 | </child> | 1540 | </child> |
1808 | 1477 | <child> | 1541 | <child> |
1809 | 1478 | <object class="GtkButton" id="button18"> | 1542 | <object class="GtkButton" id="button18"> |
1810 | 1479 | <property name="visible">True</property> | ||
1811 | 1480 | <property name="can_focus">True</property> | ||
1812 | 1481 | <property name="receives_default">True</property> | ||
1813 | 1482 | <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> | ||
1814 | 1483 | <property name="label" translatable="yes">gtk-close</property> | 1543 | <property name="label" translatable="yes">gtk-close</property> |
1815 | 1544 | <property name="visible">True</property> | ||
1816 | 1545 | <property name="can_focus">True</property> | ||
1817 | 1546 | <property name="receives_default">True</property> | ||
1818 | 1547 | <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> | ||
1819 | 1484 | <property name="use_stock">True</property> | 1548 | <property name="use_stock">True</property> |
1820 | 1485 | </object> | 1549 | </object> |
1821 | 1486 | <packing> | 1550 | <packing> |
1822 | 1551 | <property name="expand">False</property> | ||
1823 | 1552 | <property name="fill">False</property> | ||
1824 | 1487 | <property name="position">2</property> | 1553 | <property name="position">2</property> |
1825 | 1488 | </packing> | 1554 | </packing> |
1826 | 1489 | </child> | 1555 | </child> |
1827 | 1490 | </object> | 1556 | </object> |
1828 | 1491 | <packing> | 1557 | <packing> |
1829 | 1492 | <property name="expand">False</property> | 1558 | <property name="expand">False</property> |
1831 | 1493 | <property name="pack_type">GTK_PACK_END</property> | 1559 | <property name="pack_type">end</property> |
1832 | 1560 | <property name="position">0</property> | ||
1833 | 1494 | </packing> | 1561 | </packing> |
1834 | 1495 | </child> | 1562 | </child> |
1835 | 1496 | </object> | 1563 | </object> |
1836 | 1497 | </child> | 1564 | </child> |
1837 | 1498 | <action-widgets> | 1565 | <action-widgets> |
1838 | 1499 | <action-widget response="0">checkbutton1</action-widget> | ||
1839 | 1500 | <action-widget response="-6">button13</action-widget> | 1566 | <action-widget response="-6">button13</action-widget> |
1840 | 1501 | <action-widget response="-10">button16</action-widget> | 1567 | <action-widget response="-10">button16</action-widget> |
1841 | 1502 | <action-widget response="-7">button18</action-widget> | 1568 | <action-widget response="-7">button18</action-widget> |
1842 | @@ -1504,8 +1570,8 @@ | |||
1843 | 1504 | </object> | 1570 | </object> |
1844 | 1505 | <object class="GtkDialog" id="dialog_project_properties"> | 1571 | <object class="GtkDialog" id="dialog_project_properties"> |
1845 | 1506 | <property name="border_width">5</property> | 1572 | <property name="border_width">5</property> |
1848 | 1507 | <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> | 1573 | <property name="window_position">center-on-parent</property> |
1849 | 1508 | <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> | 1574 | <property name="type_hint">dialog</property> |
1850 | 1509 | <property name="has_separator">False</property> | 1575 | <property name="has_separator">False</property> |
1851 | 1510 | <child internal-child="vbox"> | 1576 | <child internal-child="vbox"> |
1852 | 1511 | <object class="GtkVBox" id="dialog-vbox4"> | 1577 | <object class="GtkVBox" id="dialog-vbox4"> |
1853 | @@ -1517,7 +1583,7 @@ | |||
1854 | 1517 | <child internal-child="action_area"> | 1583 | <child internal-child="action_area"> |
1855 | 1518 | <object class="GtkHButtonBox" id="dialog-action_area4"> | 1584 | <object class="GtkHButtonBox" id="dialog-action_area4"> |
1856 | 1519 | <property name="visible">True</property> | 1585 | <property name="visible">True</property> |
1858 | 1520 | <property name="layout_style">GTK_BUTTONBOX_END</property> | 1586 | <property name="layout_style">end</property> |
1859 | 1521 | <child> | 1587 | <child> |
1860 | 1522 | <placeholder/> | 1588 | <placeholder/> |
1861 | 1523 | </child> | 1589 | </child> |
1862 | @@ -1530,7 +1596,8 @@ | |||
1863 | 1530 | </object> | 1596 | </object> |
1864 | 1531 | <packing> | 1597 | <packing> |
1865 | 1532 | <property name="expand">False</property> | 1598 | <property name="expand">False</property> |
1867 | 1533 | <property name="pack_type">GTK_PACK_END</property> | 1599 | <property name="pack_type">end</property> |
1868 | 1600 | <property name="position">0</property> | ||
1869 | 1534 | </packing> | 1601 | </packing> |
1870 | 1535 | </child> | 1602 | </child> |
1871 | 1536 | </object> | 1603 | </object> |
1872 | @@ -1539,8 +1606,8 @@ | |||
1873 | 1539 | <object class="GtkDialog" id="Dialog_preferences"> | 1606 | <object class="GtkDialog" id="Dialog_preferences"> |
1874 | 1540 | <property name="border_width">5</property> | 1607 | <property name="border_width">5</property> |
1875 | 1541 | <property name="title" translatable="yes">Preferences</property> | 1608 | <property name="title" translatable="yes">Preferences</property> |
1878 | 1542 | <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> | 1609 | <property name="window_position">center-on-parent</property> |
1879 | 1543 | <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> | 1610 | <property name="type_hint">dialog</property> |
1880 | 1544 | <property name="has_separator">False</property> | 1611 | <property name="has_separator">False</property> |
1881 | 1545 | <child internal-child="vbox"> | 1612 | <child internal-child="vbox"> |
1882 | 1546 | <object class="GtkVBox" id="dialog-vbox3"> | 1613 | <object class="GtkVBox" id="dialog-vbox3"> |
1883 | @@ -1554,8 +1621,8 @@ | |||
1884 | 1554 | <object class="GtkViewport" id="viewport3"> | 1621 | <object class="GtkViewport" id="viewport3"> |
1885 | 1555 | <property name="height_request">40</property> | 1622 | <property name="height_request">40</property> |
1886 | 1556 | <property name="visible">True</property> | 1623 | <property name="visible">True</property> |
1889 | 1557 | <property name="resize_mode">GTK_RESIZE_QUEUE</property> | 1624 | <property name="resize_mode">queue</property> |
1890 | 1558 | <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> | 1625 | <property name="shadow_type">etched-in</property> |
1891 | 1559 | <child> | 1626 | <child> |
1892 | 1560 | <object class="GtkLabel" id="label_preferences"> | 1627 | <object class="GtkLabel" id="label_preferences"> |
1893 | 1561 | <property name="visible">True</property> | 1628 | <property name="visible">True</property> |
1894 | @@ -1565,6 +1632,7 @@ | |||
1895 | 1565 | </object> | 1632 | </object> |
1896 | 1566 | <packing> | 1633 | <packing> |
1897 | 1567 | <property name="padding">26</property> | 1634 | <property name="padding">26</property> |
1898 | 1635 | <property name="position">0</property> | ||
1899 | 1568 | </packing> | 1636 | </packing> |
1900 | 1569 | </child> | 1637 | </child> |
1901 | 1570 | <child> | 1638 | <child> |
1902 | @@ -1576,6 +1644,9 @@ | |||
1903 | 1576 | <property name="xalign">0.10000000149011612</property> | 1644 | <property name="xalign">0.10000000149011612</property> |
1904 | 1577 | <property name="label" translatable="yes">Select Theme</property> | 1645 | <property name="label" translatable="yes">Select Theme</property> |
1905 | 1578 | </object> | 1646 | </object> |
1906 | 1647 | <packing> | ||
1907 | 1648 | <property name="position">0</property> | ||
1908 | 1649 | </packing> | ||
1909 | 1579 | </child> | 1650 | </child> |
1910 | 1580 | <child> | 1651 | <child> |
1911 | 1581 | <object class="GtkComboBox" id="combobox_theme"> | 1652 | <object class="GtkComboBox" id="combobox_theme"> |
1912 | @@ -1602,9 +1673,10 @@ | |||
1913 | 1602 | </child> | 1673 | </child> |
1914 | 1603 | <child> | 1674 | <child> |
1915 | 1604 | <object class="GtkCheckButton" id="checkbutton_trash"> | 1675 | <object class="GtkCheckButton" id="checkbutton_trash"> |
1916 | 1605 | <property name="visible">True</property> | ||
1917 | 1606 | <property name="can_focus">True</property> | ||
1918 | 1607 | <property name="label" translatable="yes">Add Trash to montage view</property> | 1676 | <property name="label" translatable="yes">Add Trash to montage view</property> |
1919 | 1677 | <property name="visible">True</property> | ||
1920 | 1678 | <property name="can_focus">True</property> | ||
1921 | 1679 | <property name="receives_default">False</property> | ||
1922 | 1608 | <property name="draw_indicator">True</property> | 1680 | <property name="draw_indicator">True</property> |
1923 | 1609 | </object> | 1681 | </object> |
1924 | 1610 | <packing> | 1682 | <packing> |
1925 | @@ -1620,7 +1692,7 @@ | |||
1926 | 1620 | <child internal-child="action_area"> | 1692 | <child internal-child="action_area"> |
1927 | 1621 | <object class="GtkHButtonBox" id="dialog-action_area3"> | 1693 | <object class="GtkHButtonBox" id="dialog-action_area3"> |
1928 | 1622 | <property name="visible">True</property> | 1694 | <property name="visible">True</property> |
1930 | 1623 | <property name="layout_style">GTK_BUTTONBOX_END</property> | 1695 | <property name="layout_style">end</property> |
1931 | 1624 | <child> | 1696 | <child> |
1932 | 1625 | <placeholder/> | 1697 | <placeholder/> |
1933 | 1626 | </child> | 1698 | </child> |
1934 | @@ -1630,14 +1702,12 @@ | |||
1935 | 1630 | </object> | 1702 | </object> |
1936 | 1631 | <packing> | 1703 | <packing> |
1937 | 1632 | <property name="expand">False</property> | 1704 | <property name="expand">False</property> |
1939 | 1633 | <property name="pack_type">GTK_PACK_END</property> | 1705 | <property name="pack_type">end</property> |
1940 | 1706 | <property name="position">0</property> | ||
1941 | 1634 | </packing> | 1707 | </packing> |
1942 | 1635 | </child> | 1708 | </child> |
1943 | 1636 | </object> | 1709 | </object> |
1944 | 1637 | </child> | 1710 | </child> |
1945 | 1638 | <action-widgets> | ||
1946 | 1639 | <action-widget response="0">checkbutton_trash</action-widget> | ||
1947 | 1640 | </action-widgets> | ||
1948 | 1641 | </object> | 1711 | </object> |
1949 | 1642 | <object class="GtkWindow" id="window2"> | 1712 | <object class="GtkWindow" id="window2"> |
1950 | 1643 | <child> | 1713 | <child> |
1951 | 1644 | 1714 | ||
1952 | === modified file 'lucioLib/controller/controller_load_project.py' | |||
1953 | --- lucioLib/controller/controller_load_project.py 2009-04-28 13:36:55 +0000 | |||
1954 | +++ lucioLib/controller/controller_load_project.py 2009-05-07 09:27:18 +0000 | |||
1955 | @@ -77,12 +77,13 @@ | |||
1956 | 77 | """ | 77 | """ |
1957 | 78 | _TIMEOUT = 10 # 10 ms timer | 78 | _TIMEOUT = 10 # 10 ms timer |
1958 | 79 | 79 | ||
1960 | 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) : |
1961 | 81 | """ Init Thread, init gobject timer and clear progressbar """ | 81 | """ Init Thread, init gobject timer and clear progressbar """ |
1962 | 82 | self.project = project | 82 | self.project = project |
1963 | 83 | self.gui = gui | 83 | self.gui = gui |
1964 | 84 | self._cb_on_finish = cb_on_finish | 84 | self._cb_on_finish = cb_on_finish |
1965 | 85 | self._cb_acq_error = cb_acq_error | 85 | self._cb_acq_error = cb_acq_error |
1966 | 86 | self._cb_image_capture_done = cb_image_capture_done | ||
1967 | 86 | 87 | ||
1968 | 87 | self._progress_bar_widget = self.gui.status_progress_bar | 88 | self._progress_bar_widget = self.gui.status_progress_bar |
1969 | 88 | 89 | ||
1970 | @@ -155,18 +156,16 @@ | |||
1971 | 155 | 156 | ||
1972 | 156 | # update acquisition object | 157 | # update acquisition object |
1973 | 157 | if self.project['hardtype'] == LCONST.DIGICAM : | 158 | if self.project['hardtype'] == LCONST.DIGICAM : |
1979 | 158 | # acquisition for digital camera | 159 | # No acquisition for digital camera |
1980 | 159 | acq_obj = LACQ.luciole_acquisition_digicam( | 160 | acq_obj = None |
1976 | 160 | self.gui.display, | ||
1977 | 161 | project_dir = self.project['project_dir'] | ||
1978 | 162 | ) | ||
1981 | 163 | elif self.project['hardtype'] == LCONST.WEBCAM : | 161 | elif self.project['hardtype'] == LCONST.WEBCAM : |
1982 | 164 | # acquisition for WEBCAM | 162 | # acquisition for WEBCAM |
1983 | 165 | acq_obj = LACQ.luciole_acquisition_webcam( | 163 | acq_obj = LACQ.luciole_acquisition_webcam( |
1984 | 166 | self.gui.display, | 164 | self.gui.display, |
1985 | 167 | data = self.project['webcam_data'], | 165 | data = self.project['webcam_data'], |
1986 | 168 | project_dir = self.project['project_dir'], | 166 | project_dir = self.project['project_dir'], |
1988 | 169 | cb_error = self._cb_acq_error) | 167 | cb_error = self._cb_acq_error, |
1989 | 168 | cb_capture_done = self._cb_image_capture_done) | ||
1990 | 170 | else : | 169 | else : |
1991 | 171 | # default acquisition load i.e. DVCAM | 170 | # default acquisition load i.e. DVCAM |
1992 | 172 | acq_obj = LACQ.luciole_acquisition( | 171 | acq_obj = LACQ.luciole_acquisition( |
1993 | @@ -174,8 +173,9 @@ | |||
1994 | 174 | False, | 173 | False, |
1995 | 175 | self.project['hardtype'], | 174 | self.project['hardtype'], |
1996 | 176 | project_dir = self.project['project_dir'], | 175 | project_dir = self.project['project_dir'], |
1999 | 177 | cb_error = self._cb_acq_error) | 176 | cb_error = self._cb_acq_error, |
2000 | 178 | 177 | cb_capture_done = self._cb_image_capture_done) | |
2001 | 178 | |||
2002 | 179 | 179 | ||
2003 | 180 | 180 | ||
2004 | 181 | # for mixer initialisation set image to miw with the last image of the capture view. only if capture image is not empty | 181 | # for mixer initialisation set image to miw with the last image of the capture view. only if capture image is not empty |
2005 | 182 | 182 | ||
2006 | === modified file 'lucioLib/gui/assistant_new_project.py' | |||
2007 | --- lucioLib/gui/assistant_new_project.py 2009-04-20 13:11:10 +0000 | |||
2008 | +++ lucioLib/gui/assistant_new_project.py 2009-05-07 09:27:18 +0000 | |||
2009 | @@ -28,15 +28,13 @@ | |||
2010 | 28 | 28 | ||
2011 | 29 | from .. import luciole_constants as LCONST | 29 | from .. import luciole_constants as LCONST |
2012 | 30 | from .. import luciole_image as LIMG | 30 | from .. import luciole_image as LIMG |
2013 | 31 | import webcam_detection_widget as LWDW | ||
2014 | 31 | import dialog as GMSG | 32 | import dialog as GMSG |
2015 | 32 | 33 | ||
2016 | 33 | |||
2017 | 34 | |||
2018 | 35 | import gtk | 34 | import gtk |
2019 | 36 | import os.path | 35 | import os.path |
2020 | 37 | import re | 36 | import re |
2021 | 38 | import threading | 37 | import threading |
2022 | 39 | import webcam_detection_widget as LWDW | ||
2023 | 40 | from gettext import gettext as _ | 38 | from gettext import gettext as _ |
2024 | 41 | 39 | ||
2025 | 42 | 40 | ||
2026 | @@ -120,7 +118,6 @@ | |||
2027 | 120 | 118 | ||
2028 | 121 | def project_name_changed(self,widget): | 119 | def project_name_changed(self,widget): |
2029 | 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.""" |
2030 | 123 | print type(widget) | ||
2031 | 124 | if widget.get_text() == "" : | 121 | if widget.get_text() == "" : |
2032 | 125 | self.assistant.set_page_complete(self,False) | 122 | self.assistant.set_page_complete(self,False) |
2033 | 126 | else : | 123 | else : |
2034 | @@ -147,7 +144,7 @@ | |||
2035 | 147 | l_state = True | 144 | l_state = True |
2036 | 148 | else : | 145 | else : |
2037 | 149 | l_state = False | 146 | l_state = False |
2039 | 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) |
2040 | 151 | #GMSG.Dialog.ErrorMessage(assistant,msg) | 148 | #GMSG.Dialog.ErrorMessage(assistant,msg) |
2041 | 152 | print msg | 149 | print msg |
2042 | 153 | if (l_state==True) : | 150 | if (l_state==True) : |
2043 | @@ -223,7 +220,8 @@ | |||
2044 | 223 | HBox.add(radiobutton) | 220 | HBox.add(radiobutton) |
2045 | 224 | 221 | ||
2046 | 225 | l_hardtype = LCONST.DIGICAM | 222 | l_hardtype = LCONST.DIGICAM |
2048 | 226 | radiobutton = gtk.RadioButton(group=radiobutton1, label= LCONST.HardTypeName[l_hardtype]) | 223 | desc=_(" Other device.\n(Manual import)") |
2049 | 224 | radiobutton = gtk.RadioButton(group=radiobutton1, label= desc ) | ||
2050 | 227 | # conect toggled signal to button | 225 | # conect toggled signal to button |
2051 | 228 | radiobutton.connect('toggled',self.radiobutton_toggled,l_hardtype) | 226 | radiobutton.connect('toggled',self.radiobutton_toggled,l_hardtype) |
2052 | 229 | HBox.add(radiobutton) | 227 | HBox.add(radiobutton) |
2053 | @@ -307,12 +305,12 @@ | |||
2054 | 307 | 305 | ||
2055 | 308 | def _on_webcam_detect_complete(self,webcam_obj) : | 306 | def _on_webcam_detect_complete(self,webcam_obj) : |
2056 | 309 | """ callback , executed when webcam detection is complete """ | 307 | """ callback , executed when webcam detection is complete """ |
2057 | 310 | # assisant page can now be set as complete | ||
2058 | 311 | self.assistant.set_page_complete(self,True) | ||
2059 | 312 | 308 | ||
2063 | 313 | super(Page_webcam,self)._on_webcam_detect_complete(webcam_obj) | 309 | nb_webcam = super(Page_webcam,self)._on_webcam_detect_complete(webcam_obj) |
2064 | 314 | 310 | if nb_webcam > 0 : | |
2065 | 315 | 311 | # almost one webcam detected | |
2066 | 312 | # assisant page can now be set as complete | ||
2067 | 313 | self.assistant.set_page_complete(self,True) | ||
2068 | 316 | class Page_summary(gtk.VBox) : | 314 | class Page_summary(gtk.VBox) : |
2069 | 317 | """ Asistant summary page : show lucuile project info""" | 315 | """ Asistant summary page : show lucuile project info""" |
2070 | 318 | 316 | ||
2071 | @@ -354,7 +352,7 @@ | |||
2072 | 354 | string = "%s : %s "%( _('Number of frames per seconds'), fps) | 352 | string = "%s : %s "%( _('Number of frames per seconds'), fps) |
2073 | 355 | text_list.append(string) | 353 | text_list.append(string) |
2074 | 356 | 354 | ||
2076 | 357 | # display Hardware type | 355 | # display Hardware type |
2077 | 358 | string = "%s : %s "%( _('Hardware type'), LCONST.HardTypeName[self.project_data['hardtype']] ) | 356 | string = "%s : %s "%( _('Hardware type'), LCONST.HardTypeName[self.project_data['hardtype']] ) |
2078 | 359 | text_list.append(string) | 357 | text_list.append(string) |
2079 | 360 | 358 | ||
2080 | @@ -412,8 +410,8 @@ | |||
2081 | 412 | 410 | ||
2082 | 413 | self.assistant.set_property('title',_('Luciole project assistant')) | 411 | self.assistant.set_property('title',_('Luciole project assistant')) |
2083 | 414 | 412 | ||
2086 | 415 | # assistant logo | 413 | # assistant logo with no text |
2087 | 416 | image = LIMG.Image('images/luciole_logo.png',True,2) | 414 | image = LIMG.Image('images/luciole_logo.png',True,2,False) |
2088 | 417 | 415 | ||
2089 | 418 | 416 | ||
2090 | 419 | # | 417 | # |
2091 | @@ -441,7 +439,8 @@ | |||
2092 | 441 | self.p3 = Page_webcam( self.assistant, self.project_data) | 439 | self.p3 = Page_webcam( self.assistant, self.project_data) |
2093 | 442 | self.assistant.append_page(self.p3) | 440 | self.assistant.append_page(self.p3) |
2094 | 443 | self.assistant.set_page_title( self.p3, _(' Webcam detection ')) | 441 | self.assistant.set_page_title( self.p3, _(' Webcam detection ')) |
2096 | 444 | self.assistant.set_page_type( self.p3, gtk.ASSISTANT_PAGE_PROGRESS) | 442 | #self.assistant.set_page_type( self.p3, gtk.ASSISTANT_PAGE_PROGRESS) |
2097 | 443 | self.assistant.set_page_type( self.p3, gtk.ASSISTANT_PAGE_CONTENT) | ||
2098 | 445 | self.assistant.set_page_side_image(self.p1,image.pixbuf_thumb) | 444 | self.assistant.set_page_side_image(self.p1,image.pixbuf_thumb) |
2099 | 446 | 445 | ||
2100 | 447 | # | 446 | # |
2101 | @@ -470,7 +469,6 @@ | |||
2102 | 470 | 469 | ||
2103 | 471 | def page_func(self,page_num) : | 470 | def page_func(self,page_num) : |
2104 | 472 | """ call back to verify the validity of the pages """ | 471 | """ call back to verify the validity of the pages """ |
2105 | 473 | print "entering page func , page id : ",page_num | ||
2106 | 474 | page_out = page_num | 472 | page_out = page_num |
2107 | 475 | if (self.verify_page_ok(page_num)) : | 473 | if (self.verify_page_ok(page_num)) : |
2108 | 476 | if (page_out == 1 ) and (self.project_data['hardtype'] != LCONST.WEBCAM) : | 474 | if (page_out == 1 ) and (self.project_data['hardtype'] != LCONST.WEBCAM) : |
2109 | 477 | 475 | ||
2110 | === modified file 'lucioLib/gui/gui_controller.py' | |||
2111 | --- lucioLib/gui/gui_controller.py 2009-04-28 10:37:08 +0000 | |||
2112 | +++ lucioLib/gui/gui_controller.py 2009-05-04 22:24:14 +0000 | |||
2113 | @@ -134,6 +134,15 @@ | |||
2114 | 134 | 134 | ||
2115 | 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) |
2116 | 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') |
2117 | 137 | |||
2118 | 138 | |||
2119 | 139 | def f_get_is_button_snapshot_sensitive(self) : | ||
2120 | 140 | return self._snapshot_button.get_property('sensitive') | ||
2121 | 141 | def f_set_is_button_snapshot_sensitive(self, value) : | ||
2122 | 142 | if type(value) == bool : | ||
2123 | 143 | self._snapshot_button.set_sensitive(value) | ||
2124 | 144 | self._snapshot_button.grab_focus() | ||
2125 | 145 | is_button_snapshot_sensitive = property(f_get_is_button_snapshot_sensitive,f_set_is_button_snapshot_sensitive,None, 'Snapshot button sensitivity') | ||
2126 | 137 | 146 | ||
2127 | 138 | def __init__(self, ctrl_obj) : | 147 | def __init__(self, ctrl_obj) : |
2128 | 139 | 148 | ||
2129 | 140 | 149 | ||
2130 | === modified file 'lucioLib/gui/webcam_detection_widget.py' | |||
2131 | --- lucioLib/gui/webcam_detection_widget.py 2009-04-20 08:50:43 +0000 | |||
2132 | +++ lucioLib/gui/webcam_detection_widget.py 2009-05-07 08:24:31 +0000 | |||
2133 | @@ -155,14 +155,16 @@ | |||
2134 | 155 | def prepare_webcam_detection(self) : | 155 | def prepare_webcam_detection(self) : |
2135 | 156 | """ prepare assistant page for the webcam detection page """ | 156 | """ prepare assistant page for the webcam detection page """ |
2136 | 157 | 157 | ||
2139 | 158 | # destroy label for webcam status | 158 | # Hide label for webcam status |
2140 | 159 | self.label.destroy() | 159 | self.label.hide() |
2141 | 160 | 160 | ||
2142 | 161 | # launch webcam detection thread | 161 | # launch webcam detection thread |
2143 | 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) |
2144 | 163 | 163 | ||
2145 | 164 | def _on_webcam_detect_complete(self,webcam_obj) : | 164 | def _on_webcam_detect_complete(self,webcam_obj) : |
2147 | 165 | """ callback , executed when webcam detection is complete """ | 165 | """ callback , executed when webcam detection is complete |
2148 | 166 | Return the number of detected webcams""" | ||
2149 | 167 | status = 0 | ||
2150 | 166 | 168 | ||
2151 | 167 | if webcam_obj != None and webcam_obj.webcam_devices != None: | 169 | if webcam_obj != None and webcam_obj.webcam_devices != None: |
2152 | 168 | vbox = self.VBox | 170 | vbox = self.VBox |
2153 | @@ -183,10 +185,13 @@ | |||
2154 | 183 | if webcam_index == 0 : | 185 | if webcam_index == 0 : |
2155 | 184 | # select by default. | 186 | # select by default. |
2156 | 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) |
2158 | 186 | self.label.set_text(_('Detected webcam')) | 188 | self.label.set_text(_('Detected webcam(s)')) |
2159 | 189 | status = len(webcam_obj.webcam_devices) | ||
2160 | 187 | else : | 190 | else : |
2161 | 191 | self.project_data['webcam_data'] = None | ||
2162 | 188 | self.label.set_text(_('No webcam detected')) | 192 | self.label.set_text(_('No webcam detected')) |
2163 | 189 | self.label.show() | 193 | self.label.show() |
2164 | 194 | return status | ||
2165 | 190 | 195 | ||
2166 | 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): |
2167 | 192 | """ callback for webcam rasdio button. | 197 | """ callback for webcam rasdio button. |
2168 | 193 | 198 | ||
2169 | === modified file 'lucioLib/lucioWebCamDetect/luciole_webcam_detection.py' | |||
2170 | --- lucioLib/lucioWebCamDetect/luciole_webcam_detection.py 2009-03-08 18:06:41 +0000 | |||
2171 | +++ lucioLib/lucioWebCamDetect/luciole_webcam_detection.py 2009-05-06 16:38:41 +0000 | |||
2172 | @@ -101,7 +101,7 @@ | |||
2173 | 101 | # a format was detected : prepare pipeline info | 101 | # a format was detected : prepare pipeline info |
2174 | 102 | webcam_bin_data['width'] = width | 102 | webcam_bin_data['width'] = width |
2175 | 103 | webcam_bin_data['height'] = height | 103 | webcam_bin_data['height'] = height |
2177 | 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'] |
2178 | 105 | webcam_bin_data['device'] = self._webcam_devices[webcam_device_index]['device'] | 105 | webcam_bin_data['device'] = self._webcam_devices[webcam_device_index]['device'] |
2179 | 106 | webcam_bin_data['name'] = self._webcam_devices[webcam_device_index]['name'] | 106 | webcam_bin_data['name'] = self._webcam_devices[webcam_device_index]['name'] |
2180 | 107 | 107 | ||
2181 | @@ -142,6 +142,15 @@ | |||
2182 | 142 | webcam_device["name"] = dev.GetProperty ('info.product') | 142 | webcam_device["name"] = dev.GetProperty ('info.product') |
2183 | 143 | if webcam_device["name"] == None : webcam_device["name"] = "Unknown" | 143 | if webcam_device["name"] == None : webcam_device["name"] = "Unknown" |
2184 | 144 | webcam_device["device"] = dev.GetProperty ('video4linux.device') | 144 | webcam_device["device"] = dev.GetProperty ('video4linux.device') |
2185 | 145 | |||
2186 | 146 | # detect if need to use v4lsrc or v4l2sec ; property :video4linux.version | ||
2187 | 147 | # for robustness if version = 1 , than use v4lsrc else use v4l2src | ||
2188 | 148 | version = dev.GetProperty ('video4linux.version') | ||
2189 | 149 | # default is v4l2src | ||
2190 | 150 | webcam_device['v4l_driver'] = 'v4l2src' | ||
2191 | 151 | if version != None and int(version) == 1 : | ||
2192 | 152 | webcam_device['v4l_driver'] = 'v4lsrc' | ||
2193 | 153 | |||
2194 | 145 | 154 | ||
2195 | 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"]) ) : |
2196 | 147 | self._webcam_devices.append(webcam_device) | 156 | self._webcam_devices.append(webcam_device) |
2197 | @@ -162,7 +171,7 @@ | |||
2198 | 162 | nb_device_detected = 0 | 171 | nb_device_detected = 0 |
2199 | 163 | for webcam_device in self._webcam_devices : | 172 | for webcam_device in self._webcam_devices : |
2200 | 164 | # for each detected device get the data (source type, mimetype, resolution) | 173 | # for each detected device get the data (source type, mimetype, resolution) |
2202 | 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"]) |
2203 | 166 | if webcam_device_data != None : | 175 | if webcam_device_data != None : |
2204 | 167 | webcam_device["webcam_data"] = webcam_device_data | 176 | webcam_device["webcam_data"] = webcam_device_data |
2205 | 168 | nb_device_detected = nb_device_detected +1 | 177 | nb_device_detected = nb_device_detected +1 |
2206 | @@ -185,40 +194,37 @@ | |||
2207 | 185 | return is_readable | 194 | return is_readable |
2208 | 186 | __is_device_readable = staticmethod(__is_device_readable) | 195 | __is_device_readable = staticmethod(__is_device_readable) |
2209 | 187 | 196 | ||
2211 | 188 | def __get_gst_webcam_data(device_name) : | 197 | def __get_gst_webcam_data(device_name,driver) : |
2212 | 189 | """ get data from the webcam test compatible sources | 198 | """ get data from the webcam test compatible sources |
2213 | 190 | input device_name is the file path ( ex. /dev/video0) | 199 | input device_name is the file path ( ex. /dev/video0) |
2214 | 191 | """ | 200 | """ |
2215 | 201 | # creation of a fake gstreamer to test webcam with v4lsrc ot v4l2src | ||
2216 | 192 | webcam_device=dict() | 202 | webcam_device=dict() |
2243 | 193 | for videoSource in GSTREAMER_VIDEO_SOURCES : | 203 | |
2244 | 194 | # creation of a fake gstreamer to test webcam with v4lsrc ot v4l2src | 204 | pipeline_desc = "%s name=source device =%s ! fakesink" %(driver, device_name) |
2245 | 195 | pipeline_desc = "%s name=source device =%s ! fakesink" %(videoSource, device_name) | 205 | pipeline = gst.parse_launch(pipeline_desc) |
2246 | 196 | pipeline = gst.parse_launch(pipeline_desc) | 206 | |
2247 | 197 | 207 | #Start pipeline and check for state | |
2248 | 198 | #Start pipeline and check for state | 208 | pipeline.set_state(gst.STATE_PLAYING) |
2249 | 199 | pipeline.set_state(gst.STATE_PLAYING) | 209 | ret = pipeline.get_state(timeout=10000*gst.MSECOND) |
2250 | 200 | ret = pipeline.get_state(timeout=10000*gst.MSECOND) | 210 | |
2251 | 201 | 211 | if ret[0] == gst.STATE_CHANGE_SUCCESS : | |
2252 | 202 | if ret[0] == gst.STATE_CHANGE_SUCCESS : | 212 | # webcam is detected succefully |
2253 | 203 | # webcam is detected succefully | 213 | pipeline.set_state(gst.STATE_PAUSED) |
2254 | 204 | pipeline.set_state(gst.STATE_PAUSED) | 214 | |
2255 | 205 | 215 | # get source element name and webcam name | |
2256 | 206 | # get source element name and webcam name | 216 | src = pipeline.get_by_name('source') |
2257 | 207 | src = pipeline.get_by_name('source') | 217 | name = src.get_property('device-name') |
2258 | 208 | name = src.get_property('device-name') | 218 | |
2259 | 209 | 219 | ||
2260 | 210 | # store video source to use | 220 | # start detection of source video formats |
2261 | 211 | webcam_device["gstreamer_src"] = videoSource | 221 | # video formats are accesible in the capabilities |
2262 | 212 | 222 | # of the source "src" pad | |
2263 | 213 | # start detection of source video formats | 223 | pad = src.get_pad("src") |
2264 | 214 | # video formats are accesible in the capabilities | 224 | caps = pad.get_caps() |
2265 | 215 | # of the source "src" pad | 225 | luciole_webcam_detection.gst_get_supported_video_formats(webcam_device,caps) |
2240 | 216 | pad = src.get_pad("src") | ||
2241 | 217 | caps = pad.get_caps() | ||
2242 | 218 | luciole_webcam_detection.gst_get_supported_video_formats(webcam_device,caps) | ||
2266 | 219 | # stop playing with webcam | 226 | # stop playing with webcam |
2267 | 220 | pipeline.set_state(gst.STATE_NULL) | 227 | pipeline.set_state(gst.STATE_NULL) |
2268 | 221 | #for k,v in webcam_device.iteritems() : print "%s : %s"%(k,v) | ||
2269 | 222 | return webcam_device | 228 | return webcam_device |
2270 | 223 | __get_gst_webcam_data = staticmethod(__get_gst_webcam_data) | 229 | __get_gst_webcam_data = staticmethod(__get_gst_webcam_data) |
2271 | 224 | 230 | ||
2272 | @@ -294,13 +300,17 @@ | |||
2273 | 294 | gst_get_supported_video_formats = staticmethod(__gst_get_supported_video_formats) | 300 | gst_get_supported_video_formats = staticmethod(__gst_get_supported_video_formats) |
2274 | 295 | 301 | ||
2275 | 296 | 302 | ||
2283 | 297 | #CamObj = luciole_webcam_detection() | 303 | |
2284 | 298 | #val = CamObj.detect_webcam() | 304 | if __name__ == '__main__' : |
2285 | 299 | #print " found %s webCam device "%val | 305 | # TEST PURPOSE : for webcam detection |
2286 | 300 | 306 | CamObj = luciole_webcam_detection() | |
2287 | 301 | #if val >0 : | 307 | val = CamObj.detect_webcam() |
2288 | 302 | # for device in CamObj.webcam_devices : | 308 | print " found %s webCam device "%val |
2289 | 303 | # for k,j in device.iteritems() : print "%s : %s"%(k,j) | 309 | |
2290 | 310 | if val >0 : | ||
2291 | 311 | for device in CamObj.webcam_devices : | ||
2292 | 312 | for k,j in device.iteritems() : print "%s : %s"%(k,j) | ||
2293 | 313 | print "----------------------------------------------------------------" | ||
2294 | 304 | 314 | ||
2295 | 305 | 315 | ||
2296 | 306 | 316 | ||
2297 | 307 | 317 | ||
2298 | === modified file 'lucioLib/luciole_acquisition.py' | |||
2299 | --- lucioLib/luciole_acquisition.py 2009-04-16 11:55:24 +0000 | |||
2300 | +++ lucioLib/luciole_acquisition.py 2009-05-07 09:27:18 +0000 | |||
2301 | @@ -59,21 +59,26 @@ | |||
2302 | 59 | def get_HardType(self) : return self.__HardType | 59 | def get_HardType(self) : return self.__HardType |
2303 | 60 | HardType = property(get_HardType,None,None,"Hard type for acquisition " ) | 60 | HardType = property(get_HardType,None,None,"Hard type for acquisition " ) |
2304 | 61 | 61 | ||
2306 | 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 ): |
2307 | 63 | """ Init of class luciole_acquisition : | 63 | """ Init of class luciole_acquisition : |
2308 | 64 | inputs : | 64 | inputs : |
2309 | 65 | - displayWidget : The gtk.DrawingArea object for display the acquired stream from video | 65 | - displayWidget : The gtk.DrawingArea object for display the acquired stream from video |
2310 | 66 | - IsOnionSkinActive : Is onion skin need to be activated | 66 | - IsOnionSkinActive : Is onion skin need to be activated |
2311 | 67 | - HardType : Type of video to acquire | 67 | - HardType : Type of video to acquire |
2312 | 68 | - project_dir : path to the project dir | 68 | - project_dir : path to the project dir |
2313 | 69 | - cb_error : callback to indicate gstreamer error | ||
2314 | 70 | - cb_capture_done : callback to indicate is done and a file is available | ||
2315 | 69 | """ | 71 | """ |
2316 | 70 | self.__HardType = HardType | 72 | self.__HardType = HardType |
2317 | 71 | self.__project_dir = project_dir | 73 | self.__project_dir = project_dir |
2318 | 72 | 74 | ||
2319 | 73 | self._ctrller_on_error = cb_error | 75 | self._ctrller_on_error = cb_error |
2320 | 76 | self._cb_capture_done = cb_capture_done | ||
2321 | 77 | |||
2322 | 78 | |||
2323 | 74 | if self.__HardType != LCONST.DIGICAM : | 79 | if self.__HardType != LCONST.DIGICAM : |
2324 | 75 | # Acquistion is gstreamer based | 80 | # Acquistion is gstreamer based |
2326 | 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) |
2327 | 77 | 82 | ||
2328 | 78 | self.Image2save = os.path.join(project_dir, LCONST.ACQUIRED_IMAGE_NAME) | 83 | self.Image2save = os.path.join(project_dir, LCONST.ACQUIRED_IMAGE_NAME) |
2329 | 79 | self.__Image2Mix = None #No image to mix at creation | 84 | self.__Image2Mix = None #No image to mix at creation |
2330 | @@ -121,7 +126,7 @@ | |||
2331 | 121 | 126 | ||
2332 | 122 | def capture_image(self) : | 127 | def capture_image(self) : |
2333 | 123 | """ capture/snapshot of an image from video device """ | 128 | """ capture/snapshot of an image from video device """ |
2335 | 124 | pass | 129 | self.GstObj.capture() |
2336 | 125 | # commented by nbd@grape : Now job of controller | 130 | # commented by nbd@grape : Now job of controller |
2337 | 126 | # if self.GstObj.is_playing(): | 131 | # if self.GstObj.is_playing(): |
2338 | 127 | # # copy of snapshot on capture Treeview | 132 | # # copy of snapshot on capture Treeview |
2339 | @@ -183,33 +188,20 @@ | |||
2340 | 183 | 188 | ||
2341 | 184 | 189 | ||
2342 | 185 | class luciole_acquisition_digicam(luciole_acquisition) : | 190 | class luciole_acquisition_digicam(luciole_acquisition) : |
2344 | 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. """ |
2345 | 187 | 192 | ||
2346 | 188 | def __init__(self,display): | 193 | def __init__(self,display): |
2347 | 189 | """ constructor : | 194 | """ constructor : |
2348 | 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 ?? |
2349 | 191 | """ | 196 | """ |
2350 | 192 | luciole_acquisition.__init__(self,display,False,LCONST.DIGICAM,None) | 197 | luciole_acquisition.__init__(self,display,False,LCONST.DIGICAM,None) |
2351 | 193 | try : | ||
2352 | 194 | pass | ||
2353 | 195 | # tbd | ||
2354 | 196 | except M_EXCEP.LucioException, err: | ||
2355 | 197 | print err.message | ||
2356 | 198 | |||
2357 | 199 | def start_acquisition(self) : | ||
2358 | 200 | """ open only the menu dialog to import images from digicam source """ | ||
2359 | 201 | fileList = self.importObj.get_images_from_source() | ||
2360 | 202 | # nbd@grape : ????? what is the job here | ||
2361 | 203 | # map(lambda x :self.tvCapture.AppendFromCapture(x), fileList) | ||
2362 | 204 | |||
2363 | 205 | |||
2364 | 206 | 198 | ||
2365 | 207 | class luciole_acquisition_webcam(luciole_acquisition) : | 199 | class luciole_acquisition_webcam(luciole_acquisition) : |
2366 | 208 | """ Heritage of luciole acquisition for webcam usage """ | 200 | """ Heritage of luciole acquisition for webcam usage """ |
2367 | 209 | 201 | ||
2369 | 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): |
2370 | 211 | """ module init as parent + new param (data) """ | 203 | """ module init as parent + new param (data) """ |
2372 | 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 ) |
2373 | 213 | 205 | ||
2374 | 214 | # add webcam data info to gst obj | 206 | # add webcam data info to gst obj |
2375 | 215 | self.GstObj.webcam_data = data | 207 | self.GstObj.webcam_data = data |
2376 | 216 | 208 | ||
2377 | === modified file 'lucioLib/luciole_constants.py' | |||
2378 | --- lucioLib/luciole_constants.py 2009-04-27 13:12:50 +0000 | |||
2379 | +++ lucioLib/luciole_constants.py 2009-05-07 09:27:18 +0000 | |||
2380 | @@ -25,6 +25,7 @@ | |||
2381 | 25 | 25 | ||
2382 | 26 | # Luciole constants file | 26 | # Luciole constants file |
2383 | 27 | 27 | ||
2384 | 28 | from gettext import gettext as _ | ||
2385 | 28 | 29 | ||
2386 | 29 | ######################################## | 30 | ######################################## |
2387 | 30 | # Hardware constants | 31 | # Hardware constants |
2388 | @@ -34,7 +35,12 @@ | |||
2389 | 34 | WEBCAM = 2 | 35 | WEBCAM = 2 |
2390 | 35 | DIGICAM= 3 | 36 | DIGICAM= 3 |
2391 | 36 | HardType=(FAKE,DVCAM,WEBCAM,DIGICAM) | 37 | HardType=(FAKE,DVCAM,WEBCAM,DIGICAM) |
2393 | 37 | HardTypeName=("FAKE","DVCAM","WEBCAM","DIGICAM") | 38 | HardTypeName=( |
2394 | 39 | "FAKE", | ||
2395 | 40 | "DVCAM", | ||
2396 | 41 | "WEBCAM", | ||
2397 | 42 | _("OTHER DEVICE"), | ||
2398 | 43 | ) | ||
2399 | 38 | 44 | ||
2400 | 39 | ######################################## | 45 | ######################################## |
2401 | 40 | # Image screen display constants | 46 | # Image screen display constants |
2402 | 41 | 47 | ||
2403 | === modified file 'lucioLib/luciole_controller.py' | |||
2404 | --- lucioLib/luciole_controller.py 2009-05-01 16:18:25 +0000 | |||
2405 | +++ lucioLib/luciole_controller.py 2009-05-07 09:27:18 +0000 | |||
2406 | @@ -41,7 +41,7 @@ | |||
2407 | 41 | 41 | ||
2408 | 42 | import gui as LTK | 42 | import gui as LTK |
2409 | 43 | import time | 43 | import time |
2411 | 44 | 44 | import threading | |
2412 | 45 | import os.path | 45 | import os.path |
2413 | 46 | 46 | ||
2414 | 47 | from gettext import gettext as _ | 47 | from gettext import gettext as _ |
2415 | @@ -190,21 +190,28 @@ | |||
2416 | 190 | def image_capture(self) : | 190 | def image_capture(self) : |
2417 | 191 | """ add an image from capture """ | 191 | """ add an image from capture """ |
2418 | 192 | if self._acquirer_active == True and self.acq_obj.IsStreamingActive == True : | 192 | if self._acquirer_active == True and self.acq_obj.IsStreamingActive == True : |
2419 | 193 | # streaming is active video capture can be made is active | ||
2420 | 194 | |||
2421 | 195 | # play sound | 193 | # play sound |
2422 | 196 | self.sound_player.play() | 194 | self.sound_player.play() |
2423 | 197 | try : | ||
2424 | 198 | # 1. copy it to rush dir and rename it | ||
2425 | 199 | l_rush_imagename = self.__move_capture_to_rush_folder() | ||
2426 | 200 | except L_EXCEP.LucioException,err : | ||
2427 | 201 | print " DEBUG ERROR in image capture :", err | ||
2428 | 202 | else : | ||
2429 | 203 | #2.append it to rush and capture obj | ||
2430 | 204 | self.__append_image_to_project(l_rush_imagename) | ||
2431 | 205 | 195 | ||
2434 | 206 | 196 | #inactive(sentitivity) snapshot button | |
2435 | 207 | 197 | self.gui.is_button_snapshot_sensitive = False | |
2436 | 198 | |||
2437 | 199 | # streaming is active video capture can be made is active | ||
2438 | 200 | self.acq_obj.capture_image() | ||
2439 | 201 | |||
2440 | 202 | def _cb_image_catpure_done(self): | ||
2441 | 203 | """ callback to indicate capture is done. Now image can be proccessed into poject""" | ||
2442 | 204 | try : | ||
2443 | 205 | # 1. copy it to rush dir and rename it | ||
2444 | 206 | l_rush_imagename = self.__move_capture_to_rush_folder() | ||
2445 | 207 | except L_EXCEP.LucioException,err : | ||
2446 | 208 | print " DEBUG ERROR in image capture :", err | ||
2447 | 209 | else : | ||
2448 | 210 | #2.append it to rush and capture obj | ||
2449 | 211 | self.__append_image_to_project(l_rush_imagename) | ||
2450 | 212 | |||
2451 | 213 | #active(sentitivity) snapshot button | ||
2452 | 214 | self.gui.is_button_snapshot_sensitive = True | ||
2453 | 208 | 215 | ||
2454 | 209 | def image_import(self) : | 216 | def image_import(self) : |
2455 | 210 | """ import images from external source """ | 217 | """ import images from external source """ |
2456 | @@ -409,6 +416,14 @@ | |||
2457 | 409 | self._set_acquirer(False) # stop acquirer | 416 | self._set_acquirer(False) # stop acquirer |
2458 | 410 | self._set_imager(True) # allow imager | 417 | self._set_imager(True) # allow imager |
2459 | 411 | self._set_player(False) # diasallow player | 418 | self._set_player(False) # diasallow player |
2460 | 419 | else : | ||
2461 | 420 | # check if ack obj is None due to DIGICAM hardware | ||
2462 | 421 | if self.project['hardtype'] == LCONST.DIGICAM : | ||
2463 | 422 | self.gui.acquisition_widget_hide() | ||
2464 | 423 | self._set_acquirer(False) # stop acquirer | ||
2465 | 424 | msg = _("No acquisition available. Use 'import image' button to load images in project.") | ||
2466 | 425 | LTK.Dialog.ErrorMessage(self.gui.window, msg) | ||
2467 | 426 | |||
2468 | 412 | else : | 427 | else : |
2469 | 413 | # deactivate acqusition button acquisition not allowed when palyer is active | 428 | # deactivate acqusition button acquisition not allowed when palyer is active |
2470 | 414 | self.gui.acquisition_widget_hide() | 429 | self.gui.acquisition_widget_hide() |
2471 | @@ -582,7 +597,7 @@ | |||
2472 | 582 | for item in intersect : | 597 | for item in intersect : |
2473 | 583 | if item == 'Theme' : | 598 | if item == 'Theme' : |
2474 | 584 | self.conf_obj.conf_options[item] = modif_options[item] | 599 | self.conf_obj.conf_options[item] = modif_options[item] |
2476 | 585 | msg = _('Please restart luciole to take into acount the new theme ') | 600 | msg = _('Please restart luciole to take into account the new theme ') |
2477 | 586 | self.status_bar.display_message(msg) | 601 | self.status_bar.display_message(msg) |
2478 | 587 | 602 | ||
2479 | 588 | if item == 'CaptureTrashDisplay' : | 603 | if item == 'CaptureTrashDisplay' : |
2480 | @@ -606,20 +621,20 @@ | |||
2481 | 606 | """ load treview, pepare acquiistion rush list , etc ..""" | 621 | """ load treview, pepare acquiistion rush list , etc ..""" |
2482 | 607 | self.time = time.time() | 622 | self.time = time.time() |
2483 | 608 | if self.project != None : | 623 | if self.project != None : |
2490 | 609 | #print "---------------------------------------------------------------------" | 624 | print "---------------------------------------------------------------------" |
2491 | 610 | #print "TEST Luciole_controller project info: " | 625 | print "TEST Luciole_controller project info: " |
2492 | 611 | #print "---------------------------------------------------------------------" | 626 | print "---------------------------------------------------------------------" |
2493 | 612 | #for k,v in self.project.iteritems() : | 627 | for k,v in self.project.iteritems() : |
2494 | 613 | # print "**%s** : %s "%(k,v) | 628 | print "**%s** : %s "%(k,v) |
2495 | 614 | #print "---------------------------------------------------------------------" | 629 | print "---------------------------------------------------------------------" |
2496 | 615 | 630 | ||
2497 | 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) |
2498 | 617 | # When rush load is finish : __on_rush_finish is called | 632 | # When rush load is finish : __on_rush_finish is called |
2499 | 618 | 633 | ||
2501 | 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) |
2502 | 620 | 635 | ||
2503 | 621 | def __cb_project_load_finsih(self,rush_obj,acq_obj) : | 636 | def __cb_project_load_finsih(self,rush_obj,acq_obj) : |
2505 | 622 | if (rush_obj != None) and ( acq_obj != None) : | 637 | if (rush_obj != None) : |
2506 | 623 | 638 | ||
2507 | 624 | self.rush_obj = rush_obj | 639 | self.rush_obj = rush_obj |
2508 | 625 | self.acq_obj = acq_obj | 640 | self.acq_obj = acq_obj |
2509 | @@ -632,7 +647,7 @@ | |||
2510 | 632 | 647 | ||
2511 | 633 | print ' DEBUG load time = %s'%( time.time() - self.time ) | 648 | print ' DEBUG load time = %s'%( time.time() - self.time ) |
2512 | 634 | else : | 649 | else : |
2514 | 635 | msg = _("Failed to load project ") | 650 | msg = _("Failed to load project ") |
2515 | 636 | LTK.Dialog.ErrorMessage(self.gui.window, msg) | 651 | LTK.Dialog.ErrorMessage(self.gui.window, msg) |
2516 | 637 | 652 | ||
2517 | 638 | 653 | ||
2518 | 639 | 654 | ||
2519 | === modified file 'lucioLib/luciole_gstreamer.py' | |||
2520 | --- lucioLib/luciole_gstreamer.py 2009-05-01 15:22:38 +0000 | |||
2521 | +++ lucioLib/luciole_gstreamer.py 2009-05-06 15:57:30 +0000 | |||
2522 | @@ -39,28 +39,27 @@ | |||
2523 | 39 | import luciole_tools as MT | 39 | import luciole_tools as MT |
2524 | 40 | import os.path | 40 | import os.path |
2525 | 41 | 41 | ||
2531 | 42 | class SaveCapturedImageBin(gst.Bin) : | 42 | |
2532 | 43 | """ Bin Pad to save in jpeg format image from stream""" | 43 | class PhotoSaveBin(gst.Bin) : |
2533 | 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 """ | |
2534 | 45 | def __init__(self, imagePath) : | 45 | def __init__(self) : |
2535 | 46 | """ Bin Pad to save in jpeg format image from stream""" | 46 | """ Pilpeline desc : jpegenc + fakseink """ |
2536 | 47 | |||
2537 | 47 | self.__gobject_init__() | 48 | self.__gobject_init__() |
2538 | 48 | ImageBinElems=[] | 49 | ImageBinElems=[] |
2540 | 49 | 50 | ||
2541 | 50 | MyJpegenc = gst.element_factory_make("jpegenc","MyJpegenc") # jpeg encoding | 51 | MyJpegenc = gst.element_factory_make("jpegenc","MyJpegenc") # jpeg encoding |
2542 | 51 | ImageBinElems.append(MyJpegenc) | 52 | ImageBinElems.append(MyJpegenc) |
2548 | 52 | 53 | ||
2549 | 53 | MyFilesink = gst.element_factory_make("multifilesink","MyFilesink") # save to file | 54 | photosink = gst.element_factory_make("fakesink","PhotoSink") |
2550 | 54 | MyFilesink.set_property('location', imagePath) | 55 | ImageBinElems.append(photosink) |
2551 | 55 | ImageBinElems.append(MyFilesink) | 56 | |
2547 | 56 | |||
2552 | 57 | for elem in ImageBinElems : self.add(elem) | 57 | for elem in ImageBinElems : self.add(elem) |
2553 | 58 | 58 | ||
2557 | 59 | gst.element_link_many(MyJpegenc,MyFilesink) | 59 | gst.element_link_many(MyJpegenc,photosink) |
2558 | 60 | 60 | ||
2556 | 61 | # ghost pad only sink pad as this bin is an output one | ||
2559 | 62 | self.add_pad(gst.GhostPad('sink', MyJpegenc.get_pad('sink'))) | 61 | self.add_pad(gst.GhostPad('sink', MyJpegenc.get_pad('sink'))) |
2561 | 63 | 62 | ||
2562 | 64 | 63 | ||
2563 | 65 | class InputImageBin(gst.Bin): | 64 | class InputImageBin(gst.Bin): |
2564 | 66 | """ Load image to mix with stream""" | 65 | """ Load image to mix with stream""" |
2565 | @@ -216,7 +215,7 @@ | |||
2566 | 216 | ImageBinElems.append(Myvideoscale) | 215 | ImageBinElems.append(Myvideoscale) |
2567 | 217 | 216 | ||
2568 | 218 | MyVideoFilter = gst.element_factory_make("capsfilter") | 217 | MyVideoFilter = gst.element_factory_make("capsfilter") |
2570 | 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 caps | 218 | caps = gst.Caps("video/x-raw-yuv,width=%s,height=%s"%(image_size_d['width'],image_size_d['height'])) # scale image with caps |
2571 | 220 | MyVideoFilter.set_property("caps", caps) | 219 | MyVideoFilter.set_property("caps", caps) |
2572 | 221 | ImageBinElems.append(MyVideoFilter) | 220 | ImageBinElems.append(MyVideoFilter) |
2573 | 222 | 221 | ||
2574 | @@ -483,12 +482,13 @@ | |||
2575 | 483 | def del_webcam_data(self): del self.__webcam_data | 482 | def del_webcam_data(self): del self.__webcam_data |
2576 | 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 ") |
2577 | 485 | 484 | ||
2579 | 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) : |
2580 | 487 | """ Initialisation of class LucioleGstreamer | 486 | """ Initialisation of class LucioleGstreamer |
2581 | 488 | Input parameters : | 487 | Input parameters : |
2582 | 489 | - videowidget : the widget into display acquisition | 488 | - videowidget : the widget into display acquisition |
2583 | 490 | - baseDirPath : a base path to store the image to mix | 489 | - baseDirPath : a base path to store the image to mix |
2584 | 491 | - cb_on_error : callback to inidicate error | 490 | - cb_on_error : callback to inidicate error |
2585 | 491 | - cb_capture_done : callback to indicate that capture is done. | ||
2586 | 492 | """ | 492 | """ |
2587 | 493 | 493 | ||
2588 | 494 | self.__inputType = MCONST.FAKE | 494 | self.__inputType = MCONST.FAKE |
2589 | @@ -500,6 +500,7 @@ | |||
2590 | 500 | #self.DispWidget = videowidget | 500 | #self.DispWidget = videowidget |
2591 | 501 | self.videowidget = VideoWidget(videowidget) | 501 | self.videowidget = VideoWidget(videowidget) |
2592 | 502 | self._on_error = on_error | 502 | self._on_error = on_error |
2593 | 503 | self._cb_capture_done = cb_capture_done | ||
2594 | 503 | 504 | ||
2595 | 504 | self.playing = False | 505 | self.playing = False |
2596 | 505 | self.MixBin=None | 506 | self.MixBin=None |
2597 | @@ -548,7 +549,8 @@ | |||
2598 | 548 | # | 549 | # |
2599 | 549 | queueFile = gst.element_factory_make("queue","queueFile") | 550 | queueFile = gst.element_factory_make("queue","queueFile") |
2600 | 550 | ElementList.append(queueFile) | 551 | ElementList.append(queueFile) |
2602 | 551 | fileSink = SaveCapturedImageBin(self.__CaptureImagePath) | 552 | #fileSink = SaveCapturedImageBin(self.__CaptureImagePath) |
2603 | 553 | fileSink = PhotoSaveBin() | ||
2604 | 552 | ElementList.append(fileSink) | 554 | ElementList.append(fileSink) |
2605 | 553 | 555 | ||
2606 | 554 | 556 | ||
2607 | @@ -643,4 +645,30 @@ | |||
2608 | 643 | 645 | ||
2609 | 644 | def is_playing(self): | 646 | def is_playing(self): |
2610 | 645 | return self.playing | 647 | return self.playing |
2612 | 646 | 648 | ||
2613 | 649 | def capture(self) : | ||
2614 | 650 | """ capture is requested : | ||
2615 | 651 | - get jpegnec src pad (output pad of jpege enc) | ||
2616 | 652 | - and add a buffer probe with callback when frame is encoded | ||
2617 | 653 | """ | ||
2618 | 654 | # only one src pad with jpegenc | ||
2619 | 655 | pad = self.pipe.get_by_name("MyJpegenc").src_pads().next() | ||
2620 | 656 | # add the probe | ||
2621 | 657 | self.grabprobe = pad.add_buffer_probe(self._cb_process_frame) | ||
2622 | 658 | |||
2623 | 659 | |||
2624 | 660 | def _cb_process_frame(self, pad, buffer): | ||
2625 | 661 | """ Callbak to inidicate that buffer is available from probe """ | ||
2626 | 662 | # remove the prove | ||
2627 | 663 | pad.remove_buffer_probe(self.grabprobe) | ||
2628 | 664 | |||
2629 | 665 | # save to file | ||
2630 | 666 | file = open(self.__CaptureImagePath,'w') | ||
2631 | 667 | file.write(buffer) | ||
2632 | 668 | file.close() | ||
2633 | 669 | |||
2634 | 670 | # callback to indicate that job is done | ||
2635 | 671 | # the execution here is not in the same thread as gui , so call capture_done with idle add | ||
2636 | 672 | if self._cb_capture_done != None : gobject.idle_add(self._cb_capture_done) | ||
2637 | 673 | |||
2638 | 674 | return True | ||
2639 | 647 | 675 | ||
2640 | === modified file 'lucioLib/luciole_image.py' | |||
2641 | --- lucioLib/luciole_image.py 2009-05-01 16:18:25 +0000 | |||
2642 | +++ lucioLib/luciole_image.py 2009-05-06 17:33:04 +0000 | |||
2643 | @@ -43,7 +43,7 @@ | |||
2644 | 43 | # thumb_ratio | 43 | # thumb_ratio |
2645 | 44 | 44 | ||
2646 | 45 | 45 | ||
2648 | 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 ): |
2649 | 47 | """ init Image object | 47 | """ init Image object |
2650 | 48 | image_path : absolute imapge path | 48 | image_path : absolute imapge path |
2651 | 49 | generate_pixbuf : set to True to generate pixbuf during init | 49 | generate_pixbuf : set to True to generate pixbuf during init |
2652 | @@ -55,8 +55,10 @@ | |||
2653 | 55 | self._pixbuf_normal = None | 55 | self._pixbuf_normal = None |
2654 | 56 | self._pixbuf_thumb = None | 56 | self._pixbuf_thumb = None |
2655 | 57 | self._thumb_ratio = thumb_ratio | 57 | self._thumb_ratio = thumb_ratio |
2656 | 58 | self._generate_text = generate_text | ||
2657 | 58 | self.generated = False | 59 | self.generated = False |
2658 | 59 | 60 | ||
2659 | 61 | |||
2660 | 60 | if generate_pixbuf == True : | 62 | if generate_pixbuf == True : |
2661 | 61 | # launch generation of poixbuf at init. Not threaded | 63 | # launch generation of poixbuf at init. Not threaded |
2662 | 62 | self._generare_pixbuf() | 64 | self._generare_pixbuf() |
2663 | @@ -81,8 +83,8 @@ | |||
2664 | 81 | self._pixbuf_thumb = self._pixbuf_normal.scale_simple( width , | 83 | self._pixbuf_thumb = self._pixbuf_normal.scale_simple( width , |
2665 | 82 | height , | 84 | height , |
2666 | 83 | gtk.gdk.INTERP_BILINEAR) | 85 | gtk.gdk.INTERP_BILINEAR) |
2669 | 84 | 86 | if self._generate_text == True : | |
2670 | 85 | self._generate_thumb_with_text() | 87 | self._generate_thumb_with_text() |
2671 | 86 | 88 | ||
2672 | 87 | self.generated =True | 89 | self.generated =True |
2673 | 88 | return False | 90 | return False |
2674 | 89 | 91 | ||
2675 | === modified file 'po/POTFILES.in' | |||
2676 | --- po/POTFILES.in 2009-04-24 10:24:03 +0000 | |||
2677 | +++ po/POTFILES.in 2009-05-07 09:27:18 +0000 | |||
2678 | @@ -10,6 +10,7 @@ | |||
2679 | 10 | lucioLib/gui/gui_controller.py | 10 | lucioLib/gui/gui_controller.py |
2680 | 11 | lucioLib/gui/webcam_detection_widget.py | 11 | lucioLib/gui/webcam_detection_widget.py |
2681 | 12 | lucioLib/gui/dialog.py | 12 | lucioLib/gui/dialog.py |
2682 | 13 | lucioLib/luciole_constants.py | ||
2683 | 13 | lucioLib/luciole_controller.py | 14 | lucioLib/luciole_controller.py |
2684 | 14 | lucioLib/luciole_image.py | 15 | lucioLib/luciole_image.py |
2685 | 15 | lucioLib/lucioExport/luciole_export.py | 16 | lucioLib/lucioExport/luciole_export.py |
2686 | 16 | 17 | ||
2687 | === added directory 'po/de_DE' | |||
2688 | === added file 'po/de_DE.po' | |||
2689 | --- po/de_DE.po 1970-01-01 00:00:00 +0000 | |||
2690 | +++ po/de_DE.po 2009-05-07 09:27:18 +0000 | |||
2691 | @@ -0,0 +1,613 @@ | |||
2692 | 1 | # German translations for nico package. | ||
2693 | 2 | # Copyright (C) 2009 THE nico'S COPYRIGHT HOLDER | ||
2694 | 3 | # This file is distributed under the same license as the nico package. | ||
2695 | 4 | # nico <nico@inattendu.org>, 2009. | ||
2696 | 5 | # | ||
2697 | 6 | msgid "" | ||
2698 | 7 | msgstr "" | ||
2699 | 8 | "Project-Id-Version: nico 3\n" | ||
2700 | 9 | "Report-Msgid-Bugs-To: \n" | ||
2701 | 10 | "POT-Creation-Date: 2009-05-07 11:21+0200\n" | ||
2702 | 11 | "PO-Revision-Date: 2009-05-06 01:02+0200\n" | ||
2703 | 12 | "Last-Translator: nico <nico@inattendu.org>\n" | ||
2704 | 13 | "Language-Team: German\n" | ||
2705 | 14 | "MIME-Version: 1.0\n" | ||
2706 | 15 | "Content-Type: text/plain; charset=ASCII\n" | ||
2707 | 16 | "Content-Transfer-Encoding: 8bit\n" | ||
2708 | 17 | "Plural-Forms: nplurals=2; plural=(n != 1);\n" | ||
2709 | 18 | |||
2710 | 19 | #: ../images/luciole.glade.h:1 | ||
2711 | 20 | msgid "" | ||
2712 | 21 | "\n" | ||
2713 | 22 | "Tool for video capture, for making animated cartoon from image per " | ||
2714 | 23 | "image \n" | ||
2715 | 24 | msgstr "" | ||
2716 | 25 | |||
2717 | 26 | #: ../images/luciole.glade.h:4 | ||
2718 | 27 | msgid " " | ||
2719 | 28 | msgstr "" | ||
2720 | 29 | |||
2721 | 30 | #: ../images/luciole.glade.h:5 | ||
2722 | 31 | msgid " Export file name (without extension) :" | ||
2723 | 32 | msgstr "" | ||
2724 | 33 | |||
2725 | 34 | #: ../images/luciole.glade.h:6 | ||
2726 | 35 | msgid "About" | ||
2727 | 36 | msgstr "" | ||
2728 | 37 | |||
2729 | 38 | #: ../images/luciole.glade.h:7 | ||
2730 | 39 | msgid "About Luciole" | ||
2731 | 40 | msgstr "" | ||
2732 | 41 | |||
2733 | 42 | #: ../images/luciole.glade.h:8 | ||
2734 | 43 | msgid "Activate/Deactivate camera preview" | ||
2735 | 44 | msgstr "" | ||
2736 | 45 | |||
2737 | 46 | #: ../images/luciole.glade.h:9 | ||
2738 | 47 | msgid "Add Trash to montage view" | ||
2739 | 48 | msgstr "" | ||
2740 | 49 | |||
2741 | 50 | #: ../images/luciole.glade.h:10 | ||
2742 | 51 | msgid "Choose export format." | ||
2743 | 52 | msgstr "" | ||
2744 | 53 | |||
2745 | 54 | #: ../images/luciole.glade.h:11 | ||
2746 | 55 | msgid "Copyright 2009 Nicolas Bertrand /GRAPE" | ||
2747 | 56 | msgstr "" | ||
2748 | 57 | |||
2749 | 58 | #: ../images/luciole.glade.h:12 | ||
2750 | 59 | msgid "" | ||
2751 | 60 | "DV format (raw DV)\n" | ||
2752 | 61 | "Format DVD (mpeg2)\n" | ||
2753 | 62 | "Format divx/xvid (avi)" | ||
2754 | 63 | msgstr "" | ||
2755 | 64 | |||
2756 | 65 | #: ../images/luciole.glade.h:15 | ||
2757 | 66 | msgid "" | ||
2758 | 67 | "Default\n" | ||
2759 | 68 | "Tropical" | ||
2760 | 69 | msgstr "" | ||
2761 | 70 | |||
2762 | 71 | #: ../images/luciole.glade.h:17 | ||
2763 | 72 | msgid "" | ||
2764 | 73 | "Elise : elise@inattendu.org\n" | ||
2765 | 74 | "Nico : nico@inattendu.org" | ||
2766 | 75 | msgstr "" | ||
2767 | 76 | |||
2768 | 77 | #: ../images/luciole.glade.h:19 | ||
2769 | 78 | msgid "Export" | ||
2770 | 79 | msgstr "" | ||
2771 | 80 | |||
2772 | 81 | #: ../images/luciole.glade.h:20 | ||
2773 | 82 | msgid "Export path:" | ||
2774 | 83 | msgstr "" | ||
2775 | 84 | |||
2776 | 85 | #: ../images/luciole.glade.h:21 | ||
2777 | 86 | msgid "Export video with sound." | ||
2778 | 87 | msgstr "" | ||
2779 | 88 | |||
2780 | 89 | #: ../images/luciole.glade.h:22 | ||
2781 | 90 | msgid "File format :" | ||
2782 | 91 | msgstr "" | ||
2783 | 92 | |||
2784 | 93 | #: ../images/luciole.glade.h:23 | ||
2785 | 94 | msgid "Image per seconds" | ||
2786 | 95 | msgstr "" | ||
2787 | 96 | |||
2788 | 97 | #. Caller une image sur le flux video | ||
2789 | 98 | #: ../images/luciole.glade.h:25 | ||
2790 | 99 | msgid "Import images" | ||
2791 | 100 | msgstr "" | ||
2792 | 101 | |||
2793 | 102 | #: ../images/luciole.glade.h:26 | ||
2794 | 103 | msgid "Luciole on line" | ||
2795 | 104 | msgstr "" | ||
2796 | 105 | |||
2797 | 106 | #: ../images/luciole.glade.h:27 | ||
2798 | 107 | msgid "Mixer" | ||
2799 | 108 | msgstr "" | ||
2800 | 109 | |||
2801 | 110 | #: ../images/luciole.glade.h:28 | ||
2802 | 111 | msgid "Mixer activation (onion skin)" | ||
2803 | 112 | msgstr "" | ||
2804 | 113 | |||
2805 | 114 | #. Descendre un/ou plusieurs images | ||
2806 | 115 | #: ../images/luciole.glade.h:30 | ||
2807 | 116 | msgid "Move down one or several images" | ||
2808 | 117 | msgstr "" | ||
2809 | 118 | |||
2810 | 119 | #. Déplacer des images capturées dans la zone de montage | ||
2811 | 120 | #: ../images/luciole.glade.h:32 | ||
2812 | 121 | msgid "Move snapshot to montage area" | ||
2813 | 122 | msgstr "" | ||
2814 | 123 | |||
2815 | 124 | #. Monter un/ou plusieurs images | ||
2816 | 125 | #: ../images/luciole.glade.h:34 | ||
2817 | 126 | msgid "Move up one or several images" | ||
2818 | 127 | msgstr "" | ||
2819 | 128 | |||
2820 | 129 | #: ../images/luciole.glade.h:35 | ||
2821 | 130 | msgid "Open recent" | ||
2822 | 131 | msgstr "" | ||
2823 | 132 | |||
2824 | 133 | #: ../images/luciole.glade.h:36 | ||
2825 | 134 | msgid "Play video" | ||
2826 | 135 | msgstr "" | ||
2827 | 136 | |||
2828 | 137 | #: ../images/luciole.glade.h:37 | ||
2829 | 138 | msgid "Preferences" | ||
2830 | 139 | msgstr "" | ||
2831 | 140 | |||
2832 | 141 | #: ../images/luciole.glade.h:38 | ||
2833 | 142 | msgid "Project Properties" | ||
2834 | 143 | msgstr "" | ||
2835 | 144 | |||
2836 | 145 | #: ../images/luciole.glade.h:39 | ||
2837 | 146 | #: ../lucioLib/gui/dialog_project_properties.py:89 | ||
2838 | 147 | msgid "Project properties" | ||
2839 | 148 | msgstr "" | ||
2840 | 149 | |||
2841 | 150 | #: ../images/luciole.glade.h:40 | ||
2842 | 151 | msgid "Select Theme" | ||
2843 | 152 | msgstr "" | ||
2844 | 153 | |||
2845 | 154 | #: ../images/luciole.glade.h:41 | ||
2846 | 155 | msgid "Select a Luciole project" | ||
2847 | 156 | msgstr "" | ||
2848 | 157 | |||
2849 | 158 | #: ../images/luciole.glade.h:42 ../lucioLib/gui/assistant_new_project.py:100 | ||
2850 | 159 | msgid "Select a folder" | ||
2851 | 160 | msgstr "" | ||
2852 | 161 | |||
2853 | 162 | #: ../images/luciole.glade.h:43 | ||
2854 | 163 | msgid "" | ||
2855 | 164 | "This program is free software; you can redistribute it and/or\n" | ||
2856 | 165 | "modify it under the terms of the GNU General Public License\n" | ||
2857 | 166 | "as published by the Free Software Foundation; either \n" | ||
2858 | 167 | "version 2 of the License, or (at your option) any later version.\n" | ||
2859 | 168 | "\n" | ||
2860 | 169 | "This program is distributed in the hope that it will be useful,\n" | ||
2861 | 170 | "but WITHOUT ANY WARRANTY; without even the implied \n" | ||
2862 | 171 | "warranty of MERCHANTABILITY or FITNESS FOR A \n" | ||
2863 | 172 | "PARTICULAR PURPOSE. See the GNU General Public \n" | ||
2864 | 173 | "License for more details.\n" | ||
2865 | 174 | "\n" | ||
2866 | 175 | "You should have received a copy of the GNU General Public\n" | ||
2867 | 176 | "License along with this program; if not, write to the \n" | ||
2868 | 177 | "Free Software Foundation, \n" | ||
2869 | 178 | "Inc., 59 Temple Place - \n" | ||
2870 | 179 | "Suite 330, Boston, MA 02111-1307, USA." | ||
2871 | 180 | msgstr "" | ||
2872 | 181 | |||
2873 | 182 | #. Jeter à la poubelle | ||
2874 | 183 | #: ../images/luciole.glade.h:60 | ||
2875 | 184 | msgid "To trash" | ||
2876 | 185 | msgstr "" | ||
2877 | 186 | |||
2878 | 187 | #: ../images/luciole.glade.h:61 | ||
2879 | 188 | msgid "Transparency level" | ||
2880 | 189 | msgstr "" | ||
2881 | 190 | |||
2882 | 191 | #: ../images/luciole.glade.h:62 | ||
2883 | 192 | msgid "Video Export" | ||
2884 | 193 | msgstr "" | ||
2885 | 194 | |||
2886 | 195 | #: ../images/luciole.glade.h:63 | ||
2887 | 196 | msgid "_File" | ||
2888 | 197 | msgstr "" | ||
2889 | 198 | |||
2890 | 199 | #: ../images/luciole.glade.h:64 | ||
2891 | 200 | msgid "_Help" | ||
2892 | 201 | msgstr "" | ||
2893 | 202 | |||
2894 | 203 | #: ../images/luciole.glade.h:65 | ||
2895 | 204 | msgid "_View" | ||
2896 | 205 | msgstr "" | ||
2897 | 206 | |||
2898 | 207 | #: ../images/luciole.glade.h:66 | ||
2899 | 208 | msgid "gtk-apply" | ||
2900 | 209 | msgstr "" | ||
2901 | 210 | |||
2902 | 211 | #: ../images/luciole.glade.h:67 | ||
2903 | 212 | msgid "gtk-cancel" | ||
2904 | 213 | msgstr "" | ||
2905 | 214 | |||
2906 | 215 | #: ../images/luciole.glade.h:68 | ||
2907 | 216 | msgid "gtk-close" | ||
2908 | 217 | msgstr "" | ||
2909 | 218 | |||
2910 | 219 | #. Capturer une image | ||
2911 | 220 | #: ../images/luciole.glade.h:70 | ||
2912 | 221 | msgid "make a snapshot" | ||
2913 | 222 | msgstr "" | ||
2914 | 223 | |||
2915 | 224 | #: ../images/luciole.glade.h:71 | ||
2916 | 225 | msgid "options" | ||
2917 | 226 | msgstr "" | ||
2918 | 227 | |||
2919 | 228 | #: ../images/luciole.glade.h:72 | ||
2920 | 229 | msgid "project1" | ||
2921 | 230 | msgstr "" | ||
2922 | 231 | |||
2923 | 232 | #: ../images/luciole.glade.h:73 | ||
2924 | 233 | msgid "project2" | ||
2925 | 234 | msgstr "" | ||
2926 | 235 | |||
2927 | 236 | #: ../images/luciole.glade.h:74 | ||
2928 | 237 | msgid "project3" | ||
2929 | 238 | msgstr "" | ||
2930 | 239 | |||
2931 | 240 | #: ../images/luciole.glade.h:75 | ||
2932 | 241 | msgid "project4" | ||
2933 | 242 | msgstr "" | ||
2934 | 243 | |||
2935 | 244 | #: ../images/luciole.glade.h:76 | ||
2936 | 245 | msgid "project5" | ||
2937 | 246 | msgstr "" | ||
2938 | 247 | |||
2939 | 248 | #: ../lucioLib/controller/controller_load_project.py:134 | ||
2940 | 249 | msgid "Project Load started" | ||
2941 | 250 | msgstr "" | ||
2942 | 251 | |||
2943 | 252 | #: ../lucioLib/controller/controller_load_project.py:139 | ||
2944 | 253 | #, python-format | ||
2945 | 254 | msgid "Project %s is loaded" | ||
2946 | 255 | msgstr "" | ||
2947 | 256 | |||
2948 | 257 | #: ../lucioLib/controller/controller_load_project.py:145 | ||
2949 | 258 | #, python-format | ||
2950 | 259 | msgid "Project %s is loading" | ||
2951 | 260 | msgstr "" | ||
2952 | 261 | |||
2953 | 262 | #: ../lucioLib/controller/controller_import.py:178 | ||
2954 | 263 | msgid "Import started" | ||
2955 | 264 | msgstr "" | ||
2956 | 265 | |||
2957 | 266 | #: ../lucioLib/controller/controller_import.py:183 | ||
2958 | 267 | msgid "All images imported" | ||
2959 | 268 | msgstr "" | ||
2960 | 269 | |||
2961 | 270 | #: ../lucioLib/controller/controller_import.py:189 | ||
2962 | 271 | msgid "Importing images ..." | ||
2963 | 272 | msgstr "" | ||
2964 | 273 | |||
2965 | 274 | #: ../lucioLib/gui/dialog_project_properties.py:41 | ||
2966 | 275 | msgid "Project folder :" | ||
2967 | 276 | msgstr "" | ||
2968 | 277 | |||
2969 | 278 | #: ../lucioLib/gui/dialog_project_properties.py:45 | ||
2970 | 279 | msgid "Project name :" | ||
2971 | 280 | msgstr "" | ||
2972 | 281 | |||
2973 | 282 | #: ../lucioLib/gui/dialog_project_properties.py:49 | ||
2974 | 283 | msgid "XML file :" | ||
2975 | 284 | msgstr "" | ||
2976 | 285 | |||
2977 | 286 | #: ../lucioLib/gui/dialog_project_properties.py:54 | ||
2978 | 287 | msgid "Number of frames / image" | ||
2979 | 288 | msgstr "" | ||
2980 | 289 | |||
2981 | 290 | #: ../lucioLib/gui/dialog_project_properties.py:58 | ||
2982 | 291 | msgid "Device type" | ||
2983 | 292 | msgstr "" | ||
2984 | 293 | |||
2985 | 294 | #: ../lucioLib/gui/dialog_project_properties.py:66 | ||
2986 | 295 | msgid "Device :" | ||
2987 | 296 | msgstr "" | ||
2988 | 297 | |||
2989 | 298 | #: ../lucioLib/gui/dialog_project_properties.py:70 | ||
2990 | 299 | msgid "Webcam name :" | ||
2991 | 300 | msgstr "" | ||
2992 | 301 | |||
2993 | 302 | #: ../lucioLib/gui/dialog_project_properties.py:75 | ||
2994 | 303 | msgid "Video capture driver :" | ||
2995 | 304 | msgstr "" | ||
2996 | 305 | |||
2997 | 306 | #: ../lucioLib/gui/dialog_project_properties.py:79 | ||
2998 | 307 | msgid "Video width :" | ||
2999 | 308 | msgstr "" | ||
3000 | 309 | |||
3001 | 310 | #: ../lucioLib/gui/dialog_project_properties.py:83 | ||
3002 | 311 | msgid "Video height :" | ||
3003 | 312 | msgstr "" | ||
3004 | 313 | |||
3005 | 314 | #: ../lucioLib/gui/dialog_project_properties.py:177 | ||
3006 | 315 | #: ../lucioLib/gui/dialog_project_properties.py:193 | ||
3007 | 316 | msgid "desc" | ||
3008 | 317 | msgstr "" | ||
3009 | 318 | |||
3010 | 319 | #: ../lucioLib/gui/dialog_project_properties.py:220 | ||
3011 | 320 | msgid "Webcam properties" | ||
3012 | 321 | msgstr "" | ||
3013 | 322 | |||
3014 | 323 | #. | ||
3015 | 324 | #. Display Button fo webcam detetction | ||
3016 | 325 | #. | ||
3017 | 326 | #: ../lucioLib/gui/dialog_project_properties.py:247 | ||
3018 | 327 | msgid "Webcam detection" | ||
3019 | 328 | msgstr "" | ||
3020 | 329 | |||
3021 | 330 | #: ../lucioLib/gui/luciole_export_window.py:164 | ||
3022 | 331 | #, python-format | ||
3023 | 332 | msgid "" | ||
3024 | 333 | "%s is not valid. Not valid video name. Should be a combination of " | ||
3025 | 334 | "alhanumeric and '_' characters " | ||
3026 | 335 | msgstr "" | ||
3027 | 336 | |||
3028 | 337 | #: ../lucioLib/gui/luciole_export_window.py:184 | ||
3029 | 338 | msgid "unknown video export command" | ||
3030 | 339 | msgstr "" | ||
3031 | 340 | |||
3032 | 341 | #. Launch Dialog window to ask if export file can be overide | ||
3033 | 342 | #: ../lucioLib/gui/luciole_export_window.py:195 | ||
3034 | 343 | #, python-format | ||
3035 | 344 | msgid "File %s exists. Replace file ?" | ||
3036 | 345 | msgstr "" | ||
3037 | 346 | |||
3038 | 347 | #. | ||
3039 | 348 | #. Initailize widgets for first page | ||
3040 | 349 | #. | ||
3041 | 350 | #. A label | ||
3042 | 351 | #: ../lucioLib/gui/assistant_new_project.py:59 | ||
3043 | 352 | msgid "This assistant will help you on configuration of a new luciole project." | ||
3044 | 353 | msgstr "" | ||
3045 | 354 | |||
3046 | 355 | #. A label | ||
3047 | 356 | #: ../lucioLib/gui/assistant_new_project.py:72 | ||
3048 | 357 | msgid "Select project name and destination folder." | ||
3049 | 358 | msgstr "" | ||
3050 | 359 | |||
3051 | 360 | #. display project name | ||
3052 | 361 | #: ../lucioLib/gui/assistant_new_project.py:82 | ||
3053 | 362 | #: ../lucioLib/gui/assistant_new_project.py:339 | ||
3054 | 363 | msgid "Project Name" | ||
3055 | 364 | msgstr "" | ||
3056 | 365 | |||
3057 | 366 | #: ../lucioLib/gui/assistant_new_project.py:93 | ||
3058 | 367 | msgid "Folder" | ||
3059 | 368 | msgstr "" | ||
3060 | 369 | |||
3061 | 370 | #: ../lucioLib/gui/assistant_new_project.py:147 | ||
3062 | 371 | #, python-format | ||
3063 | 372 | msgid "" | ||
3064 | 373 | "%s is not valid. Not valid project name. Should be a combination of " | ||
3065 | 374 | "alhanumeric and '_' characters " | ||
3066 | 375 | msgstr "" | ||
3067 | 376 | |||
3068 | 377 | #: ../lucioLib/gui/assistant_new_project.py:158 | ||
3069 | 378 | #, python-format | ||
3070 | 379 | msgid "The project %s exists !" | ||
3071 | 380 | msgstr "" | ||
3072 | 381 | |||
3073 | 382 | #: ../lucioLib/gui/assistant_new_project.py:203 | ||
3074 | 383 | msgid "Select a device" | ||
3075 | 384 | msgstr "" | ||
3076 | 385 | |||
3077 | 386 | #: ../lucioLib/gui/assistant_new_project.py:223 | ||
3078 | 387 | msgid "" | ||
3079 | 388 | " Other device.\n" | ||
3080 | 389 | "(Manual import)" | ||
3081 | 390 | msgstr "" | ||
3082 | 391 | |||
3083 | 392 | #: ../lucioLib/gui/assistant_new_project.py:240 | ||
3084 | 393 | msgid "Images per second" | ||
3085 | 394 | msgstr "" | ||
3086 | 395 | |||
3087 | 396 | #. display project path | ||
3088 | 397 | #: ../lucioLib/gui/assistant_new_project.py:343 | ||
3089 | 398 | msgid "Project Path" | ||
3090 | 399 | msgstr "" | ||
3091 | 400 | |||
3092 | 401 | #: ../lucioLib/gui/assistant_new_project.py:352 | ||
3093 | 402 | msgid "Number of frames per seconds" | ||
3094 | 403 | msgstr "" | ||
3095 | 404 | |||
3096 | 405 | #. display Hardware type | ||
3097 | 406 | #: ../lucioLib/gui/assistant_new_project.py:356 | ||
3098 | 407 | msgid "Hardware type" | ||
3099 | 408 | msgstr "" | ||
3100 | 409 | |||
3101 | 410 | #. webcam name | ||
3102 | 411 | #: ../lucioLib/gui/assistant_new_project.py:362 | ||
3103 | 412 | msgid "Webcam name" | ||
3104 | 413 | msgstr "" | ||
3105 | 414 | |||
3106 | 415 | #. webcam device | ||
3107 | 416 | #: ../lucioLib/gui/assistant_new_project.py:366 | ||
3108 | 417 | msgid "Webcam device" | ||
3109 | 418 | msgstr "" | ||
3110 | 419 | |||
3111 | 420 | #. webcam resolution | ||
3112 | 421 | #: ../lucioLib/gui/assistant_new_project.py:370 | ||
3113 | 422 | msgid "Webcam resolution used" | ||
3114 | 423 | msgstr "" | ||
3115 | 424 | |||
3116 | 425 | #. webcam device | ||
3117 | 426 | #: ../lucioLib/gui/assistant_new_project.py:376 | ||
3118 | 427 | msgid "Webcam driver used" | ||
3119 | 428 | msgstr "" | ||
3120 | 429 | |||
3121 | 430 | #. Final message | ||
3122 | 431 | #: ../lucioLib/gui/assistant_new_project.py:381 | ||
3123 | 432 | msgid "Have fun with luciole !" | ||
3124 | 433 | msgstr "" | ||
3125 | 434 | |||
3126 | 435 | #: ../lucioLib/gui/assistant_new_project.py:411 | ||
3127 | 436 | msgid "Luciole project assistant" | ||
3128 | 437 | msgstr "" | ||
3129 | 438 | |||
3130 | 439 | #: ../lucioLib/gui/assistant_new_project.py:422 | ||
3131 | 440 | msgid " Select a project path " | ||
3132 | 441 | msgstr "" | ||
3133 | 442 | |||
3134 | 443 | #: ../lucioLib/gui/assistant_new_project.py:431 | ||
3135 | 444 | msgid " Select hardware " | ||
3136 | 445 | msgstr "" | ||
3137 | 446 | |||
3138 | 447 | #: ../lucioLib/gui/assistant_new_project.py:441 | ||
3139 | 448 | msgid " Webcam detection " | ||
3140 | 449 | msgstr "" | ||
3141 | 450 | |||
3142 | 451 | #: ../lucioLib/gui/assistant_new_project.py:451 | ||
3143 | 452 | msgid " Project overview " | ||
3144 | 453 | msgstr "" | ||
3145 | 454 | |||
3146 | 455 | #. create New button project | ||
3147 | 456 | #: ../lucioLib/gui/open_project_widget.py:50 | ||
3148 | 457 | msgid "Create a new project" | ||
3149 | 458 | msgstr "" | ||
3150 | 459 | |||
3151 | 460 | #. create open button project | ||
3152 | 461 | #: ../lucioLib/gui/open_project_widget.py:59 | ||
3153 | 462 | msgid "Open an existing project" | ||
3154 | 463 | msgstr "" | ||
3155 | 464 | |||
3156 | 465 | #: ../lucioLib/gui/webcam_detection_widget.py:98 | ||
3157 | 466 | msgid "Please wait for webcam detection" | ||
3158 | 467 | msgstr "" | ||
3159 | 468 | |||
3160 | 469 | #: ../lucioLib/gui/webcam_detection_widget.py:103 | ||
3161 | 470 | msgid "Webcam detection done" | ||
3162 | 471 | msgstr "" | ||
3163 | 472 | |||
3164 | 473 | #: ../lucioLib/gui/webcam_detection_widget.py:188 | ||
3165 | 474 | msgid "Detected webcam(s)" | ||
3166 | 475 | msgstr "" | ||
3167 | 476 | |||
3168 | 477 | #: ../lucioLib/gui/webcam_detection_widget.py:192 | ||
3169 | 478 | msgid "No webcam detected" | ||
3170 | 479 | msgstr "" | ||
3171 | 480 | |||
3172 | 481 | #: ../lucioLib/gui/dialog.py:73 | ||
3173 | 482 | msgid "Select files to import" | ||
3174 | 483 | msgstr "" | ||
3175 | 484 | |||
3176 | 485 | #: ../lucioLib/gui/dialog.py:114 | ||
3177 | 486 | msgid "Select a Folder" | ||
3178 | 487 | msgstr "" | ||
3179 | 488 | |||
3180 | 489 | #: ../lucioLib/luciole_constants.py:42 | ||
3181 | 490 | msgid "OTHER DEVICE" | ||
3182 | 491 | msgstr "" | ||
3183 | 492 | |||
3184 | 493 | #: ../lucioLib/luciole_controller.py:157 | ||
3185 | 494 | #, python-format | ||
3186 | 495 | msgid "Project %s saved" | ||
3187 | 496 | msgstr "" | ||
3188 | 497 | |||
3189 | 498 | #: ../lucioLib/luciole_controller.py:185 | ||
3190 | 499 | #, python-format | ||
3191 | 500 | msgid "Project saved as %s" | ||
3192 | 501 | msgstr "" | ||
3193 | 502 | |||
3194 | 503 | #: ../lucioLib/luciole_controller.py:229 | ||
3195 | 504 | msgid "No file or valid file choosen for image import." | ||
3196 | 505 | msgstr "" | ||
3197 | 506 | |||
3198 | 507 | #: ../lucioLib/luciole_controller.py:233 | ||
3199 | 508 | msgid "Impossible to import images when no project are loaded." | ||
3200 | 509 | msgstr "" | ||
3201 | 510 | |||
3202 | 511 | #. nbd@grape to transform as error message | ||
3203 | 512 | #: ../lucioLib/luciole_controller.py:262 | ||
3204 | 513 | msgid "Nothing to export. No project loaded" | ||
3205 | 514 | msgstr "" | ||
3206 | 515 | |||
3207 | 516 | #. nbd@grape specify action to do err message or raise exception ? | ||
3208 | 517 | #: ../lucioLib/luciole_controller.py:280 | ||
3209 | 518 | msgid "Imposible to initialize player." | ||
3210 | 519 | msgstr "" | ||
3211 | 520 | |||
3212 | 521 | #. nbd@grape to transform as error message | ||
3213 | 522 | #: ../lucioLib/luciole_controller.py:302 | ||
3214 | 523 | msgid "Can not play animantion : No image on montage view " | ||
3215 | 524 | msgstr "" | ||
3216 | 525 | |||
3217 | 526 | #. nbd@grape to transform as error message | ||
3218 | 527 | #: ../lucioLib/luciole_controller.py:311 | ||
3219 | 528 | msgid "Can not play animantion : No project loaded " | ||
3220 | 529 | msgstr "" | ||
3221 | 530 | |||
3222 | 531 | #. nbd@grape : ask for save if save set status as loaded | ||
3223 | 532 | #: ../lucioLib/luciole_controller.py:360 | ||
3224 | 533 | msgid "Save Project before closing" | ||
3225 | 534 | msgstr "" | ||
3226 | 535 | |||
3227 | 536 | #: ../lucioLib/luciole_controller.py:386 | ||
3228 | 537 | #, python-format | ||
3229 | 538 | msgid "Project %s is closed" | ||
3230 | 539 | msgstr "" | ||
3231 | 540 | |||
3232 | 541 | #. clear message status bar | ||
3233 | 542 | #: ../lucioLib/luciole_controller.py:407 | ||
3234 | 543 | msgid "Acquiring" | ||
3235 | 544 | msgstr "" | ||
3236 | 545 | |||
3237 | 546 | #. stop acquirer | ||
3238 | 547 | #: ../lucioLib/luciole_controller.py:424 | ||
3239 | 548 | msgid "" | ||
3240 | 549 | "No acquisition available. Use 'import image' button to load images in " | ||
3241 | 550 | "project." | ||
3242 | 551 | msgstr "" | ||
3243 | 552 | |||
3244 | 553 | #: ../lucioLib/luciole_controller.py:436 | ||
3245 | 554 | msgid " Can not start acquisition when no project are loaded." | ||
3246 | 555 | msgstr "" | ||
3247 | 556 | |||
3248 | 557 | #: ../lucioLib/luciole_controller.py:445 | ||
3249 | 558 | #, python-format | ||
3250 | 559 | msgid "Acquisition error. %s" | ||
3251 | 560 | msgstr "" | ||
3252 | 561 | |||
3253 | 562 | #: ../lucioLib/luciole_controller.py:459 | ||
3254 | 563 | msgid "No Acquistion" | ||
3255 | 564 | msgstr "" | ||
3256 | 565 | |||
3257 | 566 | #. nbd@grape : ask for save if save set status as loaded | ||
3258 | 567 | #: ../lucioLib/luciole_controller.py:548 | ||
3259 | 568 | msgid "Project modified. Save project before exit ?" | ||
3260 | 569 | msgstr "" | ||
3261 | 570 | |||
3262 | 571 | #: ../lucioLib/luciole_controller.py:600 | ||
3263 | 572 | msgid "Please restart luciole to take into account the new theme " | ||
3264 | 573 | msgstr "" | ||
3265 | 574 | |||
3266 | 575 | #: ../lucioLib/luciole_controller.py:650 | ||
3267 | 576 | msgid "Failed to load project " | ||
3268 | 577 | msgstr "" | ||
3269 | 578 | |||
3270 | 579 | #: ../lucioLib/luciole_image.py:137 | ||
3271 | 580 | #, python-format | ||
3272 | 581 | msgid "Not a file : %s" | ||
3273 | 582 | msgstr "" | ||
3274 | 583 | |||
3275 | 584 | #: ../lucioLib/luciole_image.py:185 | ||
3276 | 585 | msgid "rush folder not valid" | ||
3277 | 586 | msgstr "" | ||
3278 | 587 | |||
3279 | 588 | #. error to raise | ||
3280 | 589 | #: ../lucioLib/luciole_image.py:280 | ||
3281 | 590 | #, python-format | ||
3282 | 591 | msgid "Error path does not exist : %s" | ||
3283 | 592 | msgstr "" | ||
3284 | 593 | |||
3285 | 594 | #: ../lucioLib/lucioExport/luciole_export.py:90 | ||
3286 | 595 | msgid "Pass 1/2" | ||
3287 | 596 | msgstr "" | ||
3288 | 597 | |||
3289 | 598 | #: ../lucioLib/lucioExport/luciole_export.py:99 | ||
3290 | 599 | msgid "Pass 2/2" | ||
3291 | 600 | msgstr "" | ||
3292 | 601 | |||
3293 | 602 | #. Terminated normaly | ||
3294 | 603 | #: ../lucioLib/lucioExport/luciole_export.py:202 | ||
3295 | 604 | msgid "Export Done" | ||
3296 | 605 | msgstr "" | ||
3297 | 606 | |||
3298 | 607 | #: ../lucioLib/lucioExport/luciole_export.py:205 | ||
3299 | 608 | msgid "Export Canceled" | ||
3300 | 609 | msgstr "" | ||
3301 | 610 | |||
3302 | 611 | #: ../lucioLib/lucioExport/luciole_export.py:507 | ||
3303 | 612 | msgid "Unable to erase" | ||
3304 | 613 | msgstr "" | ||
3305 | 0 | 614 | ||
3306 | === added directory 'po/de_DE/LC_MESSAGES' | |||
3307 | === added file 'po/de_DE/LC_MESSAGES/luciole.mo' | |||
3308 | 1 | Binary 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 | 615 | Binary 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 |
3309 | === modified file 'po/en_EN.po' | |||
3310 | --- po/en_EN.po 2009-05-01 16:34:13 +0000 | |||
3311 | +++ po/en_EN.po 2009-05-07 09:27:18 +0000 | |||
3312 | @@ -7,7 +7,7 @@ | |||
3313 | 7 | msgstr "" | 7 | msgstr "" |
3314 | 8 | "Project-Id-Version: myrtille-i 18n\n" | 8 | "Project-Id-Version: myrtille-i 18n\n" |
3315 | 9 | "Report-Msgid-Bugs-To: \n" | 9 | "Report-Msgid-Bugs-To: \n" |
3317 | 10 | "POT-Creation-Date: 2009-05-01 18:31+0200\n" | 10 | "POT-Creation-Date: 2009-05-07 11:21+0200\n" |
3318 | 11 | "PO-Revision-Date: 2008-05-08 18:51+0200\n" | 11 | "PO-Revision-Date: 2008-05-08 18:51+0200\n" |
3319 | 12 | "Last-Translator: nico <nico@inattendu.org>\n" | 12 | "Last-Translator: nico <nico@inattendu.org>\n" |
3320 | 13 | "Language-Team: English\n" | 13 | "Language-Team: English\n" |
3321 | @@ -79,8 +79,9 @@ | |||
3322 | 79 | msgstr "" | 79 | msgstr "" |
3323 | 80 | 80 | ||
3324 | 81 | #: ../images/luciole.glade.h:19 | 81 | #: ../images/luciole.glade.h:19 |
3325 | 82 | #, fuzzy | ||
3326 | 82 | msgid "Export" | 83 | msgid "Export" |
3328 | 83 | msgstr "Export" | 84 | msgstr "Export ..." |
3329 | 84 | 85 | ||
3330 | 85 | #: ../images/luciole.glade.h:20 | 86 | #: ../images/luciole.glade.h:20 |
3331 | 86 | #, fuzzy | 87 | #, fuzzy |
3332 | @@ -124,7 +125,7 @@ | |||
3333 | 124 | msgid "Move down one or several images" | 125 | msgid "Move down one or several images" |
3334 | 125 | msgstr "" | 126 | msgstr "" |
3335 | 126 | 127 | ||
3337 | 127 | #. Déplacer des images capturées dans la zone de montage | 128 | #. Déplacer des images capturées dans la zone de montage |
3338 | 128 | #: ../images/luciole.glade.h:32 | 129 | #: ../images/luciole.glade.h:32 |
3339 | 129 | msgid "Move snapshot to montage area" | 130 | msgid "Move snapshot to montage area" |
3340 | 130 | msgstr "" | 131 | msgstr "" |
3341 | @@ -151,19 +152,24 @@ | |||
3342 | 151 | msgstr "" | 152 | msgstr "" |
3343 | 152 | 153 | ||
3344 | 153 | #: ../images/luciole.glade.h:39 | 154 | #: ../images/luciole.glade.h:39 |
3345 | 155 | #: ../lucioLib/gui/dialog_project_properties.py:89 | ||
3346 | 156 | msgid "Project properties" | ||
3347 | 157 | msgstr "" | ||
3348 | 158 | |||
3349 | 159 | #: ../images/luciole.glade.h:40 | ||
3350 | 154 | msgid "Select Theme" | 160 | msgid "Select Theme" |
3351 | 155 | msgstr "" | 161 | msgstr "" |
3352 | 156 | 162 | ||
3354 | 157 | #: ../images/luciole.glade.h:40 | 163 | #: ../images/luciole.glade.h:41 |
3355 | 158 | #, fuzzy | 164 | #, fuzzy |
3356 | 159 | msgid "Select a Luciole project" | 165 | msgid "Select a Luciole project" |
3357 | 160 | msgstr "Select a myrtille project file" | 166 | msgstr "Select a myrtille project file" |
3358 | 161 | 167 | ||
3360 | 162 | #: ../images/luciole.glade.h:41 ../lucioLib/gui/assistant_new_project.py:102 | 168 | #: ../images/luciole.glade.h:42 ../lucioLib/gui/assistant_new_project.py:100 |
3361 | 163 | msgid "Select a folder" | 169 | msgid "Select a folder" |
3362 | 164 | msgstr "" | 170 | msgstr "" |
3363 | 165 | 171 | ||
3365 | 166 | #: ../images/luciole.glade.h:42 | 172 | #: ../images/luciole.glade.h:43 |
3366 | 167 | msgid "" | 173 | msgid "" |
3367 | 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" |
3368 | 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" |
3369 | @@ -199,108 +205,85 @@ | |||
3370 | 199 | "Inc., 59 Temple Place - \n" | 205 | "Inc., 59 Temple Place - \n" |
3371 | 200 | "Suite 330, Boston, MA 02111-1307, USA." | 206 | "Suite 330, Boston, MA 02111-1307, USA." |
3372 | 201 | 207 | ||
3375 | 202 | #. Jeter à la poubelle | 208 | #. Jeter à la poubelle |
3376 | 203 | #: ../images/luciole.glade.h:59 | 209 | #: ../images/luciole.glade.h:60 |
3377 | 204 | msgid "To trash" | 210 | msgid "To trash" |
3378 | 205 | msgstr "" | 211 | msgstr "" |
3379 | 206 | 212 | ||
3381 | 207 | #: ../images/luciole.glade.h:60 | 213 | #: ../images/luciole.glade.h:61 |
3382 | 208 | msgid "Transparency level" | 214 | msgid "Transparency level" |
3383 | 209 | msgstr "" | 215 | msgstr "" |
3384 | 210 | 216 | ||
3386 | 211 | #: ../images/luciole.glade.h:61 | 217 | #: ../images/luciole.glade.h:62 |
3387 | 218 | #, fuzzy | ||
3388 | 219 | msgid "Video Export" | ||
3389 | 220 | msgstr "Export" | ||
3390 | 221 | |||
3391 | 222 | #: ../images/luciole.glade.h:63 | ||
3392 | 212 | #, fuzzy | 223 | #, fuzzy |
3393 | 213 | msgid "_File" | 224 | msgid "_File" |
3394 | 214 | msgstr "_Fichier" | 225 | msgstr "_Fichier" |
3395 | 215 | 226 | ||
3397 | 216 | #: ../images/luciole.glade.h:62 | 227 | #: ../images/luciole.glade.h:64 |
3398 | 217 | msgid "_Help" | 228 | msgid "_Help" |
3399 | 218 | msgstr "" | 229 | msgstr "" |
3400 | 219 | 230 | ||
3402 | 220 | #: ../images/luciole.glade.h:63 | 231 | #: ../images/luciole.glade.h:65 |
3403 | 221 | msgid "_View" | 232 | msgid "_View" |
3404 | 222 | msgstr "" | 233 | msgstr "" |
3405 | 223 | 234 | ||
3411 | 224 | #: ../images/luciole.glade.h:64 | 235 | #: ../images/luciole.glade.h:66 |
3407 | 225 | msgid "gtk-about" | ||
3408 | 226 | msgstr "gtk-about" | ||
3409 | 227 | |||
3410 | 228 | #: ../images/luciole.glade.h:65 | ||
3412 | 229 | msgid "gtk-apply" | 236 | msgid "gtk-apply" |
3413 | 230 | msgstr "gtk-apply" | 237 | msgstr "gtk-apply" |
3414 | 231 | 238 | ||
3416 | 232 | #: ../images/luciole.glade.h:66 | 239 | #: ../images/luciole.glade.h:67 |
3417 | 233 | msgid "gtk-cancel" | 240 | msgid "gtk-cancel" |
3418 | 234 | msgstr "gtk-cancel" | 241 | msgstr "gtk-cancel" |
3419 | 235 | 242 | ||
3421 | 236 | #: ../images/luciole.glade.h:67 | 243 | #: ../images/luciole.glade.h:68 |
3422 | 237 | #, fuzzy | 244 | #, fuzzy |
3423 | 238 | msgid "gtk-close" | 245 | msgid "gtk-close" |
3424 | 239 | msgstr "gtk-open" | 246 | msgstr "gtk-open" |
3425 | 240 | 247 | ||
3434 | 241 | #: ../images/luciole.glade.h:68 | 248 | #. Capturer une image |
3427 | 242 | msgid "gtk-new" | ||
3428 | 243 | msgstr "gtk-new" | ||
3429 | 244 | |||
3430 | 245 | #: ../images/luciole.glade.h:69 | ||
3431 | 246 | msgid "gtk-open" | ||
3432 | 247 | msgstr "gtk-open" | ||
3433 | 248 | |||
3435 | 249 | #: ../images/luciole.glade.h:70 | 249 | #: ../images/luciole.glade.h:70 |
3438 | 250 | msgid "gtk-quit" | 250 | msgid "make a snapshot" |
3439 | 251 | msgstr "gtk-quit" | 251 | msgstr "" |
3440 | 252 | 252 | ||
3441 | 253 | #: ../images/luciole.glade.h:71 | 253 | #: ../images/luciole.glade.h:71 |
3444 | 254 | msgid "gtk-save" | 254 | msgid "options" |
3445 | 255 | msgstr "gtk-save" | 255 | msgstr "" |
3446 | 256 | 256 | ||
3447 | 257 | #: ../images/luciole.glade.h:72 | 257 | #: ../images/luciole.glade.h:72 |
3448 | 258 | msgid "gtk-save-as" | ||
3449 | 259 | msgstr "gtk-save-as" | ||
3450 | 260 | |||
3451 | 261 | #. Capturer une image | ||
3452 | 262 | #: ../images/luciole.glade.h:74 | ||
3453 | 263 | msgid "make a snapshot" | ||
3454 | 264 | msgstr "" | ||
3455 | 265 | |||
3456 | 266 | #: ../images/luciole.glade.h:75 | ||
3457 | 267 | msgid "menuitem1" | ||
3458 | 268 | msgstr "" | ||
3459 | 269 | |||
3460 | 270 | #: ../images/luciole.glade.h:76 | ||
3461 | 271 | msgid "options" | ||
3462 | 272 | msgstr "" | ||
3463 | 273 | |||
3464 | 274 | #: ../images/luciole.glade.h:77 | ||
3465 | 275 | msgid "project1" | 258 | msgid "project1" |
3466 | 276 | msgstr "" | 259 | msgstr "" |
3467 | 277 | 260 | ||
3469 | 278 | #: ../images/luciole.glade.h:78 | 261 | #: ../images/luciole.glade.h:73 |
3470 | 279 | msgid "project2" | 262 | msgid "project2" |
3471 | 280 | msgstr "" | 263 | msgstr "" |
3472 | 281 | 264 | ||
3474 | 282 | #: ../images/luciole.glade.h:79 | 265 | #: ../images/luciole.glade.h:74 |
3475 | 283 | msgid "project3" | 266 | msgid "project3" |
3476 | 284 | msgstr "" | 267 | msgstr "" |
3477 | 285 | 268 | ||
3479 | 286 | #: ../images/luciole.glade.h:80 | 269 | #: ../images/luciole.glade.h:75 |
3480 | 287 | msgid "project4" | 270 | msgid "project4" |
3481 | 288 | msgstr "" | 271 | msgstr "" |
3482 | 289 | 272 | ||
3484 | 290 | #: ../images/luciole.glade.h:81 | 273 | #: ../images/luciole.glade.h:76 |
3485 | 291 | msgid "project5" | 274 | msgid "project5" |
3486 | 292 | msgstr "" | 275 | msgstr "" |
3487 | 293 | 276 | ||
3489 | 294 | #: ../lucioLib/controller/controller_load_project.py:133 | 277 | #: ../lucioLib/controller/controller_load_project.py:134 |
3490 | 295 | msgid "Project Load started" | 278 | msgid "Project Load started" |
3491 | 296 | msgstr "" | 279 | msgstr "" |
3492 | 297 | 280 | ||
3494 | 298 | #: ../lucioLib/controller/controller_load_project.py:138 | 281 | #: ../lucioLib/controller/controller_load_project.py:139 |
3495 | 299 | #, python-format | 282 | #, python-format |
3496 | 300 | msgid "Project %s is loaded" | 283 | msgid "Project %s is loaded" |
3497 | 301 | msgstr "" | 284 | msgstr "" |
3498 | 302 | 285 | ||
3500 | 303 | #: ../lucioLib/controller/controller_load_project.py:144 | 286 | #: ../lucioLib/controller/controller_load_project.py:145 |
3501 | 304 | #, python-format | 287 | #, python-format |
3502 | 305 | msgid "Project %s is loading" | 288 | msgid "Project %s is loading" |
3503 | 306 | msgstr "" | 289 | msgstr "" |
3504 | @@ -361,10 +344,6 @@ | |||
3505 | 361 | msgid "Video height :" | 344 | msgid "Video height :" |
3506 | 362 | msgstr "" | 345 | msgstr "" |
3507 | 363 | 346 | ||
3508 | 364 | #: ../lucioLib/gui/dialog_project_properties.py:89 | ||
3509 | 365 | msgid "Project properties" | ||
3510 | 366 | msgstr "" | ||
3511 | 367 | |||
3512 | 368 | #: ../lucioLib/gui/dialog_project_properties.py:177 | 347 | #: ../lucioLib/gui/dialog_project_properties.py:177 |
3513 | 369 | #: ../lucioLib/gui/dialog_project_properties.py:193 | 348 | #: ../lucioLib/gui/dialog_project_properties.py:193 |
3514 | 370 | msgid "desc" | 349 | msgid "desc" |
3515 | @@ -404,107 +383,113 @@ | |||
3516 | 404 | #. Initailize widgets for first page | 383 | #. Initailize widgets for first page |
3517 | 405 | #. | 384 | #. |
3518 | 406 | #. A label | 385 | #. A label |
3520 | 407 | #: ../lucioLib/gui/assistant_new_project.py:61 | 386 | #: ../lucioLib/gui/assistant_new_project.py:59 |
3521 | 408 | msgid "This assistant will help you on configuration of a new luciole project." | 387 | msgid "This assistant will help you on configuration of a new luciole project." |
3522 | 409 | msgstr "" | 388 | msgstr "" |
3523 | 410 | 389 | ||
3524 | 411 | #. A label | 390 | #. A label |
3526 | 412 | #: ../lucioLib/gui/assistant_new_project.py:74 | 391 | #: ../lucioLib/gui/assistant_new_project.py:72 |
3527 | 413 | msgid "Select project name and destination folder." | 392 | msgid "Select project name and destination folder." |
3528 | 414 | msgstr "" | 393 | msgstr "" |
3529 | 415 | 394 | ||
3530 | 416 | #. display project name | 395 | #. display project name |
3533 | 417 | #: ../lucioLib/gui/assistant_new_project.py:84 | 396 | #: ../lucioLib/gui/assistant_new_project.py:82 |
3534 | 418 | #: ../lucioLib/gui/assistant_new_project.py:341 | 397 | #: ../lucioLib/gui/assistant_new_project.py:339 |
3535 | 419 | msgid "Project Name" | 398 | msgid "Project Name" |
3536 | 420 | msgstr "" | 399 | msgstr "" |
3537 | 421 | 400 | ||
3539 | 422 | #: ../lucioLib/gui/assistant_new_project.py:95 | 401 | #: ../lucioLib/gui/assistant_new_project.py:93 |
3540 | 423 | msgid "Folder" | 402 | msgid "Folder" |
3541 | 424 | msgstr "" | 403 | msgstr "" |
3542 | 425 | 404 | ||
3544 | 426 | #: ../lucioLib/gui/assistant_new_project.py:150 | 405 | #: ../lucioLib/gui/assistant_new_project.py:147 |
3545 | 427 | #, python-format | 406 | #, python-format |
3546 | 428 | msgid "" | 407 | msgid "" |
3548 | 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 " |
3549 | 430 | "alhanumeric and '_' characters " | 409 | "alhanumeric and '_' characters " |
3550 | 431 | msgstr "" | 410 | msgstr "" |
3551 | 432 | 411 | ||
3553 | 433 | #: ../lucioLib/gui/assistant_new_project.py:161 | 412 | #: ../lucioLib/gui/assistant_new_project.py:158 |
3554 | 434 | #, python-format | 413 | #, python-format |
3555 | 435 | msgid "The project %s exists !" | 414 | msgid "The project %s exists !" |
3556 | 436 | msgstr "" | 415 | msgstr "" |
3557 | 437 | 416 | ||
3559 | 438 | #: ../lucioLib/gui/assistant_new_project.py:206 | 417 | #: ../lucioLib/gui/assistant_new_project.py:203 |
3560 | 439 | msgid "Select a device" | 418 | msgid "Select a device" |
3561 | 440 | msgstr "" | 419 | msgstr "" |
3562 | 441 | 420 | ||
3564 | 442 | #: ../lucioLib/gui/assistant_new_project.py:242 | 421 | #: ../lucioLib/gui/assistant_new_project.py:223 |
3565 | 422 | msgid "" | ||
3566 | 423 | " Other device.\n" | ||
3567 | 424 | "(Manual import)" | ||
3568 | 425 | msgstr "" | ||
3569 | 426 | |||
3570 | 427 | #: ../lucioLib/gui/assistant_new_project.py:240 | ||
3571 | 443 | #, fuzzy | 428 | #, fuzzy |
3572 | 444 | msgid "Images per second" | 429 | msgid "Images per second" |
3573 | 445 | msgstr "Images par secondes" | 430 | msgstr "Images par secondes" |
3574 | 446 | 431 | ||
3575 | 447 | #. display project path | 432 | #. display project path |
3577 | 448 | #: ../lucioLib/gui/assistant_new_project.py:345 | 433 | #: ../lucioLib/gui/assistant_new_project.py:343 |
3578 | 449 | msgid "Project Path" | 434 | msgid "Project Path" |
3579 | 450 | msgstr "" | 435 | msgstr "" |
3580 | 451 | 436 | ||
3582 | 452 | #: ../lucioLib/gui/assistant_new_project.py:354 | 437 | #: ../lucioLib/gui/assistant_new_project.py:352 |
3583 | 453 | #, fuzzy | 438 | #, fuzzy |
3584 | 454 | msgid "Number of frames per seconds" | 439 | msgid "Number of frames per seconds" |
3585 | 455 | msgstr "Images par secondes" | 440 | msgstr "Images par secondes" |
3586 | 456 | 441 | ||
3587 | 457 | #. display Hardware type | 442 | #. display Hardware type |
3589 | 458 | #: ../lucioLib/gui/assistant_new_project.py:358 | 443 | #: ../lucioLib/gui/assistant_new_project.py:356 |
3590 | 459 | msgid "Hardware type" | 444 | msgid "Hardware type" |
3591 | 460 | msgstr "" | 445 | msgstr "" |
3592 | 461 | 446 | ||
3593 | 462 | #. webcam name | 447 | #. webcam name |
3595 | 463 | #: ../lucioLib/gui/assistant_new_project.py:364 | 448 | #: ../lucioLib/gui/assistant_new_project.py:362 |
3596 | 464 | #, fuzzy | 449 | #, fuzzy |
3597 | 465 | msgid "Webcam name" | 450 | msgid "Webcam name" |
3598 | 466 | msgstr "Web Cam" | 451 | msgstr "Web Cam" |
3599 | 467 | 452 | ||
3600 | 468 | #. webcam device | 453 | #. webcam device |
3602 | 469 | #: ../lucioLib/gui/assistant_new_project.py:368 | 454 | #: ../lucioLib/gui/assistant_new_project.py:366 |
3603 | 470 | #, fuzzy | 455 | #, fuzzy |
3604 | 471 | msgid "Webcam device" | 456 | msgid "Webcam device" |
3605 | 472 | msgstr "Web Cam" | 457 | msgstr "Web Cam" |
3606 | 473 | 458 | ||
3607 | 474 | #. webcam resolution | 459 | #. webcam resolution |
3609 | 475 | #: ../lucioLib/gui/assistant_new_project.py:372 | 460 | #: ../lucioLib/gui/assistant_new_project.py:370 |
3610 | 476 | msgid "Webcam resolution used" | 461 | msgid "Webcam resolution used" |
3611 | 477 | msgstr "" | 462 | msgstr "" |
3612 | 478 | 463 | ||
3613 | 479 | #. webcam device | 464 | #. webcam device |
3615 | 480 | #: ../lucioLib/gui/assistant_new_project.py:378 | 465 | #: ../lucioLib/gui/assistant_new_project.py:376 |
3616 | 481 | msgid "Webcam driver used" | 466 | msgid "Webcam driver used" |
3617 | 482 | msgstr "" | 467 | msgstr "" |
3618 | 483 | 468 | ||
3619 | 484 | #. Final message | 469 | #. Final message |
3621 | 485 | #: ../lucioLib/gui/assistant_new_project.py:383 | 470 | #: ../lucioLib/gui/assistant_new_project.py:381 |
3622 | 486 | msgid "Have fun with luciole !" | 471 | msgid "Have fun with luciole !" |
3623 | 487 | msgstr "" | 472 | msgstr "" |
3624 | 488 | 473 | ||
3626 | 489 | #: ../lucioLib/gui/assistant_new_project.py:413 | 474 | #: ../lucioLib/gui/assistant_new_project.py:411 |
3627 | 490 | #, fuzzy | 475 | #, fuzzy |
3628 | 491 | msgid "Luciole project assistant" | 476 | msgid "Luciole project assistant" |
3629 | 492 | msgstr "Select a myrtille project file" | 477 | msgstr "Select a myrtille project file" |
3630 | 493 | 478 | ||
3632 | 494 | #: ../lucioLib/gui/assistant_new_project.py:424 | 479 | #: ../lucioLib/gui/assistant_new_project.py:422 |
3633 | 495 | #, fuzzy | 480 | #, fuzzy |
3634 | 496 | msgid " Select a project path " | 481 | msgid " Select a project path " |
3635 | 497 | msgstr "Select a myrtille project file" | 482 | msgstr "Select a myrtille project file" |
3636 | 498 | 483 | ||
3638 | 499 | #: ../lucioLib/gui/assistant_new_project.py:433 | 484 | #: ../lucioLib/gui/assistant_new_project.py:431 |
3639 | 500 | msgid " Select hardware " | 485 | msgid " Select hardware " |
3640 | 501 | msgstr "" | 486 | msgstr "" |
3641 | 502 | 487 | ||
3643 | 503 | #: ../lucioLib/gui/assistant_new_project.py:443 | 488 | #: ../lucioLib/gui/assistant_new_project.py:441 |
3644 | 504 | msgid " Webcam detection " | 489 | msgid " Webcam detection " |
3645 | 505 | msgstr "" | 490 | msgstr "" |
3646 | 506 | 491 | ||
3648 | 507 | #: ../lucioLib/gui/assistant_new_project.py:452 | 492 | #: ../lucioLib/gui/assistant_new_project.py:451 |
3649 | 508 | msgid " Project overview " | 493 | msgid " Project overview " |
3650 | 509 | msgstr "" | 494 | msgstr "" |
3651 | 510 | 495 | ||
3652 | @@ -527,11 +512,11 @@ | |||
3653 | 527 | msgid "Webcam detection done" | 512 | msgid "Webcam detection done" |
3654 | 528 | msgstr "" | 513 | msgstr "" |
3655 | 529 | 514 | ||
3656 | 530 | #: ../lucioLib/gui/webcam_detection_widget.py:186 | ||
3657 | 531 | msgid "Detected webcam" | ||
3658 | 532 | msgstr "" | ||
3659 | 533 | |||
3660 | 534 | #: ../lucioLib/gui/webcam_detection_widget.py:188 | 515 | #: ../lucioLib/gui/webcam_detection_widget.py:188 |
3661 | 516 | msgid "Detected webcam(s)" | ||
3662 | 517 | msgstr "" | ||
3663 | 518 | |||
3664 | 519 | #: ../lucioLib/gui/webcam_detection_widget.py:192 | ||
3665 | 535 | msgid "No webcam detected" | 520 | msgid "No webcam detected" |
3666 | 536 | msgstr "" | 521 | msgstr "" |
3667 | 537 | 522 | ||
3668 | @@ -545,6 +530,10 @@ | |||
3669 | 545 | msgid "Select a Folder" | 530 | msgid "Select a Folder" |
3670 | 546 | msgstr "Select a myrtille project file" | 531 | msgstr "Select a myrtille project file" |
3671 | 547 | 532 | ||
3672 | 533 | #: ../lucioLib/luciole_constants.py:42 | ||
3673 | 534 | msgid "OTHER DEVICE" | ||
3674 | 535 | msgstr "" | ||
3675 | 536 | |||
3676 | 548 | #: ../lucioLib/luciole_controller.py:157 | 537 | #: ../lucioLib/luciole_controller.py:157 |
3677 | 549 | #, python-format | 538 | #, python-format |
3678 | 550 | msgid "Project %s saved" | 539 | msgid "Project %s saved" |
3679 | @@ -555,87 +544,94 @@ | |||
3680 | 555 | msgid "Project saved as %s" | 544 | msgid "Project saved as %s" |
3681 | 556 | msgstr "" | 545 | msgstr "" |
3682 | 557 | 546 | ||
3684 | 558 | #: ../lucioLib/luciole_controller.py:222 | 547 | #: ../lucioLib/luciole_controller.py:229 |
3685 | 559 | msgid "No file or valid file choosen for image import." | 548 | msgid "No file or valid file choosen for image import." |
3686 | 560 | msgstr "" | 549 | msgstr "" |
3687 | 561 | 550 | ||
3689 | 562 | #: ../lucioLib/luciole_controller.py:226 | 551 | #: ../lucioLib/luciole_controller.py:233 |
3690 | 563 | msgid "Impossible to import images when no project are loaded." | 552 | msgid "Impossible to import images when no project are loaded." |
3691 | 564 | msgstr "" | 553 | msgstr "" |
3692 | 565 | 554 | ||
3693 | 566 | #. nbd@grape to transform as error message | 555 | #. nbd@grape to transform as error message |
3695 | 567 | #: ../lucioLib/luciole_controller.py:255 | 556 | #: ../lucioLib/luciole_controller.py:262 |
3696 | 568 | msgid "Nothing to export. No project loaded" | 557 | msgid "Nothing to export. No project loaded" |
3697 | 569 | msgstr "" | 558 | msgstr "" |
3698 | 570 | 559 | ||
3699 | 571 | #. nbd@grape specify action to do err message or raise exception ? | 560 | #. nbd@grape specify action to do err message or raise exception ? |
3701 | 572 | #: ../lucioLib/luciole_controller.py:273 | 561 | #: ../lucioLib/luciole_controller.py:280 |
3702 | 573 | msgid "Imposible to initialize player." | 562 | msgid "Imposible to initialize player." |
3703 | 574 | msgstr "" | 563 | msgstr "" |
3704 | 575 | 564 | ||
3705 | 576 | #. nbd@grape to transform as error message | 565 | #. nbd@grape to transform as error message |
3707 | 577 | #: ../lucioLib/luciole_controller.py:295 | 566 | #: ../lucioLib/luciole_controller.py:302 |
3708 | 578 | msgid "Can not play animantion : No image on montage view " | 567 | msgid "Can not play animantion : No image on montage view " |
3709 | 579 | msgstr "" | 568 | msgstr "" |
3710 | 580 | 569 | ||
3711 | 581 | #. nbd@grape to transform as error message | 570 | #. nbd@grape to transform as error message |
3713 | 582 | #: ../lucioLib/luciole_controller.py:304 | 571 | #: ../lucioLib/luciole_controller.py:311 |
3714 | 583 | msgid "Can not play animantion : No project loaded " | 572 | msgid "Can not play animantion : No project loaded " |
3715 | 584 | msgstr "" | 573 | msgstr "" |
3716 | 585 | 574 | ||
3717 | 586 | #. nbd@grape : ask for save if save set status as loaded | 575 | #. nbd@grape : ask for save if save set status as loaded |
3719 | 587 | #: ../lucioLib/luciole_controller.py:353 | 576 | #: ../lucioLib/luciole_controller.py:360 |
3720 | 588 | msgid "Save Project before closing" | 577 | msgid "Save Project before closing" |
3721 | 589 | msgstr "" | 578 | msgstr "" |
3722 | 590 | 579 | ||
3724 | 591 | #: ../lucioLib/luciole_controller.py:379 | 580 | #: ../lucioLib/luciole_controller.py:386 |
3725 | 592 | #, python-format | 581 | #, python-format |
3726 | 593 | msgid "Project %s is closed" | 582 | msgid "Project %s is closed" |
3727 | 594 | msgstr "" | 583 | msgstr "" |
3728 | 595 | 584 | ||
3729 | 596 | #. clear message status bar | 585 | #. clear message status bar |
3731 | 597 | #: ../lucioLib/luciole_controller.py:400 | 586 | #: ../lucioLib/luciole_controller.py:407 |
3732 | 598 | msgid "Acquiring" | 587 | msgid "Acquiring" |
3733 | 599 | msgstr "" | 588 | msgstr "" |
3734 | 600 | 589 | ||
3736 | 601 | #: ../lucioLib/luciole_controller.py:421 | 590 | #. stop acquirer |
3737 | 591 | #: ../lucioLib/luciole_controller.py:424 | ||
3738 | 592 | msgid "" | ||
3739 | 593 | "No acquisition available. Use 'import image' button to load images in " | ||
3740 | 594 | "project." | ||
3741 | 595 | msgstr "" | ||
3742 | 596 | |||
3743 | 597 | #: ../lucioLib/luciole_controller.py:436 | ||
3744 | 602 | msgid " Can not start acquisition when no project are loaded." | 598 | msgid " Can not start acquisition when no project are loaded." |
3745 | 603 | msgstr "" | 599 | msgstr "" |
3746 | 604 | 600 | ||
3748 | 605 | #: ../lucioLib/luciole_controller.py:430 | 601 | #: ../lucioLib/luciole_controller.py:445 |
3749 | 606 | #, python-format | 602 | #, python-format |
3750 | 607 | msgid "Acquisition error. %s" | 603 | msgid "Acquisition error. %s" |
3751 | 608 | msgstr "" | 604 | msgstr "" |
3752 | 609 | 605 | ||
3754 | 610 | #: ../lucioLib/luciole_controller.py:444 | 606 | #: ../lucioLib/luciole_controller.py:459 |
3755 | 611 | msgid "No Acquistion" | 607 | msgid "No Acquistion" |
3756 | 612 | msgstr "" | 608 | msgstr "" |
3757 | 613 | 609 | ||
3758 | 614 | #. nbd@grape : ask for save if save set status as loaded | 610 | #. nbd@grape : ask for save if save set status as loaded |
3760 | 615 | #: ../lucioLib/luciole_controller.py:533 | 611 | #: ../lucioLib/luciole_controller.py:548 |
3761 | 616 | msgid "Project modified. Save project before exit ?" | 612 | msgid "Project modified. Save project before exit ?" |
3762 | 617 | msgstr "" | 613 | msgstr "" |
3763 | 618 | 614 | ||
3766 | 619 | #: ../lucioLib/luciole_controller.py:585 | 615 | #: ../lucioLib/luciole_controller.py:600 |
3767 | 620 | msgid "Please restart luciole to take into acount the new theme " | 616 | msgid "Please restart luciole to take into account the new theme " |
3768 | 621 | msgstr "" | 617 | msgstr "" |
3769 | 622 | 618 | ||
3771 | 623 | #: ../lucioLib/luciole_controller.py:635 | 619 | #: ../lucioLib/luciole_controller.py:650 |
3772 | 624 | #, fuzzy | 620 | #, fuzzy |
3774 | 625 | msgid "Failed to load project " | 621 | msgid "Failed to load project " |
3775 | 626 | msgstr "Select a myrtille project file" | 622 | msgstr "Select a myrtille project file" |
3776 | 627 | 623 | ||
3778 | 628 | #: ../lucioLib/luciole_image.py:135 | 624 | #: ../lucioLib/luciole_image.py:137 |
3779 | 629 | #, python-format | 625 | #, python-format |
3780 | 630 | msgid "Not a file : %s" | 626 | msgid "Not a file : %s" |
3781 | 631 | msgstr "" | 627 | msgstr "" |
3782 | 632 | 628 | ||
3784 | 633 | #: ../lucioLib/luciole_image.py:183 | 629 | #: ../lucioLib/luciole_image.py:185 |
3785 | 634 | msgid "rush folder not valid" | 630 | msgid "rush folder not valid" |
3786 | 635 | msgstr "" | 631 | msgstr "" |
3787 | 636 | 632 | ||
3788 | 637 | #. error to raise | 633 | #. error to raise |
3790 | 638 | #: ../lucioLib/luciole_image.py:278 | 634 | #: ../lucioLib/luciole_image.py:280 |
3791 | 639 | #, python-format | 635 | #, python-format |
3792 | 640 | msgid "Error path does not exist : %s" | 636 | msgid "Error path does not exist : %s" |
3793 | 641 | msgstr "" | 637 | msgstr "" |
3794 | @@ -663,6 +659,24 @@ | |||
3795 | 663 | msgid "Unable to erase" | 659 | msgid "Unable to erase" |
3796 | 664 | msgstr "" | 660 | msgstr "" |
3797 | 665 | 661 | ||
3798 | 662 | #~ msgid "gtk-about" | ||
3799 | 663 | #~ msgstr "gtk-about" | ||
3800 | 664 | |||
3801 | 665 | #~ msgid "gtk-new" | ||
3802 | 666 | #~ msgstr "gtk-new" | ||
3803 | 667 | |||
3804 | 668 | #~ msgid "gtk-open" | ||
3805 | 669 | #~ msgstr "gtk-open" | ||
3806 | 670 | |||
3807 | 671 | #~ msgid "gtk-quit" | ||
3808 | 672 | #~ msgstr "gtk-quit" | ||
3809 | 673 | |||
3810 | 674 | #~ msgid "gtk-save" | ||
3811 | 675 | #~ msgstr "gtk-save" | ||
3812 | 676 | |||
3813 | 677 | #~ msgid "gtk-save-as" | ||
3814 | 678 | #~ msgstr "gtk-save-as" | ||
3815 | 679 | |||
3816 | 666 | #, fuzzy | 680 | #, fuzzy |
3817 | 667 | #~ msgid "Import" | 681 | #~ msgid "Import" |
3818 | 668 | #~ msgstr "Export" | 682 | #~ msgstr "Export" |
3819 | @@ -696,9 +710,6 @@ | |||
3820 | 696 | #~ msgid "DV cam" | 710 | #~ msgid "DV cam" |
3821 | 697 | #~ msgstr "DV cam" | 711 | #~ msgstr "DV cam" |
3822 | 698 | 712 | ||
3823 | 699 | #~ msgid "Export ..." | ||
3824 | 700 | #~ msgstr "Export ..." | ||
3825 | 701 | |||
3826 | 702 | #, fuzzy | 713 | #, fuzzy |
3827 | 703 | #~ msgid "Images per second number" | 714 | #~ msgid "Images per second number" |
3828 | 704 | #~ msgstr "Images par seconde" | 715 | #~ msgstr "Images par seconde" |
3829 | 705 | 716 | ||
3830 | === modified file 'po/en_EN/LC_MESSAGES/luciole.mo' | |||
3831 | 706 | Binary 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 | 717 | Binary 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 |
3832 | === modified file 'po/en_US.po' | |||
3833 | --- po/en_US.po 2009-05-01 16:34:13 +0000 | |||
3834 | +++ po/en_US.po 2009-05-07 09:27:18 +0000 | |||
3835 | @@ -7,7 +7,7 @@ | |||
3836 | 7 | msgstr "" | 7 | msgstr "" |
3837 | 8 | "Project-Id-Version: myrtille-i 18n\n" | 8 | "Project-Id-Version: myrtille-i 18n\n" |
3838 | 9 | "Report-Msgid-Bugs-To: \n" | 9 | "Report-Msgid-Bugs-To: \n" |
3840 | 10 | "POT-Creation-Date: 2009-05-01 18:31+0200\n" | 10 | "POT-Creation-Date: 2009-05-07 11:21+0200\n" |
3841 | 11 | "PO-Revision-Date: 2008-06-22 10:32+0200\n" | 11 | "PO-Revision-Date: 2008-06-22 10:32+0200\n" |
3842 | 12 | "Last-Translator: nico <nico@inattendu.org>\n" | 12 | "Last-Translator: nico <nico@inattendu.org>\n" |
3843 | 13 | "Language-Team: English\n" | 13 | "Language-Team: English\n" |
3844 | @@ -126,7 +126,7 @@ | |||
3845 | 126 | msgid "Move down one or several images" | 126 | msgid "Move down one or several images" |
3846 | 127 | msgstr "" | 127 | msgstr "" |
3847 | 128 | 128 | ||
3849 | 129 | #. Déplacer des images capturées dans la zone de montage | 129 | #. Déplacer des images capturées dans la zone de montage |
3850 | 130 | #: ../images/luciole.glade.h:32 | 130 | #: ../images/luciole.glade.h:32 |
3851 | 131 | msgid "Move snapshot to montage area" | 131 | msgid "Move snapshot to montage area" |
3852 | 132 | msgstr "" | 132 | msgstr "" |
3853 | @@ -154,20 +154,26 @@ | |||
3854 | 154 | msgstr "Project name" | 154 | msgstr "Project name" |
3855 | 155 | 155 | ||
3856 | 156 | #: ../images/luciole.glade.h:39 | 156 | #: ../images/luciole.glade.h:39 |
3857 | 157 | #: ../lucioLib/gui/dialog_project_properties.py:89 | ||
3858 | 158 | #, fuzzy | ||
3859 | 159 | msgid "Project properties" | ||
3860 | 160 | msgstr "Project name" | ||
3861 | 161 | |||
3862 | 162 | #: ../images/luciole.glade.h:40 | ||
3863 | 157 | #, fuzzy | 163 | #, fuzzy |
3864 | 158 | msgid "Select Theme" | 164 | msgid "Select Theme" |
3865 | 159 | msgstr "Select a folder" | 165 | msgstr "Select a folder" |
3866 | 160 | 166 | ||
3868 | 161 | #: ../images/luciole.glade.h:40 | 167 | #: ../images/luciole.glade.h:41 |
3869 | 162 | #, fuzzy | 168 | #, fuzzy |
3870 | 163 | msgid "Select a Luciole project" | 169 | msgid "Select a Luciole project" |
3871 | 164 | msgstr "Select a myrtille project file" | 170 | msgstr "Select a myrtille project file" |
3872 | 165 | 171 | ||
3874 | 166 | #: ../images/luciole.glade.h:41 ../lucioLib/gui/assistant_new_project.py:102 | 172 | #: ../images/luciole.glade.h:42 ../lucioLib/gui/assistant_new_project.py:100 |
3875 | 167 | msgid "Select a folder" | 173 | msgid "Select a folder" |
3876 | 168 | msgstr "Select a folder" | 174 | msgstr "Select a folder" |
3877 | 169 | 175 | ||
3879 | 170 | #: ../images/luciole.glade.h:42 | 176 | #: ../images/luciole.glade.h:43 |
3880 | 171 | msgid "" | 177 | msgid "" |
3881 | 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" |
3882 | 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" |
3883 | @@ -203,115 +209,92 @@ | |||
3884 | 203 | "Inc., 59 Temple Place - \n" | 209 | "Inc., 59 Temple Place - \n" |
3885 | 204 | "Suite 330, Boston, MA 02111-1307, USA." | 210 | "Suite 330, Boston, MA 02111-1307, USA." |
3886 | 205 | 211 | ||
3889 | 206 | #. Jeter à la poubelle | 212 | #. Jeter à la poubelle |
3890 | 207 | #: ../images/luciole.glade.h:59 | 213 | #: ../images/luciole.glade.h:60 |
3891 | 208 | msgid "To trash" | 214 | msgid "To trash" |
3892 | 209 | msgstr "" | 215 | msgstr "" |
3893 | 210 | 216 | ||
3895 | 211 | #: ../images/luciole.glade.h:60 | 217 | #: ../images/luciole.glade.h:61 |
3896 | 212 | msgid "Transparency level" | 218 | msgid "Transparency level" |
3897 | 213 | msgstr "Transparency level" | 219 | msgstr "Transparency level" |
3898 | 214 | 220 | ||
3900 | 215 | #: ../images/luciole.glade.h:61 | 221 | #: ../images/luciole.glade.h:62 |
3901 | 222 | #, fuzzy | ||
3902 | 223 | msgid "Video Export" | ||
3903 | 224 | msgstr "File export" | ||
3904 | 225 | |||
3905 | 226 | #: ../images/luciole.glade.h:63 | ||
3906 | 216 | #, fuzzy | 227 | #, fuzzy |
3907 | 217 | msgid "_File" | 228 | msgid "_File" |
3908 | 218 | msgstr "_File" | 229 | msgstr "_File" |
3909 | 219 | 230 | ||
3911 | 220 | #: ../images/luciole.glade.h:62 | 231 | #: ../images/luciole.glade.h:64 |
3912 | 221 | msgid "_Help" | 232 | msgid "_Help" |
3913 | 222 | msgstr "_Help" | 233 | msgstr "_Help" |
3914 | 223 | 234 | ||
3916 | 224 | #: ../images/luciole.glade.h:63 | 235 | #: ../images/luciole.glade.h:65 |
3917 | 225 | msgid "_View" | 236 | msgid "_View" |
3918 | 226 | msgstr "" | 237 | msgstr "" |
3919 | 227 | 238 | ||
3925 | 228 | #: ../images/luciole.glade.h:64 | 239 | #: ../images/luciole.glade.h:66 |
3921 | 229 | msgid "gtk-about" | ||
3922 | 230 | msgstr "gtk-about" | ||
3923 | 231 | |||
3924 | 232 | #: ../images/luciole.glade.h:65 | ||
3926 | 233 | msgid "gtk-apply" | 240 | msgid "gtk-apply" |
3927 | 234 | msgstr "gtk-apply" | 241 | msgstr "gtk-apply" |
3928 | 235 | 242 | ||
3930 | 236 | #: ../images/luciole.glade.h:66 | 243 | #: ../images/luciole.glade.h:67 |
3931 | 237 | msgid "gtk-cancel" | 244 | msgid "gtk-cancel" |
3932 | 238 | msgstr "gtk-cancel" | 245 | msgstr "gtk-cancel" |
3933 | 239 | 246 | ||
3935 | 240 | #: ../images/luciole.glade.h:67 | 247 | #: ../images/luciole.glade.h:68 |
3936 | 241 | #, fuzzy | 248 | #, fuzzy |
3937 | 242 | msgid "gtk-close" | 249 | msgid "gtk-close" |
3938 | 243 | msgstr "gtk-open" | 250 | msgstr "gtk-open" |
3939 | 244 | 251 | ||
3948 | 245 | #: ../images/luciole.glade.h:68 | 252 | #. Capturer une image |
3941 | 246 | msgid "gtk-new" | ||
3942 | 247 | msgstr "gtk-new" | ||
3943 | 248 | |||
3944 | 249 | #: ../images/luciole.glade.h:69 | ||
3945 | 250 | msgid "gtk-open" | ||
3946 | 251 | msgstr "gtk-open" | ||
3947 | 252 | |||
3949 | 253 | #: ../images/luciole.glade.h:70 | 253 | #: ../images/luciole.glade.h:70 |
3950 | 254 | msgid "gtk-quit" | ||
3951 | 255 | msgstr "gtk-quit" | ||
3952 | 256 | |||
3953 | 257 | #: ../images/luciole.glade.h:71 | ||
3954 | 258 | msgid "gtk-save" | ||
3955 | 259 | msgstr "gtk-save" | ||
3956 | 260 | |||
3957 | 261 | #: ../images/luciole.glade.h:72 | ||
3958 | 262 | msgid "gtk-save-as" | ||
3959 | 263 | msgstr "gtk-save-as" | ||
3960 | 264 | |||
3961 | 265 | #. Capturer une image | ||
3962 | 266 | #: ../images/luciole.glade.h:74 | ||
3963 | 267 | #, fuzzy | 254 | #, fuzzy |
3964 | 268 | msgid "make a snapshot" | 255 | msgid "make a snapshot" |
3965 | 269 | msgstr "Snapshot" | 256 | msgstr "Snapshot" |
3966 | 270 | 257 | ||
3972 | 271 | #: ../images/luciole.glade.h:75 | 258 | #: ../images/luciole.glade.h:71 |
3968 | 272 | msgid "menuitem1" | ||
3969 | 273 | msgstr "" | ||
3970 | 274 | |||
3971 | 275 | #: ../images/luciole.glade.h:76 | ||
3973 | 276 | msgid "options" | 259 | msgid "options" |
3974 | 277 | msgstr "" | 260 | msgstr "" |
3975 | 278 | 261 | ||
3977 | 279 | #: ../images/luciole.glade.h:77 | 262 | #: ../images/luciole.glade.h:72 |
3978 | 280 | #, fuzzy | 263 | #, fuzzy |
3979 | 281 | msgid "project1" | 264 | msgid "project1" |
3980 | 282 | msgstr "Project name" | 265 | msgstr "Project name" |
3981 | 283 | 266 | ||
3983 | 284 | #: ../images/luciole.glade.h:78 | 267 | #: ../images/luciole.glade.h:73 |
3984 | 285 | #, fuzzy | 268 | #, fuzzy |
3985 | 286 | msgid "project2" | 269 | msgid "project2" |
3986 | 287 | msgstr "Project name" | 270 | msgstr "Project name" |
3987 | 288 | 271 | ||
3989 | 289 | #: ../images/luciole.glade.h:79 | 272 | #: ../images/luciole.glade.h:74 |
3990 | 290 | #, fuzzy | 273 | #, fuzzy |
3991 | 291 | msgid "project3" | 274 | msgid "project3" |
3992 | 292 | msgstr "Project name" | 275 | msgstr "Project name" |
3993 | 293 | 276 | ||
3995 | 294 | #: ../images/luciole.glade.h:80 | 277 | #: ../images/luciole.glade.h:75 |
3996 | 295 | #, fuzzy | 278 | #, fuzzy |
3997 | 296 | msgid "project4" | 279 | msgid "project4" |
3998 | 297 | msgstr "Project name" | 280 | msgstr "Project name" |
3999 | 298 | 281 | ||
4001 | 299 | #: ../images/luciole.glade.h:81 | 282 | #: ../images/luciole.glade.h:76 |
4002 | 300 | #, fuzzy | 283 | #, fuzzy |
4003 | 301 | msgid "project5" | 284 | msgid "project5" |
4004 | 302 | msgstr "Project name" | 285 | msgstr "Project name" |
4005 | 303 | 286 | ||
4007 | 304 | #: ../lucioLib/controller/controller_load_project.py:133 | 287 | #: ../lucioLib/controller/controller_load_project.py:134 |
4008 | 305 | #, fuzzy | 288 | #, fuzzy |
4009 | 306 | msgid "Project Load started" | 289 | msgid "Project Load started" |
4010 | 307 | msgstr "Project name" | 290 | msgstr "Project name" |
4011 | 308 | 291 | ||
4013 | 309 | #: ../lucioLib/controller/controller_load_project.py:138 | 292 | #: ../lucioLib/controller/controller_load_project.py:139 |
4014 | 310 | #, fuzzy, python-format | 293 | #, fuzzy, python-format |
4015 | 311 | msgid "Project %s is loaded" | 294 | msgid "Project %s is loaded" |
4016 | 312 | msgstr "Project name" | 295 | msgstr "Project name" |
4017 | 313 | 296 | ||
4019 | 314 | #: ../lucioLib/controller/controller_load_project.py:144 | 297 | #: ../lucioLib/controller/controller_load_project.py:145 |
4020 | 315 | #, python-format | 298 | #, python-format |
4021 | 316 | msgid "Project %s is loading" | 299 | msgid "Project %s is loading" |
4022 | 317 | msgstr "" | 300 | msgstr "" |
4023 | @@ -374,11 +357,6 @@ | |||
4024 | 374 | msgid "Video height :" | 357 | msgid "Video height :" |
4025 | 375 | msgstr "" | 358 | msgstr "" |
4026 | 376 | 359 | ||
4027 | 377 | #: ../lucioLib/gui/dialog_project_properties.py:89 | ||
4028 | 378 | #, fuzzy | ||
4029 | 379 | msgid "Project properties" | ||
4030 | 380 | msgstr "Project name" | ||
4031 | 381 | |||
4032 | 382 | #: ../lucioLib/gui/dialog_project_properties.py:177 | 360 | #: ../lucioLib/gui/dialog_project_properties.py:177 |
4033 | 383 | #: ../lucioLib/gui/dialog_project_properties.py:193 | 361 | #: ../lucioLib/gui/dialog_project_properties.py:193 |
4034 | 384 | msgid "desc" | 362 | msgid "desc" |
4035 | @@ -418,114 +396,120 @@ | |||
4036 | 418 | #. Initailize widgets for first page | 396 | #. Initailize widgets for first page |
4037 | 419 | #. | 397 | #. |
4038 | 420 | #. A label | 398 | #. A label |
4040 | 421 | #: ../lucioLib/gui/assistant_new_project.py:61 | 399 | #: ../lucioLib/gui/assistant_new_project.py:59 |
4041 | 422 | #, fuzzy | 400 | #, fuzzy |
4042 | 423 | msgid "This assistant will help you on configuration of a new luciole project." | 401 | msgid "This assistant will help you on configuration of a new luciole project." |
4043 | 424 | msgstr "" | 402 | msgstr "" |
4044 | 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." |
4045 | 426 | 404 | ||
4046 | 427 | #. A label | 405 | #. A label |
4048 | 428 | #: ../lucioLib/gui/assistant_new_project.py:74 | 406 | #: ../lucioLib/gui/assistant_new_project.py:72 |
4049 | 429 | #, fuzzy | 407 | #, fuzzy |
4050 | 430 | msgid "Select project name and destination folder." | 408 | msgid "Select project name and destination folder." |
4051 | 431 | msgstr "Select project name and destination folder.\n" | 409 | msgstr "Select project name and destination folder.\n" |
4052 | 432 | 410 | ||
4053 | 433 | #. display project name | 411 | #. display project name |
4056 | 434 | #: ../lucioLib/gui/assistant_new_project.py:84 | 412 | #: ../lucioLib/gui/assistant_new_project.py:82 |
4057 | 435 | #: ../lucioLib/gui/assistant_new_project.py:341 | 413 | #: ../lucioLib/gui/assistant_new_project.py:339 |
4058 | 436 | #, fuzzy | 414 | #, fuzzy |
4059 | 437 | msgid "Project Name" | 415 | msgid "Project Name" |
4060 | 438 | msgstr "Project name" | 416 | msgstr "Project name" |
4061 | 439 | 417 | ||
4063 | 440 | #: ../lucioLib/gui/assistant_new_project.py:95 | 418 | #: ../lucioLib/gui/assistant_new_project.py:93 |
4064 | 441 | msgid "Folder" | 419 | msgid "Folder" |
4065 | 442 | msgstr "Folder" | 420 | msgstr "Folder" |
4066 | 443 | 421 | ||
4068 | 444 | #: ../lucioLib/gui/assistant_new_project.py:150 | 422 | #: ../lucioLib/gui/assistant_new_project.py:147 |
4069 | 445 | #, python-format | 423 | #, python-format |
4070 | 446 | msgid "" | 424 | msgid "" |
4072 | 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 " |
4073 | 448 | "alhanumeric and '_' characters " | 426 | "alhanumeric and '_' characters " |
4074 | 449 | msgstr "" | 427 | msgstr "" |
4075 | 450 | 428 | ||
4077 | 451 | #: ../lucioLib/gui/assistant_new_project.py:161 | 429 | #: ../lucioLib/gui/assistant_new_project.py:158 |
4078 | 452 | #, python-format | 430 | #, python-format |
4079 | 453 | msgid "The project %s exists !" | 431 | msgid "The project %s exists !" |
4080 | 454 | msgstr "" | 432 | msgstr "" |
4081 | 455 | 433 | ||
4083 | 456 | #: ../lucioLib/gui/assistant_new_project.py:206 | 434 | #: ../lucioLib/gui/assistant_new_project.py:203 |
4084 | 457 | #, fuzzy | 435 | #, fuzzy |
4085 | 458 | msgid "Select a device" | 436 | msgid "Select a device" |
4086 | 459 | msgstr "Select a folder" | 437 | msgstr "Select a folder" |
4087 | 460 | 438 | ||
4089 | 461 | #: ../lucioLib/gui/assistant_new_project.py:242 | 439 | #: ../lucioLib/gui/assistant_new_project.py:223 |
4090 | 440 | msgid "" | ||
4091 | 441 | " Other device.\n" | ||
4092 | 442 | "(Manual import)" | ||
4093 | 443 | msgstr "" | ||
4094 | 444 | |||
4095 | 445 | #: ../lucioLib/gui/assistant_new_project.py:240 | ||
4096 | 462 | #, fuzzy | 446 | #, fuzzy |
4097 | 463 | msgid "Images per second" | 447 | msgid "Images per second" |
4098 | 464 | msgstr "Images per seconds" | 448 | msgstr "Images per seconds" |
4099 | 465 | 449 | ||
4100 | 466 | #. display project path | 450 | #. display project path |
4102 | 467 | #: ../lucioLib/gui/assistant_new_project.py:345 | 451 | #: ../lucioLib/gui/assistant_new_project.py:343 |
4103 | 468 | #, fuzzy | 452 | #, fuzzy |
4104 | 469 | msgid "Project Path" | 453 | msgid "Project Path" |
4105 | 470 | msgstr "Project name" | 454 | msgstr "Project name" |
4106 | 471 | 455 | ||
4108 | 472 | #: ../lucioLib/gui/assistant_new_project.py:354 | 456 | #: ../lucioLib/gui/assistant_new_project.py:352 |
4109 | 473 | #, fuzzy | 457 | #, fuzzy |
4110 | 474 | msgid "Number of frames per seconds" | 458 | msgid "Number of frames per seconds" |
4111 | 475 | msgstr "Images per seconds" | 459 | msgstr "Images per seconds" |
4112 | 476 | 460 | ||
4113 | 477 | #. display Hardware type | 461 | #. display Hardware type |
4115 | 478 | #: ../lucioLib/gui/assistant_new_project.py:358 | 462 | #: ../lucioLib/gui/assistant_new_project.py:356 |
4116 | 479 | msgid "Hardware type" | 463 | msgid "Hardware type" |
4117 | 480 | msgstr "" | 464 | msgstr "" |
4118 | 481 | 465 | ||
4119 | 482 | #. webcam name | 466 | #. webcam name |
4121 | 483 | #: ../lucioLib/gui/assistant_new_project.py:364 | 467 | #: ../lucioLib/gui/assistant_new_project.py:362 |
4122 | 484 | #, fuzzy | 468 | #, fuzzy |
4123 | 485 | msgid "Webcam name" | 469 | msgid "Webcam name" |
4124 | 486 | msgstr "Web Cam" | 470 | msgstr "Web Cam" |
4125 | 487 | 471 | ||
4126 | 488 | #. webcam device | 472 | #. webcam device |
4128 | 489 | #: ../lucioLib/gui/assistant_new_project.py:368 | 473 | #: ../lucioLib/gui/assistant_new_project.py:366 |
4129 | 490 | #, fuzzy | 474 | #, fuzzy |
4130 | 491 | msgid "Webcam device" | 475 | msgid "Webcam device" |
4131 | 492 | msgstr "Web Cam" | 476 | msgstr "Web Cam" |
4132 | 493 | 477 | ||
4133 | 494 | #. webcam resolution | 478 | #. webcam resolution |
4135 | 495 | #: ../lucioLib/gui/assistant_new_project.py:372 | 479 | #: ../lucioLib/gui/assistant_new_project.py:370 |
4136 | 496 | msgid "Webcam resolution used" | 480 | msgid "Webcam resolution used" |
4137 | 497 | msgstr "" | 481 | msgstr "" |
4138 | 498 | 482 | ||
4139 | 499 | #. webcam device | 483 | #. webcam device |
4141 | 500 | #: ../lucioLib/gui/assistant_new_project.py:378 | 484 | #: ../lucioLib/gui/assistant_new_project.py:376 |
4142 | 501 | msgid "Webcam driver used" | 485 | msgid "Webcam driver used" |
4143 | 502 | msgstr "" | 486 | msgstr "" |
4144 | 503 | 487 | ||
4145 | 504 | #. Final message | 488 | #. Final message |
4147 | 505 | #: ../lucioLib/gui/assistant_new_project.py:383 | 489 | #: ../lucioLib/gui/assistant_new_project.py:381 |
4148 | 506 | msgid "Have fun with luciole !" | 490 | msgid "Have fun with luciole !" |
4149 | 507 | msgstr "" | 491 | msgstr "" |
4150 | 508 | 492 | ||
4152 | 509 | #: ../lucioLib/gui/assistant_new_project.py:413 | 493 | #: ../lucioLib/gui/assistant_new_project.py:411 |
4153 | 510 | #, fuzzy | 494 | #, fuzzy |
4154 | 511 | msgid "Luciole project assistant" | 495 | msgid "Luciole project assistant" |
4155 | 512 | msgstr "Select a myrtille project file" | 496 | msgstr "Select a myrtille project file" |
4156 | 513 | 497 | ||
4158 | 514 | #: ../lucioLib/gui/assistant_new_project.py:424 | 498 | #: ../lucioLib/gui/assistant_new_project.py:422 |
4159 | 515 | #, fuzzy | 499 | #, fuzzy |
4160 | 516 | msgid " Select a project path " | 500 | msgid " Select a project path " |
4161 | 517 | msgstr "Select a myrtille project file" | 501 | msgstr "Select a myrtille project file" |
4162 | 518 | 502 | ||
4164 | 519 | #: ../lucioLib/gui/assistant_new_project.py:433 | 503 | #: ../lucioLib/gui/assistant_new_project.py:431 |
4165 | 520 | #, fuzzy | 504 | #, fuzzy |
4166 | 521 | msgid " Select hardware " | 505 | msgid " Select hardware " |
4167 | 522 | msgstr "Select a folder" | 506 | msgstr "Select a folder" |
4168 | 523 | 507 | ||
4170 | 524 | #: ../lucioLib/gui/assistant_new_project.py:443 | 508 | #: ../lucioLib/gui/assistant_new_project.py:441 |
4171 | 525 | msgid " Webcam detection " | 509 | msgid " Webcam detection " |
4172 | 526 | msgstr "" | 510 | msgstr "" |
4173 | 527 | 511 | ||
4175 | 528 | #: ../lucioLib/gui/assistant_new_project.py:452 | 512 | #: ../lucioLib/gui/assistant_new_project.py:451 |
4176 | 529 | #, fuzzy | 513 | #, fuzzy |
4177 | 530 | msgid " Project overview " | 514 | msgid " Project overview " |
4178 | 531 | msgstr "Project name" | 515 | msgstr "Project name" |
4179 | @@ -549,11 +533,11 @@ | |||
4180 | 549 | msgid "Webcam detection done" | 533 | msgid "Webcam detection done" |
4181 | 550 | msgstr "" | 534 | msgstr "" |
4182 | 551 | 535 | ||
4183 | 552 | #: ../lucioLib/gui/webcam_detection_widget.py:186 | ||
4184 | 553 | msgid "Detected webcam" | ||
4185 | 554 | msgstr "" | ||
4186 | 555 | |||
4187 | 556 | #: ../lucioLib/gui/webcam_detection_widget.py:188 | 536 | #: ../lucioLib/gui/webcam_detection_widget.py:188 |
4188 | 537 | msgid "Detected webcam(s)" | ||
4189 | 538 | msgstr "" | ||
4190 | 539 | |||
4191 | 540 | #: ../lucioLib/gui/webcam_detection_widget.py:192 | ||
4192 | 557 | msgid "No webcam detected" | 541 | msgid "No webcam detected" |
4193 | 558 | msgstr "" | 542 | msgstr "" |
4194 | 559 | 543 | ||
4195 | @@ -567,6 +551,10 @@ | |||
4196 | 567 | msgid "Select a Folder" | 551 | msgid "Select a Folder" |
4197 | 568 | msgstr "Select a folder" | 552 | msgstr "Select a folder" |
4198 | 569 | 553 | ||
4199 | 554 | #: ../lucioLib/luciole_constants.py:42 | ||
4200 | 555 | msgid "OTHER DEVICE" | ||
4201 | 556 | msgstr "" | ||
4202 | 557 | |||
4203 | 570 | #: ../lucioLib/luciole_controller.py:157 | 558 | #: ../lucioLib/luciole_controller.py:157 |
4204 | 571 | #, fuzzy, python-format | 559 | #, fuzzy, python-format |
4205 | 572 | msgid "Project %s saved" | 560 | msgid "Project %s saved" |
4206 | @@ -577,87 +565,94 @@ | |||
4207 | 577 | msgid "Project saved as %s" | 565 | msgid "Project saved as %s" |
4208 | 578 | msgstr "Project name" | 566 | msgstr "Project name" |
4209 | 579 | 567 | ||
4211 | 580 | #: ../lucioLib/luciole_controller.py:222 | 568 | #: ../lucioLib/luciole_controller.py:229 |
4212 | 581 | msgid "No file or valid file choosen for image import." | 569 | msgid "No file or valid file choosen for image import." |
4213 | 582 | msgstr "" | 570 | msgstr "" |
4214 | 583 | 571 | ||
4216 | 584 | #: ../lucioLib/luciole_controller.py:226 | 572 | #: ../lucioLib/luciole_controller.py:233 |
4217 | 585 | msgid "Impossible to import images when no project are loaded." | 573 | msgid "Impossible to import images when no project are loaded." |
4218 | 586 | msgstr "" | 574 | msgstr "" |
4219 | 587 | 575 | ||
4220 | 588 | #. nbd@grape to transform as error message | 576 | #. nbd@grape to transform as error message |
4222 | 589 | #: ../lucioLib/luciole_controller.py:255 | 577 | #: ../lucioLib/luciole_controller.py:262 |
4223 | 590 | msgid "Nothing to export. No project loaded" | 578 | msgid "Nothing to export. No project loaded" |
4224 | 591 | msgstr "" | 579 | msgstr "" |
4225 | 592 | 580 | ||
4226 | 593 | #. nbd@grape specify action to do err message or raise exception ? | 581 | #. nbd@grape specify action to do err message or raise exception ? |
4228 | 594 | #: ../lucioLib/luciole_controller.py:273 | 582 | #: ../lucioLib/luciole_controller.py:280 |
4229 | 595 | msgid "Imposible to initialize player." | 583 | msgid "Imposible to initialize player." |
4230 | 596 | msgstr "" | 584 | msgstr "" |
4231 | 597 | 585 | ||
4232 | 598 | #. nbd@grape to transform as error message | 586 | #. nbd@grape to transform as error message |
4234 | 599 | #: ../lucioLib/luciole_controller.py:295 | 587 | #: ../lucioLib/luciole_controller.py:302 |
4235 | 600 | msgid "Can not play animantion : No image on montage view " | 588 | msgid "Can not play animantion : No image on montage view " |
4236 | 601 | msgstr "" | 589 | msgstr "" |
4237 | 602 | 590 | ||
4238 | 603 | #. nbd@grape to transform as error message | 591 | #. nbd@grape to transform as error message |
4240 | 604 | #: ../lucioLib/luciole_controller.py:304 | 592 | #: ../lucioLib/luciole_controller.py:311 |
4241 | 605 | msgid "Can not play animantion : No project loaded " | 593 | msgid "Can not play animantion : No project loaded " |
4242 | 606 | msgstr "" | 594 | msgstr "" |
4243 | 607 | 595 | ||
4244 | 608 | #. nbd@grape : ask for save if save set status as loaded | 596 | #. nbd@grape : ask for save if save set status as loaded |
4246 | 609 | #: ../lucioLib/luciole_controller.py:353 | 597 | #: ../lucioLib/luciole_controller.py:360 |
4247 | 610 | msgid "Save Project before closing" | 598 | msgid "Save Project before closing" |
4248 | 611 | msgstr "" | 599 | msgstr "" |
4249 | 612 | 600 | ||
4251 | 613 | #: ../lucioLib/luciole_controller.py:379 | 601 | #: ../lucioLib/luciole_controller.py:386 |
4252 | 614 | #, python-format | 602 | #, python-format |
4253 | 615 | msgid "Project %s is closed" | 603 | msgid "Project %s is closed" |
4254 | 616 | msgstr "" | 604 | msgstr "" |
4255 | 617 | 605 | ||
4256 | 618 | #. clear message status bar | 606 | #. clear message status bar |
4258 | 619 | #: ../lucioLib/luciole_controller.py:400 | 607 | #: ../lucioLib/luciole_controller.py:407 |
4259 | 620 | msgid "Acquiring" | 608 | msgid "Acquiring" |
4260 | 621 | msgstr "" | 609 | msgstr "" |
4261 | 622 | 610 | ||
4263 | 623 | #: ../lucioLib/luciole_controller.py:421 | 611 | #. stop acquirer |
4264 | 612 | #: ../lucioLib/luciole_controller.py:424 | ||
4265 | 613 | msgid "" | ||
4266 | 614 | "No acquisition available. Use 'import image' button to load images in " | ||
4267 | 615 | "project." | ||
4268 | 616 | msgstr "" | ||
4269 | 617 | |||
4270 | 618 | #: ../lucioLib/luciole_controller.py:436 | ||
4271 | 624 | msgid " Can not start acquisition when no project are loaded." | 619 | msgid " Can not start acquisition when no project are loaded." |
4272 | 625 | msgstr "" | 620 | msgstr "" |
4273 | 626 | 621 | ||
4275 | 627 | #: ../lucioLib/luciole_controller.py:430 | 622 | #: ../lucioLib/luciole_controller.py:445 |
4276 | 628 | #, python-format | 623 | #, python-format |
4277 | 629 | msgid "Acquisition error. %s" | 624 | msgid "Acquisition error. %s" |
4278 | 630 | msgstr "" | 625 | msgstr "" |
4279 | 631 | 626 | ||
4281 | 632 | #: ../lucioLib/luciole_controller.py:444 | 627 | #: ../lucioLib/luciole_controller.py:459 |
4282 | 633 | msgid "No Acquistion" | 628 | msgid "No Acquistion" |
4283 | 634 | msgstr "" | 629 | msgstr "" |
4284 | 635 | 630 | ||
4285 | 636 | #. nbd@grape : ask for save if save set status as loaded | 631 | #. nbd@grape : ask for save if save set status as loaded |
4287 | 637 | #: ../lucioLib/luciole_controller.py:533 | 632 | #: ../lucioLib/luciole_controller.py:548 |
4288 | 638 | msgid "Project modified. Save project before exit ?" | 633 | msgid "Project modified. Save project before exit ?" |
4289 | 639 | msgstr "" | 634 | msgstr "" |
4290 | 640 | 635 | ||
4293 | 641 | #: ../lucioLib/luciole_controller.py:585 | 636 | #: ../lucioLib/luciole_controller.py:600 |
4294 | 642 | msgid "Please restart luciole to take into acount the new theme " | 637 | msgid "Please restart luciole to take into account the new theme " |
4295 | 643 | msgstr "" | 638 | msgstr "" |
4296 | 644 | 639 | ||
4298 | 645 | #: ../lucioLib/luciole_controller.py:635 | 640 | #: ../lucioLib/luciole_controller.py:650 |
4299 | 646 | #, fuzzy | 641 | #, fuzzy |
4301 | 647 | msgid "Failed to load project " | 642 | msgid "Failed to load project " |
4302 | 648 | msgstr "Select a myrtille project file" | 643 | msgstr "Select a myrtille project file" |
4303 | 649 | 644 | ||
4305 | 650 | #: ../lucioLib/luciole_image.py:135 | 645 | #: ../lucioLib/luciole_image.py:137 |
4306 | 651 | #, python-format | 646 | #, python-format |
4307 | 652 | msgid "Not a file : %s" | 647 | msgid "Not a file : %s" |
4308 | 653 | msgstr "" | 648 | msgstr "" |
4309 | 654 | 649 | ||
4311 | 655 | #: ../lucioLib/luciole_image.py:183 | 650 | #: ../lucioLib/luciole_image.py:185 |
4312 | 656 | msgid "rush folder not valid" | 651 | msgid "rush folder not valid" |
4313 | 657 | msgstr "" | 652 | msgstr "" |
4314 | 658 | 653 | ||
4315 | 659 | #. error to raise | 654 | #. error to raise |
4317 | 660 | #: ../lucioLib/luciole_image.py:278 | 655 | #: ../lucioLib/luciole_image.py:280 |
4318 | 661 | #, python-format | 656 | #, python-format |
4319 | 662 | msgid "Error path does not exist : %s" | 657 | msgid "Error path does not exist : %s" |
4320 | 663 | msgstr "" | 658 | msgstr "" |
4321 | @@ -685,6 +680,24 @@ | |||
4322 | 685 | msgid "Unable to erase" | 680 | msgid "Unable to erase" |
4323 | 686 | msgstr "" | 681 | msgstr "" |
4324 | 687 | 682 | ||
4325 | 683 | #~ msgid "gtk-about" | ||
4326 | 684 | #~ msgstr "gtk-about" | ||
4327 | 685 | |||
4328 | 686 | #~ msgid "gtk-new" | ||
4329 | 687 | #~ msgstr "gtk-new" | ||
4330 | 688 | |||
4331 | 689 | #~ msgid "gtk-open" | ||
4332 | 690 | #~ msgstr "gtk-open" | ||
4333 | 691 | |||
4334 | 692 | #~ msgid "gtk-quit" | ||
4335 | 693 | #~ msgstr "gtk-quit" | ||
4336 | 694 | |||
4337 | 695 | #~ msgid "gtk-save" | ||
4338 | 696 | #~ msgstr "gtk-save" | ||
4339 | 697 | |||
4340 | 698 | #~ msgid "gtk-save-as" | ||
4341 | 699 | #~ msgstr "gtk-save-as" | ||
4342 | 700 | |||
4343 | 688 | #, fuzzy | 701 | #, fuzzy |
4344 | 689 | #~ msgid "project_name" | 702 | #~ msgid "project_name" |
4345 | 690 | #~ msgstr "Project name" | 703 | #~ msgstr "Project name" |
4346 | @@ -728,9 +741,6 @@ | |||
4347 | 728 | #~ msgid "Export ..." | 741 | #~ msgid "Export ..." |
4348 | 729 | #~ msgstr "Export ..." | 742 | #~ msgstr "Export ..." |
4349 | 730 | 743 | ||
4350 | 731 | #~ msgid "File export" | ||
4351 | 732 | #~ msgstr "File export" | ||
4352 | 733 | |||
4353 | 734 | #, fuzzy | 744 | #, fuzzy |
4354 | 735 | #~ msgid "Images per second number" | 745 | #~ msgid "Images per second number" |
4355 | 736 | #~ msgstr "Images per seconds" | 746 | #~ msgstr "Images per seconds" |
4356 | 737 | 747 | ||
4357 | === modified file 'po/en_US/LC_MESSAGES/luciole.mo' | |||
4358 | 738 | Binary 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 | 748 | Binary 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 |
4359 | === modified file 'po/fr_FR.po' | |||
4360 | --- po/fr_FR.po 2009-05-01 16:34:13 +0000 | |||
4361 | +++ po/fr_FR.po 2009-05-07 09:27:18 +0000 | |||
4362 | @@ -9,7 +9,7 @@ | |||
4363 | 9 | msgstr "" | 9 | msgstr "" |
4364 | 10 | "Project-Id-Version: myrtille export\n" | 10 | "Project-Id-Version: myrtille export\n" |
4365 | 11 | "Report-Msgid-Bugs-To: \n" | 11 | "Report-Msgid-Bugs-To: \n" |
4367 | 12 | "POT-Creation-Date: 2009-05-01 18:31+0200\n" | 12 | "POT-Creation-Date: 2009-05-07 11:21+0200\n" |
4368 | 13 | "PO-Revision-Date: 2009-04-30 18:04+0000\n" | 13 | "PO-Revision-Date: 2009-04-30 18:04+0000\n" |
4369 | 14 | "Last-Translator: Lili <Unknown>\n" | 14 | "Last-Translator: Lili <Unknown>\n" |
4370 | 15 | "Language-Team: French <gnomefr@traduc.org>\n" | 15 | "Language-Team: French <gnomefr@traduc.org>\n" |
4371 | @@ -59,7 +59,7 @@ | |||
4372 | 59 | #: ../images/luciole.glade.h:11 | 59 | #: ../images/luciole.glade.h:11 |
4373 | 60 | #, fuzzy | 60 | #, fuzzy |
4374 | 61 | msgid "Copyright 2009 Nicolas Bertrand /GRAPE" | 61 | msgid "Copyright 2009 Nicolas Bertrand /GRAPE" |
4376 | 62 | msgstr "Copyright 2009 GRAPE" | 62 | msgstr "Copyright 2009 Nicolas Bertrand/GRAPE" |
4377 | 63 | 63 | ||
4378 | 64 | #: ../images/luciole.glade.h:12 | 64 | #: ../images/luciole.glade.h:12 |
4379 | 65 | msgid "" | 65 | msgid "" |
4380 | @@ -75,7 +75,7 @@ | |||
4381 | 75 | msgid "" | 75 | msgid "" |
4382 | 76 | "Default\n" | 76 | "Default\n" |
4383 | 77 | "Tropical" | 77 | "Tropical" |
4385 | 78 | msgstr "Tropical" | 78 | msgstr "" |
4386 | 79 | 79 | ||
4387 | 80 | #: ../images/luciole.glade.h:17 | 80 | #: ../images/luciole.glade.h:17 |
4388 | 81 | msgid "" | 81 | msgid "" |
4389 | @@ -83,10 +83,10 @@ | |||
4390 | 83 | "Nico : nico@inattendu.org" | 83 | "Nico : nico@inattendu.org" |
4391 | 84 | msgstr "" | 84 | msgstr "" |
4392 | 85 | 85 | ||
4393 | 86 | # msgstr "Le Fichier %s existe. Ecraser ce fichier ?" | ||
4394 | 87 | #: ../images/luciole.glade.h:19 | 86 | #: ../images/luciole.glade.h:19 |
4395 | 87 | #, fuzzy | ||
4396 | 88 | msgid "Export" | 88 | msgid "Export" |
4398 | 89 | msgstr "Export" | 89 | msgstr "Export terminé" |
4399 | 90 | 90 | ||
4400 | 91 | #: ../images/luciole.glade.h:20 | 91 | #: ../images/luciole.glade.h:20 |
4401 | 92 | msgid "Export path:" | 92 | msgid "Export path:" |
4402 | @@ -126,7 +126,7 @@ | |||
4403 | 126 | msgid "Move down one or several images" | 126 | msgid "Move down one or several images" |
4404 | 127 | msgstr "Descendre une ou plusieurs images" | 127 | msgstr "Descendre une ou plusieurs images" |
4405 | 128 | 128 | ||
4407 | 129 | #. Déplacer des images capturées dans la zone de montage | 129 | #. Déplacer des images capturées dans la zone de montage |
4408 | 130 | #: ../images/luciole.glade.h:32 | 130 | #: ../images/luciole.glade.h:32 |
4409 | 131 | msgid "Move snapshot to montage area" | 131 | msgid "Move snapshot to montage area" |
4410 | 132 | msgstr "Déplacer des images capturées dans la zone de montage" | 132 | msgstr "Déplacer des images capturées dans la zone de montage" |
4411 | @@ -134,7 +134,7 @@ | |||
4412 | 134 | #. Monter un/ou plusieurs images | 134 | #. Monter un/ou plusieurs images |
4413 | 135 | #: ../images/luciole.glade.h:34 | 135 | #: ../images/luciole.glade.h:34 |
4414 | 136 | msgid "Move up one or several images" | 136 | msgid "Move up one or several images" |
4416 | 137 | msgstr "Monter une ou plusieurs images" | 137 | msgstr "Monter une ou plusieurs images" |
4417 | 138 | 138 | ||
4418 | 139 | #: ../images/luciole.glade.h:35 | 139 | #: ../images/luciole.glade.h:35 |
4419 | 140 | msgid "Open recent" | 140 | msgid "Open recent" |
4420 | @@ -153,18 +153,23 @@ | |||
4421 | 153 | msgstr "Propriétés du projet" | 153 | msgstr "Propriétés du projet" |
4422 | 154 | 154 | ||
4423 | 155 | #: ../images/luciole.glade.h:39 | 155 | #: ../images/luciole.glade.h:39 |
4424 | 156 | #: ../lucioLib/gui/dialog_project_properties.py:89 | ||
4425 | 157 | msgid "Project properties" | ||
4426 | 158 | msgstr "Propriétés du projet" | ||
4427 | 159 | |||
4428 | 160 | #: ../images/luciole.glade.h:40 | ||
4429 | 156 | msgid "Select Theme" | 161 | msgid "Select Theme" |
4430 | 157 | msgstr "Choisir un thème" | 162 | msgstr "Choisir un thème" |
4431 | 158 | 163 | ||
4433 | 159 | #: ../images/luciole.glade.h:40 | 164 | #: ../images/luciole.glade.h:41 |
4434 | 160 | msgid "Select a Luciole project" | 165 | msgid "Select a Luciole project" |
4435 | 161 | msgstr "Choisir un projet Luciole" | 166 | msgstr "Choisir un projet Luciole" |
4436 | 162 | 167 | ||
4438 | 163 | #: ../images/luciole.glade.h:41 ../lucioLib/gui/assistant_new_project.py:102 | 168 | #: ../images/luciole.glade.h:42 ../lucioLib/gui/assistant_new_project.py:100 |
4439 | 164 | msgid "Select a folder" | 169 | msgid "Select a folder" |
4440 | 165 | msgstr "Sélectionner un dossier" | 170 | msgstr "Sélectionner un dossier" |
4441 | 166 | 171 | ||
4443 | 167 | #: ../images/luciole.glade.h:42 | 172 | #: ../images/luciole.glade.h:43 |
4444 | 168 | msgid "" | 173 | msgid "" |
4445 | 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" |
4446 | 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" |
4447 | @@ -183,120 +188,99 @@ | |||
4448 | 183 | "Inc., 59 Temple Place - \n" | 188 | "Inc., 59 Temple Place - \n" |
4449 | 184 | "Suite 330, Boston, MA 02111-1307, USA." | 189 | "Suite 330, Boston, MA 02111-1307, USA." |
4450 | 185 | msgstr "" | 190 | msgstr "" |
4454 | 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" |
4455 | 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" |
4456 | 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" |
4457 | 189 | "convenance) toute version ultérieure.\n" | 194 | "convenance) toute version ultérieure.\n" |
4460 | 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 " |
4461 | 191 | "GARANTIE ; sans même une garantie implicite de commercialisation ou " | 196 | "AUCUNE \n" |
4462 | 197 | "GARANTIE ; sans même une garantie implicite de commercialisation ou \n" | ||
4463 | 192 | "d'adaptation à un USAGE PARTICULIER. Voir la GNU General Public\n" | 198 | "d'adaptation à un USAGE PARTICULIER. Voir la GNU General Public\n" |
4464 | 193 | "License pour plus de détails.\n" | 199 | "License pour plus de détails.\n" |
4466 | 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" |
4467 | 195 | "programme ; sinon, écrivez à la\n" | 201 | "programme ; sinon, écrivez à la\n" |
4468 | 196 | "Free Software Foundation,\n" | 202 | "Free Software Foundation,\n" |
4469 | 197 | "Inc, 59 Temple Place -\n" | 203 | "Inc, 59 Temple Place -\n" |
4471 | 198 | "Suite 330, Boston, MA 02111-1307, USA." | 204 | "Suite 330, Boston, MA 02111-1307, USA.\n" |
4472 | 199 | 205 | ||
4475 | 200 | #. Jeter à la poubelle | 206 | #. Jeter à la poubelle |
4476 | 201 | #: ../images/luciole.glade.h:59 | 207 | #: ../images/luciole.glade.h:60 |
4477 | 202 | msgid "To trash" | 208 | msgid "To trash" |
4478 | 203 | msgstr "Mettre à la poubelle" | 209 | msgstr "Mettre à la poubelle" |
4479 | 204 | 210 | ||
4481 | 205 | #: ../images/luciole.glade.h:60 | 211 | #: ../images/luciole.glade.h:61 |
4482 | 206 | msgid "Transparency level" | 212 | msgid "Transparency level" |
4483 | 207 | msgstr "Niveau de transparence" | 213 | msgstr "Niveau de transparence" |
4484 | 208 | 214 | ||
4486 | 209 | #: ../images/luciole.glade.h:61 | 215 | # msgstr "Le Fichier %s existe. Ecraser ce fichier ?" |
4487 | 216 | #: ../images/luciole.glade.h:62 | ||
4488 | 217 | #, fuzzy | ||
4489 | 218 | msgid "Video Export" | ||
4490 | 219 | msgstr "Export" | ||
4491 | 220 | |||
4492 | 221 | #: ../images/luciole.glade.h:63 | ||
4493 | 210 | msgid "_File" | 222 | msgid "_File" |
4494 | 211 | msgstr "_Fichier" | 223 | msgstr "_Fichier" |
4495 | 212 | 224 | ||
4497 | 213 | #: ../images/luciole.glade.h:62 | 225 | #: ../images/luciole.glade.h:64 |
4498 | 214 | msgid "_Help" | 226 | msgid "_Help" |
4500 | 215 | msgstr "Aide" | 227 | msgstr "_Aide" |
4501 | 216 | 228 | ||
4503 | 217 | #: ../images/luciole.glade.h:63 | 229 | #: ../images/luciole.glade.h:65 |
4504 | 218 | msgid "_View" | 230 | msgid "_View" |
4512 | 219 | msgstr "_Affichage" | 231 | msgstr "_Options" |
4513 | 220 | 232 | ||
4514 | 221 | #: ../images/luciole.glade.h:64 | 233 | #: ../images/luciole.glade.h:66 |
4508 | 222 | msgid "gtk-about" | ||
4509 | 223 | msgstr "" | ||
4510 | 224 | |||
4511 | 225 | #: ../images/luciole.glade.h:65 | ||
4515 | 226 | msgid "gtk-apply" | 234 | msgid "gtk-apply" |
4516 | 227 | msgstr "" | 235 | msgstr "" |
4517 | 228 | 236 | ||
4519 | 229 | #: ../images/luciole.glade.h:66 | 237 | #: ../images/luciole.glade.h:67 |
4520 | 230 | msgid "gtk-cancel" | 238 | msgid "gtk-cancel" |
4521 | 231 | msgstr "" | 239 | msgstr "" |
4522 | 232 | 240 | ||
4524 | 233 | #: ../images/luciole.glade.h:67 | 241 | #: ../images/luciole.glade.h:68 |
4525 | 234 | msgid "gtk-close" | 242 | msgid "gtk-close" |
4526 | 235 | msgstr "" | 243 | msgstr "" |
4527 | 236 | 244 | ||
4536 | 237 | #: ../images/luciole.glade.h:68 | 245 | #. Capturer une image |
4529 | 238 | msgid "gtk-new" | ||
4530 | 239 | msgstr "" | ||
4531 | 240 | |||
4532 | 241 | #: ../images/luciole.glade.h:69 | ||
4533 | 242 | msgid "gtk-open" | ||
4534 | 243 | msgstr "" | ||
4535 | 244 | |||
4537 | 245 | #: ../images/luciole.glade.h:70 | 246 | #: ../images/luciole.glade.h:70 |
4538 | 246 | msgid "gtk-quit" | ||
4539 | 247 | msgstr "" | ||
4540 | 248 | |||
4541 | 249 | #: ../images/luciole.glade.h:71 | ||
4542 | 250 | msgid "gtk-save" | ||
4543 | 251 | msgstr "" | ||
4544 | 252 | |||
4545 | 253 | #: ../images/luciole.glade.h:72 | ||
4546 | 254 | msgid "gtk-save-as" | ||
4547 | 255 | msgstr "" | ||
4548 | 256 | |||
4549 | 257 | #. Capturer une image | ||
4550 | 258 | #: ../images/luciole.glade.h:74 | ||
4551 | 259 | msgid "make a snapshot" | 247 | msgid "make a snapshot" |
4552 | 260 | msgstr "Capturer une image" | 248 | msgstr "Capturer une image" |
4553 | 261 | 249 | ||
4559 | 262 | #: ../images/luciole.glade.h:75 | 250 | #: ../images/luciole.glade.h:71 |
4555 | 263 | msgid "menuitem1" | ||
4556 | 264 | msgstr "" | ||
4557 | 265 | |||
4558 | 266 | #: ../images/luciole.glade.h:76 | ||
4560 | 267 | msgid "options" | 251 | msgid "options" |
4561 | 268 | msgstr "Options" | 252 | msgstr "Options" |
4562 | 269 | 253 | ||
4564 | 270 | #: ../images/luciole.glade.h:77 | 254 | #: ../images/luciole.glade.h:72 |
4565 | 271 | msgid "project1" | 255 | msgid "project1" |
4566 | 272 | msgstr "" | 256 | msgstr "" |
4567 | 273 | 257 | ||
4569 | 274 | #: ../images/luciole.glade.h:78 | 258 | #: ../images/luciole.glade.h:73 |
4570 | 275 | msgid "project2" | 259 | msgid "project2" |
4571 | 276 | msgstr "" | 260 | msgstr "" |
4572 | 277 | 261 | ||
4574 | 278 | #: ../images/luciole.glade.h:79 | 262 | #: ../images/luciole.glade.h:74 |
4575 | 279 | msgid "project3" | 263 | msgid "project3" |
4576 | 280 | msgstr "" | 264 | msgstr "" |
4577 | 281 | 265 | ||
4579 | 282 | #: ../images/luciole.glade.h:80 | 266 | #: ../images/luciole.glade.h:75 |
4580 | 283 | msgid "project4" | 267 | msgid "project4" |
4581 | 284 | msgstr "" | 268 | msgstr "" |
4582 | 285 | 269 | ||
4584 | 286 | #: ../images/luciole.glade.h:81 | 270 | #: ../images/luciole.glade.h:76 |
4585 | 287 | msgid "project5" | 271 | msgid "project5" |
4586 | 288 | msgstr "" | 272 | msgstr "" |
4587 | 289 | 273 | ||
4589 | 290 | #: ../lucioLib/controller/controller_load_project.py:133 | 274 | #: ../lucioLib/controller/controller_load_project.py:134 |
4590 | 291 | msgid "Project Load started" | 275 | msgid "Project Load started" |
4591 | 292 | msgstr "Chargement du projet démarré" | 276 | msgstr "Chargement du projet démarré" |
4592 | 293 | 277 | ||
4594 | 294 | #: ../lucioLib/controller/controller_load_project.py:138 | 278 | #: ../lucioLib/controller/controller_load_project.py:139 |
4595 | 295 | #, python-format | 279 | #, python-format |
4596 | 296 | msgid "Project %s is loaded" | 280 | msgid "Project %s is loaded" |
4597 | 297 | msgstr "Le projet %s est chargé" | 281 | msgstr "Le projet %s est chargé" |
4598 | 298 | 282 | ||
4600 | 299 | #: ../lucioLib/controller/controller_load_project.py:144 | 283 | #: ../lucioLib/controller/controller_load_project.py:145 |
4601 | 300 | #, python-format | 284 | #, python-format |
4602 | 301 | msgid "Project %s is loading" | 285 | msgid "Project %s is loading" |
4603 | 302 | msgstr "Le projet %s est en cours de chargement" | 286 | msgstr "Le projet %s est en cours de chargement" |
4604 | @@ -310,8 +294,9 @@ | |||
4605 | 310 | msgstr "Toutes les images ont été importées" | 294 | msgstr "Toutes les images ont été importées" |
4606 | 311 | 295 | ||
4607 | 312 | #: ../lucioLib/controller/controller_import.py:189 | 296 | #: ../lucioLib/controller/controller_import.py:189 |
4608 | 297 | #, fuzzy | ||
4609 | 313 | msgid "Importing images ..." | 298 | msgid "Importing images ..." |
4611 | 314 | msgstr "Images en cours d'import ..." | 299 | msgstr "Images en cours d'import..." |
4612 | 315 | 300 | ||
4613 | 316 | #: ../lucioLib/gui/dialog_project_properties.py:41 | 301 | #: ../lucioLib/gui/dialog_project_properties.py:41 |
4614 | 317 | msgid "Project folder :" | 302 | msgid "Project folder :" |
4615 | @@ -353,10 +338,6 @@ | |||
4616 | 353 | msgid "Video height :" | 338 | msgid "Video height :" |
4617 | 354 | msgstr "Hauteur :" | 339 | msgstr "Hauteur :" |
4618 | 355 | 340 | ||
4619 | 356 | #: ../lucioLib/gui/dialog_project_properties.py:89 | ||
4620 | 357 | msgid "Project properties" | ||
4621 | 358 | msgstr "Propriétés du projet" | ||
4622 | 359 | |||
4623 | 360 | #: ../lucioLib/gui/dialog_project_properties.py:177 | 341 | #: ../lucioLib/gui/dialog_project_properties.py:177 |
4624 | 361 | #: ../lucioLib/gui/dialog_project_properties.py:193 | 342 | #: ../lucioLib/gui/dialog_project_properties.py:193 |
4625 | 362 | msgid "desc" | 343 | msgid "desc" |
4626 | @@ -396,105 +377,111 @@ | |||
4627 | 396 | #. Initailize widgets for first page | 377 | #. Initailize widgets for first page |
4628 | 397 | #. | 378 | #. |
4629 | 398 | #. A label | 379 | #. A label |
4631 | 399 | #: ../lucioLib/gui/assistant_new_project.py:61 | 380 | #: ../lucioLib/gui/assistant_new_project.py:59 |
4632 | 400 | msgid "This assistant will help you on configuration of a new luciole project." | 381 | msgid "This assistant will help you on configuration of a new luciole project." |
4633 | 401 | msgstr "" | 382 | msgstr "" |
4634 | 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 " |
4635 | 403 | "luciole." | 384 | "luciole." |
4636 | 404 | 385 | ||
4637 | 405 | #. A label | 386 | #. A label |
4639 | 406 | #: ../lucioLib/gui/assistant_new_project.py:74 | 387 | #: ../lucioLib/gui/assistant_new_project.py:72 |
4640 | 407 | msgid "Select project name and destination folder." | 388 | msgid "Select project name and destination folder." |
4641 | 408 | msgstr "Choisir un nom de projet et un répertoire." | 389 | msgstr "Choisir un nom de projet et un répertoire." |
4642 | 409 | 390 | ||
4643 | 410 | #. display project name | 391 | #. display project name |
4646 | 411 | #: ../lucioLib/gui/assistant_new_project.py:84 | 392 | #: ../lucioLib/gui/assistant_new_project.py:82 |
4647 | 412 | #: ../lucioLib/gui/assistant_new_project.py:341 | 393 | #: ../lucioLib/gui/assistant_new_project.py:339 |
4648 | 413 | msgid "Project Name" | 394 | msgid "Project Name" |
4649 | 414 | msgstr "Nom de projet" | 395 | msgstr "Nom de projet" |
4650 | 415 | 396 | ||
4652 | 416 | #: ../lucioLib/gui/assistant_new_project.py:95 | 397 | #: ../lucioLib/gui/assistant_new_project.py:93 |
4653 | 417 | msgid "Folder" | 398 | msgid "Folder" |
4654 | 418 | msgstr "Répertoire" | 399 | msgstr "Répertoire" |
4655 | 419 | 400 | ||
4657 | 420 | #: ../lucioLib/gui/assistant_new_project.py:150 | 401 | #: ../lucioLib/gui/assistant_new_project.py:147 |
4658 | 421 | #, python-format | 402 | #, python-format |
4659 | 422 | msgid "" | 403 | msgid "" |
4661 | 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 " |
4662 | 424 | "alhanumeric and '_' characters " | 405 | "alhanumeric and '_' characters " |
4663 | 425 | msgstr "" | 406 | msgstr "" |
4664 | 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 " |
4665 | 427 | "caractères alphanumériques et '_' " | 408 | "caractères alphanumériques et '_' " |
4666 | 428 | 409 | ||
4668 | 429 | #: ../lucioLib/gui/assistant_new_project.py:161 | 410 | #: ../lucioLib/gui/assistant_new_project.py:158 |
4669 | 430 | #, python-format | 411 | #, python-format |
4670 | 431 | msgid "The project %s exists !" | 412 | msgid "The project %s exists !" |
4671 | 432 | msgstr "Le projet %s existe déjà !" | 413 | msgstr "Le projet %s existe déjà !" |
4672 | 433 | 414 | ||
4674 | 434 | #: ../lucioLib/gui/assistant_new_project.py:206 | 415 | #: ../lucioLib/gui/assistant_new_project.py:203 |
4675 | 435 | msgid "Select a device" | 416 | msgid "Select a device" |
4676 | 436 | msgstr "Choisir un périphérique" | 417 | msgstr "Choisir un périphérique" |
4677 | 437 | 418 | ||
4679 | 438 | #: ../lucioLib/gui/assistant_new_project.py:242 | 419 | #: ../lucioLib/gui/assistant_new_project.py:223 |
4680 | 420 | msgid "" | ||
4681 | 421 | " Other device.\n" | ||
4682 | 422 | "(Manual import)" | ||
4683 | 423 | msgstr "" | ||
4684 | 424 | |||
4685 | 425 | #: ../lucioLib/gui/assistant_new_project.py:240 | ||
4686 | 439 | msgid "Images per second" | 426 | msgid "Images per second" |
4687 | 440 | msgstr "Images par seconde" | 427 | msgstr "Images par seconde" |
4688 | 441 | 428 | ||
4689 | 442 | #. display project path | 429 | #. display project path |
4691 | 443 | #: ../lucioLib/gui/assistant_new_project.py:345 | 430 | #: ../lucioLib/gui/assistant_new_project.py:343 |
4692 | 444 | msgid "Project Path" | 431 | msgid "Project Path" |
4693 | 445 | msgstr "Chemin du projet" | 432 | msgstr "Chemin du projet" |
4694 | 446 | 433 | ||
4696 | 447 | #: ../lucioLib/gui/assistant_new_project.py:354 | 434 | #: ../lucioLib/gui/assistant_new_project.py:352 |
4697 | 448 | msgid "Number of frames per seconds" | 435 | msgid "Number of frames per seconds" |
4698 | 449 | msgstr "Nombre de frames par seconde" | 436 | msgstr "Nombre de frames par seconde" |
4699 | 450 | 437 | ||
4700 | 451 | #. display Hardware type | 438 | #. display Hardware type |
4702 | 452 | #: ../lucioLib/gui/assistant_new_project.py:358 | 439 | #: ../lucioLib/gui/assistant_new_project.py:356 |
4703 | 453 | msgid "Hardware type" | 440 | msgid "Hardware type" |
4704 | 454 | msgstr "Type de matériel" | 441 | msgstr "Type de matériel" |
4705 | 455 | 442 | ||
4706 | 456 | #. webcam name | 443 | #. webcam name |
4708 | 457 | #: ../lucioLib/gui/assistant_new_project.py:364 | 444 | #: ../lucioLib/gui/assistant_new_project.py:362 |
4709 | 458 | msgid "Webcam name" | 445 | msgid "Webcam name" |
4710 | 459 | msgstr "Nom de la webcam" | 446 | msgstr "Nom de la webcam" |
4711 | 460 | 447 | ||
4712 | 461 | #. webcam device | 448 | #. webcam device |
4714 | 462 | #: ../lucioLib/gui/assistant_new_project.py:368 | 449 | #: ../lucioLib/gui/assistant_new_project.py:366 |
4715 | 463 | msgid "Webcam device" | 450 | msgid "Webcam device" |
4716 | 464 | msgstr "Webcam driver" | 451 | msgstr "Webcam driver" |
4717 | 465 | 452 | ||
4718 | 466 | #. webcam resolution | 453 | #. webcam resolution |
4720 | 467 | #: ../lucioLib/gui/assistant_new_project.py:372 | 454 | #: ../lucioLib/gui/assistant_new_project.py:370 |
4721 | 468 | msgid "Webcam resolution used" | 455 | msgid "Webcam resolution used" |
4722 | 469 | msgstr "Résolution utilisée par la webcam" | 456 | msgstr "Résolution utilisée par la webcam" |
4723 | 470 | 457 | ||
4724 | 471 | #. webcam device | 458 | #. webcam device |
4726 | 472 | #: ../lucioLib/gui/assistant_new_project.py:378 | 459 | #: ../lucioLib/gui/assistant_new_project.py:376 |
4727 | 473 | msgid "Webcam driver used" | 460 | msgid "Webcam driver used" |
4728 | 474 | msgstr "Driver de webcam utilisé" | 461 | msgstr "Driver de webcam utilisé" |
4729 | 475 | 462 | ||
4730 | 476 | #. Final message | 463 | #. Final message |
4732 | 477 | #: ../lucioLib/gui/assistant_new_project.py:383 | 464 | #: ../lucioLib/gui/assistant_new_project.py:381 |
4733 | 478 | msgid "Have fun with luciole !" | 465 | msgid "Have fun with luciole !" |
4734 | 479 | msgstr "Amusez-vous bien avec luciole !" | 466 | msgstr "Amusez-vous bien avec luciole !" |
4735 | 480 | 467 | ||
4737 | 481 | #: ../lucioLib/gui/assistant_new_project.py:413 | 468 | #: ../lucioLib/gui/assistant_new_project.py:411 |
4738 | 482 | msgid "Luciole project assistant" | 469 | msgid "Luciole project assistant" |
4739 | 483 | msgstr "Assistant de projet luciole" | 470 | msgstr "Assistant de projet luciole" |
4740 | 484 | 471 | ||
4742 | 485 | #: ../lucioLib/gui/assistant_new_project.py:424 | 472 | #: ../lucioLib/gui/assistant_new_project.py:422 |
4743 | 486 | msgid " Select a project path " | 473 | msgid " Select a project path " |
4744 | 487 | msgstr " Choisir un chemin de projet " | 474 | msgstr " Choisir un chemin de projet " |
4745 | 488 | 475 | ||
4747 | 489 | #: ../lucioLib/gui/assistant_new_project.py:433 | 476 | #: ../lucioLib/gui/assistant_new_project.py:431 |
4748 | 490 | msgid " Select hardware " | 477 | msgid " Select hardware " |
4749 | 491 | msgstr " Choisir un matériel " | 478 | msgstr " Choisir un matériel " |
4750 | 492 | 479 | ||
4752 | 493 | #: ../lucioLib/gui/assistant_new_project.py:443 | 480 | #: ../lucioLib/gui/assistant_new_project.py:441 |
4753 | 494 | msgid " Webcam detection " | 481 | msgid " Webcam detection " |
4754 | 495 | msgstr " Détection de webcam " | 482 | msgstr " Détection de webcam " |
4755 | 496 | 483 | ||
4757 | 497 | #: ../lucioLib/gui/assistant_new_project.py:452 | 484 | #: ../lucioLib/gui/assistant_new_project.py:451 |
4758 | 498 | msgid " Project overview " | 485 | msgid " Project overview " |
4759 | 499 | msgstr " Propriétés du projet " | 486 | msgstr " Propriétés du projet " |
4760 | 500 | 487 | ||
4761 | @@ -516,11 +503,12 @@ | |||
4762 | 516 | msgid "Webcam detection done" | 503 | msgid "Webcam detection done" |
4763 | 517 | msgstr "Détection de webcam terminée" | 504 | msgstr "Détection de webcam terminée" |
4764 | 518 | 505 | ||
4767 | 519 | #: ../lucioLib/gui/webcam_detection_widget.py:186 | 506 | #: ../lucioLib/gui/webcam_detection_widget.py:188 |
4768 | 520 | msgid "Detected webcam" | 507 | #, fuzzy |
4769 | 508 | msgid "Detected webcam(s)" | ||
4770 | 521 | msgstr "Webcam détectée(s)" | 509 | msgstr "Webcam détectée(s)" |
4771 | 522 | 510 | ||
4773 | 523 | #: ../lucioLib/gui/webcam_detection_widget.py:188 | 511 | #: ../lucioLib/gui/webcam_detection_widget.py:192 |
4774 | 524 | msgid "No webcam detected" | 512 | msgid "No webcam detected" |
4775 | 525 | msgstr "Pas de webcam détectée" | 513 | msgstr "Pas de webcam détectée" |
4776 | 526 | 514 | ||
4777 | @@ -532,6 +520,10 @@ | |||
4778 | 532 | msgid "Select a Folder" | 520 | msgid "Select a Folder" |
4779 | 533 | msgstr "Sélectionner un dossier" | 521 | msgstr "Sélectionner un dossier" |
4780 | 534 | 522 | ||
4781 | 523 | #: ../lucioLib/luciole_constants.py:42 | ||
4782 | 524 | msgid "OTHER DEVICE" | ||
4783 | 525 | msgstr "" | ||
4784 | 526 | |||
4785 | 535 | #: ../lucioLib/luciole_controller.py:157 | 527 | #: ../lucioLib/luciole_controller.py:157 |
4786 | 536 | #, python-format | 528 | #, python-format |
4787 | 537 | msgid "Project %s saved" | 529 | msgid "Project %s saved" |
4788 | @@ -542,86 +534,94 @@ | |||
4789 | 542 | msgid "Project saved as %s" | 534 | msgid "Project saved as %s" |
4790 | 543 | msgstr "Projet sauvegardé en tant que %s" | 535 | msgstr "Projet sauvegardé en tant que %s" |
4791 | 544 | 536 | ||
4793 | 545 | #: ../lucioLib/luciole_controller.py:222 | 537 | #: ../lucioLib/luciole_controller.py:229 |
4794 | 546 | msgid "No file or valid file choosen for image import." | 538 | msgid "No file or valid file choosen for image import." |
4795 | 547 | msgstr "Pas d'image ou d'images valides choisies pour l'import." | 539 | msgstr "Pas d'image ou d'images valides choisies pour l'import." |
4796 | 548 | 540 | ||
4798 | 549 | #: ../lucioLib/luciole_controller.py:226 | 541 | #: ../lucioLib/luciole_controller.py:233 |
4799 | 550 | msgid "Impossible to import images when no project are loaded." | 542 | msgid "Impossible to import images when no project are loaded." |
4800 | 551 | msgstr "Impossible d'importer des images. Aucun projet chargé." | 543 | msgstr "Impossible d'importer des images. Aucun projet chargé." |
4801 | 552 | 544 | ||
4802 | 553 | #. nbd@grape to transform as error message | 545 | #. nbd@grape to transform as error message |
4804 | 554 | #: ../lucioLib/luciole_controller.py:255 | 546 | #: ../lucioLib/luciole_controller.py:262 |
4805 | 555 | msgid "Nothing to export. No project loaded" | 547 | msgid "Nothing to export. No project loaded" |
4806 | 556 | msgstr "Rien à exporter. Il n'y a pas de projet chargé." | 548 | msgstr "Rien à exporter. Il n'y a pas de projet chargé." |
4807 | 557 | 549 | ||
4808 | 558 | #. nbd@grape specify action to do err message or raise exception ? | 550 | #. nbd@grape specify action to do err message or raise exception ? |
4810 | 559 | #: ../lucioLib/luciole_controller.py:273 | 551 | #: ../lucioLib/luciole_controller.py:280 |
4811 | 560 | msgid "Imposible to initialize player." | 552 | msgid "Imposible to initialize player." |
4812 | 561 | msgstr "Impossible d'initialiser la lecture de la vidéo." | 553 | msgstr "Impossible d'initialiser la lecture de la vidéo." |
4813 | 562 | 554 | ||
4814 | 563 | #. nbd@grape to transform as error message | 555 | #. nbd@grape to transform as error message |
4816 | 564 | #: ../lucioLib/luciole_controller.py:295 | 556 | #: ../lucioLib/luciole_controller.py:302 |
4817 | 565 | msgid "Can not play animantion : No image on montage view " | 557 | msgid "Can not play animantion : No image on montage view " |
4818 | 566 | msgstr "Impossible de lire la vidéo : pas d'image dans la zone de montage. " | 558 | msgstr "Impossible de lire la vidéo : pas d'image dans la zone de montage. " |
4819 | 567 | 559 | ||
4820 | 568 | #. nbd@grape to transform as error message | 560 | #. nbd@grape to transform as error message |
4822 | 569 | #: ../lucioLib/luciole_controller.py:304 | 561 | #: ../lucioLib/luciole_controller.py:311 |
4823 | 570 | msgid "Can not play animantion : No project loaded " | 562 | msgid "Can not play animantion : No project loaded " |
4824 | 571 | msgstr "Impossible de lire la vidéo : pas de projet chargé " | 563 | msgstr "Impossible de lire la vidéo : pas de projet chargé " |
4825 | 572 | 564 | ||
4826 | 573 | #. nbd@grape : ask for save if save set status as loaded | 565 | #. nbd@grape : ask for save if save set status as loaded |
4828 | 574 | #: ../lucioLib/luciole_controller.py:353 | 566 | #: ../lucioLib/luciole_controller.py:360 |
4829 | 575 | msgid "Save Project before closing" | 567 | msgid "Save Project before closing" |
4830 | 576 | msgstr "Sauvegardez le projet avant de fermer ?" | 568 | msgstr "Sauvegardez le projet avant de fermer ?" |
4831 | 577 | 569 | ||
4833 | 578 | #: ../lucioLib/luciole_controller.py:379 | 570 | #: ../lucioLib/luciole_controller.py:386 |
4834 | 579 | #, python-format | 571 | #, python-format |
4835 | 580 | msgid "Project %s is closed" | 572 | msgid "Project %s is closed" |
4836 | 581 | msgstr "Le projet %s est fermé" | 573 | msgstr "Le projet %s est fermé" |
4837 | 582 | 574 | ||
4838 | 583 | #. clear message status bar | 575 | #. clear message status bar |
4840 | 584 | #: ../lucioLib/luciole_controller.py:400 | 576 | #: ../lucioLib/luciole_controller.py:407 |
4841 | 585 | msgid "Acquiring" | 577 | msgid "Acquiring" |
4842 | 586 | msgstr "En cours d'acquisition" | 578 | msgstr "En cours d'acquisition" |
4843 | 587 | 579 | ||
4845 | 588 | #: ../lucioLib/luciole_controller.py:421 | 580 | #. stop acquirer |
4846 | 581 | #: ../lucioLib/luciole_controller.py:424 | ||
4847 | 582 | msgid "" | ||
4848 | 583 | "No acquisition available. Use 'import image' button to load images in " | ||
4849 | 584 | "project." | ||
4850 | 585 | msgstr "" | ||
4851 | 586 | |||
4852 | 587 | #: ../lucioLib/luciole_controller.py:436 | ||
4853 | 589 | msgid " Can not start acquisition when no project are loaded." | 588 | msgid " Can not start acquisition when no project are loaded." |
4854 | 590 | msgstr " Impossible de démarrer l'acquisition. Pas de projet chargé." | 589 | msgstr " Impossible de démarrer l'acquisition. Pas de projet chargé." |
4855 | 591 | 590 | ||
4857 | 592 | #: ../lucioLib/luciole_controller.py:430 | 591 | #: ../lucioLib/luciole_controller.py:445 |
4858 | 593 | #, python-format | 592 | #, python-format |
4859 | 594 | msgid "Acquisition error. %s" | 593 | msgid "Acquisition error. %s" |
4860 | 595 | msgstr "Erreur d'acquisition : %s" | 594 | msgstr "Erreur d'acquisition : %s" |
4861 | 596 | 595 | ||
4863 | 597 | #: ../lucioLib/luciole_controller.py:444 | 596 | #: ../lucioLib/luciole_controller.py:459 |
4864 | 598 | msgid "No Acquistion" | 597 | msgid "No Acquistion" |
4865 | 599 | msgstr "Pas d'acquisition." | 598 | msgstr "Pas d'acquisition." |
4866 | 600 | 599 | ||
4867 | 601 | #. nbd@grape : ask for save if save set status as loaded | 600 | #. nbd@grape : ask for save if save set status as loaded |
4869 | 602 | #: ../lucioLib/luciole_controller.py:533 | 601 | #: ../lucioLib/luciole_controller.py:548 |
4870 | 603 | msgid "Project modified. Save project before exit ?" | 602 | msgid "Project modified. Save project before exit ?" |
4871 | 604 | msgstr "Le projet a été modifié. Le sauvegarder avant de quitter ?" | 603 | msgstr "Le projet a été modifié. Le sauvegarder avant de quitter ?" |
4872 | 605 | 604 | ||
4875 | 606 | #: ../lucioLib/luciole_controller.py:585 | 605 | #: ../lucioLib/luciole_controller.py:600 |
4876 | 607 | msgid "Please restart luciole to take into acount the new theme " | 606 | msgid "Please restart luciole to take into account the new theme " |
4877 | 608 | msgstr "Merci de redémarrer Luciole pour prendre en compte le nouveau thème. " | 607 | msgstr "Merci de redémarrer Luciole pour prendre en compte le nouveau thème. " |
4878 | 609 | 608 | ||
4882 | 610 | #: ../lucioLib/luciole_controller.py:635 | 609 | #: ../lucioLib/luciole_controller.py:650 |
4883 | 611 | msgid "Failed to load project " | 610 | #, fuzzy |
4884 | 612 | msgstr "Impossible de charger le projet " | 611 | msgid "Failed to load project " |
4885 | 612 | msgstr "Impossible de charger le projet " | ||
4886 | 613 | 613 | ||
4888 | 614 | #: ../lucioLib/luciole_image.py:135 | 614 | #: ../lucioLib/luciole_image.py:137 |
4889 | 615 | #, python-format | 615 | #, python-format |
4890 | 616 | msgid "Not a file : %s" | 616 | msgid "Not a file : %s" |
4891 | 617 | msgstr "%s n'est pas un fichier" | 617 | msgstr "%s n'est pas un fichier" |
4892 | 618 | 618 | ||
4894 | 619 | #: ../lucioLib/luciole_image.py:183 | 619 | #: ../lucioLib/luciole_image.py:185 |
4895 | 620 | msgid "rush folder not valid" | 620 | msgid "rush folder not valid" |
4896 | 621 | msgstr "Répertoire 'rush' invalide" | 621 | msgstr "Répertoire 'rush' invalide" |
4897 | 622 | 622 | ||
4898 | 623 | #. error to raise | 623 | #. error to raise |
4900 | 624 | #: ../lucioLib/luciole_image.py:278 | 624 | #: ../lucioLib/luciole_image.py:280 |
4901 | 625 | #, python-format | 625 | #, python-format |
4902 | 626 | msgid "Error path does not exist : %s" | 626 | msgid "Error path does not exist : %s" |
4903 | 627 | msgstr "Erreur. Le chemin %s n'existe pas." | 627 | msgstr "Erreur. Le chemin %s n'existe pas." |
4904 | 628 | 628 | ||
4905 | === modified file 'po/fr_FR/LC_MESSAGES/luciole.mo' | |||
4906 | 629 | Binary 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 | 629 | Binary 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 |
4907 | === modified file 'po/luciole.pot' | |||
4908 | --- po/luciole.pot 2009-05-01 16:34:13 +0000 | |||
4909 | +++ po/luciole.pot 2009-05-07 09:27:18 +0000 | |||
4910 | @@ -8,12 +8,12 @@ | |||
4911 | 8 | msgstr "" | 8 | msgstr "" |
4912 | 9 | "Project-Id-Version: PACKAGE VERSION\n" | 9 | "Project-Id-Version: PACKAGE VERSION\n" |
4913 | 10 | "Report-Msgid-Bugs-To: \n" | 10 | "Report-Msgid-Bugs-To: \n" |
4915 | 11 | "POT-Creation-Date: 2009-05-01 18:31+0200\n" | 11 | "POT-Creation-Date: 2009-05-07 11:21+0200\n" |
4916 | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
4917 | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
4918 | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
4919 | 15 | "MIME-Version: 1.0\n" | 15 | "MIME-Version: 1.0\n" |
4921 | 16 | "Content-Type: text/plain; charset=UTF-8\n" | 16 | "Content-Type: text/plain; charset=CHARSET\n" |
4922 | 17 | "Content-Transfer-Encoding: 8bit\n" | 17 | "Content-Transfer-Encoding: 8bit\n" |
4923 | 18 | 18 | ||
4924 | 19 | #: ../images/luciole.glade.h:1 | 19 | #: ../images/luciole.glade.h:1 |
4925 | @@ -116,7 +116,7 @@ | |||
4926 | 116 | msgid "Move down one or several images" | 116 | msgid "Move down one or several images" |
4927 | 117 | msgstr "" | 117 | msgstr "" |
4928 | 118 | 118 | ||
4930 | 119 | #. Déplacer des images capturées dans la zone de montage | 119 | #. Déplacer des images capturées dans la zone de montage |
4931 | 120 | #: ../images/luciole.glade.h:32 | 120 | #: ../images/luciole.glade.h:32 |
4932 | 121 | msgid "Move snapshot to montage area" | 121 | msgid "Move snapshot to montage area" |
4933 | 122 | msgstr "" | 122 | msgstr "" |
4934 | @@ -143,18 +143,23 @@ | |||
4935 | 143 | msgstr "" | 143 | msgstr "" |
4936 | 144 | 144 | ||
4937 | 145 | #: ../images/luciole.glade.h:39 | 145 | #: ../images/luciole.glade.h:39 |
4938 | 146 | #: ../lucioLib/gui/dialog_project_properties.py:89 | ||
4939 | 147 | msgid "Project properties" | ||
4940 | 148 | msgstr "" | ||
4941 | 149 | |||
4942 | 150 | #: ../images/luciole.glade.h:40 | ||
4943 | 146 | msgid "Select Theme" | 151 | msgid "Select Theme" |
4944 | 147 | msgstr "" | 152 | msgstr "" |
4945 | 148 | 153 | ||
4947 | 149 | #: ../images/luciole.glade.h:40 | 154 | #: ../images/luciole.glade.h:41 |
4948 | 150 | msgid "Select a Luciole project" | 155 | msgid "Select a Luciole project" |
4949 | 151 | msgstr "" | 156 | msgstr "" |
4950 | 152 | 157 | ||
4952 | 153 | #: ../images/luciole.glade.h:41 ../lucioLib/gui/assistant_new_project.py:102 | 158 | #: ../images/luciole.glade.h:42 ../lucioLib/gui/assistant_new_project.py:100 |
4953 | 154 | msgid "Select a folder" | 159 | msgid "Select a folder" |
4954 | 155 | msgstr "" | 160 | msgstr "" |
4955 | 156 | 161 | ||
4957 | 157 | #: ../images/luciole.glade.h:42 | 162 | #: ../images/luciole.glade.h:43 |
4958 | 158 | msgid "" | 163 | msgid "" |
4959 | 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" |
4960 | 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" |
4961 | @@ -174,106 +179,82 @@ | |||
4962 | 174 | "Suite 330, Boston, MA 02111-1307, USA." | 179 | "Suite 330, Boston, MA 02111-1307, USA." |
4963 | 175 | msgstr "" | 180 | msgstr "" |
4964 | 176 | 181 | ||
4967 | 177 | #. Jeter à la poubelle | 182 | #. Jeter à la poubelle |
4968 | 178 | #: ../images/luciole.glade.h:59 | 183 | #: ../images/luciole.glade.h:60 |
4969 | 179 | msgid "To trash" | 184 | msgid "To trash" |
4970 | 180 | msgstr "" | 185 | msgstr "" |
4971 | 181 | 186 | ||
4973 | 182 | #: ../images/luciole.glade.h:60 | 187 | #: ../images/luciole.glade.h:61 |
4974 | 183 | msgid "Transparency level" | 188 | msgid "Transparency level" |
4975 | 184 | msgstr "" | 189 | msgstr "" |
4976 | 185 | 190 | ||
4977 | 186 | #: ../images/luciole.glade.h:61 | ||
4978 | 187 | msgid "_File" | ||
4979 | 188 | msgstr "" | ||
4980 | 189 | |||
4981 | 190 | #: ../images/luciole.glade.h:62 | 191 | #: ../images/luciole.glade.h:62 |
4983 | 191 | msgid "_Help" | 192 | msgid "Video Export" |
4984 | 192 | msgstr "" | 193 | msgstr "" |
4985 | 193 | 194 | ||
4986 | 194 | #: ../images/luciole.glade.h:63 | 195 | #: ../images/luciole.glade.h:63 |
4988 | 195 | msgid "_View" | 196 | msgid "_File" |
4989 | 196 | msgstr "" | 197 | msgstr "" |
4990 | 197 | 198 | ||
4991 | 198 | #: ../images/luciole.glade.h:64 | 199 | #: ../images/luciole.glade.h:64 |
4993 | 199 | msgid "gtk-about" | 200 | msgid "_Help" |
4994 | 200 | msgstr "" | 201 | msgstr "" |
4995 | 201 | 202 | ||
4996 | 202 | #: ../images/luciole.glade.h:65 | 203 | #: ../images/luciole.glade.h:65 |
4997 | 204 | msgid "_View" | ||
4998 | 205 | msgstr "" | ||
4999 | 206 | |||
5000 | 207 | #: ../images/luciole.glade.h:66 |
The diff has been truncated for viewing.
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