[cheese/netbook-mode: 27/28] Merge branch 'master' into netbook-mode
- From: Filippo Argiolas <fargiolas src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [cheese/netbook-mode: 27/28] Merge branch 'master' into netbook-mode
- Date: Sat, 8 Aug 2009 09:30:22 +0000 (UTC)
commit 9f38101ca25dd31cfd9dae1d2f7d31dcbb13842a
Merge: 52a199d... 326ed4c...
Author: Filippo Argiolas <filippo argiolas gmail com>
Date: Sat Aug 8 11:17:49 2009 +0200
Merge branch 'master' into netbook-mode
Conflicts:
data/cheese.ui
AUTHORS | 5 +-
configure.ac | 1 +
data/cheese-prefs.glade | 107 ++++-
data/cheese-prefs.ui | 130 +++++-
data/cheese.glade | 12 +-
data/cheese.ui | 9 -
data/icons/256x256/Makefile.am | 11 +
data/icons/256x256/cheese.png | Bin 0 -> 32095 bytes
data/icons/Makefile.am | 2 +-
data/wscript_build | 2 +-
help/de/de.po | 643 ++++++++++++++++---------
help/de/figures/cheese-effects-screenshot.jpg | Bin 0 -> 85377 bytes
help/de/figures/cheese-screenshot.jpg | Bin 0 -> 68529 bytes
help/fr/fr.po | 316 ++++++++-----
po/LINGUAS | 1 +
po/ast.po | 584 ++++++++++++++++++++++
po/de.po | 287 +++++++-----
po/es.po | 280 +++++++-----
po/et.po | 84 ++--
po/ga.po | 389 ++++++++++-----
po/gl.po | 389 +++++++++------
po/nb.po | 266 ++++++-----
po/pl.po | 362 +++++++++------
po/sv.po | 14 +-
po/ta.po | 279 ++++++-----
src/Makefile.am | 4 +-
src/cheese-prefs-burst-spinbox.c | 186 +++++++
src/cheese-prefs-burst-spinbox.h | 56 +++
src/cheese-prefs-dialog.c | 19 +-
src/cheese-prefs-dialog.h | 1 +
src/cheese-window.c | 77 ++--
31 files changed, 3151 insertions(+), 1365 deletions(-)
---
diff --cc data/cheese.ui
index cb681e1,9564c28..7a54f10
--- a/data/cheese.ui
+++ b/data/cheese.ui
@@@ -114,104 -98,81 +114,101 @@@
<placeholder/>
</child>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
- <child type="tab">
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkNotebook" id="notebook_bar">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="show_tabs">False</property>
- <property name="show_border">False</property>
<child>
- <object class="GtkHBox" id="toolbar_hbox">
+ <object class="GtkNotebook" id="notebook_bar">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="homogeneous">True</property>
+ <property name="show_tabs">False</property>
+ <property name="show_border">False</property>
<child>
- <object class="GtkAlignment" id="togglegroup_alignment">
+ <object class="GtkHBox" id="toolbar_hbox">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="xscale">0</property>
- <property name="left_padding">24</property>
+ <property name="homogeneous">True</property>
<child>
- <object class="GtkHBox" id="hbox2">
+ <object class="GtkAlignment" id="togglegroup_alignment">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="xalign">0</property>
+ <property name="xscale">0</property>
+ <property name="left_padding">24</property>
<child>
- <object class="GtkToggleButton" id="button_photo">
+ <object class="GtkHBox" id="hbox2">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Switch to Photo Mode</property>
<child>
- <object class="GtkAlignment" id="alignment4">
+ <object class="GtkToggleButton" id="button_photo">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<child>
- <object class="GtkImage" id="image4">
+ <object class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="icon_name">cheese-take-photo</property>
+ <child>
+ <object class="GtkImage" id="image4">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="icon_name">cheese-take-photo</property>
- <property name="icon-size">3</property>
+ </object>
+ </child>
</object>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToggleButton" id="button_video">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkAlignment" id="alignment5">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkImage" id="image5">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="icon_name">video-x-generic</property>
- <property name="icon-size">2</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkToggleButton" id="button_video">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Switch to Video Mode</property>
<child>
- <object class="GtkAlignment" id="alignment5">
+ <object class="GtkToggleButton" id="button_burst">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<child>
- <object class="GtkImage" id="image5">
+ <object class="GtkAlignment" id="alignment12">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="icon_name">video-x-generic</property>
+ <child>
+ <object class="GtkImage" id="image8">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="icon_name">cheese-take-burst</property>
- <property name="icon-size">3</property>
+ </object>
+ </child>
</object>
</child>
</object>
@@@ -275,38 -205,45 +272,37 @@@
</object>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
</child>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="take_picture_alignment">
- <property name="visible">True</property>
- <property name="xscale">0.5</property>
<child>
- <object class="GtkButton" id="take_picture">
+ <object class="GtkAlignment" id="effect_button_alignment">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="xalign">1</property>
+ <property name="xscale">0</property>
+ <property name="right_padding">24</property>
<child>
- <object class="GtkAlignment" id="alignment3">
+ <object class="GtkToggleButton" id="button_effects">
<property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<child>
- <object class="GtkHBox" id="hbox3">
+ <object class="GtkHBox" id="hbox15">
<property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">2</property>
<child>
- <object class="GtkImage" id="image_take_photo">
+ <object class="GtkImage" id="image2">
<property name="visible">True</property>
- <property name="stock">gtk-media-record</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="icon_name">browse-webcam-effects</property>
- <property name="icon-size">3</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
