Simple Scan

Merge lp:~moimael/simple-scan/remove-deprecated into lp:~simple-scan-team/simple-scan/trunk

  1. remove-deprecated
  2. Merge into trunk
Proposed by moimael
Status: Merged
Merged at revision: 670
Proposed branch: lp:~moimael/simple-scan/remove-deprecated
Merge into: lp:~simple-scan-team/simple-scan/trunk
Diff against target: 1608 lines (+473/-368)
3 files modified
data/simple-scan.ui (+460/-355)
src/book-view.vala (+1/-1)
src/ui.vala (+12/-12)
To merge this branch: bzr merge lp:~moimael/simple-scan/remove-deprecated
Reviewer Review Type Date Requested Status
Robert Ancell Approve
moimael (community) Needs Resubmitting
Review via email: mp+195432@code.launchpad.net

Description of the change

Remove deprecated Gtk.Stock items and Gtk widgets (GtkVBox, GtkTable, GtkHButtonBox) and replace them with their newer counterparts. Also bump Gtk required version to 3.8 and rewamp glade file to work well with last glade release.

To post a comment you must log in.
lp:~moimael/simple-scan/remove-deprecated updated
669. By moimael

Replace deprecated widgets (GtkVBox, GtkHButtonBox, GtkTable) and bump required GTK release to 3.8

Revision history for this message
Robert Ancell (robert-ancell) wrote :

The stock label replacements should be marked as translatable:
+ info_bar_close_button = (Gtk.Button) info_bar.add_button ("_Close", Gtk.ResponseType.CLOSE);

i.e. _("_Close")

review: Needs Fixing
lp:~moimael/simple-scan/remove-deprecated updated
670. By moimael

Mark stock label replacements as translatable

Revision history for this message
moimael (moimael) wrote :

> The stock label replacements should be marked as translatable:
> + info_bar_close_button = (Gtk.Button) info_bar.add_button ("_Close",
> Gtk.ResponseType.CLOSE);
>
> i.e. _("_Close")

Done !

review: Needs Resubmitting
Revision history for this message
Robert Ancell (robert-ancell) :
review: Approve
Revision history for this message
Robert Ancell (robert-ancell) wrote :

