Merge lp:~nico-inattendu/luciole/bug_520495 into lp:luciole/0.8

Proposed by NicoInattendu
Status: Merged
Approved by: NicoInattendu
Approved revision: not available
Merged at revision: not available
Proposed branch: lp:~nico-inattendu/luciole/bug_520495
Merge into: lp:luciole/0.8
Diff against target: 333 lines (+127/-121)
1 file modified
ui/luciole.glade (+127/-121)
To merge this branch: bzr merge lp:~nico-inattendu/luciole/bug_520495
Reviewer Review Type Date Requested Status
NicoInattendu Approve
Review via email: mp+19268@code.launchpad.net

Commit message

Fix for bung #520495

To post a comment you must log in.
Revision history for this message
NicoInattendu (nico-inattendu) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ui/luciole.glade'
--- ui/luciole.glade 2010-02-07 18:06:55 +0000
+++ ui/luciole.glade 2010-02-13 13:30:32 +0000
@@ -316,30 +316,18 @@
316 <property name="shadow_type">none</property>316 <property name="shadow_type">none</property>
317 <child>317 <child>
318 <object class="GtkHBox" id="hbox_acquisition">318 <object class="GtkHBox" id="hbox_acquisition">
319 <property name="height_request">51</property>319 <property name="height_request">55</property>
320 <property name="visible">True</property>320 <property name="visible">True</property>
321 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>321 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
322 <property name="spacing">1</property>322 <property name="spacing">1</property>
323 <child>323 <child>
324 <object class="GtkFixed" id="fixed8">
325 <property name="width_request">20</property>
326 <property name="visible">True</property>
327 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
328 </object>
329 <packing>
330 <property name="position">0</property>
331 </packing>
332 </child>
333 <child>
334 <object class="GtkToggleButton" id="acquisition_button">324 <object class="GtkToggleButton" id="acquisition_button">
335 <property name="width_request">56</property>325 <property name="width_request">56</property>
336 <property name="height_request">46</property>326 <property name="height_request">46</property>
337 <property name="visible">True</property>327 <property name="visible">True</property>
338 <property name="can_focus">True</property>328 <property name="can_focus">True</property>
339 <property name="receives_default">False</property>329 <property name="receives_default">True</property>
340 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>330 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
341 <property name="has_tooltip">True</property>
342 <property name="tooltip_text" translatable="yes">Activate/Deactivate camera preview</property>
343 <property name="focus_on_click">False</property>331 <property name="focus_on_click">False</property>
344 <signal name="toggled" handler="on_acquisition_button_toggled"/>332 <signal name="toggled" handler="on_acquisition_button_toggled"/>
345 <child>333 <child>
@@ -352,6 +340,99 @@
352 </child>340 </child>
353 </object>341 </object>
354 <packing>342 <packing>
343 <property name="position">0</property>
344 </packing>
345 </child>
346 <child>
347 <object class="GtkHBox" id="hbox5">
348 <property name="width_request">150</property>
349 <property name="visible">True</property>
350 <child>
351 <object class="GtkButton" id="snapshot_button">
352 <property name="width_request">56</property>
353 <property name="height_request">46</property>
354 <property name="visible">True</property>
355 <property name="can_focus">True</property>
356 <property name="can_default">True</property>
357 <property name="has_default">True</property>
358 <property name="receives_default">True</property>
359 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
360 <accelerator key="c" signal="clicked"/>
361 <signal name="clicked" handler="on_button_capture_clicked"/>
362 <child>
363 <object class="GtkImage" id="image_snapshot_button">
364 <property name="visible">True</property>
365 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
366 <property name="tooltip_text" translatable="yes">make a snapshot</property>
367 <property name="pixbuf">../images/capture.png</property>
368 </object>
369 </child>
370 </object>
371 <packing>
372 <property name="expand">False</property>
373 <property name="fill">False</property>
374 <property name="position">0</property>
375 </packing>
376 </child>
377 <child>
378 <object class="GtkFixed" id="fixed11">
379 <property name="width_request">0</property>
380 <property name="visible">True</property>
381 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
382 </object>
383 <packing>
384 <property name="expand">False</property>
385 <property name="fill">False</property>
386 <property name="position">1</property>
387 </packing>
388 </child>
389 <child>
390 <object class="GtkVBox" id="vbox9">
391 <property name="width_request">94</property>
392 <property name="visible">True</property>
393 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
394 <property name="orientation">vertical</property>
395 <child>
396 <object class="GtkCheckButton" id="mixer_checkbutton">
397 <property name="label" translatable="yes">Mixer</property>
398 <property name="visible">True</property>
399 <property name="can_focus">False</property>
400 <property name="receives_default">False</property>
401 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
402 <property name="draw_indicator">True</property>
403 <signal name="toggled" handler="on_mixer_checkbutton_toggled"/>
404 </object>
405 <packing>
406 <property name="expand">False</property>
407 <property name="fill">False</property>
408 <property name="position">0</property>
409 </packing>
410 </child>
411 <child>
412 <object class="GtkHScale" id="alpha_hscale">
413 <property name="visible">True</property>
414 <property name="can_focus">True</property>
415 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
416 <property name="update_policy">discontinuous</property>
417 <property name="adjustment">adjustment1</property>
418 <property name="value_pos">bottom</property>
419 <signal name="value_changed" handler="on_alpha_hscale_value_changed"/>
420 </object>
421 <packing>
422 <property name="expand">False</property>
423 <property name="fill">False</property>
424 <property name="position">1</property>
425 </packing>
426 </child>
427 </object>
428 <packing>
429 <property name="expand">False</property>
430 <property name="fill">False</property>
431 <property name="position">2</property>
432 </packing>
433 </child>
434 </object>
435 <packing>
355 <property name="expand">False</property>436 <property name="expand">False</property>
356 <property name="fill">False</property>437 <property name="fill">False</property>
357 <property name="position">1</property>438 <property name="position">1</property>
@@ -359,7 +440,7 @@
359 </child>440 </child>
360 <child>441 <child>
361 <object class="GtkFixed" id="fixed15">442 <object class="GtkFixed" id="fixed15">
362 <property name="width_request">20</property>443 <property name="width_request">9</property>
363 <property name="visible">True</property>444 <property name="visible">True</property>
364 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>445 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
365 </object>446 </object>
@@ -370,118 +451,33 @@
370 </packing>451 </packing>
371 </child>452 </child>
372 <child>453 <child>
373 <object class="GtkAspectFrame" id="aspectframe3">454 <object class="GtkFixed" id="fixed8">
374 <property name="width_request">200</property>455 <property name="width_request">20</property>
375 <property name="visible">True</property>456 <property name="visible">True</property>
376 <property name="label_xalign">0</property>457 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
377 <property name="shadow_type">none</property>
378 <child>
379 <object class="GtkHBox" id="hbox5">
380 <property name="width_request">200</property>
381 <property name="visible">True</property>
382 <child>
383 <object class="GtkButton" id="snapshot_button">
384 <property name="width_request">56</property>
385 <property name="height_request">46</property>
386 <property name="visible">True</property>
387 <property name="can_focus">True</property>
388 <property name="can_default">True</property>
389 <property name="has_default">True</property>
390 <property name="receives_default">True</property>
391 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
392 <accelerator key="c" signal="clicked"/>
393 <signal name="clicked" handler="on_button_capture_clicked"/>
394 <child>
395 <object class="GtkImage" id="image_snapshot_button">
396 <property name="visible">True</property>
397 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
398 <property name="tooltip_text" translatable="yes">make a snapshot</property>
399 <property name="pixbuf">../images/capture.png</property>
400 </object>
401 </child>
402 </object>
403 <packing>
404 <property name="expand">False</property>
405 <property name="position">0</property>
406 </packing>
407 </child>
408 <child>
409 <object class="GtkFixed" id="fixed11">
410 <property name="width_request">20</property>
411 <property name="visible">True</property>
412 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
413 </object>
414 <packing>
415 <property name="expand">False</property>
416 <property name="fill">False</property>
417 <property name="position">1</property>
418 </packing>
419 </child>
420 <child>
421 <object class="GtkVBox" id="vbox9">
422 <property name="width_request">120</property>
423 <property name="visible">True</property>
424 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
425 <property name="orientation">vertical</property>
426 <child>
427 <object class="GtkCheckButton" id="mixer_checkbutton">
428 <property name="label" translatable="yes">Mixer</property>
429 <property name="width_request">120</property>
430 <property name="visible">True</property>
431 <property name="can_focus">True</property>
432 <property name="receives_default">False</property>
433 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
434 <property name="relief">half</property>
435 <property name="draw_indicator">True</property>
436 <signal name="toggled" handler="on_mixer_checkbutton_toggled"/>
437 </object>
438 <packing>
439 <property name="expand">False</property>
440 <property name="fill">False</property>
441 <property name="padding">3</property>
442 <property name="position">0</property>
443 </packing>
444 </child>
445 <child>
446 <object class="GtkHScale" id="alpha_hscale">
447 <property name="width_request">120</property>
448 <property name="visible">True</property>
449 <property name="can_focus">True</property>
450 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
451 <property name="update_policy">discontinuous</property>
452 <property name="adjustment">adjustment1</property>
453 <property name="value_pos">left</property>
454 <signal name="value_changed" handler="on_alpha_hscale_value_changed"/>
455 </object>
456 <packing>
457 <property name="expand">False</property>
458 <property name="fill">False</property>
459 <property name="padding">4</property>
460 <property name="position">1</property>
461 </packing>
462 </child>
463 </object>
464 <packing>
465 <property name="expand">False</property>
466 <property name="position">2</property>
467 </packing>
468 </child>
469 </object>
470 </child>
471 </object>458 </object>
472 <packing>459 <packing>
473 <property name="expand">False</property>
474 <property name="position">3</property>460 <property name="position">3</property>
475 </packing>461 </packing>
476 </child>462 </child>
477 <child>463 <child>
478 <object class="GtkVBox" id="vbox10">464 <object class="GtkVBox" id="vbox10">
479 <property name="width_request">134</property>
480 <property name="visible">True</property>465 <property name="visible">True</property>
481 <property name="orientation">vertical</property>466 <property name="orientation">vertical</property>
482 <child>467 <child>
468 <object class="GtkFixed" id="fixed23">
469 <property name="height_request">1</property>
470 <property name="visible">True</property>
471 </object>
472 <packing>
473 <property name="expand">False</property>
474 <property name="fill">False</property>
475 <property name="position">0</property>
476 </packing>
477 </child>
478 <child>
483 <object class="GtkLabel" id="label_fpi">479 <object class="GtkLabel" id="label_fpi">
484 <property name="width_request">134</property>480 <property name="width_request">150</property>
485 <property name="visible">True</property>481 <property name="visible">True</property>
486 <property name="label" translatable="yes">Image per seconds</property>482 <property name="label" translatable="yes">Image per seconds</property>
487 <property name="justify">center</property>483 <property name="justify">center</property>
@@ -489,28 +485,38 @@
489 <packing>485 <packing>
490 <property name="expand">False</property>486 <property name="expand">False</property>
491 <property name="fill">False</property>487 <property name="fill">False</property>
492 <property name="position">0</property>488 <property name="position">1</property>
489 </packing>
490 </child>
491 <child>
492 <object class="GtkFixed" id="fixed24">
493 <property name="height_request">4</property>
494 <property name="visible">True</property>
495 </object>
496 <packing>
497 <property name="expand">False</property>
498 <property name="fill">False</property>
499 <property name="position">2</property>
493 </packing>500 </packing>
494 </child>501 </child>
495 <child>502 <child>
496 <object class="GtkHScale" id="hscale_fps">503 <object class="GtkHScale" id="hscale_fps">
497 <property name="width_request">134</property>
498 <property name="visible">True</property>504 <property name="visible">True</property>
505 <property name="can_focus">True</property>
499 <property name="adjustment">adjustment2</property>506 <property name="adjustment">adjustment2</property>
500 <property name="digits">0</property>507 <property name="digits">0</property>
508 <property name="value_pos">bottom</property>
501 <signal name="value_changed" handler="on_hscale_fps_value_changed"/>509 <signal name="value_changed" handler="on_hscale_fps_value_changed"/>
502 <signal name="format_value" handler="on_hscale_fps_format_value"/>510 <signal name="format_value" handler="on_hscale_fps_format_value"/>
503 </object>511 </object>
504 <packing>512 <packing>
505 <property name="expand">False</property>513 <property name="expand">False</property>
506 <property name="fill">False</property>514 <property name="fill">False</property>
507 <property name="position">1</property>515 <property name="position">3</property>
508 </packing>516 </packing>
509 </child>517 </child>
510 </object>518 </object>
511 <packing>519 <packing>
512 <property name="expand">False</property>
513 <property name="fill">False</property>
514 <property name="position">4</property>520 <property name="position">4</property>
515 </packing>521 </packing>
516 </child>522 </child>
@@ -1421,8 +1427,8 @@
1421 <object class="GtkFileChooserButton" id="filechooserbutton1">1427 <object class="GtkFileChooserButton" id="filechooserbutton1">
1422 <property name="visible">True</property>1428 <property name="visible">True</property>
1423 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>1429 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1430 <property name="use_preview_label">False</property>
1424 <property name="action">select-folder</property>1431 <property name="action">select-folder</property>
1425 <property name="use_preview_label">False</property>
1426 <property name="do_overwrite_confirmation">True</property>1432 <property name="do_overwrite_confirmation">True</property>
1427 <property name="title" translatable="yes">Select a folder</property>1433 <property name="title" translatable="yes">Select a folder</property>
1428 </object>1434 </object>

Subscribers

People subscribed via source and target branches

to all changes: