Merge remote-tracking branch 'origin/development' into development

[Mograsim.git] / plugins / net.mograsim.plugin.core / src / net / mograsim / plugin / views / LogicUIPart.java

diff --git a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/views/LogicUIPart.java b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/views/LogicUIPart.java
index 42c2db4..cf883d2 100644 (file)
--- a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/views/LogicUIPart.java
+++ b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/views/LogicUIPart.java
@@ -4,6 +4,8 @@ import javax.inject.Inject;
 
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.MouseTrackListener;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
@@ -21,6 +23,9 @@ import net.mograsim.machine.mi.AssignableMicroInstructionMemory;
 import net.mograsim.plugin.EclipsePreferences;
 import net.mograsim.plugin.MachineContext;
 import net.mograsim.plugin.MograsimActivator;
+import net.mograsim.plugin.nature.MachineContextSwtTools;
+import net.mograsim.plugin.nature.MachineContextSwtTools.MachineCombo;
+import net.mograsim.plugin.nature.MachineContextSwtTools.MograsimProjectCombo;
 import net.mograsim.plugin.tables.DisplaySettings;
 import net.mograsim.plugin.tables.mi.ActiveInstructionPreviewContentProvider;
 import net.mograsim.plugin.tables.mi.InstructionTable;
@@ -39,6 +44,7 @@ public class LogicUIPart extends ViewPart
        {
                if (exec != null)
                        exec.stopLiveExecution();
+               super.dispose();
        }
 
        @Override
@@ -87,22 +93,46 @@ public class LogicUIPart extends ViewPart
        private void addSimulationControlWidgets(Composite parent)
        {
                Composite c = new Composite(parent, SWT.NONE);
-               c.setLayout(new GridLayout(4, false));
+               c.setLayout(new GridLayout(6, false));
+
+               MograsimProjectCombo projectCombo = MachineContextSwtTools.createMograsimProjectSelector(c, SWT.NONE);
+               MachineCombo machineCombo = MachineContextSwtTools.createMachineSelector(c, SWT.NONE);
+
                Button pauseButton = new Button(c, SWT.TOGGLE);
-               pauseButton.setText("Running");
+               pauseButton.setSelection(true);
+               setPauseText(pauseButton, false);
 
                pauseButton.addListener(SWT.Selection, e ->
                {
-                       if (!pauseButton.getSelection())
+                       setPauseText(pauseButton, false);
+                       if (pauseButton.getSelection())
                        {
-                               pauseButton.setText("Running");
                                exec.unpauseLiveExecution();
                        } else
                        {
-                               pauseButton.setText("Paused");
                                exec.pauseLiveExecution();
                        }
                });
+               pauseButton.addMouseTrackListener(new MouseTrackListener()
+               {
+                       @Override
+                       public void mouseHover(MouseEvent e)
+                       {
+                               // nothing
+                       }
+
+                       @Override
+                       public void mouseExit(MouseEvent e)
+                       {
+                               setPauseText(pauseButton, false);
+                       }
+
+                       @Override
+                       public void mouseEnter(MouseEvent e)
+                       {
+                               setPauseText(pauseButton, true);
+                       }
+               });
 
                Label speedLabel = new Label(c, SWT.NONE);
                speedLabel.setText("Simulation Speed: ");
@@ -129,6 +159,29 @@ public class LogicUIPart extends ViewPart
                c.setVisible(true);
        }
 
+       private void setPauseText(Button pauseButton, boolean hovered)
+       {
+               if (hovered)
+               {
+                       if (pauseButton.getSelection())
+                       {
+                               pauseButton.setText("Pause?");
+                       } else
+                       {
+                               pauseButton.setText("Resume?");
+                       }
+               } else
+               {
+                       if (pauseButton.getSelection())
+                       {
+                               pauseButton.setText("Running");
+                       } else
+                       {
+                               pauseButton.setText("Paused");
+                       }
+               }
+       }
+
        @Override
        public void setFocus()
        {