Rearrange jupyter and poll icons

Author: martenrichter

src/ui/toolbox/toolbox.jsx

@@ -298,7 +298,12 @@ export class ToolBox extends ToolHandling {
   reactivate() {
     console.log('reactivate toolbox')
     this.addRemoveSecondToolGuardian(true)
-    this.setState({ activated: true, selectedButtonid: this.lasttool })
+    this.setState({
+      activated: true,
+      selectedButtonid: this.lasttool,
+      secondtoolstep: 0,
+      thirdtoolstep: 0
+    })
   }
 
   deactivate() {
@@ -408,19 +413,6 @@ export class ToolBox extends ToolHandling {
       />
     )
 
-    const ipynbbutton = (
-      <Button
-        icon={fiJupyterLiteIcon}
-        tooltip='Jupyter lite base apps and more'
-        tooltipOptions={ttopts}
-        key={11}
-        onClick={(e) => {
-          this.ipynbButtonPressed()
-        }}
-        className='p-button-secondary p-button-raised p-button-rounded tbChild'
-      />
-    )
-
     const addformpictbutton = (
       <Button
         icon={fiFormPictSubMenuIcon}
@@ -432,6 +424,17 @@ export class ToolBox extends ToolHandling {
       />
     )
 
+    const startactivitybutton = (
+      <Button
+        icon={<b>A</b>}
+        tooltip='Start activity'
+        tooltipOptions={ttopts}
+        key={11}
+        onClick={(e) => this.selectTool(11)}
+        className={selbuttonclass(this.state.selectedButtonid === 11)}
+      />
+    )
+
     //   onPointerLeave={this.scrollPointerup}
     const scrollbutton = (
       <Button
@@ -539,7 +542,8 @@ export class ToolBox extends ToolHandling {
     if (this.state.canundo) maintools.push(undobutton)
     maintools.push(addformpictbutton)
     maintools.push(laserbutton)
-    maintools.push(pollbutton)
+    if (!this.props.experimental) maintools.push(pollbutton)
+    else maintools.push(startactivitybutton)
     maintools.push(endbutton)
     maintools.push(scrollbutton)
 
@@ -851,7 +855,6 @@ export class ToolBox extends ToolHandling {
     }
     if (idents.length > 0) settingswheel.push(identbutton)
     if (this.props.startUpAVBroadcast) settingswheel.push(avstartupbutton)
-    if (this.props.experimental) settingswheel.push(ipynbbutton)
     settingswheel.push(infobutton)
 
     let setwheelpcpos = false
@@ -958,6 +961,30 @@ export class ToolBox extends ToolHandling {
       </div>
     ))
 
+    const ipynbbutton = (
+      <Button
+        icon={fiJupyterLiteIcon}
+        tooltip='Jupyter lite base apps and more'
+        tooltipOptions={ttopts}
+        key={11}
+        onClick={(e) => {
+          this.ipynbButtonPressed()
+        }}
+        className='p-button-secondary p-button-raised p-button-rounded tbChild'
+      />
+    )
+
+    const activitywheel = []
+    activitywheel.push(pollbutton)
+    if (this.props.experimental) activitywheel.push(ipynbbutton)
+
+    let activitywheelcpos = false
+    if (this.state.selectedButtonid === 11) {
+      if (this.state.secondtoolstep === 1) {
+        activitywheelcpos = true
+      }
+    }
+
     const { colorwheel, pensizewheel, tmcolorwheel, bcolorwheel, fcolorwheel } =
       this.getColorButtons({
         addclass: 'p-mr-2 p-mb-2',
@@ -1088,6 +1115,11 @@ export class ToolBox extends ToolHandling {
                 {formpictwheel}
               </div>
             )}
+            {activitywheelcpos && (
+              <div className='p-d-flex p-flex-wrap p-jc-center fadeMenu'>
+                {activitywheel}
+              </div>
+            )}
             {cwheelcpos && (
               <div className='p-d-flex p-flex-wrap p-jc-center fadeMenu'>
                 {colorwheel}

src/ui/toolbox/toolhandling.jsx

@@ -204,6 +204,10 @@ export class ToolHandling extends Component {
         this.setState({ selectedFormid: undefined })
         this.addRemoveSecondToolGuardian(false, this.lasttool)
         break
+      case 11: // startActivityMenu menu
+        if (this.blackboard()) this.blackboard().setMenuMode()
+        this.addRemoveSecondToolGuardian(true, this.lasttool)
+        break
       default:
         break
     }
@@ -220,6 +224,7 @@ export class ToolHandling extends Component {
         case 1:
         case 4:
         case 10:
+        case 11:
           secondtoolstep = 1
           newbuttonid = buttonid
           break