From c06c271a600127a4c98d52fc3e714f368960cd5e Mon Sep 17 00:00:00 2001
From: makc <makc.the.great@gmail.com>
Date: Mon, 10 Jun 2013 19:21:38 +0200
Subject: [PATCH] fixes #3, closes #8

---
 ColtPlugin/ColtPlugin.csproj        |   4 +
 ColtPlugin/PluginMain.cs            | 153 +++++++++++++++++++++-------
 ColtPlugin/Resources/en_US.resX     |   9 +-
 ColtPlugin/obj/Debug/ColtPlugin.dll | Bin 16896 -> 19968 bytes
 4 files changed, 129 insertions(+), 37 deletions(-)

diff --git a/ColtPlugin/ColtPlugin.csproj b/ColtPlugin/ColtPlugin.csproj
index cd86eb5..4f2ed06 100644
--- a/ColtPlugin/ColtPlugin.csproj
+++ b/ColtPlugin/ColtPlugin.csproj
@@ -142,4 +142,8 @@
       <Name>PluginCore</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\colt_run.png" />
+    <EmbeddedResource Include="Resources\colt_save.png" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/ColtPlugin/PluginMain.cs b/ColtPlugin/PluginMain.cs
index 5b0932e..66dfdb9 100644
--- a/ColtPlugin/PluginMain.cs
+++ b/ColtPlugin/PluginMain.cs
@@ -26,11 +26,10 @@ public class PluginMain : IPlugin
         private String pluginHelp = "makc3d.wordpress.com/about/";
         private String pluginDesc = "COLT FD Plugin";
         private String pluginAuth = "Makc"; // as if
-        private String buttonText = "Open in COLT";
         private String settingFilename;
         private Settings settingObject;
         private ToolStripMenuItem menuItem;
-        private ToolStripButton toolbarButton;
+        private ToolStripButton toolbarButton, toolbarButton2;
         private FileSystemWatcher watcher;
         private String pathToLog;
         private System.Timers.Timer timer;
@@ -133,6 +132,7 @@ public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority prority)
                         Boolean as3projectIsOpen = (project != null) && (project.Language == "as3");
                         if (menuItem != null) menuItem.Enabled = as3projectIsOpen;
                         if (toolbarButton != null) toolbarButton.Enabled = as3projectIsOpen;
+                        if (toolbarButton2 != null) toolbarButton2.Enabled = as3projectIsOpen && (GetCOLTFile() != null);
                         // modified or new project - reconnect in any case
                         ConnectToCOLT();
                     }
@@ -144,7 +144,8 @@ public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority prority)
                     else if (cmd == "ProjectManager.ToolBar")
                     {
                         Object toolStrip = (e as DataEvent).Data;
-                        CreateToolbarButton(toolStrip as ToolStrip);
+                        toolbarButton = CreateToolbarButton(toolStrip as ToolStrip, "colt_save.png", "Menu.ExportToCOLT", new EventHandler(OnClick));
+                        toolbarButton2 = CreateToolbarButton(toolStrip as ToolStrip, "colt_run.png", "Menu.OpenInCOLT", new EventHandler(OnClick2));
                     }
                     break;
                 
@@ -206,7 +207,6 @@ public void InitLocalization()
                     break;
             }
             pluginDesc = LocaleHelper.GetString("Info.Description");
-            buttonText = LocaleHelper.GetString("Info.ButtonText");
         }
 
         /// <summary>
@@ -229,19 +229,20 @@ public void AddEventHandlers()
 
         private void CreateMenuItem(ToolStripMenuItem projectMenu)
         {
-            menuItem = new ToolStripMenuItem(buttonText, GetImage("colt.png"), new EventHandler(OnClick), null);
+            menuItem = new ToolStripMenuItem(LocaleHelper.GetString("Menu.ExportToCOLT"), GetImage("colt_save.png"), new EventHandler(OnClick), null);
             menuItem.Enabled = false;
             projectMenu.DropDownItems.Add(menuItem);
         }
 
