Luciole

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

  1. bug_520495
  2. Merge into 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
1=== modified file 'ui/luciole.glade'
2--- ui/luciole.glade 2010-02-07 18:06:55 +0000
3+++ ui/luciole.glade 2010-02-13 13:30:32 +0000
4@@ -316,30 +316,18 @@
5 <property name="shadow_type">none</property>
6 <child>
7 <object class="GtkHBox" id="hbox_acquisition">
8- <property name="height_request">51</property>
9+ <property name="height_request">55</property>
10 <property name="visible">True</property>
11 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
12 <property name="spacing">1</property>
13 <child>
14- <object class="GtkFixed" id="fixed8">
15- <property name="width_request">20</property>
16- <property name="visible">True</property>
17- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
18- </object>
19- <packing>
20- <property name="position">0</property>
21- </packing>
22- </child>
23- <child>
24 <object class="GtkToggleButton" id="acquisition_button">
25 <property name="width_request">56</property>
26 <property name="height_request">46</property>
27 <property name="visible">True</property>
28 <property name="can_focus">True</property>
29- <property name="receives_default">False</property>
30+ <property name="receives_default">True</property>
31 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
32- <property name="has_tooltip">True</property>
33- <property name="tooltip_text" translatable="yes">Activate/Deactivate camera preview</property>
34 <property name="focus_on_click">False</property>
35 <signal name="toggled" handler="on_acquisition_button_toggled"/>
36 <child>
37@@ -352,6 +340,99 @@
38 </child>
39 </object>
40 <packing>
41+ <property name="position">0</property>
42+ </packing>
43+ </child>
44+ <child>
45+ <object class="GtkHBox" id="hbox5">
46+ <property name="width_request">150</property>
47+ <property name="visible">True</property>
48+ <child>
49+ <object class="GtkButton" id="snapshot_button">
50+ <property name="width_request">56</property>
51+ <property name="height_request">46</property>
52+ <property name="visible">True</property>
53+ <property name="can_focus">True</property>
54+ <property name="can_default">True</property>
55+ <property name="has_default">True</property>
56+ <property name="receives_default">True</property>
57+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
58+ <accelerator key="c" signal="clicked"/>
59+ <signal name="clicked" handler="on_button_capture_clicked"/>
60+ <child>
61+ <object class="GtkImage" id="image_snapshot_button">
62+ <property name="visible">True</property>
63+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
64+ <property name="tooltip_text" translatable="yes">make a snapshot</property>
65+ <property name="pixbuf">../images/capture.png</property>
66+ </object>
67+ </child>
68+ </object>
69+ <packing>
70+ <property name="expand">False</property>
71+ <property name="fill">False</property>
72+ <property name="position">0</property>
73+ </packing>
74+ </child>
75+ <child>
76+ <object class="GtkFixed" id="fixed11">
77+ <property name="width_request">0</property>
78+ <property name="visible">True</property>
79+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
80+ </object>
81+ <packing>
82+ <property name="expand">False</property>
83+ <property name="fill">False</property>
84+ <property name="position">1</property>
85+ </packing>
86+ </child>
87+ <child>
88+ <object class="GtkVBox" id="vbox9">
89+ <property name="width_request">94</property>
90+ <property name="visible">True</property>
91+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
92+ <property name="orientation">vertical</property>
93+ <child>
94+ <object class="GtkCheckButton" id="mixer_checkbutton">
95+ <property name="label" translatable="yes">Mixer</property>
96+ <property name="visible">True</property>
97+ <property name="can_focus">False</property>
98+ <property name="receives_default">False</property>
99+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
100+ <property name="draw_indicator">True</property>
101+ <signal name="toggled" handler="on_mixer_checkbutton_toggled"/>
102+ </object>
103+ <packing>
104+ <property name="expand">False</property>
105+ <property name="fill">False</property>
106+ <property name="position">0</property>
107+ </packing>
108+ </child>
109+ <child>
110+ <object class="GtkHScale" id="alpha_hscale">
111+ <property name="visible">True</property>
112+ <property name="can_focus">True</property>
113+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
114+ <property name="update_policy">discontinuous</property>
115+ <property name="adjustment">adjustment1</property>
116+ <property name="value_pos">bottom</property>
117+ <signal name="value_changed" handler="on_alpha_hscale_value_changed"/>
118+ </object>
119+ <packing>
120+ <property name="expand">False</property>
121+ <property name="fill">False</property>
122+ <property name="position">1</property>
123+ </packing>
124+ </child>
125+ </object>
126+ <packing>
127+ <property name="expand">False</property>
128+ <property name="fill">False</property>
129+ <property name="position">2</property>
130+ </packing>
131+ </child>
132+ </object>
133+ <packing>
134 <property name="expand">False</property>
135 <property name="fill">False</property>
136 <property name="position">1</property>
137@@ -359,7 +440,7 @@
138 </child>
139 <child>
140 <object class="GtkFixed" id="fixed15">
141- <property name="width_request">20</property>
142+ <property name="width_request">9</property>
143 <property name="visible">True</property>
144 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
145 </object>
146@@ -370,118 +451,33 @@
147 </packing>
148 </child>
149 <child>
150- <object class="GtkAspectFrame" id="aspectframe3">
151- <property name="width_request">200</property>
152+ <object class="GtkFixed" id="fixed8">
153+ <property name="width_request">20</property>
154 <property name="visible">True</property>
155- <property name="label_xalign">0</property>
156- <property name="shadow_type">none</property>
157- <child>
158- <object class="GtkHBox" id="hbox5">
159- <property name="width_request">200</property>
160- <property name="visible">True</property>
161- <child>
162- <object class="GtkButton" id="snapshot_button">
163- <property name="width_request">56</property>
164- <property name="height_request">46</property>
165- <property name="visible">True</property>
166- <property name="can_focus">True</property>
167- <property name="can_default">True</property>
168- <property name="has_default">True</property>
169- <property name="receives_default">True</property>
170- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
171- <accelerator key="c" signal="clicked"/>
172- <signal name="clicked" handler="on_button_capture_clicked"/>
173- <child>
174- <object class="GtkImage" id="image_snapshot_button">
175- <property name="visible">True</property>
176- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
177- <property name="tooltip_text" translatable="yes">make a snapshot</property>
178- <property name="pixbuf">../images/capture.png</property>
179- </object>
180- </child>
181- </object>
182- <packing>
183- <property name="expand">False</property>
184- <property name="position">0</property>
185- </packing>
186- </child>
187- <child>
188- <object class="GtkFixed" id="fixed11">
189- <property name="width_request">20</property>
190- <property name="visible">True</property>
191- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
192- </object>
193- <packing>
194- <property name="expand">False</property>
195- <property name="fill">False</property>
196- <property name="position">1</property>
197- </packing>
198- </child>
199- <child>
200- <object class="GtkVBox" id="vbox9">
201- <property name="width_request">120</property>
202- <property name="visible">True</property>
203- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
204- <property name="orientation">vertical</property>
205- <child>
206- <object class="GtkCheckButton" id="mixer_checkbutton">
207- <property name="label" translatable="yes">Mixer</property>
208- <property name="width_request">120</property>
209- <property name="visible">True</property>
210- <property name="can_focus">True</property>
211- <property name="receives_default">False</property>
212- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
213- <property name="relief">half</property>
214- <property name="draw_indicator">True</property>
215- <signal name="toggled" handler="on_mixer_checkbutton_toggled"/>
216- </object>
217- <packing>
218- <property name="expand">False</property>
219- <property name="fill">False</property>
220- <property name="padding">3</property>
221- <property name="position">0</property>
222- </packing>
223- </child>
224- <child>
225- <object class="GtkHScale" id="alpha_hscale">
226- <property name="width_request">120</property>
227- <property name="visible">True</property>
228- <property name="can_focus">True</property>
229- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
230- <property name="update_policy">discontinuous</property>
231- <property name="adjustment">adjustment1</property>
232- <property name="value_pos">left</property>
233- <signal name="value_changed" handler="on_alpha_hscale_value_changed"/>
234- </object>
235- <packing>
236- <property name="expand">False</property>
237- <property name="fill">False</property>
238- <property name="padding">4</property>
239- <property name="position">1</property>
240- </packing>
241- </child>
242- </object>
243- <packing>
244- <property name="expand">False</property>
245- <property name="position">2</property>
246- </packing>
247- </child>
248- </object>
249- </child>
250+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
251 </object>
252 <packing>
253- <property name="expand">False</property>
254 <property name="position">3</property>
255 </packing>
256 </child>
257 <child>
258 <object class="GtkVBox" id="vbox10">
259- <property name="width_request">134</property>
260 <property name="visible">True</property>
261 <property name="orientation">vertical</property>
262 <child>
263+ <object class="GtkFixed" id="fixed23">
264+ <property name="height_request">1</property>
265+ <property name="visible">True</property>
266+ </object>
267+ <packing>
268+ <property name="expand">False</property>
269+ <property name="fill">False</property>
270+ <property name="position">0</property>
271+ </packing>
272+ </child>
273+ <child>
274 <object class="GtkLabel" id="label_fpi">
275- <property name="width_request">134</property>
276+ <property name="width_request">150</property>
277 <property name="visible">True</property>
278 <property name="label" translatable="yes">Image per seconds</property>
279 <property name="justify">center</property>
280@@ -489,28 +485,38 @@
281 <packing>
282 <property name="expand">False</property>
283 <property name="fill">False</property>
284- <property name="position">0</property>
285+ <property name="position">1</property>
286+ </packing>
287+ </child>
288+ <child>
289+ <object class="GtkFixed" id="fixed24">
290+ <property name="height_request">4</property>
291+ <property name="visible">True</property>
292+ </object>
293+ <packing>
294+ <property name="expand">False</property>
295+ <property name="fill">False</property>
296+ <property name="position">2</property>
297 </packing>
298 </child>
299 <child>
300 <object class="GtkHScale" id="hscale_fps">
301- <property name="width_request">134</property>
302 <property name="visible">True</property>
303+ <property name="can_focus">True</property>
304 <property name="adjustment">adjustment2</property>
305 <property name="digits">0</property>
306+ <property name="value_pos">bottom</property>
307 <signal name="value_changed" handler="on_hscale_fps_value_changed"/>
308 <signal name="format_value" handler="on_hscale_fps_format_value"/>
309 </object>
310 <packing>
311 <property name="expand">False</property>
312 <property name="fill">False</property>
313- <property name="position">1</property>
314+ <property name="position">3</property>
315 </packing>
316 </child>
317 </object>
318 <packing>
319- <property name="expand">False</property>
320- <property name="fill">False</property>
321 <property name="position">4</property>
322 </packing>
323 </child>
324@@ -1421,8 +1427,8 @@
325 <object class="GtkFileChooserButton" id="filechooserbutton1">
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+ <property name="use_preview_label">False</property>
329 <property name="action">select-folder</property>
330- <property name="use_preview_label">False</property>
331 <property name="do_overwrite_confirmation">True</property>
332 <property name="title" translatable="yes">Select a folder</property>
333 </object>

Subscribers

People subscribed via source and target branches

to all changes: