From 29af0eb5cefddd21b90f553883eab4d47623b728 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=F8=EDk?= <jindra.petrik@gmail.com>
Date: Mon, 6 Sep 2010 09:01:59 +0200
Subject: [PATCH] Updated gui

---
 trunk/.idea/workspace.xml                     | 121 ++++++++++++++----
 .../com/jpexs/asdec/abc/gui/MainFrame.java    |  18 +--
 .../com/jpexs/asdec/action/gui/MainFrame.java |  29 ++++-
 3 files changed, 125 insertions(+), 43 deletions(-)

diff --git a/trunk/.idea/workspace.xml b/trunk/.idea/workspace.xml
index 8e4cd62eb..2f6ddde58 100644
--- a/trunk/.idea/workspace.xml
+++ b/trunk/.idea/workspace.xml
@@ -2,8 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" readonly="true" id="2a5649cc-c63c-4e40-abcf-b08a0b6d3714" name="Default" comment="" />
-    <ignored path=".idea/workspace.xml" />
     <ignored path="trunk.iws" />
+    <ignored path=".idea/workspace.xml" />
     <option name="TRACKING_ENABLED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -59,7 +59,17 @@
   </component>
   <component name="FileColors" enabled="true" enabledForTabs="true" />
   <component name="FileEditorManager">
-    <leaf />
+    <leaf>
+      <file leaf-file-name="Main.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/com/jpexs/asdec/Main.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="36" column="42" selection-start="1022" selection-end="1022" vertical-scroll-proportion="0.18959108">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FindManager">
     <FindUsagesManager>
@@ -73,8 +83,10 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/com/jpexs/asdec/Main.java" />
         <option value="$PROJECT_DIR$/test/com/jpexs/asdec/TestRecompile.java" />
+        <option value="$PROJECT_DIR$/src/com/jpexs/asdec/abc/gui/MainFrame.java" />
+        <option value="$PROJECT_DIR$/src/com/jpexs/asdec/action/gui/MainFrame.java" />
+        <option value="$PROJECT_DIR$/src/com/jpexs/asdec/Main.java" />
       </list>
     </option>
   </component>
@@ -102,7 +114,7 @@
   </component>
   <component name="ProjectView">
     <navigator currentView="ProjectPane" proportions="" version="1" splitterProportion="0.5">
-      <flattenPackages />
+      <flattenPackages PackagesPane="false" />
       <showMembers />
       <showModules />
       <showLibraryContents />
@@ -114,8 +126,6 @@
     </navigator>
     <panes>
       <pane id="Favorites" />
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -134,8 +144,61 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="trunk" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="trunk" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="asdec" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
         </subPane>
       </pane>
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="trunk" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="trunk" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ASDec" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="trunk" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ASDec" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="com.jpexs.asdec" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -152,11 +215,11 @@
     <property name="GoToClass.toSaveIncludeLibraries" value="false" />
     <property name="MemberChooser.showClasses" value="true" />
     <property name="GoToClass.includeLibraries" value="false" />
-    <property name="dynamic.classpath" value="false" />
-    <property name="options.searchVisible" value="true" />
     <property name="options.splitter.details.proportions" value="0.2" />
+    <property name="options.searchVisible" value="true" />
+    <property name="dynamic.classpath" value="false" />
   </component>
-  <component name="RunManager" selected="Application.Basic run">
+  <component name="RunManager">
     <configuration default="true" type="Remote" factoryName="Remote">
       <option name="USE_SOCKET_TRANSPORT" value="true" />
       <option name="SERVER_MODE" value="false" />
