# HG changeset patch # User wenzelm # Date 1353876034 -3600 # Node ID 907373a080b997eea0859d22fb6146e2495795da # Parent 1382ad6d4774828b9d49c958ba2d95da3ba8b60a tuned signature; diff -r 1382ad6d4774 -r 907373a080b9 src/Tools/jEdit/src/Isabelle.props --- a/src/Tools/jEdit/src/Isabelle.props Sun Nov 25 21:35:29 2012 +0100 +++ b/src/Tools/jEdit/src/Isabelle.props Sun Nov 25 21:40:34 2012 +0100 @@ -27,14 +27,14 @@ options.isabelle-rendering.code=new isabelle.jedit.Isabelle_Options2(); #actions +isabelle.check-buffer.label=Commence full proof checking of current buffer +isabelle.check-buffer.shortcut=C+e SPACE +isabelle.cancel-execution.label=Cancel current proof checking process +isabelle.cancel-execution.shortcut=C+e BACK_SPACE isabelle.increase-font-size.label=Increase font size isabelle.increase-font-size.shortcut=C+PLUS isabelle.decrease-font-size.label=Decrease font size isabelle.decrease-font-size.shortcut=C+MINUS -isabelle.check-buffer.label=Commence full proof checking of current buffer -isabelle.check-buffer.shortcut=C+e SPACE -isabelle.cancel-execution.label=Cancel current proof checking process -isabelle.cancel-execution.shortcut=C+e BACK_SPACE isabelle.control-isub.label=Control subscript isabelle.control-isub.shortcut=C+e DOWN isabelle.control-isup.label=Control superscript diff -r 1382ad6d4774 -r 907373a080b9 src/Tools/jEdit/src/actions.xml --- a/src/Tools/jEdit/src/actions.xml Sun Nov 25 21:35:29 2012 +0100 +++ b/src/Tools/jEdit/src/actions.xml Sun Nov 25 21:40:34 2012 +0100 @@ -42,6 +42,16 @@ wm.addDockableWindow("isabelle-symbols"); + + + isabelle.jedit.PIDE.check_buffer(buffer); + + + + + isabelle.jedit.PIDE.cancel_execution(); + + isabelle.jedit.Isabelle.increase_font_size(view); @@ -52,16 +62,6 @@ isabelle.jedit.Isabelle.decrease_font_size(view); - - - isabelle.jedit.Isabelle.check_buffer(buffer); - - - - - isabelle.jedit.Isabelle.cancel_execution(); - - isabelle.jedit.Isabelle.control_sub(textArea); diff -r 1382ad6d4774 -r 907373a080b9 src/Tools/jEdit/src/isabelle.scala --- a/src/Tools/jEdit/src/isabelle.scala Sun Nov 25 21:35:29 2012 +0100 +++ b/src/Tools/jEdit/src/isabelle.scala Sun Nov 25 21:40:34 2012 +0100 @@ -60,19 +60,6 @@ def decrease_font_size(view: View): Unit = change_font_size(view, i => i - ((i / 10) max 1)) - /* full checking */ - - def check_buffer(buffer: Buffer) - { - PIDE.document_model(buffer) match { - case None => - case Some(model) => model.full_perspective() - } - } - - def cancel_execution() { PIDE.session.cancel_execution() } - - /* control styles */ def control_sub(text_area: JEditTextArea) diff -r 1382ad6d4774 -r 907373a080b9 src/Tools/jEdit/src/plugin.scala --- a/src/Tools/jEdit/src/plugin.scala Sun Nov 25 21:35:29 2012 +0100 +++ b/src/Tools/jEdit/src/plugin.scala Sun Nov 25 21:40:34 2012 +0100 @@ -103,6 +103,19 @@ Document_View.exit(text_area) } } + + + /* full checking */ + + def check_buffer(buffer: Buffer) + { + PIDE.document_model(buffer) match { + case None => + case Some(model) => model.full_perspective() + } + } + + def cancel_execution() { PIDE.session.cancel_execution() } } diff -r 1382ad6d4774 -r 907373a080b9 src/Tools/jEdit/src/session_dockable.scala --- a/src/Tools/jEdit/src/session_dockable.scala Sun Nov 25 21:35:29 2012 +0100 +++ b/src/Tools/jEdit/src/session_dockable.scala Sun Nov 25 21:40:34 2012 +0100 @@ -51,12 +51,12 @@ } private val cancel = new Button("Cancel") { - reactions += { case ButtonClicked(_) => Isabelle.cancel_execution() } + reactions += { case ButtonClicked(_) => PIDE.cancel_execution() } } cancel.tooltip = jEdit.getProperty("isabelle.cancel-execution.label") private val check = new Button("Check") { - reactions += { case ButtonClicked(_) => Isabelle.check_buffer(view.getBuffer) } + reactions += { case ButtonClicked(_) => PIDE.check_buffer(view.getBuffer) } } check.tooltip = jEdit.getProperty("isabelle.check-buffer.label")