Thanks!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/simple-scan.ui'
2--- data/simple-scan.ui 2013-06-06 22:50:37 +0000
3+++ data/simple-scan.ui 2013-11-24 21:28:29 +0000
4@@ -1,97 +1,350 @@
5-<?xml version="1.0"?>
6+<?xml version="1.0" encoding="UTF-8"?>
7+<!-- Generated with glade 3.16.0 on Tue Nov 19 13:50:35 2013 -->
8 <interface>
9- <requires lib="gtk+" version="2.16"/>
10- <!-- interface-naming-policy project-wide -->
11+ <!-- interface-requires gtk+ 3.8 -->
12+ <object class="GtkDialog" id="authorize_dialog">
13+ <property name="can_focus">False</property>
14+ <property name="border_width">12</property>
15+ <property name="resizable">False</property>
16+ <property name="modal">True</property>
17+ <property name="type_hint">normal</property>
18+ <property name="urgency_hint">True</property>
19+ <property name="transient_for">simple_scan_window</property>
20+ <child internal-child="vbox">
21+ <object class="GtkBox" id="dialog-vbox1">
22+ <property name="visible">True</property>
23+ <property name="can_focus">False</property>
24+ <property name="orientation">vertical</property>
25+ <property name="spacing">12</property>
26+ <child internal-child="action_area">
27+ <object class="GtkButtonBox" id="dialog-action_area1">
28+ <property name="visible">True</property>
29+ <property name="can_focus">False</property>
30+ <property name="layout_style">end</property>
31+ <child>
32+ <object class="GtkButton" id="authorize_button">
33+ <property name="label" translatable="yes" comments="Button to submit authorization dialog">_Authorize</property>
34+ <property name="visible">True</property>
35+ <property name="can_focus">True</property>
36+ <property name="receives_default">True</property>
37+ <property name="use_underline">True</property>
38+ </object>
39+ <packing>
40+ <property name="expand">False</property>
41+ <property name="fill">False</property>
42+ <property name="position">0</property>
43+ </packing>
44+ </child>
45+ </object>
46+ <packing>
47+ <property name="expand">False</property>
48+ <property name="fill">True</property>
49+ <property name="pack_type">end</property>
50+ <property name="position">0</property>
51+ </packing>
52+ </child>
53+ <child>
54+ <object class="GtkBox" id="vbox5">
55+ <property name="visible">True</property>
56+ <property name="can_focus">False</property>
57+ <property name="border_width">5</property>
58+ <property name="orientation">vertical</property>
59+ <property name="spacing">12</property>
60+ <child>
61+ <object class="GtkLabel" id="authorize_label">
62+ <property name="visible">True</property>
63+ <property name="can_focus">False</property>
64+ <property name="label" comments="This label is set dynamically and is not translated">To connect to ? you need to authorize</property>
65+ </object>
66+ <packing>
67+ <property name="expand">True</property>
68+ <property name="fill">True</property>
69+ <property name="position">0</property>
70+ </packing>
71+ </child>
72+ <child>
73+ <object class="GtkGrid" id="grid2">
74+ <property name="visible">True</property>
75+ <property name="can_focus">False</property>
76+ <property name="row_spacing">6</property>
77+ <property name="column_spacing">6</property>
78+ <child>
79+ <object class="GtkEntry" id="username_entry">
80+ <property name="visible">True</property>
81+ <property name="can_focus">True</property>
82+ <property name="hexpand">True</property>
83+ <property name="invisible_char">●</property>
84+ </object>
85+ <packing>
86+ <property name="left_attach">1</property>
87+ <property name="top_attach">0</property>
88+ <property name="width">1</property>
89+ <property name="height">1</property>
90+ </packing>
91+ </child>
92+ <child>
93+ <object class="GtkEntry" id="password_entry">
94+ <property name="visible">True</property>
95+ <property name="can_focus">True</property>
96+ <property name="hexpand">True</property>
97+ <property name="visibility">False</property>
98+ <property name="invisible_char">●</property>
99+ </object>
100+ <packing>
101+ <property name="left_attach">1</property>
102+ <property name="top_attach">1</property>
103+ <property name="width">1</property>
104+ <property name="height">1</property>
105+ </packing>
106+ </child>
107+ <child>
108+ <object class="GtkLabel" id="username_label">
109+ <property name="visible">True</property>
110+ <property name="can_focus">False</property>
111+ <property name="label" translatable="yes" comments="Label beside username entry">_Username for resource:</property>
112+ <property name="use_underline">True</property>
113+ <property name="mnemonic_widget">username_entry</property>
114+ </object>
115+ <packing>
116+ <property name="left_attach">0</property>
117+ <property name="top_attach">0</property>
118+ <property name="width">1</property>
119+ <property name="height">1</property>
120+ </packing>
121+ </child>
122+ <child>
123+ <object class="GtkLabel" id="password_label">
124+ <property name="visible">True</property>
125+ <property name="can_focus">False</property>
126+ <property name="label" translatable="yes" comments="Label beside password entry">_Password:</property>
127+ <property name="use_underline">True</property>
128+ <property name="mnemonic_widget">password_entry</property>
129+ </object>
130+ <packing>
131+ <property name="left_attach">0</property>
132+ <property name="top_attach">1</property>
133+ <property name="width">1</property>
134+ <property name="height">1</property>
135+ </packing>
136+ </child>
137+ </object>
138+ <packing>
139+ <property name="expand">False</property>
140+ <property name="fill">True</property>
141+ <property name="position">1</property>
142+ </packing>
143+ </child>
144+ </object>
145+ <packing>
146+ <property name="expand">False</property>
147+ <property name="fill">True</property>
148+ <property name="position">1</property>
149+ </packing>
150+ </child>
151+ </object>
152+ </child>
153+ <action-widgets>
154+ <action-widget response="0">authorize_button</action-widget>
155+ </action-widgets>
156+ </object>
157+ <object class="GtkAdjustment" id="brightness_adjustment">
158+ <property name="lower">-100</property>
159+ <property name="upper">100</property>
160+ <property name="step_increment">1</property>
161+ <property name="page_increment">10</property>
162+ </object>
163+ <object class="GtkAdjustment" id="contrast_adjustment">
164+ <property name="lower">-100</property>
165+ <property name="upper">100</property>
166+ <property name="step_increment">1</property>
167+ <property name="page_increment">10</property>
168+ </object>
169+ <object class="GtkListStore" id="device_store">
170+ <columns>
171+ <!-- column-name device_name -->
172+ <column type="gchararray"/>
173+ <!-- column-name label -->
174+ <column type="gchararray"/>
175+ </columns>
176+ </object>
177+ <object class="GtkImage" id="email_image">
178+ <property name="visible">True</property>
179+ <property name="can_focus">False</property>
180+ <property name="icon_name">mail-send</property>
181+ </object>
182+ <object class="GtkImage" id="help_image">
183+ <property name="visible">True</property>
184+ <property name="can_focus">False</property>
185+ <property name="stock">gtk-help</property>
186+ </object>
187+ <object class="GtkListStore" id="mode_store">
188+ <columns>
189+ <!-- column-name mode -->
190+ <column type="gchararray"/>
191+ <!-- column-name label -->
192+ <column type="gchararray"/>
193+ </columns>
194+ <data>
195+ <row>
196+ <col id="0">text</col>
197+ <col id="1" translatable="yes" comments="Combo box label for text scan mode">Text</col>
198+ </row>
199+ <row>
200+ <col id="0">photo</col>
201+ <col id="1" translatable="yes" comments="Combo box label for photo scan mode">Photo</col>
202+ </row>
203+ </data>
204+ </object>
205+ <object class="GtkListStore" id="page_side_store">
206+ <columns>
207+ <!-- column-name side -->
208+ <column type="gint"/>
209+ <!-- column-name label -->
210+ <column type="gchararray"/>
211+ </columns>
212+ <data>
213+ <row>
214+ <col id="0">3</col>
215+ <col id="1" translatable="yes" comments="Combo box label for scanning both sides of a page">Front and Back</col>
216+ </row>
217+ <row>
218+ <col id="0">1</col>
219+ <col id="1" translatable="yes" comments="Combo box label for scanning the front side of a page">Front</col>
220+ </row>
221+ <row>
222+ <col id="0">2</col>
223+ <col id="1" translatable="yes" comments="Combo box label for scanning the back side of a page">Back</col>
224+ </row>
225+ </data>
226+ </object>
227+ <object class="GtkListStore" id="paper_size_store">
228+ <columns>
229+ <!-- column-name width -->
230+ <column type="gint"/>
231+ <!-- column-name height -->
232+ <column type="gint"/>
233+ <!-- column-name label -->
234+ <column type="gchararray"/>
235+ </columns>
236+ </object>
237+ <object class="GtkListStore" id="photo_dpi_store">
238+ <columns>
239+ <!-- column-name dpi -->
240+ <column type="gint"/>
241+ <!-- column-name label -->
242+ <column type="gchararray"/>
243+ </columns>
244+ </object>
245+ <object class="GtkAdjustment" id="quality_adjustment">
246+ <property name="upper">100</property>
247+ <property name="step_increment">1</property>
248+ <property name="page_increment">10</property>
249+ </object>
250 <object class="GtkWindow" id="simple_scan_window">
251+ <property name="can_focus">False</property>
252 <property name="title" translatable="yes" comments="Title of scan window">Simple Scan</property>
253 <property name="icon_name">scanner</property>
254- <signal name="configure_event" handler="simple_scan_window_configure_event_cb"/>
255- <signal name="delete_event" handler="window_delete_event_cb"/>
256- <signal name="window_state_event" handler="simple_scan_window_window_state_event_cb"/>
257+ <signal name="configure-event" handler="simple_scan_window_configure_event_cb" swapped="no"/>
258+ <signal name="delete-event" handler="window_delete_event_cb" swapped="no"/>
259+ <signal name="window-state-event" handler="simple_scan_window_window_state_event_cb" swapped="no"/>
260 <child>
261- <object class="GtkVBox" id="main_vbox">
262+ <object class="GtkBox" id="main_vbox">
263 <property name="visible">True</property>
264+ <property name="can_focus">False</property>
265+ <property name="orientation">vertical</property>
266 <child>
267 <object class="GtkMenuBar" id="menubar">
268 <property name="visible">True</property>
269+ <property name="can_focus">False</property>
270 <child>
271 <object class="GtkMenuItem" id="document_menuitem">
272 <property name="visible">True</property>
273+ <property name="can_focus">False</property>
274 <property name="label" translatable="yes" comments="Label on document menu (contains actions for this document, e.g. save, print)">_Document</property>
275 <property name="use_underline">True</property>
276 <child type="submenu">
277 <object class="GtkMenu" id="document_menu">
278 <property name="visible">True</property>
279+ <property name="can_focus">False</property>
280 <child>
281 <object class="GtkImageMenuItem" id="new_menuitem">
282 <property name="label">gtk-new</property>
283 <property name="visible">True</property>
284+ <property name="can_focus">False</property>
285 <property name="use_underline">True</property>
286 <property name="use_stock">True</property>
287 <accelerator key="n" signal="activate" modifiers="GDK_CONTROL_MASK"/>
288- <signal name="activate" handler="new_button_clicked_cb"/>
289+ <signal name="activate" handler="new_button_clicked_cb" swapped="no"/>
290 </object>
291 </child>
292 <child>
293 <object class="GtkImageMenuItem" id="scan_menuitem">
294 <property name="label" translatable="yes" comments="Scan menu item">Sc_an</property>
295 <property name="visible">True</property>
296+ <property name="can_focus">False</property>
297 <property name="use_underline">True</property>
298 <property name="use_stock">False</property>
299 <child type="submenu">
300 <object class="GtkMenu" id="scan_menu">
301 <property name="visible">True</property>
302+ <property name="can_focus">False</property>
303 <child>
304 <object class="GtkMenuItem" id="scan_single_menuitem">
305 <property name="visible">True</property>
306+ <property name="can_focus">False</property>
307 <property name="label" translatable="yes" comments="Scan menu item to scan a single page from the scanner">Single _Page</property>
308 <property name="use_underline">True</property>
309 <accelerator key="1" signal="activate" modifiers="GDK_CONTROL_MASK"/>
310- <signal name="activate" handler="scan_button_clicked_cb"/>
311+ <signal name="activate" handler="scan_button_clicked_cb" swapped="no"/>
312 </object>
313 </child>
314 <child>
315 <object class="GtkMenuItem" id="scan_all_menuitem">
316 <property name="visible">True</property>
317+ <property name="can_focus">False</property>
318 <property name="label" translatable="yes" comments="Scan menu item to scan all pages from a document feeder">All Pages From _Feeder</property>
319 <property name="use_underline">True</property>
320 <accelerator key="f" signal="activate" modifiers="GDK_CONTROL_MASK"/>
321- <signal name="activate" handler="continuous_scan_button_clicked_cb"/>
322+ <signal name="activate" handler="continuous_scan_button_clicked_cb" swapped="no"/>
323 </object>
324 </child>
325 <child>
326 <object class="GtkMenuItem" id="stop_scan_menuitem">
327 <property name="visible">True</property>
328 <property name="sensitive">False</property>
329+ <property name="can_focus">False</property>
330 <property name="label" translatable="yes" comments="Menu entry to stop current scan">_Stop Scan</property>
331 <property name="use_underline">True</property>
332 <accelerator key="Escape" signal="activate"/>
333- <signal name="activate" handler="stop_scan_button_clicked_cb"/>
334+ <signal name="activate" handler="stop_scan_button_clicked_cb" swapped="no"/>
335 </object>
336 </child>
337 <child>
338 <object class="GtkSeparatorMenuItem" id="menuitem2">
339 <property name="visible">True</property>
340+ <property name="can_focus">False</property>
341 </object>
342 </child>
343 <child>
344 <object class="GtkRadioMenuItem" id="text_menuitem">
345 <property name="visible">True</property>
346+ <property name="can_focus">False</property>
347 <property name="label" translatable="yes">Text</property>
348 <property name="use_underline">True</property>
349 <property name="draw_as_radio">True</property>
350- <signal name="toggled" handler="text_menuitem_toggled_cb"/>
351+ <signal name="toggled" handler="text_menuitem_toggled_cb" swapped="no"/>
352 </object>
353 </child>
354 <child>
355 <object class="GtkRadioMenuItem" id="photo_menuitem">
356 <property name="visible">True</property>
357+ <property name="can_focus">False</property>
358 <property name="label" translatable="yes">Photo</property>
359 <property name="use_underline">True</property>
360 <property name="active">True</property>
361 <property name="draw_as_radio">True</property>
362 <property name="group">text_menuitem</property>
363- <signal name="toggled" handler="photo_menuitem_toggled_cb"/>
364+ <signal name="toggled" handler="photo_menuitem_toggled_cb" swapped="no"/>
365 </object>
366 </child>
367 </object>
368@@ -103,10 +356,11 @@
369 <property name="label">gtk-save</property>
370 <property name="visible">True</property>
371 <property name="sensitive">False</property>
372+ <property name="can_focus">False</property>
373 <property name="use_underline">True</property>
374 <property name="use_stock">True</property>
375 <accelerator key="s" signal="activate" modifiers="GDK_CONTROL_MASK"/>
376- <signal name="activate" handler="save_file_button_clicked_cb"/>
377+ <signal name="activate" handler="save_file_button_clicked_cb" swapped="no"/>
378 </object>
379 </child>
380 <child>
381@@ -114,61 +368,68 @@
382 <property name="label">gtk-save-as</property>
383 <property name="visible">True</property>
384 <property name="sensitive">False</property>
385+ <property name="can_focus">False</property>
386 <property name="use_underline">True</property>
387 <property name="use_stock">True</property>
388 <accelerator key="s" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
389- <signal name="activate" handler="save_as_file_button_clicked_cb"/>
390+ <signal name="activate" handler="save_as_file_button_clicked_cb" swapped="no"/>
391 </object>
392 </child>
393 <child>
394 <object class="GtkImageMenuItem" id="email_menuitem">
395 <property name="label" translatable="yes" comments="Label on email menu item">_Email</property>
396 <property name="visible">True</property>
397+ <property name="can_focus">False</property>
398 <property name="use_underline">True</property>
399 <property name="image">email_image</property>
400 <property name="use_stock">False</property>
401 <accelerator key="e" signal="activate" modifiers="GDK_CONTROL_MASK"/>
402- <signal name="activate" handler="email_button_clicked_cb"/>
403+ <signal name="activate" handler="email_button_clicked_cb" swapped="no"/>
404 </object>
405 </child>
406 <child>
407 <object class="GtkImageMenuItem" id="print_menuitem">
408 <property name="label">gtk-print</property>
409 <property name="visible">True</property>
410+ <property name="can_focus">False</property>
411 <property name="use_underline">True</property>
412 <property name="use_stock">True</property>
413 <accelerator key="p" signal="activate" modifiers="GDK_CONTROL_MASK"/>
414- <signal name="activate" handler="print_button_clicked_cb"/>
415+ <signal name="activate" handler="print_button_clicked_cb" swapped="no"/>
416 </object>
417 </child>
418 <child>
419 <object class="GtkSeparatorMenuItem" id="document_sep_menuitem">
420 <property name="visible">True</property>
421+ <property name="can_focus">False</property>
422 </object>
423 </child>
424 <child>
425 <object class="GtkImageMenuItem" id="preferences_menuitem">
426 <property name="label">gtk-preferences</property>
427 <property name="visible">True</property>
428+ <property name="can_focus">False</property>
429 <property name="use_underline">True</property>
430 <property name="use_stock">True</property>
431- <signal name="activate" handler="preferences_button_clicked_cb"/>
432+ <signal name="activate" handler="preferences_button_clicked_cb" swapped="no"/>
433 </object>
434 </child>
435 <child>
436 <object class="GtkSeparatorMenuItem" id="separatormenuitem1">
437 <property name="visible">True</property>
438+ <property name="can_focus">False</property>
439 </object>
440 </child>
441 <child>
442 <object class="GtkImageMenuItem" id="quit_menuitem">
443 <property name="label">gtk-quit</property>
444 <property name="visible">True</property>
445+ <property name="can_focus">False</property>
446 <property name="use_underline">True</property>
447 <property name="use_stock">True</property>
448+ <accelerator key="w" signal="activate" modifiers="GDK_CONTROL_MASK"/>
449 <accelerator key="q" signal="activate" modifiers="GDK_CONTROL_MASK"/>
450- <accelerator key="w" signal="activate" modifiers="GDK_CONTROL_MASK"/>
451- <signal name="activate" handler="quit_menuitem_activate_cb"/>
452+ <signal name="activate" handler="quit_menuitem_activate_cb" swapped="no"/>
453 </object>
454 </child>
455 </object>
456@@ -178,129 +439,145 @@
457 <child>
458 <object class="GtkMenuItem" id="page_menuitem">
459 <property name="visible">True</property>
460+ <property name="can_focus">False</property>
461 <property name="label" translatable="yes" comments="Page menu (contains action for each page, e.g. delete, crop)">_Page</property>
462 <property name="use_underline">True</property>
463 <child type="submenu">
464 <object class="GtkMenu" id="page_menu">
465 <property name="visible">True</property>
466+ <property name="can_focus">False</property>
467 <child>
468 <object class="GtkMenuItem" id="rotate_left_menuitem">
469 <property name="visible">True</property>
470+ <property name="can_focus">False</property>
471 <property name="label" translatable="yes" comments="Menu item to rotate page to left (anti-clockwise)">Rotate _Left</property>
472 <property name="use_underline">True</property>
473 <accelerator key="bracketleft" signal="activate"/>
474- <signal name="activate" handler="rotate_left_button_clicked_cb"/>
475+ <signal name="activate" handler="rotate_left_button_clicked_cb" swapped="no"/>
476 </object>
477 </child>
478 <child>
479 <object class="GtkMenuItem" id="rotate_right_menuitem">
480 <property name="visible">True</property>
481+ <property name="can_focus">False</property>
482 <property name="label" translatable="yes" comments="Menu item to rotate page to right (clockwise)">Rotate _Right</property>
483 <property name="use_underline">True</property>
484 <accelerator key="bracketright" signal="activate"/>
485- <signal name="activate" handler="rotate_right_button_clicked_cb"/>
486+ <signal name="activate" handler="rotate_right_button_clicked_cb" swapped="no"/>
487 </object>
488 </child>
489 <child>
490 <object class="GtkMenuItem" id="crop_menuitem">
491 <property name="visible">True</property>
492+ <property name="can_focus">False</property>
493 <property name="label" translatable="yes" comments="Label for page crop submenu">_Crop</property>
494 <property name="use_underline">True</property>
495 <child type="submenu">
496 <object class="GtkMenu" id="crop_menu">
497 <property name="visible">True</property>
498+ <property name="can_focus">False</property>
499 <child>
500 <object class="GtkRadioMenuItem" id="no_crop_menuitem">
501 <property name="visible">True</property>
502+ <property name="can_focus">False</property>
503 <property name="label" translatable="yes" comments="Radio button for no crop">_None</property>
504 <property name="use_underline">True</property>
505 <property name="active">True</property>
506 <property name="draw_as_radio">True</property>
507- <signal name="toggled" handler="no_crop_menuitem_toggled_cb"/>
508+ <signal name="toggled" handler="no_crop_menuitem_toggled_cb" swapped="no"/>
509 </object>
510 </child>
511 <child>
512 <object class="GtkRadioMenuItem" id="a4_menuitem">
513 <property name="visible">True</property>
514+ <property name="can_focus">False</property>
515 <property name="label" translatable="yes" comments="Radio button for cropping page to A4 size">A_4</property>
516 <property name="use_underline">True</property>
517 <property name="draw_as_radio">True</property>
518 <property name="group">no_crop_menuitem</property>
519- <signal name="toggled" handler="a4_menuitem_toggled_cb"/>
520+ <signal name="toggled" handler="a4_menuitem_toggled_cb" swapped="no"/>
521 </object>
522 </child>
523 <child>
524 <object class="GtkRadioMenuItem" id="a5_menuitem">
525 <property name="visible">True</property>
526+ <property name="can_focus">False</property>
527 <property name="label" translatable="yes" comments="Radio button for cropping page to A5 size">A_5</property>
528 <property name="use_underline">True</property>
529 <property name="draw_as_radio">True</property>
530 <property name="group">no_crop_menuitem</property>
531- <signal name="toggled" handler="a5_menuitem_toggled_cb"/>
532+ <signal name="toggled" handler="a5_menuitem_toggled_cb" swapped="no"/>
533 </object>
534 </child>
535 <child>
536 <object class="GtkRadioMenuItem" id="a6_menuitem">
537 <property name="visible">True</property>
538+ <property name="can_focus">False</property>
539 <property name="label" translatable="yes" comments="Radio button for cropping page to A6 size">A_6</property>
540 <property name="use_underline">True</property>
541 <property name="draw_as_radio">True</property>
542 <property name="group">no_crop_menuitem</property>
543- <signal name="toggled" handler="a6_menuitem_toggled_cb"/>
544+ <signal name="toggled" handler="a6_menuitem_toggled_cb" swapped="no"/>
545 </object>
546 </child>
547 <child>
548 <object class="GtkRadioMenuItem" id="letter_menuitem">
549 <property name="visible">True</property>
550+ <property name="can_focus">False</property>
551 <property name="label" translatable="yes" comments="Radio button for cropping page to US letter size">_Letter</property>
552 <property name="use_underline">True</property>
553 <property name="draw_as_radio">True</property>
554 <property name="group">no_crop_menuitem</property>
555- <signal name="toggled" handler="letter_menuitem_toggled_cb"/>
556+ <signal name="toggled" handler="letter_menuitem_toggled_cb" swapped="no"/>
557 </object>
558 </child>
559 <child>
560 <object class="GtkRadioMenuItem" id="legal_menuitem">
561 <property name="visible">True</property>
562+ <property name="can_focus">False</property>
563 <property name="label" translatable="yes" comments="Radio button for cropping to page to US legal size">Le_gal</property>
564 <property name="use_underline">True</property>
565 <property name="draw_as_radio">True</property>
566 <property name="group">no_crop_menuitem</property>
567- <signal name="toggled" handler="legal_menuitem_toggled_cb"/>
568+ <signal name="toggled" handler="legal_menuitem_toggled_cb" swapped="no"/>
569 </object>
570 </child>
571 <child>
572 <object class="GtkRadioMenuItem" id="4x6_menuitem">
573 <property name="visible">True</property>
574- <property name="label" translatable="yes" comments="Radio button for cropping page to 4x6 inch">4&#xD7;6</property>
575+ <property name="can_focus">False</property>
576+ <property name="label" translatable="yes" comments="Radio button for cropping page to 4x6 inch">4×6</property>
577 <property name="use_underline">True</property>
578 <property name="draw_as_radio">True</property>
579 <property name="group">no_crop_menuitem</property>
580- <signal name="toggled" handler="four_by_six_menuitem_toggled_cb"/>
581+ <signal name="toggled" handler="four_by_six_menuitem_toggled_cb" swapped="no"/>
582 </object>
583 </child>
584 <child>
585 <object class="GtkRadioMenuItem" id="custom_crop_menuitem">
586 <property name="visible">True</property>
587+ <property name="can_focus">False</property>
588 <property name="label" translatable="yes" comments="Radio button for cropping to custom page size">_Custom</property>
589 <property name="use_underline">True</property>
590 <property name="draw_as_radio">True</property>
591 <property name="group">no_crop_menuitem</property>
592- <signal name="toggled" handler="custom_crop_menuitem_toggled_cb"/>
593+ <signal name="toggled" handler="custom_crop_menuitem_toggled_cb" swapped="no"/>
594 </object>
595 </child>
596 <child>
597 <object class="GtkSeparatorMenuItem" id="crop_sep_menuitem">
598 <property name="visible">True</property>
599+ <property name="can_focus">False</property>
600 </object>
601 </child>
602 <child>
603 <object class="GtkMenuItem" id="crop_rotate_menuitem">
604 <property name="visible">True</property>
605 <property name="sensitive">False</property>
606+ <property name="can_focus">False</property>
607 <property name="label" translatable="yes" comments="Menu item to rotate the crop area">_Rotate Crop</property>
608 <property name="use_underline">True</property>
609- <signal name="activate" handler="crop_rotate_menuitem_activate_cb"/>
610+ <signal name="activate" handler="crop_rotate_menuitem_activate_cb" swapped="no"/>
611 </object>
612 </child>
613 </object>
614@@ -310,18 +587,20 @@
615 <child>
616 <object class="GtkMenuItem" id="page_move_left_menuitem">
617 <property name="visible">True</property>
618+ <property name="can_focus">False</property>
619 <property name="label" translatable="yes" comments="Menu item to move the selected page to the left">Move Left</property>
620 <accelerator key="less" signal="activate"/>
621- <signal name="activate" handler="page_move_left_menuitem_activate_cb"/>
622+ <signal name="activate" handler="page_move_left_menuitem_activate_cb" swapped="no"/>
623 </object>
624 </child>
625 <child>
626 <object class="GtkMenuItem" id="page_move_right_menuitem">
627 <property name="visible">True</property>
628+ <property name="can_focus">False</property>
629 <property name="label" translatable="yes" comments="Menu item to move the selected page to the right">Move Right</property>
630 <property name="use_underline">True</property>
631 <accelerator key="greater" signal="activate"/>
632- <signal name="activate" handler="page_move_right_menuitem_activate_cb"/>
633+ <signal name="activate" handler="page_move_right_menuitem_activate_cb" swapped="no"/>
634 </object>
635 </child>
636 <child>
637@@ -329,20 +608,22 @@
638 <property name="label">gtk-copy</property>
639 <property name="visible">True</property>
640 <property name="sensitive">False</property>
641+ <property name="can_focus">False</property>
642 <property name="use_underline">True</property>
643 <property name="use_stock">True</property>
644 <accelerator key="c" signal="activate" modifiers="GDK_CONTROL_MASK"/>
645- <signal name="activate" handler="copy_to_clipboard_button_clicked_cb"/>
646+ <signal name="activate" handler="copy_to_clipboard_button_clicked_cb" swapped="no"/>
647 </object>
648- </child>
649+ </child>
650 <child>
651 <object class="GtkImageMenuItem" id="page_delete_menuitem">
652 <property name="label">gtk-delete</property>
653 <property name="visible">True</property>
654+ <property name="can_focus">False</property>
655 <property name="use_underline">True</property>
656 <property name="use_stock">True</property>
657 <accelerator key="Delete" signal="activate"/>
658- <signal name="activate" handler="page_delete_menuitem_activate_cb"/>
659+ <signal name="activate" handler="page_delete_menuitem_activate_cb" swapped="no"/>
660 </object>
661 </child>
662 </object>
663@@ -352,29 +633,33 @@
664 <child>
665 <object class="GtkMenuItem" id="help_menuitem">
666 <property name="visible">True</property>
667+ <property name="can_focus">False</property>
668 <property name="label" translatable="yes" comments="Label on help menu">_Help</property>
669 <property name="use_underline">True</property>
670 <child type="submenu">
671 <object class="GtkMenu" id="help_menu">
672 <property name="visible">True</property>
673+ <property name="can_focus">False</property>
674 <child>
675 <object class="GtkImageMenuItem" id="help_contents_menuitem">
676 <property name="label" translatable="yes" comments="Help|Contents menu">_Contents</property>
677 <property name="visible">True</property>
678+ <property name="can_focus">False</property>
679 <property name="use_underline">True</property>
680 <property name="image">help_image</property>
681 <property name="use_stock">False</property>
682 <accelerator key="F1" signal="activate"/>
683- <signal name="activate" handler="help_contents_menuitem_activate_cb"/>
684+ <signal name="activate" handler="help_contents_menuitem_activate_cb" swapped="no"/>
685 </object>
686 </child>
687 <child>
688 <object class="GtkImageMenuItem" id="about_menuitem">
689 <property name="label">gtk-about</property>
690 <property name="visible">True</property>
691+ <property name="can_focus">False</property>
692 <property name="use_underline">True</property>
693 <property name="use_stock">True</property>
694- <signal name="activate" handler="about_menuitem_activate_cb"/>
695+ <signal name="activate" handler="about_menuitem_activate_cb" swapped="no"/>
696 </object>
697 </child>
698 </object>
699@@ -384,23 +669,26 @@
700 </object>
701 <packing>
702 <property name="expand">False</property>
703+ <property name="fill">True</property>
704 <property name="position">0</property>
705 </packing>
706 </child>
707 <child>
708 <object class="GtkToolbar" id="toolbar1">
709 <property name="visible">True</property>
710+ <property name="can_focus">False</property>
711 <style>
712- <class name="primary-toolbar"/>
713+ <class name="primary-toolbar"/>
714 </style>
715 <child>
716 <object class="GtkToolButton" id="new_toolbutton">
717 <property name="visible">True</property>
718+ <property name="can_focus">False</property>
719 <property name="tooltip_text" translatable="yes" comments="Tooltip for new document button">Start a new document</property>
720 <property name="label" translatable="yes">New</property>
721 <property name="use_underline">True</property>
722 <property name="stock_id">gtk-new</property>
723- <signal name="clicked" handler="new_button_clicked_cb"/>
724+ <signal name="clicked" handler="new_button_clicked_cb" swapped="no"/>
725 </object>
726 <packing>
727 <property name="expand">False</property>
728@@ -410,28 +698,30 @@
729 <child>
730 <object class="GtkMenuToolButton" id="scan_toolbutton">
731 <property name="visible">True</property>
732+ <property name="can_focus">False</property>
733 <property name="tooltip_text" translatable="yes" comments="Tooltip for scan toolbar button">Scan a single page from the scanner</property>
734 <property name="is_important">True</property>
735 <property name="label" translatable="yes" comments="Label on scan toolbar item">Scan</property>
736 <property name="use_underline">True</property>
737 <property name="icon_name">scanner</property>
738- <property name="menu">scan_toolbutton_menu</property>
739- <signal name="clicked" handler="scan_button_clicked_cb"/>
740+ <signal name="clicked" handler="scan_button_clicked_cb" swapped="no"/>
741 </object>
742 <packing>
743 <property name="expand">False</property>
744+ <property name="homogeneous">False</property>
745 </packing>
746 </child>
747 <child>
748 <object class="GtkToolButton" id="save_toolbutton">
749 <property name="visible">True</property>
750 <property name="sensitive">False</property>
751+ <property name="can_focus">False</property>
752 <property name="tooltip_text" translatable="yes" comments="Tooltip for save toolbar button">Save document to a file</property>
753 <property name="is_important">True</property>
754 <property name="label" translatable="yes">Save</property>
755 <property name="use_underline">True</property>
756 <property name="stock_id">gtk-save</property>
757- <signal name="clicked" handler="save_file_button_clicked_cb"/>
758+ <signal name="clicked" handler="save_file_button_clicked_cb" swapped="no"/>
759 </object>
760 <packing>
761 <property name="expand">False</property>
762@@ -442,11 +732,12 @@
763 <object class="GtkToolButton" id="stop_toolbutton">
764 <property name="visible">True</property>
765 <property name="sensitive">False</property>
766+ <property name="can_focus">False</property>
767 <property name="tooltip_text" translatable="yes" comments="Tooltip for stop button">Stop the current scan</property>
768 <property name="label" translatable="yes">Stop</property>
769 <property name="use_underline">True</property>
770 <property name="stock_id">gtk-stop</property>
771- <signal name="clicked" handler="stop_scan_button_clicked_cb"/>
772+ <signal name="clicked" handler="stop_scan_button_clicked_cb" swapped="no"/>
773 </object>
774 <packing>
775 <property name="expand">False</property>
776@@ -456,6 +747,7 @@
777 <child>
778 <object class="GtkSeparatorToolItem" id="toolbutton2">
779 <property name="visible">True</property>
780+ <property name="can_focus">False</property>
781 </object>
782 <packing>
783 <property name="expand">False</property>
784@@ -465,11 +757,12 @@
785 <child>
786 <object class="GtkToolButton" id="rotate_left_toolbutton">
787 <property name="visible">True</property>
788+ <property name="can_focus">False</property>
789 <property name="tooltip_text" translatable="yes" comments="Tooltip for rotate left (counter-clockwise) button">Rotate the page to the left (counter-clockwise)</property>
790 <property name="label" translatable="yes" comments="Label on rotate page left (anti-clockwise) item">Rotate Left</property>
791 <property name="use_underline">True</property>
792 <property name="icon_name">object-rotate-left</property>
793- <signal name="clicked" handler="rotate_left_button_clicked_cb"/>
794+ <signal name="clicked" handler="rotate_left_button_clicked_cb" swapped="no"/>
795 </object>
796 <packing>
797 <property name="expand">False</property>
798@@ -479,11 +772,12 @@
799 <child>
800 <object class="GtkToolButton" id="rotate_right_toolbutton">
801 <property name="visible">True</property>
802+ <property name="can_focus">False</property>
803 <property name="tooltip_text" translatable="yes" comments="Tooltip for rotate right (clockwise) button">Rotate the page to the right (clockwise)</property>
804 <property name="label" translatable="yes" comments="Label on rotate page right (clockwise) item">Rotate Right</property>
805 <property name="use_underline">True</property>
806 <property name="icon_name">object-rotate-right</property>
807- <signal name="clicked" handler="rotate_right_button_clicked_cb"/>
808+ <signal name="clicked" handler="rotate_right_button_clicked_cb" swapped="no"/>
809 </object>
810 <packing>
811 <property name="expand">False</property>
812@@ -493,12 +787,13 @@
813 <child>
814 <object class="GtkToggleToolButton" id="crop_toolbutton">
815 <property name="visible">True</property>
816+ <property name="can_focus">False</property>
817 <property name="tooltip_text" translatable="yes">Crop the selected page</property>
818 <property name="is_important">True</property>
819 <property name="label" translatable="yes">Crop</property>
820 <property name="use_underline">True</property>
821 <property name="icon_name">object-crop</property>
822- <signal name="toggled" handler="crop_toolbutton_toggled_cb"/>
823+ <signal name="toggled" handler="crop_toolbutton_toggled_cb" swapped="no"/>
824 </object>
825 <packing>
826 <property name="expand">False</property>
827@@ -508,6 +803,7 @@
828 </object>
829 <packing>
830 <property name="expand">False</property>
831+ <property name="fill">True</property>
832 <property name="position">1</property>
833 </packing>
834 </child>
835@@ -517,316 +813,214 @@
836 </object>
837 </child>
838 </object>
839- <object class="GtkListStore" id="mode_store">
840- <columns>
841- <!-- column-name mode -->
842- <column type="gchararray"/>
843- <!-- column-name label -->
844- <column type="gchararray"/>
845- </columns>
846- <data>
847- <row>
848- <col id="0">text</col>
849- <col id="1" translatable="yes" comments="Combo box label for text scan mode">Text</col>
850- </row>
851- <row>
852- <col id="0">photo</col>
853- <col id="1" translatable="yes" comments="Combo box label for photo scan mode">Photo</col>
854- </row>
855- </data>
856- </object>
857- <object class="GtkListStore" id="device_store">
858- <columns>
859- <!-- column-name device_name -->
860- <column type="gchararray"/>
861- <!-- column-name label -->
862- <column type="gchararray"/>
863- </columns>
864- </object>
865- <object class="GtkDialog" id="authorize_dialog">
866- <property name="border_width">12</property>
867- <property name="resizable">False</property>
868- <property name="modal">True</property>
869- <property name="type_hint">normal</property>
870- <property name="urgency_hint">True</property>
871- <property name="transient_for">simple_scan_window</property>
872- <child internal-child="vbox">
873- <object class="GtkVBox" id="dialog-vbox1">
874- <property name="visible">True</property>
875- <property name="spacing">12</property>
876- <child>
877- <object class="GtkVBox" id="vbox5">
878- <property name="visible">True</property>
879- <property name="border_width">5</property>
880- <property name="spacing">12</property>
881- <child>
882- <object class="GtkLabel" id="authorize_label">
883- <property name="visible">True</property>
884- <property name="label" comments="This label is set dynamically and is not translated">To connect to ? you need to authorize</property>
885- </object>
886- <packing>
887- <property name="position">0</property>
888- </packing>
889- </child>
890- <child>
891- <object class="GtkTable" id="table2">
892- <property name="visible">True</property>
893- <property name="n_rows">2</property>
894- <property name="n_columns">2</property>
895- <property name="column_spacing">6</property>
896- <property name="row_spacing">6</property>
897- <child>
898- <object class="GtkEntry" id="username_entry">
899- <property name="visible">True</property>
900- <property name="can_focus">True</property>
901- <property name="invisible_char">&#x25CF;</property>
902- </object>
903- <packing>
904- <property name="left_attach">1</property>
905- <property name="right_attach">2</property>
906- <property name="y_options">GTK_FILL</property>
907- </packing>
908- </child>
909- <child>
910- <object class="GtkEntry" id="password_entry">
911- <property name="visible">True</property>
912- <property name="can_focus">True</property>
913- <property name="visibility">False</property>
914- <property name="invisible_char">&#x25CF;</property>
915- </object>
916- <packing>
917- <property name="left_attach">1</property>
918- <property name="right_attach">2</property>
919- <property name="top_attach">1</property>
920- <property name="bottom_attach">2</property>
921- <property name="y_options">GTK_FILL</property>
922- </packing>
923- </child>
924- <child>
925- <object class="GtkLabel" id="username_label">
926- <property name="visible">True</property>
927- <property name="label" translatable="yes" comments="Label beside username entry">_Username for resource:</property>
928- <property name="use_underline">True</property>
929- <property name="mnemonic_widget">username_entry</property>
930- </object>
931- <packing>
932- <property name="x_options">GTK_FILL</property>
933- <property name="y_options">GTK_FILL</property>
934- </packing>
935- </child>
936- <child>
937- <object class="GtkLabel" id="password_label">
938- <property name="visible">True</property>
939- <property name="label" translatable="yes" comments="Label beside password entry">_Password:</property>
940- <property name="use_underline">True</property>
941- <property name="mnemonic_widget">password_entry</property>
942- </object>
943- <packing>
944- <property name="top_attach">1</property>
945- <property name="bottom_attach">2</property>
946- <property name="x_options">GTK_FILL</property>
947- <property name="y_options">GTK_FILL</property>
948- </packing>
949- </child>
950- </object>
951- <packing>
952- <property name="expand">False</property>
953- <property name="position">1</property>
954- </packing>
955- </child>
956- </object>
957- <packing>
958- <property name="position">1</property>
959- </packing>
960- </child>
961- <child internal-child="action_area">
962- <object class="GtkHButtonBox" id="dialog-action_area1">
963- <property name="visible">True</property>
964- <property name="layout_style">end</property>
965- <child>
966- <object class="GtkButton" id="authorize_button">
967- <property name="label" translatable="yes" comments="Button to submit authorization dialog">_Authorize</property>
968- <property name="visible">True</property>
969- <property name="can_focus">True</property>
970- <property name="receives_default">True</property>
971- <property name="use_underline">True</property>
972- </object>
973- <packing>
974- <property name="expand">False</property>
975- <property name="fill">False</property>
976- <property name="position">0</property>
977- </packing>
978- </child>
979- </object>
980- <packing>
981- <property name="expand">False</property>
982- <property name="pack_type">end</property>
983- <property name="position">0</property>
984- </packing>
985- </child>
986- </object>
987- </child>
988- <action-widgets>
989- <action-widget response="0">authorize_button</action-widget>
990- </action-widgets>
991+ <object class="GtkListStore" id="text_dpi_store">
992+ <columns>
993+ <!-- column-name dpi -->
994+ <column type="gint"/>
995+ <!-- column-name label -->
996+ <column type="gchararray"/>
997+ </columns>
998 </object>
999 <object class="GtkDialog" id="preferences_dialog">
1000+ <property name="can_focus">False</property>
1001 <property name="border_width">7</property>
1002 <property name="title" translatable="yes" comments="Title of preferences dialog">Preferences</property>
1003 <property name="resizable">False</property>
1004 <property name="icon_name">scanner</property>
1005 <property name="type_hint">normal</property>
1006 <property name="transient_for">simple_scan_window</property>
1007- <signal name="response" handler="preferences_dialog_response_cb"/>
1008- <signal name="delete_event" handler="preferences_dialog_delete_event_cb"/>
1009+ <signal name="delete-event" handler="preferences_dialog_delete_event_cb" swapped="no"/>
1010+ <signal name="response" handler="preferences_dialog_response_cb" swapped="no"/>
1011 <child internal-child="vbox">
1012- <object class="GtkVBox" id="dialog-vbox2">
1013+ <object class="GtkBox" id="dialog-vbox2">
1014 <property name="visible">True</property>
1015+ <property name="can_focus">False</property>
1016+ <property name="orientation">vertical</property>
1017 <property name="spacing">2</property>
1018+ <child internal-child="action_area">
1019+ <object class="GtkButtonBox" id="dialog-action_area2">
1020+ <property name="visible">True</property>
1021+ <property name="can_focus">False</property>
1022+ <property name="layout_style">end</property>
1023+ <child>
1024+ <object class="GtkButton" id="preferences_close_button">
1025+ <property name="label">gtk-close</property>
1026+ <property name="visible">True</property>
1027+ <property name="can_focus">True</property>
1028+ <property name="receives_default">True</property>
1029+ <property name="use_stock">True</property>
1030+ </object>
1031+ <packing>
1032+ <property name="expand">False</property>
1033+ <property name="fill">False</property>
1034+ <property name="position">0</property>
1035+ </packing>
1036+ </child>
1037+ </object>
1038+ <packing>
1039+ <property name="expand">False</property>
1040+ <property name="fill">True</property>
1041+ <property name="pack_type">end</property>
1042+ <property name="position">0</property>
1043+ </packing>
1044+ </child>
1045 <child>
1046- <object class="GtkTable" id="table3">
1047+ <object class="GtkGrid" id="grid3">
1048 <property name="visible">True</property>
1049+ <property name="can_focus">False</property>
1050 <property name="border_width">5</property>
1051- <property name="n_rows">7</property>
1052- <property name="n_columns">2</property>
1053+ <property name="row_spacing">6</property>
1054 <property name="column_spacing">6</property>
1055- <property name="row_spacing">6</property>
1056 <child>
1057 <object class="GtkLabel" id="source_label">
1058 <property name="visible">True</property>
1059+ <property name="can_focus">False</property>
1060 <property name="xalign">0</property>
1061 <property name="label" translatable="yes" comments="Label beside scan source combo box">Scan S_ource:</property>
1062 <property name="use_underline">True</property>
1063 <property name="mnemonic_widget">device_combo</property>
1064 </object>
1065 <packing>
1066- <property name="x_options">GTK_FILL</property>
1067- <property name="y_options">GTK_FILL</property>
1068+ <property name="left_attach">0</property>
1069+ <property name="top_attach">0</property>
1070+ <property name="width">1</property>
1071+ <property name="height">1</property>
1072 </packing>
1073 </child>
1074 <child>
1075 <object class="GtkComboBox" id="device_combo">
1076 <property name="visible">True</property>
1077+ <property name="can_focus">False</property>
1078+ <property name="hexpand">True</property>
1079 <property name="model">device_store</property>
1080 <property name="button_sensitivity">on</property>
1081- <signal name="changed" handler="device_combo_changed_cb"/>
1082+ <signal name="changed" handler="device_combo_changed_cb" swapped="no"/>
1083 </object>
1084 <packing>
1085 <property name="left_attach">1</property>
1086- <property name="right_attach">2</property>
1087- <property name="y_options">GTK_FILL</property>
1088+ <property name="top_attach">0</property>
1089+ <property name="width">1</property>
1090+ <property name="height">1</property>
1091 </packing>
1092 </child>
1093 <child>
1094 <object class="GtkLabel" id="text_dpi_label">
1095 <property name="visible">True</property>
1096+ <property name="can_focus">False</property>
1097 <property name="xalign">0</property>
1098 <property name="label" translatable="yes" comments="Label beside scan source combo box">_Text Resolution:</property>
1099 <property name="use_underline">True</property>
1100 <property name="mnemonic_widget">text_dpi_combo</property>
1101 </object>
1102 <packing>
1103+ <property name="left_attach">0</property>
1104 <property name="top_attach">1</property>
1105- <property name="bottom_attach">2</property>
1106- <property name="x_options">GTK_FILL</property>
1107- <property name="y_options">GTK_FILL</property>
1108+ <property name="width">1</property>
1109+ <property name="height">1</property>
1110 </packing>
1111 </child>
1112 <child>
1113 <object class="GtkLabel" id="photo_dpi_label">
1114 <property name="visible">True</property>
1115+ <property name="can_focus">False</property>
1116 <property name="xalign">0</property>
1117 <property name="label" translatable="yes" comments="Label beside scan source combo box">_Photo Resolution:</property>
1118 <property name="use_underline">True</property>
1119 <property name="mnemonic_widget">photo_dpi_combo</property>
1120 </object>
1121 <packing>
1122+ <property name="left_attach">0</property>
1123 <property name="top_attach">2</property>
1124- <property name="bottom_attach">3</property>
1125- <property name="x_options">GTK_FILL</property>
1126- <property name="y_options">GTK_FILL</property>
1127+ <property name="width">1</property>
1128+ <property name="height">1</property>
1129 </packing>
1130 </child>
1131 <child>
1132 <object class="GtkComboBox" id="text_dpi_combo">
1133 <property name="visible">True</property>
1134+ <property name="can_focus">False</property>
1135+ <property name="hexpand">True</property>
1136 <property name="model">text_dpi_store</property>
1137 </object>
1138 <packing>
1139 <property name="left_attach">1</property>
1140- <property name="right_attach">2</property>
1141 <property name="top_attach">1</property>
1142- <property name="bottom_attach">2</property>
1143- <property name="y_options">GTK_FILL</property>
1144+ <property name="width">1</property>
1145+ <property name="height">1</property>
1146 </packing>
1147 </child>
1148 <child>
1149 <object class="GtkComboBox" id="photo_dpi_combo">
1150 <property name="visible">True</property>
1151+ <property name="can_focus">False</property>
1152+ <property name="hexpand">True</property>
1153 <property name="model">photo_dpi_store</property>
1154 </object>
1155 <packing>
1156 <property name="left_attach">1</property>
1157- <property name="right_attach">2</property>
1158 <property name="top_attach">2</property>
1159- <property name="bottom_attach">3</property>
1160- <property name="y_options">GTK_FILL</property>
1161+ <property name="width">1</property>
1162+ <property name="height">1</property>
1163 </packing>
1164 </child>
1165 <child>
1166 <object class="GtkLabel" id="page_side_label">
1167 <property name="visible">True</property>
1168+ <property name="can_focus">False</property>
1169 <property name="xalign">0</property>
1170 <property name="label" translatable="yes" comments="Label beside scan side combo box">Scan Side:</property>
1171 <property name="use_underline">True</property>
1172 <property name="mnemonic_widget">photo_dpi_combo</property>
1173 </object>
1174 <packing>
1175+ <property name="left_attach">0</property>
1176 <property name="top_attach">3</property>
1177- <property name="bottom_attach">4</property>
1178- <property name="x_options">GTK_FILL</property>
1179- <property name="y_options">GTK_FILL</property>
1180+ <property name="width">1</property>
1181+ <property name="height">1</property>
1182 </packing>
1183 </child>
1184 <child>
1185 <object class="GtkComboBox" id="page_side_combo">
1186 <property name="visible">True</property>
1187+ <property name="can_focus">False</property>
1188+ <property name="hexpand">True</property>
1189 <property name="model">page_side_store</property>
1190 </object>
1191 <packing>
1192 <property name="left_attach">1</property>
1193- <property name="right_attach">2</property>
1194 <property name="top_attach">3</property>
1195- <property name="bottom_attach">4</property>
1196- <property name="y_options">GTK_FILL</property>
1197+ <property name="width">1</property>
1198+ <property name="height">1</property>
1199 </packing>
1200 </child>
1201 <child>
1202 <object class="GtkLabel" id="paper_size_label">
1203 <property name="visible">True</property>
1204+ <property name="can_focus">False</property>
1205 <property name="xalign">0</property>
1206 <property name="label" translatable="yes" comments="Label beside page size combo box">Page Size:</property>
1207 <property name="use_underline">True</property>
1208 <property name="mnemonic_widget">photo_dpi_combo</property>
1209 </object>
1210 <packing>
1211+ <property name="left_attach">0</property>
1212 <property name="top_attach">4</property>
1213- <property name="bottom_attach">5</property>
1214- <property name="x_options">GTK_FILL</property>
1215- <property name="y_options">GTK_FILL</property>
1216+ <property name="width">1</property>
1217+ <property name="height">1</property>
1218 </packing>
1219 </child>
1220 <child>
1221 <object class="GtkComboBox" id="paper_size_combo">
1222 <property name="visible">True</property>
1223+ <property name="can_focus">False</property>
1224+ <property name="hexpand">True</property>
1225 <property name="model">paper_size_store</property>
1226 </object>
1227 <packing>
1228 <property name="left_attach">1</property>
1229- <property name="right_attach">2</property>
1230 <property name="top_attach">4</property>
1231- <property name="bottom_attach">5</property>
1232- <property name="y_options">GTK_FILL</property>
1233+ <property name="width">1</property>
1234+ <property name="height">1</property>
1235 </packing>
1236 </child>
1237 <child>
1238@@ -836,27 +1030,27 @@
1239 <property name="xalign">0</property>
1240 <property name="label" translatable="yes" comments="Label beside brightness scale">Brightness:</property>
1241 <property name="use_underline">True</property>
1242- <property name="mnemonic_widget">brightness_adjustment</property>
1243 </object>
1244 <packing>
1245+ <property name="left_attach">0</property>
1246 <property name="top_attach">5</property>
1247- <property name="bottom_attach">6</property>
1248- <property name="x_options">GTK_FILL</property>
1249- <property name="y_options">GTK_FILL</property>
1250+ <property name="width">1</property>
1251+ <property name="height">1</property>
1252 </packing>
1253 </child>
1254 <child>
1255 <object class="GtkScale" id="brightness_scale">
1256 <property name="visible">True</property>
1257 <property name="can_focus">True</property>
1258+ <property name="hexpand">True</property>
1259 <property name="adjustment">brightness_adjustment</property>
1260 <property name="draw_value">False</property>
1261 </object>
1262 <packing>
1263 <property name="left_attach">1</property>
1264- <property name="right_attach">2</property>
1265 <property name="top_attach">5</property>
1266- <property name="bottom_attach">6</property>
1267+ <property name="width">1</property>
1268+ <property name="height">1</property>
1269 </packing>
1270 </child>
1271 <child>
1272@@ -869,24 +1063,25 @@
1273 <property name="mnemonic_widget">contrast_scale</property>
1274 </object>
1275 <packing>
1276+ <property name="left_attach">0</property>
1277 <property name="top_attach">6</property>
1278- <property name="bottom_attach">7</property>
1279- <property name="x_options">GTK_FILL</property>
1280- <property name="y_options">GTK_FILL</property>
1281+ <property name="width">1</property>
1282+ <property name="height">1</property>
1283 </packing>
1284 </child>
1285 <child>
1286 <object class="GtkScale" id="contrast_scale">
1287 <property name="visible">True</property>
1288 <property name="can_focus">True</property>
1289+ <property name="hexpand">True</property>
1290 <property name="adjustment">contrast_adjustment</property>
1291 <property name="draw_value">False</property>
1292 </object>
1293 <packing>
1294 <property name="left_attach">1</property>
1295- <property name="right_attach">2</property>
1296 <property name="top_attach">6</property>
1297- <property name="bottom_attach">7</property>
1298+ <property name="width">1</property>
1299+ <property name="height">1</property>
1300 </packing>
1301 </child>
1302 <child>
1303@@ -899,56 +1094,34 @@
1304 <property name="mnemonic_widget">quality_scale</property>
1305 </object>
1306 <packing>
1307+ <property name="left_attach">0</property>
1308 <property name="top_attach">7</property>
1309- <property name="bottom_attach">8</property>
1310- <property name="x_options">GTK_FILL</property>
1311- <property name="y_options">GTK_FILL</property>
1312+ <property name="width">1</property>
1313+ <property name="height">1</property>
1314 </packing>
1315 </child>
1316 <child>
1317 <object class="GtkScale" id="quality_scale">
1318 <property name="visible">True</property>
1319 <property name="can_focus">True</property>
1320+ <property name="hexpand">True</property>
1321 <property name="adjustment">quality_adjustment</property>
1322 <property name="draw_value">False</property>
1323 </object>
1324 <packing>
1325 <property name="left_attach">1</property>
1326- <property name="right_attach">2</property>
1327 <property name="top_attach">7</property>
1328- <property name="bottom_attach">8</property>
1329+ <property name="width">1</property>
1330+ <property name="height">1</property>
1331 </packing>
1332 </child>
1333 </object>
1334 <packing>
1335+ <property name="expand">False</property>
1336+ <property name="fill">True</property>
1337 <property name="position">1</property>
1338 </packing>
1339 </child>
1340- <child internal-child="action_area">
1341- <object class="GtkHButtonBox" id="dialog-action_area2">
1342- <property name="visible">True</property>
1343- <property name="layout_style">end</property>
1344- <child>
1345- <object class="GtkButton" id="preferences_close_button">
1346- <property name="label">gtk-close</property>
1347- <property name="visible">True</property>
1348- <property name="can_focus">True</property>
1349- <property name="receives_default">True</property>
1350- <property name="use_stock">True</property>
1351- </object>
1352- <packing>
1353- <property name="expand">False</property>
1354- <property name="fill">False</property>
1355- <property name="position">0</property>
1356- </packing>
1357- </child>
1358- </object>
1359- <packing>
1360- <property name="expand">False</property>
1361- <property name="pack_type">end</property>
1362- <property name="position">0</property>
1363- </packing>
1364- </child>
1365 </object>
1366 </child>
1367 <action-widgets>
1368@@ -957,120 +1130,52 @@
1369 </object>
1370 <object class="GtkMenu" id="scan_toolbutton_menu">
1371 <property name="visible">True</property>
1372+ <property name="can_focus">False</property>
1373 <child>
1374 <object class="GtkMenuItem" id="scan_single_toolbutton_menuitem">
1375 <property name="visible">True</property>
1376+ <property name="can_focus">False</property>
1377 <property name="label" translatable="yes" comments="Toolbar scan menu item to scan a single page from the scanner">Single _Page</property>
1378 <property name="use_underline">True</property>
1379- <signal name="activate" handler="scan_button_clicked_cb"/>
1380+ <signal name="activate" handler="scan_button_clicked_cb" swapped="no"/>
1381 </object>
1382 </child>
1383 <child>
1384 <object class="GtkMenuItem" id="scan_all_toolbutton_menuitem">
1385 <property name="visible">True</property>
1386+ <property name="can_focus">False</property>
1387 <property name="label" translatable="yes" comments="Toolbar scan menu item to scan all pages from a document feeder">All Pages From _Feeder</property>
1388 <property name="use_underline">True</property>
1389- <signal name="activate" handler="continuous_scan_button_clicked_cb"/>
1390+ <signal name="activate" handler="continuous_scan_button_clicked_cb" swapped="no"/>
1391 </object>
1392 </child>
1393 <child>
1394 <object class="GtkSeparatorMenuItem" id="menuitem1">
1395 <property name="visible">True</property>
1396+ <property name="can_focus">False</property>
1397 </object>
1398 </child>
1399 <child>
1400 <object class="GtkRadioMenuItem" id="text_toolbutton_menuitem">
1401 <property name="visible">True</property>
1402+ <property name="can_focus">False</property>
1403 <property name="label" translatable="yes">Text</property>
1404 <property name="use_underline">True</property>
1405 <property name="draw_as_radio">True</property>
1406- <signal name="toggled" handler="text_menuitem_toggled_cb"/>
1407+ <signal name="toggled" handler="text_menuitem_toggled_cb" swapped="no"/>
1408 </object>
1409 </child>
1410 <child>
1411 <object class="GtkRadioMenuItem" id="photo_toolbutton_menuitem">
1412 <property name="visible">True</property>
1413+ <property name="can_focus">False</property>
1414 <property name="label" translatable="yes">Photo</property>
1415 <property name="use_underline">True</property>
1416 <property name="active">True</property>
1417 <property name="draw_as_radio">True</property>
1418 <property name="group">text_toolbutton_menuitem</property>
1419- <signal name="toggled" handler="photo_menuitem_toggled_cb"/>
1420+ <signal name="toggled" handler="photo_menuitem_toggled_cb" swapped="no"/>
1421 </object>
1422 </child>
1423 </object>
1424- <object class="GtkListStore" id="photo_dpi_store">
1425- <columns>
1426- <!-- column-name dpi -->
1427- <column type="gint"/>
1428- <!-- column-name label -->
1429- <column type="gchararray"/>
1430- </columns>
1431- </object>
1432- <object class="GtkListStore" id="text_dpi_store">
1433- <columns>
1434- <!-- column-name dpi -->
1435- <column type="gint"/>
1436- <!-- column-name label -->
1437- <column type="gchararray"/>
1438- </columns>
1439- </object>
1440- <object class="GtkImage" id="help_image">
1441- <property name="visible">True</property>
1442- <property name="stock">gtk-help</property>
1443- </object>
1444- <object class="GtkImage" id="email_image">
1445- <property name="visible">True</property>
1446- <property name="icon_name">mail-send</property>
1447- </object>
1448- <object class="GtkListStore" id="page_side_store">
1449- <columns>
1450- <!-- column-name side -->
1451- <column type="gint"/>
1452- <!-- column-name label -->
1453- <column type="gchararray"/>
1454- </columns>
1455- <data>
1456- <row>
1457- <col id="0">3</col>
1458- <col id="1" translatable="yes" comments="Combo box label for scanning both sides of a page">Front and Back</col>
1459- </row>
1460- <row>
1461- <col id="0">1</col>
1462- <col id="1" translatable="yes" comments="Combo box label for scanning the front side of a page">Front</col>
1463- </row>
1464- <row>
1465- <col id="0">2</col>
1466- <col id="1" translatable="yes" comments="Combo box label for scanning the back side of a page">Back</col>
1467- </row>
1468- </data>
1469- </object>
1470- <object class="GtkListStore" id="paper_size_store">
1471- <columns>
1472- <!-- column-name width -->
1473- <column type="gint"/>
1474- <!-- column-name height -->
1475- <column type="gint"/>
1476- <!-- column-name label -->
1477- <column type="gchararray"/>
1478- </columns>
1479- </object>
1480- <object class="GtkAdjustment" id="brightness_adjustment">
1481- <property name="lower">-100</property>
1482- <property name="upper">100</property>
1483- <property name="step_increment">1</property>
1484- <property name="page_increment">10</property>
1485- </object>
1486- <object class="GtkAdjustment" id="contrast_adjustment">
1487- <property name="lower">-100</property>
1488- <property name="upper">100</property>
1489- <property name="step_increment">1</property>
1490- <property name="page_increment">10</property>
1491- </object>
1492- <object class="GtkAdjustment" id="quality_adjustment">
1493- <property name="lower">0</property>
1494- <property name="upper">100</property>
1495- <property name="step_increment">1</property>
1496- <property name="page_increment">10</property>
1497- </object>
1498 </interface>
1499
1500=== modified file 'src/book-view.vala'
1501--- src/book-view.vala 2013-11-01 06:36:24 +0000
1502+++ src/book-view.vala 2013-11-24 21:28:29 +0000
1503@@ -12,7 +12,7 @@
1504 // FIXME: When scrolling, copy existing render sideways?
1505 // FIXME: Only render pages that change and only the part that changed
1506
1507-public class BookView : Gtk.VBox
1508+public class BookView : Gtk.Box
1509 {
1510 /* Book being rendered */
1511 public Book book { get; private set; }
1512
1513=== modified file 'src/ui.vala'
1514--- src/ui.vala 2013-11-06 07:11:17 +0000
1515+++ src/ui.vala 2013-11-24 21:28:29 +0000
1516@@ -19,7 +19,7 @@
1517 private Gtk.Builder builder;
1518
1519 private Gtk.Window window;
1520- private Gtk.VBox main_vbox;
1521+ private Gtk.Box main_vbox;
1522 private Gtk.InfoBar info_bar;
1523 private Gtk.Image info_bar_image;
1524 private Gtk.Label info_bar_label;
1525@@ -222,7 +222,7 @@
1526 Gtk.MessageType.WARNING,
1527 Gtk.ButtonsType.NONE,
1528 "%s", error_title);
1529- dialog.add_button (Gtk.Stock.CLOSE, 0);
1530+ dialog.add_button (_("_Close"), 0);
1531 dialog.format_secondary_text ("%s", error_text);
1532 dialog.destroy ();
1533 }
1534@@ -262,7 +262,7 @@
1535 if (have_error)
1536 {
1537 type = Gtk.MessageType.ERROR;
1538- image_id = Gtk.Stock.DIALOG_ERROR;
1539+ image_id = "dialog-error";
1540 title = error_title;
1541 text = error_text;
1542 show_close_button = true;
1543@@ -271,7 +271,7 @@
1544 else if (device_model.iter_n_children (null) == 0)
1545 {
1546 type = Gtk.MessageType.WARNING;
1547- image_id = Gtk.Stock.DIALOG_WARNING;
1548+ image_id = "dialog-warning";
1549 /* Warning displayed when no scanners are detected */
1550 title = _("No scanners detected");
1551 /* Hint to user on why there are no scanners detected */
1552@@ -284,7 +284,7 @@
1553 }
1554
1555 info_bar.set_message_type (type);
1556- info_bar_image.set_from_stock (image_id, Gtk.IconSize.DIALOG);
1557+ info_bar_image.set_from_icon_name (image_id, Gtk.IconSize.DIALOG);
1558 var message = "<big><b>%s</b></big>\n\n%s".printf (title, text);
1559 info_bar_label.set_markup (message);
1560 info_bar_close_button.set_visible (show_close_button);
1561@@ -414,8 +414,8 @@
1562 _("Save As..."),
1563 window,
1564 Gtk.FileChooserAction.SAVE,
1565- Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL,
1566- Gtk.Stock.SAVE, Gtk.ResponseType.ACCEPT,
1567+ _("_Cancel"), Gtk.ResponseType.CANCEL,
1568+ _("_Save"), Gtk.ResponseType.ACCEPT,
1569 null);
1570 save_dialog.set_do_overwrite_confirmation (true);
1571 save_dialog.set_local_only (false);
1572@@ -576,8 +576,8 @@
1573 /* Text in dialog warning when a document is about to be lost*/
1574 _("If you don't save, changes will be permanently lost."));
1575 dialog.add_button (discard_label, Gtk.ResponseType.NO);
1576- dialog.add_button (Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL);
1577- dialog.add_button (Gtk.Stock.SAVE, Gtk.ResponseType.YES);
1578+ dialog.add_button (_("_Cancel"), Gtk.ResponseType.CANCEL);
1579+ dialog.add_button (_("_Save"), Gtk.ResponseType.YES);
1580
1581 var response = dialog.run ();
1582 dialog.destroy ();
1583@@ -1358,7 +1358,7 @@
1584 window = (Gtk.Window) builder.get_object ("simple_scan_window");
1585 var app = Application.get_default () as Gtk.Application;
1586 app.add_window (window);
1587- main_vbox = (Gtk.VBox) builder.get_object ("main_vbox");
1588+ main_vbox = (Gtk.Box) builder.get_object ("main_vbox");
1589 page_move_left_menuitem = (Gtk.MenuItem) builder.get_object ("page_move_left_menuitem");
1590 page_move_right_menuitem = (Gtk.MenuItem) builder.get_object ("page_move_right_menuitem");
1591 page_delete_menuitem = (Gtk.MenuItem) builder.get_object ("page_delete_menuitem");
1592@@ -1407,7 +1407,7 @@
1593 content_area.add (hbox);
1594 hbox.show ();
1595
1596- info_bar_image = new Gtk.Image.from_stock (Gtk.Stock.DIALOG_WARNING, Gtk.IconSize.DIALOG);
1597+ info_bar_image = new Gtk.Image.from_icon_name ("dialog-warning", Gtk.IconSize.DIALOG);
1598 hbox.pack_start (info_bar_image, false, true, 0);
1599 info_bar_image.show ();
1600
1601@@ -1416,7 +1416,7 @@
1602 hbox.pack_start (info_bar_label, true, true, 0);
1603 info_bar_label.show ();
1604
1605- info_bar_close_button = (Gtk.Button) info_bar.add_button (Gtk.Stock.CLOSE, Gtk.ResponseType.CLOSE);
1606+ info_bar_close_button = (Gtk.Button) info_bar.add_button (_("_Close"), Gtk.ResponseType.CLOSE);
1607 info_bar_change_scanner_button = (Gtk.Button) info_bar.add_button (/* Button in error infobar to open preferences dialog and change scanner */
1608 _("Change _Scanner"), 1);
1609

Subscribers

People subscribed via source and target branches