From 401d2b10ff95cbef8a6b39d69c559c3ff2457f24 Mon Sep 17 00:00:00 2001
From: gac-S_Changer <gac-S_Changer@PC12288.psi.ch>
Date: Mon, 20 Aug 2018 10:39:37 +0200
Subject: [PATCH]

---
 src/main/java/ch/psi/mxsc/MainPanel.form | 14 +++++++-------
 src/main/java/ch/psi/mxsc/MainPanel.java | 16 ++++++++++++----
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/main/java/ch/psi/mxsc/MainPanel.form b/src/main/java/ch/psi/mxsc/MainPanel.form
index 1b153d1..b25fd46 100644
--- a/src/main/java/ch/psi/mxsc/MainPanel.form
+++ b/src/main/java/ch/psi/mxsc/MainPanel.form
@@ -30,7 +30,7 @@
           <Group type="102" alignment="1" attributes="0">
               <Component id="panelTop" max="32767" attributes="0"/>
               <EmptySpace min="-2" pref="0" max="-2" attributes="0"/>
-              <Component id="panelBottom" min="-2" max="-2" attributes="0"/>
+              <Component id="panelBottom" max="32767" attributes="0"/>
               <EmptySpace min="-2" pref="1" max="-2" attributes="0"/>
           </Group>
       </Group>
@@ -613,7 +613,7 @@
                               <Component id="led6" alignment="3" min="-2" max="-2" attributes="0"/>
                               <Component id="jLabel9" alignment="3" min="-2" max="-2" attributes="0"/>
                           </Group>
-                          <EmptySpace pref="15" max="32767" attributes="0"/>
+                          <EmptySpace pref="26" max="32767" attributes="0"/>
                       </Group>
                   </Group>
                 </DimensionLayout>
@@ -1168,11 +1168,11 @@
                           <Group type="102" attributes="0">
                               <EmptySpace min="0" pref="0" max="-2" attributes="0"/>
                               <Group type="103" groupAlignment="0" max="-2" attributes="0">
-                                  <Component id="buttonExpertCommands" max="32767" attributes="0"/>
-                                  <Component id="buttonRecovery" max="32767" attributes="0"/>
-                                  <Component id="buttonCalibrateImage" max="32767" attributes="0"/>
-                                  <Component id="buttonCalibrateCover" max="32767" attributes="0"/>
-                                  <Component id="buttonConfig" min="-2" pref="85" max="-2" attributes="0"/>
+                                  <Component id="buttonExpertCommands" linkSize="28" max="32767" attributes="0"/>
+                                  <Component id="buttonRecovery" linkSize="28" max="32767" attributes="0"/>
+                                  <Component id="buttonCalibrateImage" linkSize="28" max="32767" attributes="0"/>
+                                  <Component id="buttonCalibrateCover" linkSize="28" max="32767" attributes="0"/>
+                                  <Component id="buttonConfig" linkSize="28" min="-2" pref="85" max="-2" attributes="0"/>
                               </Group>
                               <EmptySpace max="32767" attributes="0"/>
                           </Group>
diff --git a/src/main/java/ch/psi/mxsc/MainPanel.java b/src/main/java/ch/psi/mxsc/MainPanel.java
index ce046b8..5d1d101 100644
--- a/src/main/java/ch/psi/mxsc/MainPanel.java
+++ b/src/main/java/ch/psi/mxsc/MainPanel.java
@@ -352,7 +352,9 @@ public class MainPanel extends Panel {
         if (commandsPlugin != null) {
             getContext().getPluginManager().unloadPlugin(commandsPlugin);
         }
-        commandsPlugin = getContext().getPluginManager().loadInitializePlugin(getContext().getSetup().expandPath("{plugins}/Commands.java"));
+        commandsPlugin = getContext().getPluginManager().loadPlugin(getContext().getSetup().expandPath("{plugins}/Commands.java"));
+        ((Panel)commandsPlugin).setDetached(true, getTopLevel());
+        getContext().getPluginManager().initializePlugin(commandsPlugin); 
     }
 
     Plugin recoveryPlugin;
@@ -361,7 +363,10 @@ public class MainPanel extends Panel {
         if (recoveryPlugin != null) {
             getContext().getPluginManager().unloadPlugin(recoveryPlugin);
         }
-        recoveryPlugin = getContext().getPluginManager().loadInitializePlugin(getContext().getSetup().expandPath("{plugins}/Recovery.java"));
+        recoveryPlugin = getContext().getPluginManager().loadPlugin(getContext().getSetup().expandPath("{plugins}/Recovery.java"));
+        ((Panel)recoveryPlugin).setDetached(true, getTopLevel());
+        getContext().getPluginManager().initializePlugin(recoveryPlugin);           
+       
     }
 
     void setDefaultDetail() {
@@ -856,7 +861,7 @@ public class MainPanel extends Panel {
                 .addGroup(panelBeamlineStatusLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(led6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addComponent(jLabel9))
-                .addContainerGap(15, Short.MAX_VALUE))
+                .addContainerGap(26, Short.MAX_VALUE))
         );
 
         panelLN2Control.setBorder(javax.swing.BorderFactory.createTitledBorder("LN2 Control"));
@@ -1200,6 +1205,9 @@ public class MainPanel extends Panel {
                 .addComponent(checkExpert, javax.swing.GroupLayout.PREFERRED_SIZE, 92, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addGap(0, 0, Short.MAX_VALUE))
         );
+
+        panelExpertLayout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {buttonCalibrateCover, buttonCalibrateImage, buttonConfig, buttonExpertCommands, buttonRecovery});
+
         panelExpertLayout.setVerticalGroup(
             panelExpertLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(panelExpertLayout.createSequentialGroup()
@@ -1425,7 +1433,7 @@ public class MainPanel extends Panel {
             .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
                 .addComponent(panelTop, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                 .addGap(0, 0, 0)
-                .addComponent(panelBottom, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addComponent(panelBottom, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                 .addGap(1, 1, 1))
         );
     }// </editor-fold>//GEN-END:initComponents