Simple Scan

Merge lp://qastaging/~alefteris/simple-scan/stock-menuitems into lp://qastaging/~robert-ancell/simple-scan/trunk

  1. stock-menuitems
  2. Merge into trunk
Proposed by Thanos Lefteris
Status: Merged
Merge reported by: Robert Ancell
Merged at revision: not available
Proposed branch: lp://qastaging/~alefteris/simple-scan/stock-menuitems
Merge into: lp://qastaging/~robert-ancell/simple-scan/trunk
Diff against target: 42 lines (+5/-9)
1 file modified
data/simple-scan.ui (+5/-9)
To merge this branch: bzr merge lp://qastaging/~alefteris/simple-scan/stock-menuitems
Reviewer Review Type Date Requested Status
Robert Ancell Approve
Review via email: mp+19776@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Thanos Lefteris (alefteris) wrote :

Use stock menuitems for preferences and delete to aid translators.

Thanks

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

Thanks Thanos!

review: Approve

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 2010-02-17 22:08:31 +0000
3+++ data/simple-scan.ui 2010-02-20 15:25:25 +0000
4@@ -111,11 +111,10 @@
5 </child>
6 <child>
7 <object class="GtkImageMenuItem" id="preferences_menuitem">
8- <property name="label">Pre_ferences</property>
9+ <property name="label">gtk-preferences</property>
10 <property name="visible">True</property>
11 <property name="use_underline">True</property>
12- <property name="image">preferences_image</property>
13- <property name="use_stock">False</property>
14+ <property name="use_stock">True</property>
15 <signal name="activate" handler="preferences_button_clicked_cb"/>
16 </object>
17 </child>
18@@ -272,10 +271,11 @@
19 </object>
20 </child>
21 <child>
22- <object class="GtkMenuItem" id="page_delete_menuitem">
23+ <object class="GtkImageMenuItem" id="page_delete_menuitem">
24 <property name="visible">True</property>
25- <property name="label" translatable="yes" comments="Label on page delete menuitem">_Delete</property>
26+ <property name="label">gtk-delete</property>
27 <property name="use_underline">True</property>
28+ <property name="use_stock">True</property>
29 <accelerator key="Delete" signal="activate"/>
30 <signal name="activate" handler="page_delete_menuitem_activate_cb"/>
31 </object>
32@@ -872,10 +872,6 @@
33 </object>
34 </child>
35 </object>
36- <object class="GtkImage" id="preferences_image">
37- <property name="visible">True</property>
38- <property name="stock">gtk-preferences</property>
39- </object>
40 <object class="GtkAdjustment" id="preview_adjustment">
41 <property name="upper">100</property>
42 <property name="step_increment">1</property>

Subscribers

People subscribed via source and target branches

to all changes: