From fcb2f1974f82fe4e230ae046a6dd932886d06163 Mon Sep 17 00:00:00 2001 From: pixelzoom Date: Tue, 4 Oct 2022 10:49:10 -0600 Subject: [PATCH] keyboard help for Micro screen, https://github.com/phetsims/ph-scale/issues/249 --- js/macro/view/MacroKeyboardHelpContent.ts | 3 +- js/micro/view/MicroKeyboardHelpContent.ts | 36 +++++++++++++++++++---- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/js/macro/view/MacroKeyboardHelpContent.ts b/js/macro/view/MacroKeyboardHelpContent.ts index ceabfbf9..0bf8e43f 100644 --- a/js/macro/view/MacroKeyboardHelpContent.ts +++ b/js/macro/view/MacroKeyboardHelpContent.ts @@ -14,12 +14,13 @@ import PhScaleStrings from '../../PhScaleStrings.js'; import MoveKeyboardHelpContent from '../../common/view/MoveKeyboardHelpContent.js'; export default class MacroKeyboardHelpContent extends TwoColumnKeyboardHelpContent { + public constructor() { const leftColumn = [ // Move the Dropper - new MoveKeyboardHelpContent( PhScaleStrings.keyboardHelpDialog.moveTheDropperStringProperty ), + new MoveKeyboardHelpContent( PhScaleStrings.keyboardHelpDialog.moveTheDropperOrPHProbeStringProperty ), // Choose a Solute new ComboBoxKeyboardHelpSection( { diff --git a/js/micro/view/MicroKeyboardHelpContent.ts b/js/micro/view/MicroKeyboardHelpContent.ts index 9543d041..600a33c7 100644 --- a/js/micro/view/MicroKeyboardHelpContent.ts +++ b/js/micro/view/MicroKeyboardHelpContent.ts @@ -1,19 +1,45 @@ // Copyright 2022, University of Colorado Boulder +//TODO https://github.com/phetsims/ph-scale/issues/249 same as MacroKeyboardHelpContent, except for moveTheDropperStringProperty /** * MicroKeyboardHelpContent is the keyboard-help content for the 'Micro' screen. * * @author Chris Malley (PixelZoom, Inc.) */ -import { Node, Text } from '../../../../scenery/js/imports.js'; +import TwoColumnKeyboardHelpContent from '../../../../scenery-phet/js/keyboard/help/TwoColumnKeyboardHelpContent.js'; import phScale from '../../phScale.js'; +import MoveKeyboardHelpContent from '../../common/view/MoveKeyboardHelpContent.js'; +import PhScaleStrings from '../../PhScaleStrings.js'; +import ComboBoxKeyboardHelpSection from '../../../../scenery-phet/js/keyboard/help/ComboBoxKeyboardHelpSection.js'; +import BasicActionsKeyboardHelpSection from '../../../../scenery-phet/js/keyboard/help/BasicActionsKeyboardHelpSection.js'; + +export default class MicroKeyboardHelpContent extends TwoColumnKeyboardHelpContent { -export default class MicroKeyboardHelpContent extends Node { public constructor() { - super( { - children: [ new Text( 'Under Construction' ) ] - } ); + + const leftColumn = [ + + // Move the Dropper + new MoveKeyboardHelpContent( PhScaleStrings.keyboardHelpDialog.moveTheDropperStringProperty ), + + // Choose a Solute + new ComboBoxKeyboardHelpSection( { + headingString: PhScaleStrings.keyboardHelpDialog.chooseASoluteStringProperty, + thingAsLowerCaseSingular: PhScaleStrings.keyboardHelpDialog.soluteStringProperty, + thingAsLowerCasePlural: PhScaleStrings.keyboardHelpDialog.solutesStringProperty + } ) + ]; + + const rightColumn = [ + + // Basic Actions + new BasicActionsKeyboardHelpSection( { + withCheckboxContent: true + } ) + ]; + + super( leftColumn, rightColumn ); } }