clarified GUI focus;
authorwenzelm
Tue, 06 May 2014 17:47:03 +0200
changeset 56882 6d4b2f8f010c
parent 56881 15e18540df10
child 56883 38c6b70e5e53
clarified GUI focus;
src/Tools/jEdit/src/query_dockable.scala
--- a/src/Tools/jEdit/src/query_dockable.scala	Tue May 06 17:28:58 2014 +0200
+++ b/src/Tools/jEdit/src/query_dockable.scala	Tue May 06 17:47:03 2014 +0200
@@ -199,12 +199,11 @@
 
     private def apply_query()
     {
-      query_operation.apply_query(List(_selector.selection.item))
+      query_operation.apply_query(List(selector.selection.item))
     }
 
     private val query_label = new Label("Print:")
-
-    def query: JComponent = _selector.peer.asInstanceOf[JComponent]
+    def query: JComponent = apply_button.peer
 
 
     /* items */
@@ -224,24 +223,24 @@
       }
     }
 
-    private var _selector_item: Option[String] = None
-    private var _selector = new ComboBox[String](Nil)
+    private var selector_item: Option[String] = None
+    private var selector = new ComboBox[String](Nil)
 
     private def set_selector()
     {
       val items = Print_Operation.print_operations(PIDE.session).map(p => Item(p._1, p._2))
 
-      _selector =
+      selector =
         new ComboBox(items.map(_.name)) {
-          _selector_item.foreach(item => selection.item = item)
+          selector_item.foreach(item => selection.item = item)
           listenTo(selection)
           reactions += {
             case SelectionChanged(_) =>
-              _selector_item = Some(selection.item)
+              selector_item = Some(selection.item)
               apply_query()
           }
         }
-      _selector.renderer = new Renderer(_selector.renderer, items)
+      selector.renderer = new Renderer(selector.renderer, items)
     }
     set_selector()
 
@@ -261,7 +260,7 @@
     {
       set_selector()
       control_panel.contents.clear
-      control_panel.contents ++= List(query_label, _selector, apply_button, detach, zoom)
+      control_panel.contents ++= List(query_label, selector, apply_button, detach, zoom)
     }
 
     val page =