@@ -330,20 +393,20 @@
     <layout>
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25" sideWeight="0.65924656" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32876712" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17401215" sideWeight="0.6609589" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.33206686" sideWeight="0.65924656" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32876712" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2674772" sideWeight="0.6609589" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32676518" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32876712" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout>
@@ -406,11 +469,6 @@
         <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/jpexs/asdec/Main.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="35" column="41" selection-start="979" selection-end="979" vertical-scroll-proportion="0.5371747" />
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/com/jpexs/asdec/TestRecompile.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="18" column="39" selection-start="594" selection-end="594" vertical-scroll-proportion="0.42882884" />
@@ -418,14 +476,27 @@
     </entry>
     <entry file="jar://C:/Program Files/Java/jdk1.6.0_21/src.zip!/java/lang/ref/ReferenceQueue.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="117" column="0" selection-start="3523" selection-end="3523" vertical-scroll-proportion="0.33333334">
-          <folding />
-        </state>
+        <state line="117" column="0" selection-start="3523" selection-end="3523" vertical-scroll-proportion="0.33333334" />
       </provider>
     </entry>
     <entry file="jar://C:/Program Files/Java/jdk1.6.0_21/src.zip!/java/lang/Thread.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="618" column="0" selection-start="23472" selection-end="23472" vertical-scroll-proportion="0.33333334">
+        <state line="618" column="0" selection-start="23472" selection-end="23472" vertical-scroll-proportion="0.33333334" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/jpexs/asdec/action/gui/MainFrame.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="141" column="27" selection-start="5678" selection-end="5678" vertical-scroll-proportion="0.031598512" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/jpexs/asdec/abc/gui/MainFrame.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="378" column="4" selection-start="13675" selection-end="13819" vertical-scroll-proportion="0.62081784" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/jpexs/asdec/Main.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="36" column="42" selection-start="1022" selection-end="1022" vertical-scroll-proportion="0.18959108">
           <folding />
         </state>
       </provider>
