Permalink
Browse files

Fixed #677: merged r1975:r2115 from multikey branch onto mainline

svn-revision: r2116
  • Loading branch information...
robmcmullen committed Jun 9, 2009
1 parent 2636355 commit 8a4ed3e03c6c297bb9a47e88c896e72ae15d36b4
Showing with 11,682 additions and 1,466 deletions.
  1. +4 −1 Peppy.py
  2. +19 −1 peppy/about.py
  3. +134 −92 peppy/actions/__init__.py
  4. +8 −7 peppy/actions/base.py
  5. +120 −37 peppy/actions/minibuffer.py
  6. +42 −11 peppy/buffers.py
  7. +2 −2 peppy/context_menu.py
  8. +48 −151 peppy/dired.py
  9. +14 −36 peppy/dired_menu.py
  10. +2 −0 peppy/editra/__init__.py
  11. +45 −60 peppy/editra/eclib/colorsetter.py
  12. +204 −0 peppy/editra/eclib/eclutil.py
  13. 0 peppy/editra/ed_event.py
  14. 0 peppy/editra/ed_style.py
  15. +53 −0 peppy/editra/stcmixin.py
  16. +7 −0 peppy/editra/style_editor.py
  17. +172 −0 peppy/editra/styles/BlackBoard.ess
  18. +191 −0 peppy/editra/styles/Cream.ess
  19. +106 −0 peppy/editra/styles/Guepardo.ess
  20. +13 −0 peppy/editra/styles/default.ess
  21. +9 −9 peppy/editra/styles/midnight.ess
  22. 0 peppy/editra/syntax/README
  23. 0 peppy/editra/syntax/__init__.py
  24. 0 peppy/editra/syntax/ada.py
  25. 0 peppy/editra/syntax/apache.py
  26. 0 peppy/editra/syntax/asm.py
  27. 0 peppy/editra/syntax/asm68k.py
  28. +4 −3 peppy/editra/syntax/batch.py
  29. 0 peppy/editra/syntax/caml.py
  30. +160 −0 peppy/editra/syntax/cobra.py
  31. 0 peppy/editra/syntax/cpp.py
  32. 0 peppy/editra/syntax/css.py
  33. 0 peppy/editra/syntax/d.py
  34. 0 peppy/editra/syntax/diff.py
  35. 0 peppy/editra/syntax/dot.py
  36. 0 peppy/editra/syntax/editra_ss.py
  37. 0 peppy/editra/syntax/eiffel.py
  38. 0 peppy/editra/syntax/erlang.py
  39. 0 peppy/editra/syntax/flagship.py
  40. 0 peppy/editra/syntax/fortran.py
  41. +294 −0 peppy/editra/syntax/groovy.py
  42. 0 peppy/editra/syntax/haskell.py
  43. 0 peppy/editra/syntax/html.py
  44. 0 peppy/editra/syntax/java.py
  45. 0 peppy/editra/syntax/javascript.py
  46. 0 peppy/editra/syntax/latex.py
  47. 0 peppy/editra/syntax/lisp.py
  48. 0 peppy/editra/syntax/lout.py
  49. 0 peppy/editra/syntax/lua.py
  50. 0 peppy/editra/syntax/make.py
  51. 0 peppy/editra/syntax/masm.py
  52. 0 peppy/editra/syntax/matlab.py
  53. 0 peppy/editra/syntax/mssql.py
  54. 0 peppy/editra/syntax/nasm.py
  55. 0 peppy/editra/syntax/nsis.py
  56. 0 peppy/editra/syntax/pascal.py
  57. 0 peppy/editra/syntax/perl.py
  58. 0 peppy/editra/syntax/php.py
  59. 0 peppy/editra/syntax/postscript.py
  60. 0 peppy/editra/syntax/props.py
  61. 0 peppy/editra/syntax/python.py
  62. +5 −4 peppy/editra/syntax/ruby.py
  63. 0 peppy/editra/syntax/sh.py
  64. 0 peppy/editra/syntax/smalltalk.py
  65. 0 peppy/editra/syntax/sql.py
  66. +14 −2 peppy/editra/syntax/synextreg.py
  67. +6 −3 peppy/editra/syntax/synglob.py
  68. 0 peppy/editra/syntax/syntax.py
  69. 0 peppy/editra/syntax/tcl.py
  70. 0 peppy/editra/syntax/vhdl.py
  71. 0 peppy/editra/syntax/visualbasic.py
  72. 0 peppy/editra/syntax/xml.py
  73. +536 −0 peppy/editra/syntax/xtext.py
  74. 0 peppy/editra/syntax/yaml.py
  75. +43 −0 peppy/editra/tests/Xtext.xtext
  76. +0 −1 peppy/editra/tests/c-shell_script.csh
  77. +25 −0 peppy/editra/tests/cobra.cobra
  78. +0 −1 peppy/editra/tests/d.d
  79. +73 −0 peppy/editra/tests/groovy.groovy
  80. +0 −1 peppy/editra/tests/korn_shell_script.ksh
  81. +0 −1 peppy/editra/tests/octave.oct
  82. +0 −1 peppy/editra/tests/perl.pl
  83. +6 −0 peppy/editra/tests/php.php
  84. +2 −0 peppy/editra/tests/progress_4gl.4gl
  85. +0 −1 peppy/editra/tests/python.python
  86. +0 −1 peppy/editra/tests/ruby.rb
  87. +0 −1 peppy/editra/tests/tcl_tk.tcl
  88. +2 −0 peppy/fileopener.py
  89. +27 −29 peppy/frame.py
  90. +27 −40 peppy/fundamental.py
  91. +251 −39 peppy/fundamental_menu.py
  92. +2 −2 peppy/hsi/common.py
  93. +26 −0 peppy/hsi/cube.py
  94. +9 −2 peppy/hsi/hsi_major_mode.py
  95. +2 −2 peppy/hsi/hsi_menu.py
  96. +3 −3 peppy/hsi/hsi_plugin.py
  97. +2 −4 peppy/hsi/plotters.py
  98. +13 −0 peppy/lib/autoindent.py
  99. +22 −15 peppy/lib/bitmapscroller.py
  100. +705 −241 peppy/lib/multikey.py
  101. +99 −0 peppy/list_menu.py
  102. +245 −0 peppy/list_mode.py
  103. +47 −16 peppy/main.py
  104. +33 −14 peppy/mainmenu.py
  105. +77 −5 peppy/major.py
  106. +185 −266 peppy/menu.py
  107. +3 −1 peppy/notebook.py
  108. +52 −184 peppy/plugins/buffer_list_mode.py
  109. +2 −2 peppy/plugins/changelog_mode.py
  110. +48 −3 peppy/plugins/code_explorer.py
  111. +24 −6 peppy/plugins/cursor_movement.py
  112. +2 −2 peppy/plugins/diff_mode.py
  113. +1 −3 peppy/plugins/error_log.py
  114. +5 −0 peppy/plugins/exception_handler.py
  115. +160 −74 peppy/plugins/find_replace.py
  116. +2 −2 peppy/plugins/hexedit_mode.py
  117. +2 −2 peppy/plugins/image_mode.py
  118. +5 −12 peppy/plugins/insert_text.py
  119. +474 −38 peppy/plugins/keyboard.py
  120. +9 −0 peppy/plugins/minibuffer_actions.peppy-plugin
  121. +218 −0 peppy/plugins/minibuffer_actions.py
  122. +4 −1 peppy/plugins/python_mode.py
  123. +2 −2 peppy/plugins/sandbox.py
  124. +2 −2 peppy/plugins/scintilla_commands.py
  125. +2 −2 peppy/plugins/tab_wordcompletion.py
  126. +0 −4 peppy/plugins/text_transforms.py
  127. 0 peppy/project/__init__.py
  128. +314 −0 peppy/project/actions.py
  129. +278 −0 peppy/project/editra/BZR.py
  130. +277 −0 peppy/project/editra/CVS.py
  131. +317 −0 peppy/project/editra/ConfigData.py
  132. +700 −0 peppy/project/editra/FileIcons.py
  133. +350 −0 peppy/project/editra/GIT.py
  134. +350 −0 peppy/project/editra/HG.py
  135. +255 −0 peppy/project/editra/SVN.py
  136. +444 −0 peppy/project/editra/ScCommand.py
  137. +609 −0 peppy/project/editra/SourceControl.py
  138. 0 peppy/project/editra/__init__.py
  139. +86 −0 peppy/project/editra/crypto.py
  140. +274 −0 peppy/project/project.py
  141. +9 −0 peppy/project/project_plugin.peppy-plugin
  142. +416 −0 peppy/project/project_plugin.py
  143. +113 −0 peppy/project/project_sidebar.py
  144. +1,588 −0 peppy/project/projecttree.py
  145. +16 −0 peppy/project/test.py
  146. +31 −13 peppy/stcbase.py
  147. +90 −1 peppy/stcinterface.py
  148. +2 −2 peppy/yapsy/PeppyPluginManager.py
  149. +4 −4 peppy/yapsy/plugins.py
  150. +4 −1 run.py