-        private void CreateToolbarButton(ToolStrip toolStrip)
+        private ToolStripButton CreateToolbarButton(ToolStrip toolStrip, String image, String hint, EventHandler handler)
         {
-            toolbarButton = new ToolStripButton();
-            toolbarButton.Image = GetImage("colt.png");
-            toolbarButton.Text = buttonText;
-            toolbarButton.DisplayStyle = ToolStripItemDisplayStyle.Image;
-            toolbarButton.Click += new EventHandler(OnClick);
-            toolStrip.Items.Add(toolbarButton);
+            ToolStripButton button = new ToolStripButton();
+            button.Image = GetImage(image);
+            button.Text = LocaleHelper.GetString(hint);
+            button.DisplayStyle = ToolStripItemDisplayStyle.Image;
+            button.Click += handler;
+            toolStrip.Items.Add(button);
+            return button;
         }
 
         /// <summary>
@@ -259,6 +260,11 @@ private void OnClick(Object sender, System.EventArgs e)
             OpenInCOLT();
         }
 
+        private void OnClick2(Object sender, System.EventArgs e)
+        {
+            OpenInCOLT(false);
+        }
+
         #endregion
 
         #region Plugin settings stuff
@@ -374,6 +380,8 @@ private void ShowErrors()
 
         #endregion
 
+        #region Meta tags
+
         /// <summary>
         /// Generate meta tags
         /// </summary>
@@ -428,6 +436,8 @@ private string LineIndentPosition(ScintillaNet.ScintillaControl sci, int line)
             return "";
         }
 
+        #endregion
+
         /// <summary>
         /// Connects to COLT
         /// </summary>
@@ -458,7 +468,62 @@ private void ConnectToCOLT(Boolean create = false)
         /// <summary>
         /// Opens the project in COLT
         /// </summary>
-        private void OpenInCOLT()
+        private void OpenInCOLT(Boolean create = true)
+        {
+            // Create COLT subfolder if does not exist yet
+            // While at that, start listening for colt/compile_errors.log changes
+            ConnectToCOLT(true);
+
+
+            // Find or create COLT project to open
+            String coltFileName = create ? ExportCOLTFile() : GetCOLTFile();
+
+
+            // Open it with default app (COLT)
+            try
+            {
+                if (coltFileName != null)
+                {
+                    Process.Start(coltFileName);
+                }
+
+                else
+                {
+                    toolbarButton2.Enabled = false;
+                }
+            }
+
+            catch (Exception e)
+            {
+                TraceManager.Add("Could not start COLT: " + e.ToString());
+            }
+
+        }
+
+        /// <summary>
+        /// Returns path to existing COLT project or null.
+        /// </summary>
+        private String GetCOLTFile()
+        {
+            IProject project = PluginBase.CurrentProject;
+
+            try
+            {
+                String[] files = Directory.GetFiles(project.GetAbsolutePath(settingObject.WorkingFolder), "*.colt");
+                if (files.Length > 0) return files[0];
+            }
+
+            catch (Exception)
+            {
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Exports the project to COLT and returns path to it or null.
+        /// </summary>
+        private String ExportCOLTFile()
         {
             // our options: parse project.ProjectPath (xml file) or use api
             AS3Project project = (AS3Project)PluginBase.CurrentProject;
@@ -476,7 +541,7 @@ private void OpenInCOLT()
 
                     EventManager.DispatchEvent(this, new DataEvent(EventType.Command, "ProjectManager.BuildProject", null));
 
-                    return;
+                    return null;
                 }
 
                 // Create config copy with <file-specs>...</file-specs> commented out
@@ -486,14 +551,9 @@ private void OpenInCOLT()
                         .Replace("<file-specs", "<!-- file-specs")
                         .Replace("/file-specs>", "/file-specs -->"));
             }
-            
 
-            // Create COLT subfolder if does not exist yet
-            // While at that, start listening for colt/compile_errors.log changes
-            ConnectToCOLT(true);
 
-
-            // Create COLT project with random name (todo: separate buttons for project export and project open)
+            // Create COLT project with random name
             String coltFileName = project.GetAbsolutePath(Path.Combine(settingObject.WorkingFolder, System.Guid.NewGuid() + ".colt"));
             StreamWriter stream = File.CreateText(coltFileName);
 
@@ -510,9 +570,9 @@ private void OpenInCOLT()
             stream.WriteLine("libraryPaths=" + libraryPaths);
 
             stream.WriteLine("clearMessages=true");
-            
+
             stream.WriteLine("targetPlayerVersion=" + project.MovieOptions.Version + ".0");
