- final

Author: janbender

AddinUtilities.cs

@@ -39,18 +39,13 @@ public static void initFonts()
             if (m_latexFonts == null)
             {
                 m_latexFonts = new List<LatexFont>();
-                //m_latexFonts.Add(new LatexFont("Computer Modern Roman", "cmr"));
                 m_latexFonts.Add(new LatexFont("Times Roman", "ptm"));
                 m_latexFonts.Add(new LatexFont("Palatino", "ppl"));
                 m_latexFonts.Add(new LatexFont("New Century Schoolbook", "pnc"));
                 m_latexFonts.Add(new LatexFont("Bookman", "pbk"));
-                //m_latexFonts.Add(new LatexFont("Computer Modern SansSerif", "cmss"));
                 m_latexFonts.Add(new LatexFont("Helvetica", "phv"));
                 m_latexFonts.Add(new LatexFont("Avant Garde", "pag"));
-                //m_latexFonts.Add(new LatexFont("Computer Modern Typewriter", "cmtt"));
                 m_latexFonts.Add(new LatexFont("Courier", "pcr"));
-                //m_latexFonts.Add(new LatexFont("Computer Modern Fibonacci", "cmfib"));
-                //m_latexFonts.Add(new LatexFont("Computer Modern Dunhill", "cmdh"));
             }
             if (m_latexFontSeries == null)
             {
@@ -454,11 +449,9 @@ public static void changeOptions()
             SettingsManager mgr = SettingsManager.getCurrent();
             OptionsDialog dialog = new OptionsDialog();
             dialog.MiktexPath = mgr.SettingsData.miktexPath;
-            //dialog.GSPath = mgr.SettingsData.gsPath;
             if (dialog.ShowDialog() == DialogResult.OK)
             {                
                 mgr.SettingsData.miktexPath = dialog.MiktexPath;
-                //mgr.SettingsData.gsPath = dialog.GSPath;
                 mgr.saveSettings();
             }
         }

DockerUI.xaml.cs

@@ -84,7 +84,6 @@ public bool editLatexObject(Corel.Interop.VGCore.Shape s)
         private void btn_editLatex_Click(object sender, RoutedEventArgs e)
         {
             Corel.Interop.VGCore.ShapeRange sel = corelApp.ActiveDocument.SelectionRange;
-            //Corel.Interop.VGCore.Shapes sel = corelApp.ActiveLayer.SelectableShapes;
             bool found = false;
             foreach (Corel.Interop.VGCore.Shape s in sel)
             {

Latex4CorelDraw.csproj

@@ -35,7 +35,7 @@
   <ItemGroup>
     <Reference Include="ScintillaNET, Version=2.6.0.0, Culture=neutral, PublicKeyToken=948d6c9751444115, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Scintilla\3.5.10\ScintillaNET.dll</HintPath>
+      <HintPath>..\Scintilla\2.6\bin\Release\ScintillaNET.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -133,6 +133,7 @@
     <None Include="Resources\LatexTemplate.txt" />
     <Content Include="UserUI.xslt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <SubType>Designer</SubType>
     </Content>
     <Content Include="CorelDrw.addon">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

OptionsDialog.cs

@@ -17,12 +17,6 @@ public string MiktexPath
             set { textBoxMiktex.Text = value; }
         }
 
-//         public string GSPath
-//         {
-//             get { return textBoxGS.Text; }
-//             set { textBoxGS.Text = value; }
-//         }
-
         public OptionsDialog()
         {
             InitializeComponent();

SettingsManager.cs

@@ -89,25 +89,6 @@ public bool loadSettings()
                     }
                 }
             }
-
-//             // If the GS path was not found, try to find it in the registry
-//             if ((m_settings.gsPath == null) || (m_settings.gsPath == ""))
-//             {
-//                 RegistryKey key = Registry.LocalMachine.OpenSubKey("Software\\GPL Ghostscript", false);
-//                 if (key != null)
-//                 {
-//                     string [] versionKeys = key.GetSubKeyNames();
-//                     if (versionKeys.Length > 0)
-//                     {
-//                         // Just take the first version 
-//                         key = Registry.LocalMachine.OpenSubKey("Software\\GPL Ghostscript\\" + versionKeys[0], false);
-//                         if (key != null)
-//                         {
-//                             m_settings.gsPath = Path.GetDirectoryName((string)key.GetValue("GS_DLL", ""));
-//                         }
-//                     }
-//                 }
-//             }
             return result;
         }
     }
@@ -117,7 +98,6 @@ public class Settings
         public string textColor; 
         public string fontSize;
         public string miktexPath;
-        //public string gsPath;
         public string font;
         public string fontSeries;
         public string fontShape;