@@ -10,6 +10,9 @@
import __builtin__
__builtin__._ = unicode
import peppy.main
try:
import peppy.main
except AttributeError:
raise RuntimeError("Peppy needs wxPython version 2.8.7.1 or later to function. Minimum recommended version is 2.8.8.0")
peppy.main.main()
@@ -61,7 +61,8 @@
<p>Additional thanks to:</p>
<ul>
%(thanks)s
</ul>"""
</ul>""",
'plugins': "<h1>plugins go here</h1>",
}
substitutes['copyright'] = 'Copyright (c) %(yearrange)s %(author)s (%(author_email)s)' % substitutes
@@ -150,6 +151,20 @@ def findAboutNames():
names.extend(files)
return names
def updateDynamicSubstitutes():
plugins = wx.GetApp().plugin_manager.getAllPlugins()
entries = []
for plugin in plugins:
#dprint("checking plugin %s" % plugin)
if plugin.plugin_object.is_activated:
active = "Active"
else:
active = "Disabled"
entries.append((plugin.name, "<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>\n" % (plugin.name, plugin.author, plugin.version, active)))
entries.sort()
plugin_summary = "<h3>Plugins:</h3>\n<table><tr><th>Name</th><th>Author</th><th>Version</th><th>Active</th></tr>%s</table>" % "\n".join([e[1] for e in entries])
substitutes['plugins'] = plugin_summary
class AboutFS(vfs.BaseFS):
mtime = time.time()
@@ -226,6 +241,7 @@ def open(reference, mode=None):
recurse_count = 100
mimetype = findMime(path)
if mimetype.startswith("text") and text.find("%(") >= 0:
updateDynamicSubstitutes()
while text.find("%(") >= 0 and recurse_count>0:
text = text % substitutes
recurse_count -= 1
@@ -277,6 +293,8 @@ def getNewUntitled():
<p>%(warning)s</p>
<p>%(contributors)s</p>
<p>%(plugins)s</p>
""")
SetAbout('0x00-0xff', "".join([chr(i) for i in range(256)]), "application/octet-stream")
SetAbout('red.png',
Oops, something went wrong.

0 comments on commit 8a4ed3e

Please sign in to comment.