Merge lp:~sinzui/ubuntu/oneiric/gedit-developer-plugins/0.5.4-release into lp:ubuntu/oneiric/gedit-developer-plugins
- Oneiric (11.10)
- 0.5.4-release
- Merge into oneiric
Proposed by
Curtis Hovey
Status: | Rejected |
---|---|
Rejected by: | Martin Pitt |
Proposed branch: | lp:~sinzui/ubuntu/oneiric/gedit-developer-plugins/0.5.4-release |
Merge into: | lp:ubuntu/oneiric/gedit-developer-plugins |
Diff against target: |
1447 lines (+293/-214) 13 files modified
ChangeLog (+138/-91) configure (+55/-37) configure.ac (+6/-4) debian/changelog (+6/-0) debian/control (+10/-10) plugins/gdp/bzr.py (+39/-38) plugins/gdp/find.py (+2/-2) plugins/gdp/find.ui (+4/-0) plugins/gdp/format.py (+14/-14) plugins/gdp/syntaxcompleter.py (+7/-5) plugins/gdp/tests/formatter.doctest (+3/-5) po/POTFILES.in (+8/-8) po/POTFILES.skip (+1/-0) |
To merge this branch: | bzr merge lp:~sinzui/ubuntu/oneiric/gedit-developer-plugins/0.5.4-release |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu branches | Pending | ||
Review via email: mp+74628@code.launchpad.net |
Commit message
Description of the change
Merge to 0.5.4 release of gedit-developer
To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote : | # |
Unmerged revisions
- 8. By Curtis Hovey
-
New upstream release 0.5.4.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'ChangeLog' |
2 | --- ChangeLog 2011-07-01 12:36:16 +0000 |
3 | +++ ChangeLog 2011-09-08 15:41:23 +0000 |
4 | @@ -1,5 +1,52 @@ |
5 | <Generated by bzr log --log-format=gnu> |
6 | |
7 | +2011-09-08 Curtis Hovey <sinzui.is@verizon.net> |
8 | + |
9 | + [370] Increment release. |
10 | + |
11 | +2011-09-08 Curtis Hovey <sinzui.is@verizon.net> |
12 | + |
13 | + [369] The user's theme does not support the stock icons. |
14 | + |
15 | +2011-09-07 Curtis Hovey <sinzui.is@verizon.net> |
16 | + |
17 | + [368] Increment version. |
18 | + |
19 | +2011-09-07 Curtis Hovey <sinzui.is@verizon.net> |
20 | + |
21 | + [367] Do not call sizing on a non-sized object. |
22 | + |
23 | +2011-09-07 Curtis Hovey <sinzui.is@verizon.net> |
24 | + |
25 | + [366] Add the required libpeas deps. |
26 | + |
27 | +2011-09-06 Curtis Hovey <sinzui.is@verizon.net> |
28 | + |
29 | + [365] incremented version. |
30 | + |
31 | +2011-09-06 Curtis Hovey <sinzui.is@verizon.net> |
32 | + |
33 | + [364] Restore bzr-gtk integration (running bzr-gtk gtk3 series) |
34 | + Removed data arg from menu callbacks because it is not passed. |
35 | + |
36 | +2011-09-06 Curtis Hovey <sinzui.is@verizon.net> |
37 | + |
38 | + [363] Removed data arg from menu callback because it is no longer |
39 | + passed |
40 | + |
41 | +2011-09-06 Curtis Hovey <sinzui.is@verizon.net> |
42 | + |
43 | + [362] Restored tooltip lost in a previous update. |
44 | + |
45 | +2011-09-06 Curtis Hovey <sinzui.is@verizon.net> |
46 | + |
47 | + [361] Removed data arg from menu callbacks because it is no longer |
48 | + passed. |
49 | + |
50 | +2011-06-30 Curtis Hovey <sinzui.is@verizon.net> |
51 | + |
52 | + [360] Fixed mak dist. |
53 | + |
54 | 2011-06-29 Curtis Hovey <sinzui.is@verizon.net> |
55 | |
56 | [359] Allow users to syntax complete words. |
57 | @@ -86,7 +133,7 @@ |
58 | |
59 | [339] Updated format.ui to gtk3. |
60 | |
61 | -2011-06-18 Curtis Hovey <sinzui.is@verizon.net> |
62 | +2011-06-17 Curtis Hovey <sinzui.is@verizon.net> |
63 | |
64 | [338] Removed diagnostic toolstips. |
65 | |
66 | @@ -99,11 +146,11 @@ |
67 | |
68 | [336] Removed self.windows from the last two plugins. |
69 | |
70 | -2011-06-16 Curtis Hovey <sinzui.is@verizon.net> |
71 | +2011-06-15 Curtis Hovey <sinzui.is@verizon.net> |
72 | |
73 | [335] Removed self.windows from two plugins. |
74 | |
75 | -2011-06-16 Curtis Hovey <sinzui.is@verizon.net> |
76 | +2011-06-15 Curtis Hovey <sinzui.is@verizon.net> |
77 | |
78 | [334] Rebuilt find.ui using GtkBox and GtkGrid. |
79 | |
80 | @@ -120,56 +167,56 @@ |
81 | [331] Minor fixes to layout, but the tree view is not taking of the |
82 | needed space. |
83 | |
84 | -2011-06-13 Curtis Hovey <sinzui.is@verizon.net> |
85 | +2011-06-12 Curtis Hovey <sinzui.is@verizon.net> |
86 | |
87 | [330] Restored some width rules for file_lines_view. |
88 | |
89 | -2011-06-13 Curtis Hovey <sinzui.is@verizon.net> |
90 | +2011-06-12 Curtis Hovey <sinzui.is@verizon.net> |
91 | |
92 | [329] Fixed white-space. |
93 | |
94 | -2011-06-13 Curtis Hovey <sinzui.is@verizon.net> |
95 | +2011-06-12 Curtis Hovey <sinzui.is@verizon.net> |
96 | |
97 | [328] Fixed __all__ |
98 | |
99 | -2011-06-13 Curtis Hovey <sinzui.is@verizon.net> |
100 | +2011-06-12 Curtis Hovey <sinzui.is@verizon.net> |
101 | |
102 | [327] Install language files in gtksourceview-3.0 |
103 | |
104 | -2011-06-13 Curtis Hovey <sinzui.is@verizon.net> |
105 | +2011-06-12 Curtis Hovey <sinzui.is@verizon.net> |
106 | |
107 | [326] Discovered needless actions. |
108 | |
109 | -2011-06-13 Curtis Hovey <sinzui.is@verizon.net> |
110 | +2011-06-12 Curtis Hovey <sinzui.is@verizon.net> |
111 | |
112 | [325] Updated gdpsyntaxcompleter menus to accept actionn and data |
113 | args. |
114 | |
115 | -2011-06-13 Curtis Hovey <sinzui.is@verizon.net> |
116 | +2011-06-12 Curtis Hovey <sinzui.is@verizon.net> |
117 | |
118 | [324] Updated gdpfind menus to accept actionn and data args. |
119 | |
120 | -2011-06-13 Curtis Hovey <sinzui.is@verizon.net> |
121 | +2011-06-12 Curtis Hovey <sinzui.is@verizon.net> |
122 | |
123 | [323] Updated gdp action callbacks to accept widget and data args. |
124 | |
125 | -2011-06-13 Curtis Hovey <sinzui.is@verizon.net> |
126 | +2011-06-12 Curtis Hovey <sinzui.is@verizon.net> |
127 | |
128 | [322] restored file_lines_view text. |
129 | |
130 | -2011-06-13 Curtis Hovey <sinzui.is@verizon.net> |
131 | +2011-06-12 Curtis Hovey <sinzui.is@verizon.net> |
132 | |
133 | [321] Synced get_tab_from_uri to get_tab_from_location. |
134 | |
135 | -2011-06-13 Curtis Hovey <sinzui.is@verizon.net> |
136 | +2011-06-12 Curtis Hovey <sinzui.is@verizon.net> |
137 | |
138 | [320] Updated tests to pass location instead of uri string. |
139 | |
140 | -2011-06-13 Curtis Hovey <sinzui.is@verizon.net> |
141 | +2011-06-12 Curtis Hovey <sinzui.is@verizon.net> |
142 | |
143 | [319] synced create_tab_from_uri to create_tab_from_location. |
144 | |
145 | -2011-06-13 Curtis Hovey <sinzui.is@verizon.net> |
146 | +2011-06-12 Curtis Hovey <sinzui.is@verizon.net> |
147 | |
148 | [318] Fixed get_uri_for_display. Fixed text entry. |
149 | |
150 | @@ -207,7 +254,7 @@ |
151 | |
152 | [310] Small improvement to find panel. UI is broken. |
153 | |
154 | -2011-06-12 Curtis Hovey <sinzui.is@verizon.net> |
155 | +2011-06-11 Curtis Hovey <sinzui.is@verizon.net> |
156 | |
157 | [309] Converted gdpfind to a gedit3 plugin. |
158 | |
159 | @@ -219,23 +266,23 @@ |
160 | |
161 | [307] Merged the fixes from incubation. Gtk calls need fixing. |
162 | |
163 | -2011-01-17 Curtis Hovey <sinzui.is@verizon.net> |
164 | +2011-01-16 Curtis Hovey <sinzui.is@verizon.net> |
165 | |
166 | [306] Fixed copyrights. |
167 | |
168 | -2011-01-17 Curtis Hovey <sinzui.is@verizon.net> |
169 | +2011-01-16 Curtis Hovey <sinzui.is@verizon.net> |
170 | |
171 | [305] Normalised use of GtkSource. |
172 | |
173 | -2011-01-17 Curtis Hovey <sinzui.is@verizon.net> |
174 | +2011-01-16 Curtis Hovey <sinzui.is@verizon.net> |
175 | |
176 | [304] updated copyrights |
177 | |
178 | -2011-01-17 Curtis Hovey <sinzui.is@verizon.net> |
179 | +2011-01-16 Curtis Hovey <sinzui.is@verizon.net> |
180 | |
181 | [303] Corrected tests. |
182 | |
183 | -2011-01-17 Curtis Hovey <sinzui.is@verizon.net> |
184 | +2011-01-16 Curtis Hovey <sinzui.is@verizon.net> |
185 | |
186 | [302] Caste the lineno to a string. |
187 | |
188 | @@ -271,20 +318,20 @@ |
189 | |
190 | [294] Fixed language in test harness. |
191 | |
192 | -2011-01-08 Curtis Hovey <sinzui.is@verizon.net> |
193 | +2011-01-07 Curtis Hovey <sinzui.is@verizon.net> |
194 | |
195 | [293] Added more hacks for iter get_char(). |
196 | |
197 | -2011-01-08 Curtis Hovey <sinzui.is@verizon.net> |
198 | +2011-01-07 Curtis Hovey <sinzui.is@verizon.net> |
199 | |
200 | [292] Added a hack around the exception raises calling |
201 | iter.get_char(). |
202 | |
203 | -2011-01-08 Curtis Hovey <sinzui.is@verizon.net> |
204 | +2011-01-07 Curtis Hovey <sinzui.is@verizon.net> |
205 | |
206 | [291] create_mark() should set left-gravify to false. |
207 | |
208 | -2011-01-08 Curtis Hovey <sinzui.is@verizon.net> |
209 | +2011-01-07 Curtis Hovey <sinzui.is@verizon.net> |
210 | |
211 | [290] Commit point in gobjectification. |
212 | |
213 | @@ -317,11 +364,11 @@ |
214 | |
215 | [283] Merged format check on save. |
216 | |
217 | -2010-05-16 Curtis Hovey <sinzui.is@verizon.net> |
218 | +2010-05-15 Curtis Hovey <sinzui.is@verizon.net> |
219 | |
220 | [282] Do not loose the selection during a replacement. |
221 | |
222 | -2010-05-16 Curtis Hovey <sinzui.is@verizon.net> |
223 | +2010-05-15 Curtis Hovey <sinzui.is@verizon.net> |
224 | |
225 | [281] Replace the orginal text selection; do not loose it. |
226 | |
227 | @@ -333,7 +380,7 @@ |
228 | |
229 | [279] Added a CSS syntax checker. |
230 | |
231 | -2010-04-27 Curtis Hovey <sinzui.is@verizon.net> |
232 | +2010-04-26 Curtis Hovey <sinzui.is@verizon.net> |
233 | |
234 | [278] First draft of CSS formatter. |
235 | |
236 | @@ -359,16 +406,16 @@ |
237 | [273] Implement CompletionProposal hash() and equal(). Improved the |
238 | Info window to to use pydoc. |
239 | |
240 | -2010-04-07 Curtis Hovey <sinzui.is@verizon.net> |
241 | +2010-04-06 Curtis Hovey <sinzui.is@verizon.net> |
242 | |
243 | [272] fxed typo in NEWS/ |
244 | |
245 | -2010-04-07 Curtis Hovey <sinzui.is@verizon.net> |
246 | +2010-04-06 Curtis Hovey <sinzui.is@verizon.net> |
247 | |
248 | [271] When completing a closing tag, the closing angle-bracket is also |
249 | inserted. |
250 | |
251 | -2010-04-07 Curtis Hovey <sinzui.is@verizon.net> |
252 | +2010-04-06 Curtis Hovey <sinzui.is@verizon.net> |
253 | |
254 | [270] Refactored DynamicProvider.get_word to behave like english and |
255 | programming langauges are. |
256 | @@ -382,7 +429,7 @@ |
257 | [268] Updated news. Do not raise an exception because the closed and |
258 | empty rules suck. |
259 | |
260 | -2009-11-30 Curtis Hovey <sinzui.is@verizon.net> |
261 | +2009-11-29 Curtis Hovey <sinzui.is@verizon.net> |
262 | |
263 | [267] gdp 0.3.1. |
264 | |
265 | @@ -419,12 +466,12 @@ |
266 | |
267 | [259] Tuned the config. |
268 | |
269 | -2009-10-17 sinzui |
270 | +2009-10-16 sinzui |
271 | |
272 | [258] Added a deactivate method to the PluginMixin to ensure that each |
273 | plugin provides cleanup statements. |
274 | |
275 | -2009-10-17 sinzui |
276 | +2009-10-16 sinzui |
277 | |
278 | [257] Removed unused macros. |
279 | |
280 | @@ -458,16 +505,16 @@ |
281 | [250] Removed import hack from syntaxcompleter. Let the testrunner do |
282 | the work. |
283 | |
284 | -2009-10-10 sinzui |
285 | +2009-10-09 sinzui |
286 | |
287 | [249] Added a hack and adjusted the tests to work in the distcheck |
288 | environment. |
289 | |
290 | -2009-10-10 sinzui |
291 | +2009-10-09 sinzui |
292 | |
293 | [248] autogen changes for upgrade to Karmic. |
294 | |
295 | -2009-10-10 sinzui |
296 | +2009-10-09 sinzui |
297 | |
298 | [247] Do not translate fake gedit. |
299 | |
300 | @@ -480,7 +527,7 @@ |
301 | |
302 | [245] Added a fake get_side_panel. |
303 | |
304 | -2009-10-09 sinzui |
305 | +2009-10-08 sinzui |
306 | |
307 | [244] Improved the alignment of the line number column. |
308 | |
309 | @@ -490,22 +537,22 @@ |
310 | better, but the file path is separated from the icon because the |
311 | line_no cell is always allocated width. |
312 | |
313 | -2009-10-08 sinzui |
314 | +2009-10-07 sinzui |
315 | |
316 | [242] Store the file_pattern and search path. |
317 | |
318 | -2009-10-08 sinzui |
319 | +2009-10-07 sinzui |
320 | |
321 | [241] Switched from lxml.etree to standard xml.etree. This |
322 | implementation supports HTML entities, which is better than the XXX |
323 | hack used for lxml. |
324 | |
325 | -2009-10-06 sinzui |
326 | +2009-10-05 sinzui |
327 | |
328 | [240] Moved Check syntax and style into the side panel. Added support |
329 | to check all open documents. |
330 | |
331 | -2009-10-06 sinzui |
332 | +2009-10-05 sinzui |
333 | |
334 | [239] Place the find and replace plugin in the side panel. |
335 | |
336 | @@ -517,7 +564,7 @@ |
337 | |
338 | [237] Updated XXX comments with bug number, |
339 | |
340 | -2009-10-04 sinzui |
341 | +2009-10-03 sinzui |
342 | |
343 | [236] Comprimsed between gdiff and writing the diff to file. |
344 | |
345 | @@ -554,11 +601,11 @@ |
346 | |
347 | [228] Removed comment. |
348 | |
349 | -2009-09-23 sinzui |
350 | +2009-09-22 sinzui |
351 | |
352 | [227] Moved reformat doctest to the tools menu. |
353 | |
354 | -2009-09-23 sinzui |
355 | +2009-09-22 sinzui |
356 | |
357 | [226] Added a save action to the file and replace widget. |
358 | |
359 | @@ -599,17 +646,17 @@ |
360 | widget when one is opened. Adjusted the level indentation of the |
361 | file_lines results. |
362 | |
363 | -2009-09-20 sinzui |
364 | +2009-09-19 sinzui |
365 | |
366 | [218] Set the working directory as the active item in the |
367 | path_comboboxentry. |
368 | |
369 | -2009-09-20 sinzui |
370 | +2009-09-19 sinzui |
371 | |
372 | [217] Removed the use of the 'activate' signal in the ui file because |
373 | it overlaps with 'click'. |
374 | |
375 | -2009-09-16 sinzui |
376 | +2009-09-15 sinzui |
377 | |
378 | [216] Revised the documentation. |
379 | |
380 | @@ -645,7 +692,7 @@ |
381 | [209] Gracefully recover from a Python SyntaxError when completing |
382 | words. see bug 428713. |
383 | |
384 | -2009-09-13 sinzui |
385 | +2009-09-12 sinzui |
386 | |
387 | [208] Added hack to XMLCheck to avoid false reports of entitiy |
388 | problems. See lp bug 267825 and lp bug 410916 for the nature of the |
389 | @@ -765,7 +812,7 @@ |
390 | |
391 | [182] Removed unused snippet and made placeholder menus consistent. |
392 | |
393 | -2009-09-06 sinzui |
394 | +2009-09-05 sinzui |
395 | |
396 | [181] Added missing action to search menu. |
397 | |
398 | @@ -790,7 +837,7 @@ |
399 | |
400 | [176] Added find in <Current File> |
401 | |
402 | -2009-09-03 sinzui |
403 | +2009-09-02 sinzui |
404 | |
405 | [175] Fix the bug lp:423342. Also adjust the find widget. |
406 | |
407 | @@ -802,23 +849,23 @@ |
408 | |
409 | [173] Added bzr-gtk visualise. |
410 | |
411 | -2009-09-02 sinzui |
412 | +2009-09-01 sinzui |
413 | |
414 | [172] Added bzr-gtk tags |
415 | |
416 | -2009-09-02 sinzui |
417 | +2009-09-01 sinzui |
418 | |
419 | [171] Added bzr-gtk ginfo and gconflicts. |
420 | |
421 | -2009-09-02 sinzui |
422 | +2009-09-01 sinzui |
423 | |
424 | [170] Added icons to messages. |
425 | |
426 | -2009-09-02 sinzui |
427 | +2009-09-01 sinzui |
428 | |
429 | [169] Switched from glade to gtkbuilder. |
430 | |
431 | -2009-09-02 sinzui |
432 | +2009-09-01 sinzui |
433 | |
434 | [168] Switch from glade to gtkbuilder. There is one problematic glade |
435 | file left. |
436 | @@ -840,7 +887,7 @@ |
437 | |
438 | [164] Added pep8.py to contrib |
439 | |
440 | -2009-09-01 sinzui |
441 | +2009-08-31 sinzui |
442 | |
443 | [163] Added doctest checking. |
444 | |
445 | @@ -886,7 +933,7 @@ |
446 | |
447 | [153] Exposed the file pattern and directory path for searching. |
448 | |
449 | -2009-08-29 sinzui |
450 | +2009-08-28 sinzui |
451 | |
452 | [152] Icons work some of the time. |
453 | |
454 | @@ -937,11 +984,11 @@ |
455 | [142] Add simple log to gdpfind as shim to build the UI. This provides |
456 | the same report that comes from the command line. |
457 | |
458 | -2009-08-28 sinzui |
459 | +2009-08-27 sinzui |
460 | |
461 | [141] Added simple support for case insensitivity and re escaping. |
462 | |
463 | -2009-08-28 sinzui |
464 | +2009-08-27 sinzui |
465 | |
466 | [140] Added a non-working find panel. |
467 | |
468 | @@ -1025,21 +1072,21 @@ |
469 | |
470 | [120] Renamed method to describe what it really does. |
471 | |
472 | -2009-08-27 sinzui |
473 | +2009-08-26 sinzui |
474 | |
475 | [119] Fixed grammar. |
476 | |
477 | -2009-08-27 sinzui |
478 | +2009-08-26 sinzui |
479 | |
480 | [118] Toggle the sensitivity of bzr project menu items based on the |
481 | need for a working tree. |
482 | |
483 | -2009-08-27 sinzui |
484 | +2009-08-26 sinzui |
485 | |
486 | [117] Added a rule to use the active document or cwd to get th working |
487 | tree via open_containing() |
488 | |
489 | -2009-08-27 sinzui |
490 | +2009-08-26 sinzui |
491 | |
492 | [116] Added open_changed_files to gdpbzr. |
493 | |
494 | @@ -1076,19 +1123,19 @@ |
495 | [108] Moved formatdoctest into the format plugin. Removed redundant |
496 | tools. |
497 | |
498 | -2009-08-26 sinzui |
499 | +2009-08-25 sinzui |
500 | |
501 | [107] Fixed method name. |
502 | |
503 | -2009-08-26 sinzui |
504 | +2009-08-25 sinzui |
505 | |
506 | [106] Refactored the wrapping rules. |
507 | |
508 | -2009-08-26 sinzui |
509 | +2009-08-25 sinzui |
510 | |
511 | [105] Removed redundant tools. |
512 | |
513 | -2009-08-26 sinzui |
514 | +2009-08-25 sinzui |
515 | |
516 | [104] All the selection commands now run in the format menu. |
517 | |
518 | @@ -1129,34 +1176,34 @@ |
519 | |
520 | [95] Refactored the find code. |
521 | |
522 | -2008-08-26 Curtis Hovey <sinzui.is@verizon.net> |
523 | +2008-08-25 Curtis Hovey <sinzui.is@verizon.net> |
524 | |
525 | [94] Roughed out the FindPlugin test. |
526 | |
527 | -2008-08-26 Curtis Hovey <sinzui.is@verizon.net> |
528 | +2008-08-25 Curtis Hovey <sinzui.is@verizon.net> |
529 | |
530 | [93] Added a test for FindPlugin.activate(). Added a fake |
531 | Window.get_ui_manager to test the method. |
532 | |
533 | -2008-08-26 Curtis Hovey <sinzui.is@verizon.net> |
534 | +2008-08-25 Curtis Hovey <sinzui.is@verizon.net> |
535 | |
536 | [92] Added a basic FindPlugin test. |
537 | |
538 | -2008-08-26 Curtis Hovey <sinzui.is@verizon.net> |
539 | +2008-08-25 Curtis Hovey <sinzui.is@verizon.net> |
540 | |
541 | [91] Added a rough version of the FindGenerator and FindController |
542 | based on the find.py shell script. Tests are needed to define the |
543 | correct API. |
544 | |
545 | -2008-08-26 Curtis Hovey <sinzui.is@verizon.net> |
546 | +2008-08-25 Curtis Hovey <sinzui.is@verizon.net> |
547 | |
548 | [90] Fixed typo cause by renaming. |
549 | |
550 | -2008-08-26 Curtis Hovey <sinzui.is@verizon.net> |
551 | +2008-08-25 Curtis Hovey <sinzui.is@verizon.net> |
552 | |
553 | [89] Renamed searchplugin to findplugin. Add glade file to makefile.am |
554 | |
555 | -2008-08-26 Curtis Hovey <sinzui.is@verizon.net> |
556 | +2008-08-25 Curtis Hovey <sinzui.is@verizon.net> |
557 | |
558 | [88] Added a glade file to provide UI elements. |
559 | |
560 | @@ -1170,7 +1217,7 @@ |
561 | [86] Fixed line indexing issue caused by end_iter can be after the |
562 | last index of of the buffer (WTF). |
563 | |
564 | -2008-08-25 Curtis Hovey <sinzui.is@verizon.net> |
565 | +2008-08-24 Curtis Hovey <sinzui.is@verizon.net> |
566 | |
567 | [85] Added test coverage for PythonGenerator._get_parsable_text. Added |
568 | support for keywords as candidates for symbol completion. |
569 | @@ -1180,7 +1227,7 @@ |
570 | [84] Revised the rules for 'authoritative' added rules to make the |
571 | source code compilable when the current line is invalid. |
572 | |
573 | -2008-06-29 Curtis Hovey <sinzui.is@verizon.net> |
574 | +2008-06-28 Curtis Hovey <sinzui.is@verizon.net> |
575 | |
576 | [83] Extracted get_string_before_cursor and ensure_prefix. The tests |
577 | need revision. get_words now returns a 2-tuple of (is_authoratative, |
578 | @@ -1191,11 +1238,11 @@ |
579 | [82] Extracted get_word from get_word_prefix to allow the |
580 | PythonSyntaxGenerator to see the python identifier. |
581 | |
582 | -2008-06-24 Curtis Hovey <sinzui.is@verizon.net> |
583 | +2008-06-23 Curtis Hovey <sinzui.is@verizon.net> |
584 | |
585 | [81] Renamed methods to follow PEP 8. |
586 | |
587 | -2008-06-24 Curtis Hovey <sinzui.is@verizon.net> |
588 | +2008-06-23 Curtis Hovey <sinzui.is@verizon.net> |
589 | |
590 | [80] Added a test to show that create_list is a unique list of words. |
591 | Renamed SyntaxCompleter methods to follow PEP 8. Updated docstrings. |
592 | @@ -1206,7 +1253,7 @@ |
593 | appears to work, but there is stability issues. More testing is need |
594 | to fix this. |
595 | |
596 | -2008-06-23 Curtis Hovey <sinzui.is@verizon.net> |
597 | +2008-06-22 Curtis Hovey <sinzui.is@verizon.net> |
598 | |
599 | [78] Added make rules for ChangeLog. Decided to sync plugin versions |
600 | with gedit to clearly state the intended compatability. |
601 | @@ -1265,7 +1312,7 @@ |
602 | |
603 | [66] Restructured testrunner to divide tests into suites by directory |
604 | |
605 | -2007-10-28 Curtis Hovey <curtis.hovey@canonical.com> |
606 | +2007-10-27 Curtis Hovey <curtis.hovey@canonical.com> |
607 | |
608 | [65] Fixed tests to match new object reprs. |
609 | |
610 | @@ -1288,7 +1335,7 @@ |
611 | get_origin to ensure the window is correctly positioned. Used proof |
612 | for the last check because screen width's vary. |
613 | |
614 | -2007-09-01 Curtis Hovey <curtis.hovey@canonical.com> |
615 | +2007-08-31 Curtis Hovey <curtis.hovey@canonical.com> |
616 | |
617 | [60] Replaced the source tuple with just the gedit.Document because it |
618 | has all the infomation added to sources. |
619 | @@ -1321,7 +1368,7 @@ |
620 | [54] Moved the testing doctests to tests to ensure that they are run. |
621 | Added a fake Document class for loading files and checking metadata. |
622 | |
623 | -2007-08-30 Curtis Hovey <curtis.hovey@canonical.com> |
624 | +2007-08-29 Curtis Hovey <curtis.hovey@canonical.com> |
625 | |
626 | [53] Pushed the most of the dummy setup into gedithelpers.get_window. |
627 | Add some plugin tests. |
628 | @@ -1343,7 +1390,7 @@ |
629 | remaining function to gedithelpers. Added the universal objected and |
630 | function to the test suite's globs. |
631 | |
632 | -2007-08-29 Curtis Hovey <curtis.hovey@canonical.com> |
633 | +2007-08-28 Curtis Hovey <curtis.hovey@canonical.com> |
634 | |
635 | [49] Added rules to define fake functions. Revised the rules for Dummy |
636 | data. |
637 | @@ -1392,7 +1439,7 @@ |
638 | |
639 | [40] Added tests. Removed SyntaxController.updateLanguage(). |
640 | |
641 | -2007-08-19 Curtis Hovey <curtis.hovey@canonical.com> |
642 | +2007-08-18 Curtis Hovey <curtis.hovey@canonical.com> |
643 | |
644 | [39] Added missing doctest. Added additional tests for the |
645 | SyntaxController. Refactored a few methods. |
646 | @@ -1472,18 +1519,18 @@ |
647 | tested and understood. The top is neither. The middle needs tests. |
648 | Everything needs another round of naming. |
649 | |
650 | -2007-07-26 Curtis Hovey <curtis.hovey@canonical.com> |
651 | +2007-07-25 Curtis Hovey <curtis.hovey@canonical.com> |
652 | |
653 | [22] Moved tests into gdp. Removed the forced addition of the prefix |
654 | to the SyntaxModel because that is something else's responsability. |
655 | |
656 | -2007-07-23 Curtis Hovey <curtis.hovey@canonical.com> |
657 | +2007-07-22 Curtis Hovey <curtis.hovey@canonical.com> |
658 | |
659 | [21] Extended tests. Clean up SyntaxControler. I need to understand it |
660 | better to write tests and create logic that is needed for syntax |
661 | completion. |
662 | |
663 | -2007-07-22 Curtis Hovey <curtis.hovey@canonical.com> |
664 | +2007-07-21 Curtis Hovey <curtis.hovey@canonical.com> |
665 | |
666 | [20] Hooked TextModel into CompleteModel. |
667 | |
668 | @@ -1552,12 +1599,12 @@ |
669 | |
670 | [5] Refactored the logic for readability. |
671 | |
672 | -2007-06-17 Curtis Hovey <curtis.hovey@canonical.com> |
673 | +2007-06-16 Curtis Hovey <curtis.hovey@canonical.com> |
674 | |
675 | [4] Added language knowledge to the completer to allow it to knwo when |
676 | to complete Python symbols. |
677 | |
678 | -2007-06-17 Curtis Hovey <curtis.hovey@canonical.com> |
679 | +2007-06-16 Curtis Hovey <curtis.hovey@canonical.com> |
680 | |
681 | [3] Cleaned up pylint errors about gedit_pylint. Modified it to work |
682 | with any PyLint that supports --output-format. |
683 | |
684 | === modified file 'configure' |
685 | --- configure 2011-07-01 12:36:16 +0000 |
686 | +++ configure 2011-09-08 15:41:23 +0000 |
687 | @@ -1,6 +1,6 @@ |
688 | #! /bin/sh |
689 | # Guess values for system-dependent variables and create Makefiles. |
690 | -# Generated by GNU Autoconf 2.68 for gedit-developer-plugins 0.5.1. |
691 | +# Generated by GNU Autoconf 2.68 for gedit-developer-plugins 0.5.4. |
692 | # |
693 | # Report bugs to <sinzui.is@verizon.net>. |
694 | # |
695 | @@ -560,8 +560,8 @@ |
696 | # Identity of this package. |
697 | PACKAGE_NAME='gedit-developer-plugins' |
698 | PACKAGE_TARNAME='gedit-developer-plugins' |
699 | -PACKAGE_VERSION='0.5.1' |
700 | -PACKAGE_STRING='gedit-developer-plugins 0.5.1' |
701 | +PACKAGE_VERSION='0.5.4' |
702 | +PACKAGE_STRING='gedit-developer-plugins 0.5.4' |
703 | PACKAGE_BUGREPORT='sinzui.is@verizon.net' |
704 | PACKAGE_URL='' |
705 | |
706 | @@ -1310,7 +1310,7 @@ |
707 | # Omit some internal or obsolete options to make the list less imposing. |
708 | # This message is too long to be a string in the A/UX 3.1 sh. |
709 | cat <<_ACEOF |
710 | -\`configure' configures gedit-developer-plugins 0.5.1 to adapt to many kinds of systems. |
711 | +\`configure' configures gedit-developer-plugins 0.5.4 to adapt to many kinds of systems. |
712 | |
713 | Usage: $0 [OPTION]... [VAR=VALUE]... |
714 | |
715 | @@ -1377,7 +1377,7 @@ |
716 | |
717 | if test -n "$ac_init_help"; then |
718 | case $ac_init_help in |
719 | - short | recursive ) echo "Configuration of gedit-developer-plugins 0.5.1:";; |
720 | + short | recursive ) echo "Configuration of gedit-developer-plugins 0.5.4:";; |
721 | esac |
722 | cat <<\_ACEOF |
723 | |
724 | @@ -1481,7 +1481,7 @@ |
725 | test -n "$ac_init_help" && exit $ac_status |
726 | if $ac_init_version; then |
727 | cat <<\_ACEOF |
728 | -gedit-developer-plugins configure 0.5.1 |
729 | +gedit-developer-plugins configure 0.5.4 |
730 | generated by GNU Autoconf 2.68 |
731 | |
732 | Copyright (C) 2010 Free Software Foundation, Inc. |
733 | @@ -1850,7 +1850,7 @@ |
734 | This file contains any messages produced by compilers while |
735 | running configure, to aid debugging if configure makes a mistake. |
736 | |
737 | -It was created by gedit-developer-plugins $as_me 0.5.1, which was |
738 | +It was created by gedit-developer-plugins $as_me 0.5.4, which was |
739 | generated by GNU Autoconf 2.68. Invocation command line was |
740 | |
741 | $ $0 $@ |
742 | @@ -2665,7 +2665,7 @@ |
743 | |
744 | # Define the identity of the package. |
745 | PACKAGE='gedit-developer-plugins' |
746 | - VERSION='0.5.1' |
747 | + VERSION='0.5.4' |
748 | |
749 | |
750 | cat >>confdefs.h <<_ACEOF |
751 | @@ -4589,22 +4589,28 @@ |
752 | elif test -n "$PKG_CONFIG"; then |
753 | if test -n "$PKG_CONFIG" && \ |
754 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" |
755 | - pygobject-2.0 >= 2.28 |
756 | - gobject-introspection-1.0 >= 0.10.2 |
757 | - gedit >= 3.0.1 |
758 | + pygobject-3.0 >= 2.90.3 |
759 | + gobject-introspection-1.0 >= 1.29.17 |
760 | + libpeas-1.0 >= 1.1.3 |
761 | + libpeas-gtk-1.0 >= 1.1.3 |
762 | + gedit >= 3.1.4 |
763 | \""; } >&5 |
764 | ($PKG_CONFIG --exists --print-errors " |
765 | - pygobject-2.0 >= 2.28 |
766 | - gobject-introspection-1.0 >= 0.10.2 |
767 | - gedit >= 3.0.1 |
768 | + pygobject-3.0 >= 2.90.3 |
769 | + gobject-introspection-1.0 >= 1.29.17 |
770 | + libpeas-1.0 >= 1.1.3 |
771 | + libpeas-gtk-1.0 >= 1.1.3 |
772 | + gedit >= 3.1.4 |
773 | ") 2>&5 |
774 | ac_status=$? |
775 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
776 | test $ac_status = 0; }; then |
777 | pkg_cv_GEDIT_CFLAGS=`$PKG_CONFIG --cflags " |
778 | - pygobject-2.0 >= 2.28 |
779 | - gobject-introspection-1.0 >= 0.10.2 |
780 | - gedit >= 3.0.1 |
781 | + pygobject-3.0 >= 2.90.3 |
782 | + gobject-introspection-1.0 >= 1.29.17 |
783 | + libpeas-1.0 >= 1.1.3 |
784 | + libpeas-gtk-1.0 >= 1.1.3 |
785 | + gedit >= 3.1.4 |
786 | " 2>/dev/null` |
787 | test "x$?" != "x0" && pkg_failed=yes |
788 | else |
789 | @@ -4618,22 +4624,28 @@ |
790 | elif test -n "$PKG_CONFIG"; then |
791 | if test -n "$PKG_CONFIG" && \ |
792 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" |
793 | - pygobject-2.0 >= 2.28 |
794 | - gobject-introspection-1.0 >= 0.10.2 |
795 | - gedit >= 3.0.1 |
796 | + pygobject-3.0 >= 2.90.3 |
797 | + gobject-introspection-1.0 >= 1.29.17 |
798 | + libpeas-1.0 >= 1.1.3 |
799 | + libpeas-gtk-1.0 >= 1.1.3 |
800 | + gedit >= 3.1.4 |
801 | \""; } >&5 |
802 | ($PKG_CONFIG --exists --print-errors " |
803 | - pygobject-2.0 >= 2.28 |
804 | - gobject-introspection-1.0 >= 0.10.2 |
805 | - gedit >= 3.0.1 |
806 | + pygobject-3.0 >= 2.90.3 |
807 | + gobject-introspection-1.0 >= 1.29.17 |
808 | + libpeas-1.0 >= 1.1.3 |
809 | + libpeas-gtk-1.0 >= 1.1.3 |
810 | + gedit >= 3.1.4 |
811 | ") 2>&5 |
812 | ac_status=$? |
813 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
814 | test $ac_status = 0; }; then |
815 | pkg_cv_GEDIT_LIBS=`$PKG_CONFIG --libs " |
816 | - pygobject-2.0 >= 2.28 |
817 | - gobject-introspection-1.0 >= 0.10.2 |
818 | - gedit >= 3.0.1 |
819 | + pygobject-3.0 >= 2.90.3 |
820 | + gobject-introspection-1.0 >= 1.29.17 |
821 | + libpeas-1.0 >= 1.1.3 |
822 | + libpeas-gtk-1.0 >= 1.1.3 |
823 | + gedit >= 3.1.4 |
824 | " 2>/dev/null` |
825 | test "x$?" != "x0" && pkg_failed=yes |
826 | else |
827 | @@ -4656,24 +4668,30 @@ |
828 | fi |
829 | if test $_pkg_short_errors_supported = yes; then |
830 | GEDIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " |
831 | - pygobject-2.0 >= 2.28 |
832 | - gobject-introspection-1.0 >= 0.10.2 |
833 | - gedit >= 3.0.1 |
834 | + pygobject-3.0 >= 2.90.3 |
835 | + gobject-introspection-1.0 >= 1.29.17 |
836 | + libpeas-1.0 >= 1.1.3 |
837 | + libpeas-gtk-1.0 >= 1.1.3 |
838 | + gedit >= 3.1.4 |
839 | " 2>&1` |
840 | else |
841 | GEDIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " |
842 | - pygobject-2.0 >= 2.28 |
843 | - gobject-introspection-1.0 >= 0.10.2 |
844 | - gedit >= 3.0.1 |
845 | + pygobject-3.0 >= 2.90.3 |
846 | + gobject-introspection-1.0 >= 1.29.17 |
847 | + libpeas-1.0 >= 1.1.3 |
848 | + libpeas-gtk-1.0 >= 1.1.3 |
849 | + gedit >= 3.1.4 |
850 | " 2>&1` |
851 | fi |
852 | # Put the nasty error message in config.log where it belongs |
853 | echo "$GEDIT_PKG_ERRORS" >&5 |
854 | |
855 | as_fn_error $? "Package requirements ( |
856 | - pygobject-2.0 >= 2.28 |
857 | - gobject-introspection-1.0 >= 0.10.2 |
858 | - gedit >= 3.0.1 |
859 | + pygobject-3.0 >= 2.90.3 |
860 | + gobject-introspection-1.0 >= 1.29.17 |
861 | + libpeas-1.0 >= 1.1.3 |
862 | + libpeas-gtk-1.0 >= 1.1.3 |
863 | + gedit >= 3.1.4 |
864 | ) were not met: |
865 | |
866 | $GEDIT_PKG_ERRORS |
867 | @@ -6470,7 +6488,7 @@ |
868 | # report actual input values of CONFIG_FILES etc. instead of their |
869 | # values after options handling. |
870 | ac_log=" |
871 | -This file was extended by gedit-developer-plugins $as_me 0.5.1, which was |
872 | +This file was extended by gedit-developer-plugins $as_me 0.5.4, which was |
873 | generated by GNU Autoconf 2.68. Invocation command line was |
874 | |
875 | CONFIG_FILES = $CONFIG_FILES |
876 | @@ -6527,7 +6545,7 @@ |
877 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
878 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
879 | ac_cs_version="\\ |
880 | -gedit-developer-plugins config.status 0.5.1 |
881 | +gedit-developer-plugins config.status 0.5.4 |
882 | configured by $0, generated by GNU Autoconf 2.68, |
883 | with options \\"\$ac_cs_config\\" |
884 | |
885 | |
886 | === modified file 'configure.ac' |
887 | --- configure.ac 2011-07-01 12:36:16 +0000 |
888 | +++ configure.ac 2011-09-08 15:41:23 +0000 |
889 | @@ -4,7 +4,7 @@ |
890 | |
891 | m4_define(gdp_major_version, 0) |
892 | m4_define(gdp_minor_version, 5) |
893 | -m4_define(gdp_micro_version, 1) |
894 | +m4_define(gdp_micro_version, 4) |
895 | m4_define(gdp_version, gdp_major_version.gdp_minor_version.gdp_micro_version) |
896 | |
897 | AC_INIT(gedit-developer-plugins, gdp_version, sinzui.is@verizon.net) |
898 | @@ -29,9 +29,11 @@ |
899 | # not always available. gtksourceview is a good indicator of the |
900 | # Gedit version. |
901 | PKG_CHECK_MODULES(GEDIT, [ |
902 | - pygobject-2.0 >= 2.28 |
903 | - gobject-introspection-1.0 >= 0.10.2 |
904 | - gedit >= 3.0.1 |
905 | + pygobject-3.0 >= 2.90.3 |
906 | + gobject-introspection-1.0 >= 1.29.17 |
907 | + libpeas-1.0 >= 1.1.3 |
908 | + libpeas-gtk-1.0 >= 1.1.3 |
909 | + gedit >= 3.1.4 |
910 | ]) |
911 | |
912 | # i18n configuration. |
913 | |
914 | === modified file 'debian/changelog' |
915 | --- debian/changelog 2011-07-06 10:10:44 +0000 |
916 | +++ debian/changelog 2011-09-08 15:41:23 +0000 |
917 | @@ -1,3 +1,9 @@ |
918 | +gedit-developer-plugins (0.5.4-0ubuntu1) UNRELEASED; urgency=low |
919 | + |
920 | + * New upstream release. |
921 | + |
922 | + -- Curtis C. Hovey <sinzui.is@verizon.net> Thu, 08 Sep 2011 11:21:46 -0400 |
923 | + |
924 | gedit-developer-plugins (0.5.1-0ubuntu1) oneiric; urgency=low |
925 | |
926 | * New upstream release. Fixed bug LP: #804296. Update to Gtk3, Gedit3. |
927 | |
928 | === modified file 'debian/control' |
929 | --- debian/control 2011-07-01 23:00:03 +0000 |
930 | +++ debian/control 2011-09-08 15:41:23 +0000 |
931 | @@ -5,12 +5,12 @@ |
932 | Build-Depends: debhelper (>= 8), |
933 | intltool (>= 0.35.0), |
934 | python (>= 2.7), |
935 | - gnome-common (>= 2.24.0), |
936 | - gnome-pkg-tools (>= 0.11), |
937 | - python-gobject-dev (>= 2.28.0), |
938 | - gir1.2-glib-2.0 (>= 0.10.2), |
939 | - gir1.2-gtk-3.0 (>= 3.1.0), |
940 | - gedit-dev (>= 3.0.1), |
941 | + gnome-common (>= 3.1.0), |
942 | + gnome-pkg-tools (>= 0.18), |
943 | + python-gobject-dev (>= 2.29.3), |
944 | + gir1.2-glib-2.0 (>= 1.29.17), |
945 | + gir1.2-gtk-3.0 (>= 3.1.16), |
946 | + gedit-dev (>= 3.1.4), |
947 | python-pocket-lint (>= 0.5.10) |
948 | Standards-Version: 3.9.2 |
949 | XS-Python-Version: >= 2.7 |
950 | @@ -21,10 +21,10 @@ |
951 | Depends: ${shlibs:Depends}, |
952 | ${misc:Depends}, |
953 | ${python:Depends}, |
954 | - python-gobject (>= 2.28.0), |
955 | - gir1.2-glib-2.0 (>= 0.10.2), |
956 | - gir1.2-gtk-3.0 (>= 3.1.0), |
957 | - gedit (>= 3.0.1), |
958 | + python-gobject (>= 2.29.3), |
959 | + gir1.2-glib-2.0 (>= 1.29.17), |
960 | + gir1.2-gtk-3.0 (>= 3.1.16), |
961 | + gedit (>= 3.1.4), |
962 | python-pocket-lint (>= 0.5.10) |
963 | Enhances: gedit |
964 | Recommends: bzr, bzr-gtk, python-cssutils |
965 | |
966 | === modified file 'plugins/gdp/bzr.py' |
967 | --- plugins/gdp/bzr.py 2011-07-01 12:36:16 +0000 |
968 | +++ plugins/gdp/bzr.py 2011-09-08 15:41:23 +0000 |
969 | @@ -17,22 +17,20 @@ |
970 | from bzrlib.errors import NotBranchError, NoWorkingTree |
971 | from bzrlib.revisionspec import RevisionSpec |
972 | |
973 | -#try: |
974 | -# from bzrlib.plugin import load_plugins |
975 | -# load_plugins() |
976 | -# from bzrlib.plugins.gtk.annotate.config import GAnnotateConfig |
977 | -# from bzrlib.plugins.gtk.commit import CommitDialog |
978 | -# from bzrlib.plugins.gtk.conflicts import ConflictsDialog |
979 | -# from bzrlib.plugins.gtk.dialog import error_dialog |
980 | -# from bzrlib.plugins.gtk.initialize import InitDialog |
981 | -# from bzrlib.plugins.gtk.merge import MergeDialog |
982 | -# from bzrlib.plugins.gtk.push import PushDialog |
983 | -# from bzrlib.plugins.gtk.status import StatusWindow |
984 | -# HAS_BZR_GTK = True |
985 | -#except ImportError: |
986 | -# HAS_BZR_GTK = False |
987 | - |
988 | -HAS_BZR_GTK = False |
989 | +try: |
990 | + from bzrlib.plugin import load_plugins |
991 | + load_plugins() |
992 | + from bzrlib.plugins.gtk.annotate.config import GAnnotateConfig |
993 | + from bzrlib.plugins.gtk.commit import CommitDialog |
994 | + from bzrlib.plugins.gtk.conflicts import ConflictsDialog |
995 | + from bzrlib.plugins.gtk.dialog import error_dialog |
996 | + from bzrlib.plugins.gtk.initialize import InitDialog |
997 | + from bzrlib.plugins.gtk.merge import MergeDialog |
998 | + from bzrlib.plugins.gtk.push import PushDialog |
999 | + from bzrlib.plugins.gtk.status import StatusWindow |
1000 | + HAS_BZR_GTK = True |
1001 | +except ImportError: |
1002 | + HAS_BZR_GTK = False |
1003 | |
1004 | from gdp import ControllerMixin |
1005 | |
1006 | @@ -120,15 +118,15 @@ |
1007 | self.working_tree.unlock() |
1008 | other_tree.unlock() |
1009 | |
1010 | - def open_uncommitted_files(self, action, data): |
1011 | + def open_uncommitted_files(self, action): |
1012 | """Open modified and added files in the bzr branch.""" |
1013 | self.open_changed_files(self.working_tree.basis_tree()) |
1014 | |
1015 | - def open_changed_files_to_push(self, action, data): |
1016 | + def open_changed_files_to_push(self, action): |
1017 | """Open the changed files in the branch that not been pushed.""" |
1018 | self.open_changed_files(self._push_tree) |
1019 | |
1020 | - def open_changed_files_from_parent(self, action, data): |
1021 | + def open_changed_files_from_parent(self, action): |
1022 | """Open the changed files that diverged from the parent branch.""" |
1023 | self.open_changed_files(self._parent_tree) |
1024 | |
1025 | @@ -141,8 +139,11 @@ |
1026 | """Diff the working tree against an anoter tree.""" |
1027 | if another_tree is None: |
1028 | return |
1029 | - if not HAS_BZR_GTK: |
1030 | - return |
1031 | +# if not HAS_BZR_GTK: |
1032 | +# return |
1033 | + # XXX sinzui 2011-08-01: Hack diff on. |
1034 | + from bzrlib.plugin import load_plugins |
1035 | + load_plugins() |
1036 | from bzrlib.plugins.gtk.diff import DiffWindow |
1037 | window = DiffWindow(parent=self.window) |
1038 | window.set_diff("Working Tree", self.working_tree, another_tree) |
1039 | @@ -154,19 +155,19 @@ |
1040 | end_iter = diff_buffer.get_end_iter() |
1041 | diff_file.write(diff_buffer.get_text(start_iter, end_iter, True)) |
1042 | |
1043 | - def diff_uncommited_changes(self, action, data): |
1044 | + def diff_uncommited_changes(self, action): |
1045 | """Create a diff of uncommitted changes.""" |
1046 | self._diff_tree(self.working_tree.basis_tree()) |
1047 | |
1048 | - def diff_changes_from_parent(self, action, data): |
1049 | + def diff_changes_from_parent(self, action): |
1050 | """Create a diff of changes from the parent tree.""" |
1051 | self._diff_tree(self._parent_tree) |
1052 | |
1053 | - def diff_changes_to_push(self, action, data): |
1054 | + def diff_changes_to_push(self, action): |
1055 | """Create a diff of changes to the push tree.""" |
1056 | self._diff_tree(self._push_tree) |
1057 | |
1058 | - def commit_changes(self, action, data): |
1059 | + def commit_changes(self, action): |
1060 | """Commit the changes in the working tree.""" |
1061 | try: |
1062 | self.working_tree.lock_write() |
1063 | @@ -179,7 +180,7 @@ |
1064 | finally: |
1065 | self.working_tree.unlock() |
1066 | |
1067 | - def show_status(self, action, data): |
1068 | + def show_status(self, action): |
1069 | """Show the status of the working tree.""" |
1070 | base_dir = self.working_tree.basedir |
1071 | window = StatusWindow(self.working_tree, base_dir, None) |
1072 | @@ -187,7 +188,7 @@ |
1073 | window._parent = self.window |
1074 | window.show() |
1075 | |
1076 | - def show_conflicts(self, action, data): |
1077 | + def show_conflicts(self, action): |
1078 | """Show the merge, revert, or pull conflicts in the working tree.""" |
1079 | dialog = ConflictsDialog(self.working_tree) |
1080 | dialog.props.title = "Branch conflicts - gedit" |
1081 | @@ -195,7 +196,7 @@ |
1082 | dialog.hide() |
1083 | dialog.destroy() |
1084 | |
1085 | - def show_missing(self, action, data): |
1086 | + def show_missing(self, action): |
1087 | """Show unmerged/unpulled revisions between two branches.""" |
1088 | if not HAS_BZR_GTK: |
1089 | return |
1090 | @@ -222,7 +223,7 @@ |
1091 | finally: |
1092 | self.working_tree.branch.unlock() |
1093 | |
1094 | - def show_tags(self, action, data): |
1095 | + def show_tags(self, action): |
1096 | """Show the tags in the branch.""" |
1097 | # XXX sinzui 2009-10-03 bug 107169: seahorse dbus often fails to |
1098 | # connect on a cold system. This should not kill the module. |
1099 | @@ -233,7 +234,7 @@ |
1100 | window.props.title = "Branch tags - gedit" |
1101 | window.show() |
1102 | |
1103 | - def show_annotations(self, action, data): |
1104 | + def show_annotations(self, action): |
1105 | """Show the annotated revisions of the file.""" |
1106 | document = self.window.get_active_document() |
1107 | file_path = document.get_uri_for_display() |
1108 | @@ -264,7 +265,7 @@ |
1109 | self.working_tree.lock_read() |
1110 | window.annotate(self.working_tree, branch, file_id) |
1111 | |
1112 | - def visualise_branch(self, action, data): |
1113 | + def visualise_branch(self, action): |
1114 | """Visualise the tree.""" |
1115 | limit = None |
1116 | branch = self.working_tree.branch |
1117 | @@ -278,7 +279,7 @@ |
1118 | window.props.title = "Visualise branch - gedit" |
1119 | window.show() |
1120 | |
1121 | - def merge_changes(self, action, data): |
1122 | + def merge_changes(self, action): |
1123 | """Merge changes from another branch into te working tree.""" |
1124 | branch = self.working_tree.branch |
1125 | old_tree = branch.repository.revision_tree(branch.last_revision()) |
1126 | @@ -296,7 +297,7 @@ |
1127 | dialog.run() |
1128 | dialog.destroy() |
1129 | |
1130 | - def push_changes(self, action, data): |
1131 | + def push_changes(self, action): |
1132 | """Push the changes in the working tree.""" |
1133 | branch = self.working_tree.branch |
1134 | dialog = PushDialog(branch.repository, branch.last_revision(), branch) |
1135 | @@ -304,7 +305,7 @@ |
1136 | dialog.hide() |
1137 | dialog.destroy() |
1138 | |
1139 | - def send_merge(self, action, data): |
1140 | + def send_merge(self, action): |
1141 | """Mail or create a merge-directive for submitting changes.""" |
1142 | from bzrlib.plugins.gtk.mergedirective import SendMergeDirectiveDialog |
1143 | if not HAS_BZR_GTK: |
1144 | @@ -322,7 +323,7 @@ |
1145 | dialog.hide() |
1146 | dialog.destroy() |
1147 | |
1148 | - def initialise_branch(self, action, data): |
1149 | + def initialise_branch(self, action): |
1150 | """Make a directory into a versioned branch.""" |
1151 | dialog = InitDialog(os.path.abspath(os.path.curdir)) |
1152 | dialog.props.title = "Initialize branch - gedit" |
1153 | @@ -330,7 +331,7 @@ |
1154 | dialog.hide() |
1155 | dialog.destroy() |
1156 | |
1157 | - def branch_branch(self, action, data): |
1158 | + def branch_branch(self, action): |
1159 | """Create a new branch that is a copy of an existing branch.""" |
1160 | # XXX sinzui 2009-10-03 bug 107169: seahorse dbus often fails to |
1161 | # connect on a cold system. This should not kill the module. |
1162 | @@ -343,7 +344,7 @@ |
1163 | dialog.hide() |
1164 | dialog.destroy() |
1165 | |
1166 | - def checkout_branch(self, action, data): |
1167 | + def checkout_branch(self, action): |
1168 | """Create a new checkout of an existing branch.""" |
1169 | # XXX sinzui 2009-10-03 bug 107169: seahorse dbus often fails to |
1170 | # connect on a cold system. This should not kill the module. |
1171 | @@ -356,7 +357,7 @@ |
1172 | dialog.hide() |
1173 | dialog.destroy() |
1174 | |
1175 | - def preferences(self, action, data): |
1176 | + def preferences(self, action): |
1177 | """Bazaar preferences.""" |
1178 | if not HAS_BZR_GTK: |
1179 | return |
1180 | |
1181 | === modified file 'plugins/gdp/find.py' |
1182 | --- plugins/gdp/find.py 2011-07-01 12:36:16 +0000 |
1183 | +++ plugins/gdp/find.py 2011-09-08 15:41:23 +0000 |
1184 | @@ -217,13 +217,13 @@ |
1185 | 'on_save_results': self.on_save_results, |
1186 | } |
1187 | |
1188 | - def show(self, action, data): |
1189 | + def show(self, action): |
1190 | """Show the finder pane.""" |
1191 | panel = self.window.get_side_panel() |
1192 | panel.activate_item(self.find_panel) |
1193 | panel.props.visible = True |
1194 | |
1195 | - def show_replace(self, action, data): |
1196 | + def show_replace(self, action): |
1197 | """Show the finder pane and expand replace.""" |
1198 | self.show(None, None) |
1199 | self.widgets.get_object('actions').activate() |
1200 | |
1201 | === modified file 'plugins/gdp/find.ui' |
1202 | --- plugins/gdp/find.ui 2011-07-01 12:36:16 +0000 |
1203 | +++ plugins/gdp/find.ui 2011-09-08 15:41:23 +0000 |
1204 | @@ -147,6 +147,7 @@ |
1205 | <property name="visible">True</property> |
1206 | <property name="can_focus">True</property> |
1207 | <property name="receives_default">False</property> |
1208 | + <property name="tooltip_text" translatable="yes">The text to search for is a regular expression pattern.</property> |
1209 | <property name="use_action_appearance">False</property> |
1210 | <property name="use_underline">True</property> |
1211 | <property name="xalign">0</property> |
1212 | @@ -164,6 +165,7 @@ |
1213 | <property name="visible">True</property> |
1214 | <property name="can_focus">True</property> |
1215 | <property name="receives_default">False</property> |
1216 | + <property name="tooltip_text" translatable="yes">Match the letter case of the search text.</property> |
1217 | <property name="use_action_appearance">False</property> |
1218 | <property name="use_underline">True</property> |
1219 | <property name="xalign">0</property> |
1220 | @@ -202,6 +204,8 @@ |
1221 | <child internal-child="entry"> |
1222 | <object class="GtkEntry" id="comboboxtext-entry25"> |
1223 | <property name="can_focus">True</property> |
1224 | + <property name="tooltip_text" translatable="yes">A regular expression pattern used to match the directory or file name. |
1225 | +eg. py or tests/ or \.(py|html)$</property> |
1226 | <property name="invisible_char">•</property> |
1227 | <signal name="activate" handler="on_find_in_files" swapped="no"/> |
1228 | </object> |
1229 | |
1230 | === modified file 'plugins/gdp/format.py' |
1231 | --- plugins/gdp/format.py 2011-07-01 12:36:16 +0000 |
1232 | +++ plugins/gdp/format.py 2011-09-08 15:41:23 +0000 |
1233 | @@ -96,19 +96,19 @@ |
1234 | lines = [line.strip() for line in text.splitlines()] |
1235 | return ' '.join(lines) |
1236 | |
1237 | - def single_line(self, action, data): |
1238 | + def single_line(self, action): |
1239 | """Format the text as a single line.""" |
1240 | bounds, text = self._get_bounded_text() |
1241 | text = self._single_line(text) |
1242 | self._put_bounded_text(bounds, text) |
1243 | |
1244 | - def newline_ending(self, action, data): |
1245 | + def newline_ending(self, action): |
1246 | """Fix the selection's line endings.""" |
1247 | bounds, text = self._get_bounded_text() |
1248 | lines = [line.rstrip() for line in text.splitlines()] |
1249 | self._put_bounded_text(bounds, '\n'.join(lines)) |
1250 | |
1251 | - def tabs_to_spaces(self, action, data): |
1252 | + def tabs_to_spaces(self, action): |
1253 | """Fix the selection's line endings.""" |
1254 | bounds, text = self._get_bounded_text() |
1255 | gconf_client = GConf.Client.get_default() |
1256 | @@ -118,13 +118,13 @@ |
1257 | lines = [line.replace('\t', tab_spaces) for line in text.splitlines()] |
1258 | self._put_bounded_text(bounds, '\n'.join(lines)) |
1259 | |
1260 | - def quote_lines(self, action, data): |
1261 | + def quote_lines(self, action): |
1262 | """Quote the selected text passage.""" |
1263 | bounds, text = self._get_bounded_text() |
1264 | lines = ['> %s' % line for line in text.splitlines()] |
1265 | self._put_bounded_text(bounds, '\n'.join(lines)) |
1266 | |
1267 | - def sort_imports(self, action, data): |
1268 | + def sort_imports(self, action): |
1269 | """Sort python imports.""" |
1270 | bounds, text = self._get_bounded_text() |
1271 | padding = self._get_padding(text) |
1272 | @@ -135,7 +135,7 @@ |
1273 | text = self._wrap_text(', '.join(imports), padding=padding) |
1274 | self._put_bounded_text(bounds, text) |
1275 | |
1276 | - def wrap_selection_list(self, action, data): |
1277 | + def wrap_selection_list(self, action): |
1278 | """Wrap long lines and preserve indentation.""" |
1279 | # This should use the textwrap module. |
1280 | paras = [] |
1281 | @@ -194,13 +194,13 @@ |
1282 | paragraph = '\n'.join(lines) |
1283 | return paragraph |
1284 | |
1285 | - def rewrap_text(self, action, data): |
1286 | + def rewrap_text(self, action): |
1287 | """Rewrap the paragraph.""" |
1288 | bounds, text = self._get_bounded_text() |
1289 | text = self._wrap_text(text) |
1290 | self._put_bounded_text(bounds, text) |
1291 | |
1292 | - def reformat_css(self, action, data): |
1293 | + def reformat_css(self, action): |
1294 | """Reformat the CSS.""" |
1295 | bounds, text = self._get_bounded_text() |
1296 | # Break the text into rules using the trailing brace; the last item |
1297 | @@ -227,7 +227,7 @@ |
1298 | css.append(trailing_text) |
1299 | self._put_bounded_text(bounds, '\n'.join(css)) |
1300 | |
1301 | - def re_replace(self, action, data): |
1302 | + def re_replace(self, action): |
1303 | """Replace each line using an re pattern.""" |
1304 | self._bounds, self._text = self._get_bounded_text() |
1305 | self.replace_dialog.show() |
1306 | @@ -257,13 +257,13 @@ |
1307 | self._put_bounded_text(self._bounds, '\n'.join(lines)) |
1308 | self.on_replace_quit() |
1309 | |
1310 | - def show(self, data): |
1311 | + def show(self): |
1312 | """Show the finder pane.""" |
1313 | panel = self.window.get_side_panel() |
1314 | panel.activate_item(self.file_lines) |
1315 | panel.props.visible = True |
1316 | |
1317 | - def reformat_doctest(self, action, data): |
1318 | + def reformat_doctest(self, action): |
1319 | """Reformat the doctest.""" |
1320 | bounds, text = self._get_bounded_text() |
1321 | file_name = self.active_document.get_uri_for_display() |
1322 | @@ -284,7 +284,7 @@ |
1323 | file_path, text=text, language=language, reporter=reporter) |
1324 | checker.check() |
1325 | |
1326 | - def check_style(self, data, documents=None, quiet=False): |
1327 | + def check_style(self, action, documents=None, quiet=False): |
1328 | """Check the style and syntax of the active document.""" |
1329 | self.file_lines_view.get_model().clear() |
1330 | if documents is None: |
1331 | @@ -300,8 +300,8 @@ |
1332 | # Do not interupt the user to say there is nothing to see. |
1333 | return |
1334 | self.file_lines_view.expand_all() |
1335 | - self.show(None) |
1336 | + self.show() |
1337 | |
1338 | - def check_all_style(self, action, data): |
1339 | + def check_all_style(self, action): |
1340 | """Check the style and syntax of all open documents.""" |
1341 | self.check_style(None, documents=self.window.get_documents()) |
1342 | |
1343 | === modified file 'plugins/gdp/syntaxcompleter.py' |
1344 | --- plugins/gdp/syntaxcompleter.py 2011-07-01 12:36:16 +0000 |
1345 | +++ plugins/gdp/syntaxcompleter.py 2011-09-08 15:41:23 +0000 |
1346 | @@ -155,7 +155,7 @@ |
1347 | |
1348 | def __init__(self, name, language_id, handler, document): |
1349 | GObject.GObject.__init__(self) |
1350 | - self.name = name |
1351 | + self._name = name |
1352 | self.proposals = [] |
1353 | self.language_id = language_id |
1354 | self.handler = handler |
1355 | @@ -164,7 +164,11 @@ |
1356 | self.mark = None |
1357 | theme = Gtk.IconTheme.get_default() |
1358 | s, w, h = Gtk.icon_size_lookup(Gtk.IconSize.MENU) |
1359 | - self.icon = theme.load_icon(Gtk.STOCK_JUSTIFY_LEFT, w, 0) |
1360 | + try: |
1361 | + self.icon = theme.load_icon(Gtk.STOCK_JUSTIFY_LEFT, w, 0) |
1362 | + except: |
1363 | + # The theme is not complete. |
1364 | + self.icon = None |
1365 | |
1366 | def mark_position(self, it): |
1367 | """Create or move the mark of the word start.""" |
1368 | @@ -224,7 +228,7 @@ |
1369 | |
1370 | def do_get_name(self): |
1371 | """See `CompletionProvider`.""" |
1372 | - return self.name |
1373 | + return self._name |
1374 | |
1375 | def do_activate_proposal(self, proposal, piter): |
1376 | """See `CompletionProvider`.""" |
1377 | @@ -253,8 +257,6 @@ |
1378 | self.info_view.set_markup(markup) |
1379 | self.info_view.show() |
1380 | self.info_widget.set_size_request(400, -1) |
1381 | - info.set_sizing(400, -1, False, False) |
1382 | - info.process_resize() |
1383 | |
1384 | GObject.type_register(DynamicProposal) |
1385 | GObject.type_register(DynamicProvider) |
1386 | |
1387 | === modified file 'plugins/gdp/tests/formatter.doctest' |
1388 | --- plugins/gdp/tests/formatter.doctest 2011-07-01 12:36:16 +0000 |
1389 | +++ plugins/gdp/tests/formatter.doctest 2011-09-08 15:41:23 +0000 |
1390 | @@ -8,11 +8,7 @@ |
1391 | |
1392 | >>> window, view, document = get_window('plugins/gdp/data/snark.css') |
1393 | >>> formatter = Formatter(window) |
1394 | - |
1395 | -# >>> document.select_range( |
1396 | -# ... document.get_start_iter(), document.get_end_iter()) |
1397 | - |
1398 | - >>> formatter.reformat_css(None, None) |
1399 | + >>> formatter.reformat_css(None) |
1400 | >>> print formatter.text #doctest: -NORMALIZE_WHITESPACE |
1401 | .snark { |
1402 | font-style: italic; |
1403 | @@ -27,3 +23,5 @@ |
1404 | color: #666; |
1405 | } |
1406 | ... |
1407 | + |
1408 | + |
1409 | |
1410 | === modified file 'po/POTFILES.in' |
1411 | --- po/POTFILES.in 2011-01-14 10:24:47 +0000 |
1412 | +++ po/POTFILES.in 2011-09-08 15:41:23 +0000 |
1413 | @@ -3,17 +3,17 @@ |
1414 | [encoding: UTF-8] |
1415 | language-specs/doctest.lang |
1416 | language-specs/pagetemplate.lang |
1417 | +plugins/gdpbzr.plugin.desktop.in |
1418 | plugins/gdp/bzr.py |
1419 | -plugins/gdp/format.py |
1420 | -plugins/gdp/syntaxcompleter.py |
1421 | -plugins/gdpbzr.gedit-plugin.desktop.in |
1422 | plugins/gdpbzr.py |
1423 | +plugins/gdpfind.plugin.desktop.in |
1424 | +plugins/gdpfind.py |
1425 | +plugins/gdp/find.py |
1426 | plugins/gdp/find.ui |
1427 | -plugins/gdpfind.gedit-plugin.desktop.in |
1428 | -plugins/gdpfind.py |
1429 | -plugins/gdpformat.gedit-plugin.desktop.in |
1430 | +plugins/gdpformat.plugin.desktop.in |
1431 | +plugins/gdp/format.py |
1432 | plugins/gdpformat.py |
1433 | plugins/gdp/format.ui |
1434 | -plugins/gdpsyntaxcompleter.gedit-plugin.desktop.in |
1435 | +plugins/gdpsyntaxcompleter.plugin.desktop.in |
1436 | +plugins/gdp/syntaxcompleter.py |
1437 | plugins/gdpsyntaxcompleter.py |
1438 | - |
1439 | |
1440 | === modified file 'po/POTFILES.skip' |
1441 | --- po/POTFILES.skip 2011-01-14 10:24:47 +0000 |
1442 | +++ po/POTFILES.skip 2011-09-08 15:41:23 +0000 |
1443 | @@ -2,3 +2,4 @@ |
1444 | # Please keep this file sorted alphabetically. |
1445 | contrib/pyflakes/scripts/pyflakes.py |
1446 | gedit/__init__.py |
1447 | +testing/Gedit.py |
It appears Michael Terry already got 0.5.4-0ubuntu1 into Oneiric.