X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FFrameworkWizard%2Fsrc%2Forg%2Ftianocore%2Fframeworkwizard%2FFrameworkWizardUI.java;h=ec826817da5bb652eec8e6cd76e1a5eecde8a2bc;hp=2508a895ffcb77197415f2cb43d7c9f6deb302e4;hb=dbf5dd75da639461456ce96ea48c0f73a1d071cc;hpb=8792f60fcb339fedcc1a62b1da3dbb0cfc4b5d1b

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java
index 2508a895ff..ec826817da 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java
@@ -54,7 +54,7 @@ import org.tianocore.frameworkwizard.common.Identifications.Identification;
 import org.tianocore.frameworkwizard.common.Identifications.OpeningModuleType;
 import org.tianocore.frameworkwizard.common.Identifications.OpeningPackageType;
 import org.tianocore.frameworkwizard.common.Identifications.OpeningPlatformType;
-import org.tianocore.frameworkwizard.common.find.FindPPIsResult;
+//import org.tianocore.frameworkwizard.common.find.FindPPIsResult;
 import org.tianocore.frameworkwizard.common.ui.IDefaultMutableTreeNode;
 import org.tianocore.frameworkwizard.common.ui.IDesktopManager;
 import org.tianocore.frameworkwizard.common.ui.IFrame;
@@ -99,6 +99,7 @@ import org.tianocore.frameworkwizard.platform.ui.FpdPlatformDefs;
 import org.tianocore.frameworkwizard.workspace.Workspace;
 import org.tianocore.frameworkwizard.workspace.WorkspaceTools;
 import org.tianocore.frameworkwizard.workspace.ui.SwitchWorkspace;
+import org.tianocore.frameworkwizard.toolchain.Preferences;
 
 /**
  The class is used to show main GUI of FrameworkWizard
@@ -238,11 +239,11 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
 
     private JMenuItem jMenuItemProjectChangeWorkspace = null;
 
-    private JMenu jMenuProjectBuildTargets = null;
+    private JMenuItem jMenuItemToolsBuildPreferences = null;
 
-    private JCheckBoxMenuItem jCheckBoxMenuItemProjectBuildTargetsDebug = null;
+//    private JCheckBoxMenuItem jCheckBoxMenuItemProjectBuildTargetsDebug = null;
 
-    private JCheckBoxMenuItem jCheckBoxMenuItemProjectBuildTargetsRelease = null;
+//    private JCheckBoxMenuItem jCheckBoxMenuItemProjectBuildTargetsRelease = null;
 
     private JMenuItem jMenuItemToolsToolChainConfiguration = null;
 
@@ -746,11 +747,13 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
             //
             // Add sub menu items
             //
-            jMenuTools.add(getJMenuItemToolsToolChainConfiguration());
-            jMenuTools.addSeparator();
 
             jMenuTools.add(getJMenuItemToolsClone());
             jMenuTools.add(getJMenuItemToolsCodeScan());
+            jMenuTools.addSeparator();
+            
+            jMenuTools.add(getJMenuItemToolsToolChainConfiguration());
+            jMenuTools.add(getJMenuItemToolsBuildPreferences());
         }
         return jMenuTools;
     }
@@ -1268,7 +1271,6 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
             jMenuProject.add(getJMenuItemProjectUpdateFar());
             jMenuProject.add(getJMenuItemProjectRemoveFar());
 
-            jMenuProject.add(getJMenuProjectBuildTargets());
         }
         return jMenuProject;
     }
@@ -1309,52 +1311,20 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
     }
 
     /**
-     This method initializes jMenuProjectBuildTargets	
+     This method initializes jMenuProjectBuildPreferences	
      
      @return javax.swing.JMenu	
      
      **/
-    private JMenu getJMenuProjectBuildTargets() {
-        if (jMenuProjectBuildTargets == null) {
-            jMenuProjectBuildTargets = new JMenu();
-            jMenuProjectBuildTargets.setText("Build Targets");
-            jMenuProjectBuildTargets.setMnemonic('T');
-            jMenuProjectBuildTargets.setVisible(false);
-
-            jMenuProjectBuildTargets.add(getJCheckBoxMenuItemProjectBuildTargetsDebug());
-            jMenuProjectBuildTargets.add(getJCheckBoxMenuItemProjectBuildTargetsRelease());
-        }
-        return jMenuProjectBuildTargets;
-    }
-
-    /**
-     This method initializes jCheckBoxMenuItemProjectBuildTargetsDebug	
-     
-     @return javax.swing.JCheckBoxMenuItem	
-     
-     **/
-    private JCheckBoxMenuItem getJCheckBoxMenuItemProjectBuildTargetsDebug() {
-        if (jCheckBoxMenuItemProjectBuildTargetsDebug == null) {
-            jCheckBoxMenuItemProjectBuildTargetsDebug = new JCheckBoxMenuItem();
-            jCheckBoxMenuItemProjectBuildTargetsDebug.setText("Debug");
-            jCheckBoxMenuItemProjectBuildTargetsDebug.setEnabled(false);
-        }
-        return jCheckBoxMenuItemProjectBuildTargetsDebug;
-    }
-
-    /**
-     This method initializes jCheckBoxMenuItemProjectBuildTargetsRelease	
-     
-     @return javax.swing.JCheckBoxMenuItem	
-     
-     **/
-    private JCheckBoxMenuItem getJCheckBoxMenuItemProjectBuildTargetsRelease() {
-        if (jCheckBoxMenuItemProjectBuildTargetsRelease == null) {
-            jCheckBoxMenuItemProjectBuildTargetsRelease = new JCheckBoxMenuItem();
-            jCheckBoxMenuItemProjectBuildTargetsRelease.setText("Release");
-            jCheckBoxMenuItemProjectBuildTargetsRelease.setEnabled(false);
+    private JMenuItem getJMenuItemToolsBuildPreferences() {
+        if (jMenuItemToolsBuildPreferences == null) {
+            jMenuItemToolsBuildPreferences = new JMenuItem();
+            jMenuItemToolsBuildPreferences.setText("Build Preferences");
+            jMenuItemToolsBuildPreferences.setMnemonic('P');
+            jMenuItemToolsBuildPreferences.setEnabled(true);
+            jMenuItemToolsBuildPreferences.addActionListener(this);
         }
-        return jCheckBoxMenuItemProjectBuildTargetsRelease;
+        return jMenuItemToolsBuildPreferences;
     }
 
     /**
@@ -1878,7 +1848,11 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         }
 
         if (arg0.getSource() == this.jMenuItemEditFindPpi) {
-            this.findPpi();
+//            this.findPpi();
+        }
+        
+        if (arg0.getSource() == jMenuItemToolsBuildPreferences) {
+            configBuildPreferences();
         }
 
         if (arg0.getSource() == this.jMenuItemProjectChangeWorkspace) {
@@ -3099,10 +3073,10 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      To find all defined PPIs in workspace
      
      **/
-    private void findPpi() {
-        FindPPIsResult fpr = FindPPIsResult.getInstance();
-        fpr.setVisible(true);
-    }
+//    private void findPpi() {
+//        FindPPIsResult fpr = FindPPIsResult.getInstance();
+//        fpr.setVisible(true);
+//    }
 
     /**
      Switch current workspace to others
@@ -3200,6 +3174,10 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         tcc.showDialog();
     }
 
+    private void configBuildPreferences() {
+       Preferences bt = Preferences.getInstance();
+       bt.showDialog();
+    }
     /**
      Clone selected item