Merge lp:~nico-inattendu/luciole/bug_740324 into lp:luciole
- bug_740324
- Merge into 0.9
Proposed by
NicoInattendu
Status: | Merged |
---|---|
Approved by: | NicoInattendu |
Approved revision: | 130 |
Merged at revision: | 130 |
Proposed branch: | lp:~nico-inattendu/luciole/bug_740324 |
Merge into: | lp:luciole |
Diff against target: |
394 lines (+115/-37) 5 files modified
luciole/gui/actions.py (+44/-7) luciole/gui/constants.py (+3/-0) luciole/po/POTFILES.in (+4/-5) luciole/ui/luciole.glade (+59/-20) luciole/version.py (+5/-5) |
To merge this branch: | bzr merge lp:~nico-inattendu/luciole/bug_740324 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
NicoInattendu | Pending | ||
Review via email: mp+54824@code.launchpad.net |
Commit message
fix for bug #740324. : About window added, actions report a bug, ask a question and help translate also added.
Description of the change
fix for bug #740324.
About window added, actions report a bug, ask a question and help translate also added.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'luciole/gui/actions.py' | |||
2 | --- luciole/gui/actions.py 2011-03-05 13:59:13 +0000 | |||
3 | +++ luciole/gui/actions.py 2011-03-25 09:26:06 +0000 | |||
4 | @@ -3,7 +3,7 @@ | |||
5 | 3 | # -*- Mode: Python -*- | 3 | # -*- Mode: Python -*- |
6 | 4 | # vim:si:ai:et:sw=4:sts=4:ts=4 | 4 | # vim:si:ai:et:sw=4:sts=4:ts=4 |
7 | 5 | # | 5 | # |
9 | 6 | # Copyright Nicolas Bertrand (nico@inattendu.org), 2010 | 6 | # Copyright Nicolas Bertrand (nico@inattendu.org), 2010-2011 |
10 | 7 | # | 7 | # |
11 | 8 | # This file is part of Luciole. | 8 | # This file is part of Luciole. |
12 | 9 | # | 9 | # |
13 | @@ -27,6 +27,7 @@ | |||
14 | 27 | """ | 27 | """ |
15 | 28 | # standard library imports | 28 | # standard library imports |
16 | 29 | from gettext import gettext as _ | 29 | from gettext import gettext as _ |
17 | 30 | import webbrowser | ||
18 | 30 | 31 | ||
19 | 31 | # related third party imports | 32 | # related third party imports |
20 | 32 | import gobject | 33 | import gobject |
21 | @@ -38,7 +39,7 @@ | |||
22 | 38 | import luciole.gui.constants as GUI_CONST | 39 | import luciole.gui.constants as GUI_CONST |
23 | 39 | import luciole.constants as LCONST | 40 | import luciole.constants as LCONST |
24 | 40 | from luciole.gui.windows.export_video_window import ExportVideoWindow | 41 | from luciole.gui.windows.export_video_window import ExportVideoWindow |
26 | 41 | 42 | from luciole.info import REVNO, VERSION | |
27 | 42 | _tv_change_signal = 'treeview-change' | 43 | _tv_change_signal = 'treeview-change' |
28 | 43 | _tv_selected_signal = 'treeview-selected' | 44 | _tv_selected_signal = 'treeview-selected' |
29 | 44 | 45 | ||
30 | @@ -183,6 +184,12 @@ | |||
31 | 183 | self._preferences_cb), | 184 | self._preferences_cb), |
32 | 184 | (self.builder_actions[GUI_CONST.ACTION_ABOUT], | 185 | (self.builder_actions[GUI_CONST.ACTION_ABOUT], |
33 | 185 | self._about_cb), | 186 | self._about_cb), |
34 | 187 | (self.builder_actions[GUI_CONST.ACTION_BUG], | ||
35 | 188 | self._bug_cb), | ||
36 | 189 | (self.builder_actions[GUI_CONST.ACTION_ASK], | ||
37 | 190 | self._ask_cb), | ||
38 | 191 | (self.builder_actions[GUI_CONST.ACTION_I18N], | ||
39 | 192 | self._i18n_cb), | ||
40 | 186 | ] | 193 | ] |
41 | 187 | 194 | ||
42 | 188 | # | 195 | # |
43 | @@ -457,11 +464,41 @@ | |||
44 | 457 | pass | 464 | pass |
45 | 458 | 465 | ||
46 | 459 | def _about_cb(self, action ) : | 466 | def _about_cb(self, action ) : |
52 | 460 | # TODO : implement About dialog | 467 | _ver = "%s (%s)"%(VERSION, REVNO) |
53 | 461 | pass | 468 | self.debug('show about dialog: version %s', _ver) |
54 | 462 | 469 | self.gui.windows.about(_ver) | |
55 | 463 | 470 | ||
56 | 464 | 471 | def _bug_cb(self, action ) : | |
57 | 472 | """ report bug action """ | ||
58 | 473 | self.debug('Report bug action') | ||
59 | 474 | try: | ||
60 | 475 | webbrowser.open("https://bugs.launchpad.net/luciole/+filebug") | ||
61 | 476 | except: | ||
62 | 477 | _msg = _("Unable to open the Launchpad web page.") | ||
63 | 478 | self.warning(_msg) | ||
64 | 479 | self.gui.windows.error_message(_msg) | ||
65 | 480 | |||
66 | 481 | def _ask_cb(self, action ) : | ||
67 | 482 | """ ask a question action """ | ||
68 | 483 | self.debug('Ask a question action') | ||
69 | 484 | try: | ||
70 | 485 | webbrowser.open("https://answers.launchpad.net/luciole/+addquestion") | ||
71 | 486 | except: | ||
72 | 487 | _msg = _("Unable to open the Launchpad web page.") | ||
73 | 488 | self.warning(_msg) | ||
74 | 489 | self.gui.windows.error_message(_msg) | ||
75 | 490 | |||
76 | 491 | def _i18n_cb(self, action ) : | ||
77 | 492 | """ Help trranslate action """ | ||
78 | 493 | self.debug('Help translate action') | ||
79 | 494 | try: | ||
80 | 495 | webbrowser.open("https://translations.launchpad.net/luciole") | ||
81 | 496 | except: | ||
82 | 497 | _msg = _("Unable to open the Launchpad web page.") | ||
83 | 498 | self.warning(_msg) | ||
84 | 499 | self.gui.windows.error_message(_msg) | ||
85 | 500 | |||
86 | 501 | |||
87 | 465 | # | 502 | # |
88 | 466 | # project common callbacks | 503 | # project common callbacks |
89 | 467 | # | 504 | # |
90 | 468 | 505 | ||
91 | === modified file 'luciole/gui/constants.py' | |||
92 | --- luciole/gui/constants.py 2011-02-27 18:32:53 +0000 | |||
93 | +++ luciole/gui/constants.py 2011-03-25 09:26:06 +0000 | |||
94 | @@ -64,6 +64,9 @@ | |||
95 | 64 | ACTION_PREFERENCES = "ActionPreferences" | 64 | ACTION_PREFERENCES = "ActionPreferences" |
96 | 65 | ACTION_OPEN = "ActionOpen" | 65 | ACTION_OPEN = "ActionOpen" |
97 | 66 | ACTION_NEW = "ActionNew" | 66 | ACTION_NEW = "ActionNew" |
98 | 67 | ACTION_BUG = "ActionReportBug" | ||
99 | 68 | ACTION_ASK = "ActionAsk" | ||
100 | 69 | ACTION_I18N = "ActionTranslate" | ||
101 | 67 | 70 | ||
102 | 68 | ACTION_CLOSE = "ActionClose" | 71 | ACTION_CLOSE = "ActionClose" |
103 | 69 | ACTION_SAVE = "ActionSave" | 72 | ACTION_SAVE = "ActionSave" |
104 | 70 | 73 | ||
105 | === modified file 'luciole/po/POTFILES.in' | |||
106 | --- luciole/po/POTFILES.in 2010-09-06 12:10:40 +0000 | |||
107 | +++ luciole/po/POTFILES.in 2011-03-25 09:26:06 +0000 | |||
108 | @@ -1,15 +1,12 @@ | |||
109 | 1 | [encoding: UTF-8] | 1 | [encoding: UTF-8] |
110 | 2 | ../luciole/ui/luciole.glade | ||
111 | 3 | ../luciole/ui/export_file.glade | ||
112 | 4 | ../luciole/base/lcl_et.py | 2 | ../luciole/base/lcl_et.py |
113 | 5 | ../luciole/conf.py | 3 | ../luciole/conf.py |
114 | 6 | ../luciole/constants.py | 4 | ../luciole/constants.py |
115 | 7 | ../luciole/ctrl/ctrl.py | ||
116 | 8 | ../luciole/ctrl/import_image.py | 5 | ../luciole/ctrl/import_image.py |
117 | 9 | ../luciole/ctrl/load_rush.py | 6 | ../luciole/ctrl/load_rush.py |
120 | 10 | ../luciole/ctrl/project_ctrl.py | 7 | ../luciole/ctrl/ctrl_project.py |
119 | 11 | ../luciole/ctrl/viewer_ctrl.py | ||
121 | 12 | ../luciole/gui/control_widget.py | 8 | ../luciole/gui/control_widget.py |
122 | 9 | ../luciole/gui/windows/actions.py | ||
123 | 13 | ../luciole/gui/windows/assistant_new_project.py | 10 | ../luciole/gui/windows/assistant_new_project.py |
124 | 14 | ../luciole/gui/windows/dialog_project_properties.py | 11 | ../luciole/gui/windows/dialog_project_properties.py |
125 | 15 | ../luciole/gui/windows/dialog.py | 12 | ../luciole/gui/windows/dialog.py |
126 | @@ -22,3 +19,5 @@ | |||
127 | 22 | ../luciole/project/export/export_pitivi.py | 19 | ../luciole/project/export/export_pitivi.py |
128 | 23 | ../luciole/project/export/export_tool_base.py | 20 | ../luciole/project/export/export_tool_base.py |
129 | 24 | ../luciole/project/export/export_video.py | 21 | ../luciole/project/export/export_video.py |
130 | 22 | ../luciole/ui/export_file.glade | ||
131 | 23 | ../luciole/ui/luciole.glade | ||
132 | 25 | 24 | ||
133 | === modified file 'luciole/ui/luciole.glade' | |||
134 | --- luciole/ui/luciole.glade 2011-02-28 12:58:02 +0000 | |||
135 | +++ luciole/ui/luciole.glade 2011-03-25 09:26:06 +0000 | |||
136 | @@ -1,4 +1,4 @@ | |||
138 | 1 | <?xml version="1.0"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
139 | 2 | <interface> | 2 | <interface> |
140 | 3 | <requires lib="gtk+" version="2.16"/> | 3 | <requires lib="gtk+" version="2.16"/> |
141 | 4 | <!-- interface-naming-policy toplevel-contextual --> | 4 | <!-- interface-naming-policy toplevel-contextual --> |
142 | @@ -71,8 +71,8 @@ | |||
143 | 71 | <child> | 71 | <child> |
144 | 72 | <object class="GtkImageMenuItem" id="file_new"> | 72 | <object class="GtkImageMenuItem" id="file_new"> |
145 | 73 | <property name="visible">True</property> | 73 | <property name="visible">True</property> |
146 | 74 | <property name="use_action_appearance">True</property> | ||
147 | 75 | <property name="related_action">ActionNew</property> | 74 | <property name="related_action">ActionNew</property> |
148 | 75 | <property name="use_action_appearance">True</property> | ||
149 | 76 | <property name="use_underline">True</property> | 76 | <property name="use_underline">True</property> |
150 | 77 | <property name="use_stock">True</property> | 77 | <property name="use_stock">True</property> |
151 | 78 | <signal name="activate" handler="on_file_new_activate"/> | 78 | <signal name="activate" handler="on_file_new_activate"/> |
152 | @@ -81,8 +81,8 @@ | |||
153 | 81 | <child> | 81 | <child> |
154 | 82 | <object class="GtkImageMenuItem" id="file_open"> | 82 | <object class="GtkImageMenuItem" id="file_open"> |
155 | 83 | <property name="visible">True</property> | 83 | <property name="visible">True</property> |
156 | 84 | <property name="use_action_appearance">True</property> | ||
157 | 85 | <property name="related_action">ActionOpen</property> | 84 | <property name="related_action">ActionOpen</property> |
158 | 85 | <property name="use_action_appearance">True</property> | ||
159 | 86 | <property name="use_underline">True</property> | 86 | <property name="use_underline">True</property> |
160 | 87 | <property name="use_stock">True</property> | 87 | <property name="use_stock">True</property> |
161 | 88 | </object> | 88 | </object> |
162 | @@ -137,8 +137,8 @@ | |||
163 | 137 | <child> | 137 | <child> |
164 | 138 | <object class="GtkImageMenuItem" id="imagemenuitem3"> | 138 | <object class="GtkImageMenuItem" id="imagemenuitem3"> |
165 | 139 | <property name="visible">True</property> | 139 | <property name="visible">True</property> |
166 | 140 | <property name="use_action_appearance">True</property> | ||
167 | 141 | <property name="related_action">ActionSave</property> | 140 | <property name="related_action">ActionSave</property> |
168 | 141 | <property name="use_action_appearance">True</property> | ||
169 | 142 | <property name="use_underline">True</property> | 142 | <property name="use_underline">True</property> |
170 | 143 | <property name="use_stock">True</property> | 143 | <property name="use_stock">True</property> |
171 | 144 | <signal name="activate" handler="on_file_save_activate"/> | 144 | <signal name="activate" handler="on_file_save_activate"/> |
172 | @@ -147,8 +147,8 @@ | |||
173 | 147 | <child> | 147 | <child> |
174 | 148 | <object class="GtkImageMenuItem" id="imagemenuitem4"> | 148 | <object class="GtkImageMenuItem" id="imagemenuitem4"> |
175 | 149 | <property name="visible">True</property> | 149 | <property name="visible">True</property> |
176 | 150 | <property name="use_action_appearance">True</property> | ||
177 | 151 | <property name="related_action">ActionSaveAs</property> | 150 | <property name="related_action">ActionSaveAs</property> |
178 | 151 | <property name="use_action_appearance">True</property> | ||
179 | 152 | <property name="use_underline">True</property> | 152 | <property name="use_underline">True</property> |
180 | 153 | <property name="use_stock">True</property> | 153 | <property name="use_stock">True</property> |
181 | 154 | <signal name="activate" handler="on_file_save_as_activate"/> | 154 | <signal name="activate" handler="on_file_save_as_activate"/> |
182 | @@ -162,8 +162,8 @@ | |||
183 | 162 | <child> | 162 | <child> |
184 | 163 | <object class="GtkImageMenuItem" id="file_import"> | 163 | <object class="GtkImageMenuItem" id="file_import"> |
185 | 164 | <property name="visible">True</property> | 164 | <property name="visible">True</property> |
186 | 165 | <property name="use_action_appearance">True</property> | ||
187 | 166 | <property name="related_action">ActionImportImage</property> | 165 | <property name="related_action">ActionImportImage</property> |
188 | 166 | <property name="use_action_appearance">True</property> | ||
189 | 167 | <property name="use_underline">True</property> | 167 | <property name="use_underline">True</property> |
190 | 168 | <property name="use_stock">True</property> | 168 | <property name="use_stock">True</property> |
191 | 169 | <signal name="activate" handler="on_file_import_activate"/> | 169 | <signal name="activate" handler="on_file_import_activate"/> |
192 | @@ -172,8 +172,8 @@ | |||
193 | 172 | <child> | 172 | <child> |
194 | 173 | <object class="GtkImageMenuItem" id="file_export"> | 173 | <object class="GtkImageMenuItem" id="file_export"> |
195 | 174 | <property name="visible">True</property> | 174 | <property name="visible">True</property> |
196 | 175 | <property name="use_action_appearance">True</property> | ||
197 | 176 | <property name="related_action">ActionExportVideo</property> | 175 | <property name="related_action">ActionExportVideo</property> |
198 | 176 | <property name="use_action_appearance">True</property> | ||
199 | 177 | <property name="use_underline">True</property> | 177 | <property name="use_underline">True</property> |
200 | 178 | <property name="use_stock">True</property> | 178 | <property name="use_stock">True</property> |
201 | 179 | <signal name="activate" handler="on_file_export_activate"/> | 179 | <signal name="activate" handler="on_file_export_activate"/> |
202 | @@ -182,8 +182,8 @@ | |||
203 | 182 | <child> | 182 | <child> |
204 | 183 | <object class="GtkImageMenuItem" id="file_export_tool"> | 183 | <object class="GtkImageMenuItem" id="file_export_tool"> |
205 | 184 | <property name="visible">True</property> | 184 | <property name="visible">True</property> |
206 | 185 | <property name="use_action_appearance">True</property> | ||
207 | 186 | <property name="related_action">ActionExportTool</property> | 185 | <property name="related_action">ActionExportTool</property> |
208 | 186 | <property name="use_action_appearance">True</property> | ||
209 | 187 | <property name="use_underline">True</property> | 187 | <property name="use_underline">True</property> |
210 | 188 | <property name="use_stock">True</property> | 188 | <property name="use_stock">True</property> |
211 | 189 | <signal name="activate" handler="on_file_export_tool_activate"/> | 189 | <signal name="activate" handler="on_file_export_tool_activate"/> |
212 | @@ -197,8 +197,8 @@ | |||
213 | 197 | <child> | 197 | <child> |
214 | 198 | <object class="GtkImageMenuItem" id="file_close"> | 198 | <object class="GtkImageMenuItem" id="file_close"> |
215 | 199 | <property name="visible">True</property> | 199 | <property name="visible">True</property> |
216 | 200 | <property name="use_action_appearance">True</property> | ||
217 | 201 | <property name="related_action">ActionClose</property> | 200 | <property name="related_action">ActionClose</property> |
218 | 201 | <property name="use_action_appearance">True</property> | ||
219 | 202 | <property name="use_underline">True</property> | 202 | <property name="use_underline">True</property> |
220 | 203 | <property name="use_stock">True</property> | 203 | <property name="use_stock">True</property> |
221 | 204 | <signal name="activate" handler="on_file_close_activate"/> | 204 | <signal name="activate" handler="on_file_close_activate"/> |
222 | @@ -207,8 +207,8 @@ | |||
223 | 207 | <child> | 207 | <child> |
224 | 208 | <object class="GtkImageMenuItem" id="imagemenuitem5"> | 208 | <object class="GtkImageMenuItem" id="imagemenuitem5"> |
225 | 209 | <property name="visible">True</property> | 209 | <property name="visible">True</property> |
226 | 210 | <property name="use_action_appearance">True</property> | ||
227 | 211 | <property name="related_action">ActionQuit</property> | 210 | <property name="related_action">ActionQuit</property> |
228 | 211 | <property name="use_action_appearance">True</property> | ||
229 | 212 | <property name="use_underline">True</property> | 212 | <property name="use_underline">True</property> |
230 | 213 | <property name="use_stock">True</property> | 213 | <property name="use_stock">True</property> |
231 | 214 | <signal name="activate" handler="on_file_quit_activate"/> | 214 | <signal name="activate" handler="on_file_quit_activate"/> |
232 | @@ -229,8 +229,8 @@ | |||
233 | 229 | <child> | 229 | <child> |
234 | 230 | <object class="GtkImageMenuItem" id="view_project"> | 230 | <object class="GtkImageMenuItem" id="view_project"> |
235 | 231 | <property name="visible">True</property> | 231 | <property name="visible">True</property> |
236 | 232 | <property name="use_action_appearance">True</property> | ||
237 | 233 | <property name="related_action">ActionProjectProperties</property> | 232 | <property name="related_action">ActionProjectProperties</property> |
238 | 233 | <property name="use_action_appearance">True</property> | ||
239 | 234 | <property name="use_underline">True</property> | 234 | <property name="use_underline">True</property> |
240 | 235 | <property name="use_stock">True</property> | 235 | <property name="use_stock">True</property> |
241 | 236 | <signal name="activate" handler="on_view_project_activate"/> | 236 | <signal name="activate" handler="on_view_project_activate"/> |
242 | @@ -239,8 +239,8 @@ | |||
243 | 239 | <child> | 239 | <child> |
244 | 240 | <object class="GtkImageMenuItem" id="Preferences_menu"> | 240 | <object class="GtkImageMenuItem" id="Preferences_menu"> |
245 | 241 | <property name="visible">True</property> | 241 | <property name="visible">True</property> |
246 | 242 | <property name="use_action_appearance">True</property> | ||
247 | 243 | <property name="related_action">ActionPreferences</property> | 242 | <property name="related_action">ActionPreferences</property> |
248 | 243 | <property name="use_action_appearance">True</property> | ||
249 | 244 | <property name="use_underline">True</property> | 244 | <property name="use_underline">True</property> |
250 | 245 | <property name="use_stock">True</property> | 245 | <property name="use_stock">True</property> |
251 | 246 | <signal name="activate" handler="on_preferences_activate"/> | 246 | <signal name="activate" handler="on_preferences_activate"/> |
252 | @@ -261,8 +261,8 @@ | |||
253 | 261 | <child> | 261 | <child> |
254 | 262 | <object class="GtkRadioMenuItem" id="start_stop_acqusition_item"> | 262 | <object class="GtkRadioMenuItem" id="start_stop_acqusition_item"> |
255 | 263 | <property name="visible">True</property> | 263 | <property name="visible">True</property> |
256 | 264 | <property name="use_action_appearance">True</property> | ||
257 | 265 | <property name="related_action">start_stop_acquisition</property> | 264 | <property name="related_action">start_stop_acquisition</property> |
258 | 265 | <property name="use_action_appearance">True</property> | ||
259 | 266 | </object> | 266 | </object> |
260 | 267 | </child> | 267 | </child> |
261 | 268 | </object> | 268 | </object> |
262 | @@ -278,10 +278,42 @@ | |||
263 | 278 | <object class="GtkMenu" id="menu3"> | 278 | <object class="GtkMenu" id="menu3"> |
264 | 279 | <property name="visible">True</property> | 279 | <property name="visible">True</property> |
265 | 280 | <child> | 280 | <child> |
266 | 281 | <object class="GtkImageMenuItem" id="mnuReportBug"> | ||
267 | 282 | <property name="visible">True</property> | ||
268 | 283 | <property name="related_action">ActionReportBug</property> | ||
269 | 284 | <property name="use_action_appearance">True</property> | ||
270 | 285 | <property name="use_underline">True</property> | ||
271 | 286 | <property name="use_stock">True</property> | ||
272 | 287 | </object> | ||
273 | 288 | </child> | ||
274 | 289 | <child> | ||
275 | 290 | <object class="GtkImageMenuItem" id="MnuAskQquestion"> | ||
276 | 291 | <property name="visible">True</property> | ||
277 | 292 | <property name="related_action">ActionAsk</property> | ||
278 | 293 | <property name="use_action_appearance">True</property> | ||
279 | 294 | <property name="use_underline">True</property> | ||
280 | 295 | <property name="use_stock">True</property> | ||
281 | 296 | </object> | ||
282 | 297 | </child> | ||
283 | 298 | <child> | ||
284 | 299 | <object class="GtkImageMenuItem" id="mnuTranslate"> | ||
285 | 300 | <property name="visible">True</property> | ||
286 | 301 | <property name="related_action">ActionTranslate</property> | ||
287 | 302 | <property name="use_action_appearance">True</property> | ||
288 | 303 | <property name="use_underline">True</property> | ||
289 | 304 | <property name="use_stock">True</property> | ||
290 | 305 | </object> | ||
291 | 306 | </child> | ||
292 | 307 | <child> | ||
293 | 308 | <object class="GtkSeparatorMenuItem" id="menuitem2"> | ||
294 | 309 | <property name="visible">True</property> | ||
295 | 310 | </object> | ||
296 | 311 | </child> | ||
297 | 312 | <child> | ||
298 | 281 | <object class="GtkImageMenuItem" id="help_about"> | 313 | <object class="GtkImageMenuItem" id="help_about"> |
299 | 282 | <property name="visible">True</property> | 314 | <property name="visible">True</property> |
300 | 283 | <property name="use_action_appearance">True</property> | ||
301 | 284 | <property name="related_action">ActionAbout</property> | 315 | <property name="related_action">ActionAbout</property> |
302 | 316 | <property name="use_action_appearance">True</property> | ||
303 | 285 | <property name="use_underline">True</property> | 317 | <property name="use_underline">True</property> |
304 | 286 | <property name="use_stock">True</property> | 318 | <property name="use_stock">True</property> |
305 | 287 | <signal name="activate" handler="on_help_about_activate"/> | 319 | <signal name="activate" handler="on_help_about_activate"/> |
306 | @@ -665,7 +697,6 @@ | |||
307 | 665 | <property name="title" translatable="yes">Select a Luciole project</property> | 697 | <property name="title" translatable="yes">Select a Luciole project</property> |
308 | 666 | <property name="window_position">center-on-parent</property> | 698 | <property name="window_position">center-on-parent</property> |
309 | 667 | <property name="type_hint">menu</property> | 699 | <property name="type_hint">menu</property> |
310 | 668 | <property name="has_separator">False</property> | ||
311 | 669 | <child internal-child="vbox"> | 700 | <child internal-child="vbox"> |
312 | 670 | <object class="GtkVBox" id="dialog-vbox1"> | 701 | <object class="GtkVBox" id="dialog-vbox1"> |
313 | 671 | <property name="visible">True</property> | 702 | <property name="visible">True</property> |
314 | @@ -700,7 +731,6 @@ | |||
315 | 700 | <property name="resizable">False</property> | 731 | <property name="resizable">False</property> |
316 | 701 | <property name="window_position">center-on-parent</property> | 732 | <property name="window_position">center-on-parent</property> |
317 | 702 | <property name="type_hint">dialog</property> | 733 | <property name="type_hint">dialog</property> |
318 | 703 | <property name="has_separator">False</property> | ||
319 | 704 | <property name="program_name">Luciole</property> | 734 | <property name="program_name">Luciole</property> |
320 | 705 | <property name="version">0.8</property> | 735 | <property name="version">0.8</property> |
321 | 706 | <property name="copyright" translatable="yes">Copyright 2009-2010 Nicolas Bertrand (nico@inattendu.org)</property> | 736 | <property name="copyright" translatable="yes">Copyright 2009-2010 Nicolas Bertrand (nico@inattendu.org)</property> |
322 | @@ -763,7 +793,6 @@ | |||
323 | 763 | <property name="title" translatable="yes">Video Export</property> | 793 | <property name="title" translatable="yes">Video Export</property> |
324 | 764 | <property name="window_position">center-on-parent</property> | 794 | <property name="window_position">center-on-parent</property> |
325 | 765 | <property name="type_hint">dialog</property> | 795 | <property name="type_hint">dialog</property> |
326 | 766 | <property name="has_separator">False</property> | ||
327 | 767 | <child internal-child="vbox"> | 796 | <child internal-child="vbox"> |
328 | 768 | <object class="GtkVBox" id="dialog-vbox11"> | 797 | <object class="GtkVBox" id="dialog-vbox11"> |
329 | 769 | <property name="visible">True</property> | 798 | <property name="visible">True</property> |
330 | @@ -1044,9 +1073,9 @@ | |||
331 | 1044 | <object class="GtkFileChooserButton" id="filechooserbutton1"> | 1073 | <object class="GtkFileChooserButton" id="filechooserbutton1"> |
332 | 1045 | <property name="visible">True</property> | 1074 | <property name="visible">True</property> |
333 | 1046 | <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> | 1075 | <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
334 | 1076 | <property name="action">select-folder</property> | ||
335 | 1047 | <property name="do_overwrite_confirmation">True</property> | 1077 | <property name="do_overwrite_confirmation">True</property> |
336 | 1048 | <property name="use_preview_label">False</property> | 1078 | <property name="use_preview_label">False</property> |
337 | 1049 | <property name="action">select-folder</property> | ||
338 | 1050 | <property name="title" translatable="yes">Select a folder</property> | 1079 | <property name="title" translatable="yes">Select a folder</property> |
339 | 1051 | </object> | 1080 | </object> |
340 | 1052 | <packing> | 1081 | <packing> |
341 | @@ -1268,7 +1297,6 @@ | |||
342 | 1268 | <property name="border_width">5</property> | 1297 | <property name="border_width">5</property> |
343 | 1269 | <property name="window_position">center-on-parent</property> | 1298 | <property name="window_position">center-on-parent</property> |
344 | 1270 | <property name="type_hint">dialog</property> | 1299 | <property name="type_hint">dialog</property> |
345 | 1271 | <property name="has_separator">False</property> | ||
346 | 1272 | <child internal-child="vbox"> | 1300 | <child internal-child="vbox"> |
347 | 1273 | <object class="GtkVBox" id="dialog-vbox4"> | 1301 | <object class="GtkVBox" id="dialog-vbox4"> |
348 | 1274 | <property name="visible">True</property> | 1302 | <property name="visible">True</property> |
349 | @@ -1304,7 +1332,6 @@ | |||
350 | 1304 | <property name="title" translatable="yes">Preferences</property> | 1332 | <property name="title" translatable="yes">Preferences</property> |
351 | 1305 | <property name="window_position">center-on-parent</property> | 1333 | <property name="window_position">center-on-parent</property> |
352 | 1306 | <property name="type_hint">dialog</property> | 1334 | <property name="type_hint">dialog</property> |
353 | 1307 | <property name="has_separator">False</property> | ||
354 | 1308 | <child internal-child="vbox"> | 1335 | <child internal-child="vbox"> |
355 | 1309 | <object class="GtkVBox" id="dialog-vbox3"> | 1336 | <object class="GtkVBox" id="dialog-vbox3"> |
356 | 1310 | <property name="height_request">269</property> | 1337 | <property name="height_request">269</property> |
357 | @@ -1550,4 +1577,16 @@ | |||
358 | 1550 | <object class="GtkAction" id="ActionProjectProperties"> | 1577 | <object class="GtkAction" id="ActionProjectProperties"> |
359 | 1551 | <property name="stock_id">gtk-properties</property> | 1578 | <property name="stock_id">gtk-properties</property> |
360 | 1552 | </object> | 1579 | </object> |
361 | 1580 | <object class="GtkAction" id="ActionReportBug"> | ||
362 | 1581 | <property name="label">_Report a Bug...</property> | ||
363 | 1582 | <property name="stock_id">gtk-dialog-warning</property> | ||
364 | 1583 | </object> | ||
365 | 1584 | <object class="GtkAction" id="ActionAsk"> | ||
366 | 1585 | <property name="label">_Ask a Question...</property> | ||
367 | 1586 | <property name="stock_id">gtk-dialog-question</property> | ||
368 | 1587 | </object> | ||
369 | 1588 | <object class="GtkAction" id="ActionTranslate"> | ||
370 | 1589 | <property name="label">_Translate this Application...</property> | ||
371 | 1590 | <property name="stock_id">gtk-index</property> | ||
372 | 1591 | </object> | ||
373 | 1553 | </interface> | 1592 | </interface> |
374 | 1554 | 1593 | ||
375 | === modified file 'luciole/version.py' | |||
376 | --- luciole/version.py 2010-09-06 11:02:42 +0000 | |||
377 | +++ luciole/version.py 2011-03-25 09:26:06 +0000 | |||
378 | @@ -4,12 +4,12 @@ | |||
379 | 4 | So don't edit it. :) | 4 | So don't edit it. :) |
380 | 5 | """ | 5 | """ |
381 | 6 | 6 | ||
384 | 7 | version_info = {'branch_nick': u'luciole', | 7 | version_info = {'branch_nick': u'bug_740324', |
385 | 8 | 'build_date': '2010-09-06 15:01:02 +0400', | 8 | 'build_date': '2011-03-24 19:11:26 +0100', |
386 | 9 | 'clean': None, | 9 | 'clean': None, |
390 | 10 | 'date': '2010-09-06 13:00:55 +0400', | 10 | 'date': '2011-03-09 15:52:21 +0400', |
391 | 11 | 'revision_id': 'nico@inattendu.org-20100906090055-iafu3ghe623sroam', | 11 | 'revision_id': 'nico@inattendu.org-20110309115221-l1nzqwerhwwcz9jf', |
392 | 12 | 'revno': 117} | 12 | 'revno': 129} |
393 | 13 | 13 | ||
394 | 14 | revisions = {} | 14 | revisions = {} |
395 | 15 | 15 |