Merge lp:~khaeru/gtg/bugfix-lp-492713 into lp:~gtg/gtg/old-trunk
- bugfix-lp-492713
- Merge into old-trunk
Proposed by
Paul Natsuo Kishimoto
Status: | Merged |
---|---|
Merged at revision: | not available |
Proposed branch: | lp:~khaeru/gtg/bugfix-lp-492713 |
Merge into: | lp:~gtg/gtg/old-trunk |
Diff against target: |
225 lines (+59/-30) 4 files modified
GTG/plugins/rtm_sync/rtm.ui (+5/-3) GTG/plugins/rtm_sync/rtm_sync.py (+2/-2) GTG/taskbrowser/taskbrowser.glade (+38/-17) GTG/taskeditor/taskeditor.glade (+14/-8) |
To merge this branch: | bzr merge lp:~khaeru/gtg/bugfix-lp-492713 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Luca Invernizzi (community) | Approve | ||
Review via email: mp+19524@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
Paul Natsuo Kishimoto (khaeru) wrote : | # |
Revision history for this message
Luca Invernizzi (invernizzi) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'GTG/plugins/rtm_sync/rtm.ui' |
2 | --- GTG/plugins/rtm_sync/rtm.ui 2009-12-22 20:48:13 +0000 |
3 | +++ GTG/plugins/rtm_sync/rtm.ui 2010-02-17 19:30:26 +0000 |
4 | @@ -1,6 +1,6 @@ |
5 | <?xml version="1.0"?> |
6 | <interface> |
7 | - <!-- interface-requires gtk+ 2.12 --> |
8 | + <requires lib="gtk+" version="2.16"/> |
9 | <!-- interface-naming-policy toplevel-contextual --> |
10 | <object class="GtkDialog" id="dialogtoken"> |
11 | <property name="width_request">500</property> |
12 | @@ -25,9 +25,11 @@ |
13 | <object class="GtkLabel" id="lbl_title_t"> |
14 | <property name="visible">True</property> |
15 | <property name="ypad">6</property> |
16 | - <property name="label"><b>Remember the milk</b></property> |
17 | - <property name="use_markup">True</property> |
18 | + <property name="label">Remember the milk</property> |
19 | <property name="justify">center</property> |
20 | + <attributes> |
21 | + <attribute name="weight" value="bold"/> |
22 | + </attributes> |
23 | </object> |
24 | <packing> |
25 | <property name="expand">False</property> |
26 | |
27 | === modified file 'GTG/plugins/rtm_sync/rtm_sync.py' |
28 | --- GTG/plugins/rtm_sync/rtm_sync.py 2010-02-11 10:53:11 +0000 |
29 | +++ GTG/plugins/rtm_sync/rtm_sync.py 2010-02-17 19:30:26 +0000 |
30 | @@ -185,8 +185,8 @@ |
31 | if login == False: |
32 | if not self.firstime: |
33 | self.callback = self.close_dialog |
34 | - self.loadDialogToken(_("<b>Authentication failed</b>.\ |
35 | -Please retry.")) |
36 | + self.loadDialogToken("<b>%s</b> %s" % ( |
37 | + _("Authentication failed."), _("Please retry."))) |
38 | else: |
39 | self.callback = self.close_dialog |
40 | self.callback = self.checkLoginBtn |
41 | |
42 | === modified file 'GTG/taskbrowser/taskbrowser.glade' |
43 | --- GTG/taskbrowser/taskbrowser.glade 2010-02-16 22:21:18 +0000 |
44 | +++ GTG/taskbrowser/taskbrowser.glade 2010-02-17 19:30:26 +0000 |
45 | @@ -624,36 +624,58 @@ |
46 | <property name="has_separator">False</property> |
47 | <signal name="close" handler="on_delete_cancel"/> |
48 | <child internal-child="vbox"> |
49 | - <object class="GtkVBox" id="dialog-vbox1"> |
50 | + <object class="GtkVBox" id="cd-vbox1"> |
51 | <property name="visible">True</property> |
52 | <property name="orientation">vertical</property> |
53 | <property name="spacing">2</property> |
54 | <child> |
55 | - <object class="GtkHBox" id="hbox3"> |
56 | + <object class="GtkHBox" id="cd-hbox1"> |
57 | <property name="visible">True</property> |
58 | <child> |
59 | <object class="GtkImage" id="cd_img_ask"> |
60 | <property name="visible">True</property> |
61 | + <property name="yalign">0</property> |
62 | + <property name="xpad">16</property> |
63 | <property name="stock">gtk-dialog-question</property> |
64 | <property name="icon-size">6</property> |
65 | </object> |
66 | <packing> |
67 | - <property name="fill">False</property> |
68 | - <property name="padding">16</property> |
69 | <property name="position">0</property> |
70 | </packing> |
71 | </child> |
72 | <child> |
73 | - <object class="GtkLabel" id="label1"> |
74 | + <object class="GtkVBox" id="cd-vbox2"> |
75 | <property name="visible">True</property> |
76 | - <property name="label" translatable="yes"><span weight="bold" size="large">Are you sure you want delete these tasks?</span> |
77 | - |
78 | -Deleting a task cannot be undone, and will delete the following tasks: </property> |
79 | - <property name="use_markup">True</property> |
80 | - <property name="wrap">True</property> |
81 | + <property name="orientation">vertical</property> |
82 | + <property name="spacing">16</property> |
83 | + <child> |
84 | + <object class="GtkLabel" id="cd-label2"> |
85 | + <property name="visible">True</property> |
86 | + <property name="label" translatable="yes">Are you sure you want to delete these tasks?</property> |
87 | + <attributes> |
88 | + <attribute name="weight" value="bold"/> |
89 | + <attribute name="scale" value="1.200000"/> |
90 | + </attributes> |
91 | + </object> |
92 | + <packing> |
93 | + <property name="expand">False</property> |
94 | + <property name="position">0</property> |
95 | + </packing> |
96 | + </child> |
97 | + <child> |
98 | + <object class="GtkLabel" id="label1"> |
99 | + <property name="visible">True</property> |
100 | + <property name="yalign">0</property> |
101 | + <property name="label" translatable="yes">Deleting a task cannot be undone, and will delete the following tasks: </property> |
102 | + <property name="wrap">True</property> |
103 | + <property name="wrap_mode">word-char</property> |
104 | + </object> |
105 | + <packing> |
106 | + <property name="position">1</property> |
107 | + </packing> |
108 | + </child> |
109 | </object> |
110 | <packing> |
111 | - <property name="padding">16</property> |
112 | <property name="position">1</property> |
113 | </packing> |
114 | </child> |
115 | @@ -664,7 +686,7 @@ |
116 | </packing> |
117 | </child> |
118 | <child internal-child="action_area"> |
119 | - <object class="GtkHButtonBox" id="dialog-action_area1"> |
120 | + <object class="GtkHButtonBox" id="cd-action_area1"> |
121 | <property name="visible">True</property> |
122 | <property name="layout_style">end</property> |
123 | <child> |
124 | @@ -674,7 +696,7 @@ |
125 | <property name="receives_default">True</property> |
126 | <signal name="released" handler="on_delete_cancel"/> |
127 | <child> |
128 | - <object class="GtkHBox" id="hbox1"> |
129 | + <object class="GtkHBox" id="cd-hbox2"> |
130 | <property name="visible">True</property> |
131 | <child> |
132 | <object class="GtkImage" id="cd_img_keep"> |
133 | @@ -686,7 +708,7 @@ |
134 | </packing> |
135 | </child> |
136 | <child> |
137 | - <object class="GtkLabel" id="label2"> |
138 | + <object class="GtkLabel" id="cd-label3"> |
139 | <property name="visible">True</property> |
140 | <property name="xalign">0</property> |
141 | <property name="label" translatable="yes">_Keep selected tasks</property> |
142 | @@ -713,7 +735,7 @@ |
143 | <signal name="released" handler="on_delete_confirm"/> |
144 | <signal name="activate" handler="on_delete_confirm"/> |
145 | <child> |
146 | - <object class="GtkHBox" id="hbox2"> |
147 | + <object class="GtkHBox" id="cd-hbox3"> |
148 | <property name="visible">True</property> |
149 | <child> |
150 | <object class="GtkImage" id="cd_img_delete"> |
151 | @@ -725,7 +747,7 @@ |
152 | </packing> |
153 | </child> |
154 | <child> |
155 | - <object class="GtkLabel" id="label3"> |
156 | + <object class="GtkLabel" id="cd-label4"> |
157 | <property name="visible">True</property> |
158 | <property name="label" translatable="yes">Permanently _remove tasks</property> |
159 | <property name="use_underline">True</property> |
160 | @@ -865,7 +887,6 @@ |
161 | <property name="label" translatable="yes">_Schedule for...</property> |
162 | <property name="visible">True</property> |
163 | <property name="use_underline">True</property> |
164 | - <property name="submenu">ScheduleForContextMenu</property> |
165 | <property name="use_stock">False</property> |
166 | </object> |
167 | </child> |
168 | |
169 | === modified file 'GTG/taskeditor/taskeditor.glade' |
170 | --- GTG/taskeditor/taskeditor.glade 2010-02-07 12:34:08 +0000 |
171 | +++ GTG/taskeditor/taskeditor.glade 2010-02-17 19:30:26 +0000 |
172 | @@ -160,8 +160,10 @@ |
173 | <object class="GtkLabel" id="label2"> |
174 | <property name="visible">True</property> |
175 | <property name="xalign">0</property> |
176 | - <property name="label" translatable="yes"><span weight="bold">Starting on</span></property> |
177 | - <property name="use_markup">True</property> |
178 | + <property name="label" translatable="yes">Starting on</property> |
179 | + <attributes> |
180 | + <attribute name="weight" value="bold"/> |
181 | + </attributes> |
182 | </object> |
183 | <packing> |
184 | <property name="expand">False</property> |
185 | @@ -214,8 +216,10 @@ |
186 | <object class="GtkLabel" id="label3"> |
187 | <property name="visible">True</property> |
188 | <property name="xalign">0</property> |
189 | - <property name="label" translatable="yes"><span weight="bold">Due for</span></property> |
190 | - <property name="use_markup">True</property> |
191 | + <property name="label" translatable="yes">Due for</property> |
192 | + <attributes> |
193 | + <attribute name="weight" value="bold"/> |
194 | + </attributes> |
195 | </object> |
196 | <packing> |
197 | <property name="expand">False</property> |
198 | @@ -264,13 +268,15 @@ |
199 | <property name="expand">False</property> |
200 | <property name="position">3</property> |
201 | </packing> |
202 | - </child> |
203 | + </child> |
204 | <child> |
205 | <object class="GtkLabel" id="label4"> |
206 | <property name="visible">True</property> |
207 | <property name="xalign">0</property> |
208 | - <property name="label" translatable="yes"><span weight="bold">Closed on</span></property> |
209 | - <property name="use_markup">True</property> |
210 | + <property name="label" translatable="yes">Closed on</property> |
211 | + <attributes> |
212 | + <attribute name="weight" value="bold"/> |
213 | + </attributes> |
214 | </object> |
215 | <packing> |
216 | <property name="expand">False</property> |
217 | @@ -319,7 +325,7 @@ |
218 | <property name="expand">False</property> |
219 | <property name="position">5</property> |
220 | </packing> |
221 | - </child> |
222 | + </child> |
223 | <child> |
224 | <object class="GtkLabel" id="dayleft"> |
225 | <property name="visible">True</property> |
Fixes bug #492713.