--- a/src/Tools/jEdit/src/context_menu.scala Sun Oct 05 18:30:43 2014 +0200
+++ b/src/Tools/jEdit/src/context_menu.scala Sun Oct 05 18:44:04 2014 +0200
@@ -14,62 +14,12 @@
import javax.swing.JMenuItem
-import org.gjt.sp.jedit.menu.EnhancedMenuItem
import org.gjt.sp.jedit.gui.DynamicContextMenuService
-import org.gjt.sp.jedit.{jEdit, Buffer}
import org.gjt.sp.jedit.textarea.JEditTextArea
class Context_Menu extends DynamicContextMenuService
{
- /* spell checker menu */
-
- private def spell_checker_menu(text_area: JEditTextArea, offset: Text.Offset): List[JMenuItem] =
- {
- val result =
- for {
- spell_checker <- PIDE.spell_checker.get
- doc_view <- PIDE.document_view(text_area)
- rendering = doc_view.get_rendering()
- range = JEdit_Lib.point_range(text_area.getBuffer, offset)
- Text.Info(_, word) <- Spell_Checker.current_word(text_area, rendering, range)
- } yield (spell_checker, word)
-
- result match {
- case Some((spell_checker, word)) =>
-
- val context = jEdit.getActionContext()
- def item(name: String): JMenuItem =
- new EnhancedMenuItem(context.getAction(name).getLabel, name, context)
-
- val complete_items =
- if (spell_checker.complete_enabled(word)) List(item("isabelle.complete-word"))
- else Nil
-
- val update_items =
- if (spell_checker.check(word))
- List(item("isabelle.exclude-word"), item("isabelle.exclude-word-permanently"))
- else
- List(item("isabelle.include-word"), item("isabelle.include-word-permanently"))
-
- val reset_items =
- spell_checker.reset_enabled() match {
- case 0 => Nil
- case n =>
- val name = "isabelle.reset-words"
- val label = context.getAction(name).getLabel
- List(new EnhancedMenuItem(label + " (" + n + ")", name, context))
- }
-
- complete_items ::: update_items ::: reset_items
-
- case None => Nil
- }
- }
-
-
- /* menu service */
-
def createMenu(text_area: JEditTextArea, evt: MouseEvent): Array[JMenuItem] =
{
PIDE.dismissed_popups(text_area.getView)
@@ -77,7 +27,7 @@
val items1 =
if (evt != null && evt.getSource == text_area.getPainter) {
val offset = text_area.xyToOffset(evt.getX, evt.getY)
- if (offset >= 0) spell_checker_menu(text_area, offset)
+ if (offset >= 0) Spell_Checker.context_menu(text_area, offset)
else Nil
}
else Nil