diff --git a/trunk/src/com/jpexs/asdec/abc/gui/MainFrame.java b/trunk/src/com/jpexs/asdec/abc/gui/MainFrame.java
index 04c123542..271a57710 100644
--- a/trunk/src/com/jpexs/asdec/abc/gui/MainFrame.java
+++ b/trunk/src/com/jpexs/asdec/abc/gui/MainFrame.java
@@ -42,8 +42,8 @@ public class MainFrame extends JFrame implements ActionListener, ItemListener {
     public JPanel statusPanel = new JPanel();
     public LoadingPanel loadingPanel = new LoadingPanel(20, 20);
     public JLabel statusLabel = new JLabel("");
-    public JLabel asmLabel = new JLabel("Disassembled code:");
-    public JLabel decLabel = new JLabel("Decompiled code:");
+    public JLabel asmLabel = new JLabel("P-code source (editable)");
+    public JLabel decLabel = new JLabel("ActionScript source");
 
     public void setStatus(String s) {
         if (s.equals("")) {
@@ -156,8 +156,6 @@ public class MainFrame extends JFrame implements ActionListener, ItemListener {
         setSize(800, 600);
         this.abc = list.get(listIndex).abc;
         getContentPane().setLayout(new BorderLayout());
-        //codeView = new CodeViewPanel(abc);
-        //codeView
         sourceTextArea = new ASMSourceEditorPane();
 
         JPanel rightPanel = new JPanel();
@@ -175,7 +173,6 @@ public class MainFrame extends JFrame implements ActionListener, ItemListener {
         saveButton.addActionListener(this);
 
 
-        //buttonsPan.add(verifyButton);
         buttonsPan.add(saveButton);
         rightPanel.add(buttonsPan, BorderLayout.SOUTH);
         decompiledTextArea = new DecompiledEditorPane();
@@ -186,6 +183,7 @@ public class MainFrame extends JFrame implements ActionListener, ItemListener {
         panA.setLayout(new BorderLayout());
         panA.add(rightPanel, BorderLayout.CENTER);
         panA.add(asmLabel, BorderLayout.NORTH);
+
         asmLabel.setHorizontalAlignment(SwingConstants.CENTER);
         asmLabel.setBorder(new BevelBorder(BevelBorder.RAISED));
         JPanel panB = new JPanel();
@@ -380,13 +378,7 @@ public class MainFrame extends JFrame implements ActionListener, ItemListener {
 
     public void display() {
         setVisible(true);
-
-        splitPane2.setDividerLocation(0.5); //Traitlist-classtree
-
-        //splitPane3.setDividerLocation(0.1); //classtree|right
-
-        splitPane1.setDividerLocation(0.5); //disassembled|decompiled
-
-
+        splitPane2.setDividerLocation(0.5);
+        splitPane1.setDividerLocation(0.5); 
     }
 }
diff --git a/trunk/src/com/jpexs/asdec/action/gui/MainFrame.java b/trunk/src/com/jpexs/asdec/action/gui/MainFrame.java
index 7be298f64..6cf8c122c 100644
--- a/trunk/src/com/jpexs/asdec/action/gui/MainFrame.java
+++ b/trunk/src/com/jpexs/asdec/action/gui/MainFrame.java
@@ -10,6 +10,7 @@ import com.jpexs.asdec.tags.Tag;
 import jsyntaxpane.DefaultSyntaxKit;
 
 import javax.swing.*;
+import javax.swing.border.BevelBorder;
 import javax.swing.event.TreeSelectionEvent;
 import javax.swing.event.TreeSelectionListener;
 import javax.swing.tree.DefaultTreeCellRenderer;
@@ -30,6 +31,8 @@ public class MainFrame extends JFrame implements TreeSelectionListener, ActionLi
     public JSplitPane splitPane;
     public JSplitPane splitPane2;
     public JButton saveButton = new JButton("Save");
+    public JLabel asmLabel = new JLabel("P-code source (editable)");
+    public JLabel decLabel = new JLabel("ActionScript source");
 
     public MainFrame(List<Tag> list) {
         this.list = list;
@@ -45,15 +48,30 @@ public class MainFrame extends JFrame implements TreeSelectionListener, ActionLi
         treeRenderer.setLeafIcon(leafIcon);
         tagTree.setCellRenderer(treeRenderer);
 
-        JPanel centerPanel = new JPanel();
-        centerPanel.setLayout(new BorderLayout());
-        centerPanel.add(new JScrollPane(editor), BorderLayout.CENTER);
-        centerPanel.add(saveButton, BorderLayout.SOUTH);
+        JPanel panB = new JPanel();
+        panB.setLayout(new BorderLayout());
+        asmLabel.setHorizontalAlignment(SwingConstants.CENTER);
+        asmLabel.setBorder(new BevelBorder(BevelBorder.RAISED));
+        panB.add(asmLabel,BorderLayout.NORTH);
+        panB.add(new JScrollPane(editor), BorderLayout.CENTER);
+
+        JPanel buttonsPan = new JPanel();
+        buttonsPan.setLayout(new FlowLayout());
+        buttonsPan.add(saveButton);
+        panB.add(buttonsPan, BorderLayout.SOUTH);
 
         saveButton.addActionListener(this);
         saveButton.setActionCommand("SAVEACTION");
+
+        JPanel panA=new JPanel();
+        panA.setLayout(new BorderLayout());
+        panA.add(new JScrollPane(decompiledEditor),BorderLayout.CENTER);
+        panA.add(decLabel, BorderLayout.NORTH);
+        decLabel.setHorizontalAlignment(SwingConstants.CENTER);
+        decLabel.setBorder(new BevelBorder(BevelBorder.RAISED));
+        
         setLayout(new BorderLayout());
-        add(splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, new JScrollPane(tagTree), splitPane2 = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centerPanel, new JScrollPane(decompiledEditor))), BorderLayout.CENTER);
+        add(splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, new JScrollPane(tagTree), splitPane2 = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, panA, panB)), BorderLayout.CENTER);
         editor.setContentType("text/flasm");
         decompiledEditor.setContentType("text/actionscript");
         setSize(640, 480);
@@ -124,6 +142,7 @@ public class MainFrame extends JFrame implements TreeSelectionListener, ActionLi
     public void display() {
         setVisible(true);
         splitPane.setDividerLocation(0.5);
+        splitPane2.setDividerLocation(0.5);
     }
 
     public void actionPerformed(ActionEvent e) {