-            
+
             stream.WriteLine("mainClass=" + EscapeForCOLT(project.GetAbsolutePath(project.CompileTargets[0])));
 
             stream.WriteLine("maxLoopIterations=10000");
@@ -526,7 +586,7 @@ private void OpenInCOLT()
                 stream.WriteLine("useCustomSDKConfiguration=true");
                 stream.WriteLine("customConfigPath=" + EscapeForCOLT(project.GetAbsolutePath(configCopy)) + "\"");
             }
-            
+
             stream.WriteLine("target=SWF"); // use project.MovieOptions.Platform switch ??
 
             String outputPath = project.OutputPath;
@@ -549,24 +609,42 @@ private void OpenInCOLT()
                 sourcePaths += EscapeForCOLT(project.GetAbsolutePath(sourcePath)) + ";";
             stream.WriteLine("sourcePaths=" + sourcePaths);
 
-            // size, frame rate and background color
-            stream.WriteLine("compilerOptions=-default-size " + project.MovieOptions.Width + " " + project.MovieOptions.Height +
-                " -default-frame-rate " + project.MovieOptions.Fps +
-                " -default-background-color " + project.MovieOptions.BackgroundColorInt);
 
-            stream.Close();
-
-            // Open it with default app (COLT)
-            try
+            // size, frame rate and background color
+            String[] coltAdditionalOptionsKeys = {
+                "-default-size",
+                "-default-frame-rate",
+                "-default-background-color"
+            };
+            String[] coltAdditionalOptions = {
+                coltAdditionalOptionsKeys[0] + " " + project.MovieOptions.Width + " " + project.MovieOptions.Height,
+                coltAdditionalOptionsKeys[1] + " " + project.MovieOptions.Fps,
+                coltAdditionalOptionsKeys[2] + " " + project.MovieOptions.BackgroundColorInt
+            };
+
+            String additionalOptions = "";
+            foreach (String option in project.CompilerOptions.Additional)
             {
-                Process.Start(coltFileName);
+                for (int i = 0; i < coltAdditionalOptionsKeys.Length; i++)
+                {
+                    if (option.Contains(coltAdditionalOptionsKeys[i]))
+                    {
+                        coltAdditionalOptions[i] = "";
+                    }
+                }
+                additionalOptions += option + " ";
             }
 
-            catch (Exception e)
+            foreach (String option in coltAdditionalOptions)
             {
-                TraceManager.Add("Could not start COLT: " + e.ToString());
+                additionalOptions += option + " ";
             }
 
+            stream.WriteLine("compilerOptions=" + additionalOptions.Trim());
+
+            stream.Close();
+
+
             // Remove older *.colt files
             foreach (String oldFile in Directory.GetFiles(project.GetAbsolutePath(settingObject.WorkingFolder), "*.colt"))
             {
@@ -575,6 +653,13 @@ private void OpenInCOLT()
                     File.Delete(oldFile);
                 }
             }
+
+
+            // Enable "open" button
+            toolbarButton2.Enabled = true;
+
+
+            return coltFileName;
         }
 
         private String EscapeForCOLT(String path)
diff --git a/ColtPlugin/Resources/en_US.resX b/ColtPlugin/Resources/en_US.resX
index 92f45f0..622c0d7 100644
--- a/ColtPlugin/Resources/en_US.resX
+++ b/ColtPlugin/Resources/en_US.resX
@@ -117,10 +117,13 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="Info.ButtonText" xml:space="preserve">
-    <value>Open in COLT</value>
-  </data>
   <data name="Info.Description" xml:space="preserve">
     <value>COLT Plugin for FlashDevelop.</value>
   </data>
+  <data name="Menu.ExportToCOLT" xml:space="preserve">
+    <value>Export to COLT</value>
+  </data>
+  <data name="Menu.OpenInCOLT" xml:space="preserve">
+    <value>Open in COLT</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ColtPlugin/obj/Debug/ColtPlugin.dll b/ColtPlugin/obj/Debug/ColtPlugin.dll
index 401a6b2fbaee5eda7ce989dc4a810cfdc86620ba..c56b1f65ca4ae5ad8aedfdd397948aae903e055d 100644
GIT binary patch
delta 8789
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

delta 5997
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
Xeuw_9u?WG@>aEzAJ^vybt<(MoV8#Pr