Remove remaining Silverlight support

punker76 · Nov 22, 2017 · 50024b0 · 50024b0
1 parent fed868d
commit 50024b0
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 66 deletions.
diff --git a/Kaxaml/DocumentViews/WpfDocumentView.xaml.cs b/Kaxaml/DocumentViews/WpfDocumentView.xaml.cs
@@ -376,8 +376,6 @@ private void Parse(bool IsExplicit)
                     string str = XamlDocument.SourceText;
 
                     // handle the in memory preparsing (this happens behind the scenes all in memory)
-                    str = DeSilverlight(str);
-
 
                     try
                     {
@@ -473,17 +471,7 @@ private void Parse(bool IsExplicit)
             }
         }
 
-        private string DeSilverlight(string str)
-        {
-            if (Kaxaml.Properties.Settings.Default.EnablePseudoSilverlight)
-            {
-                str = str.Replace("http://schemas.microsoft.com/client/2007", "http://schemas.microsoft.com/winfx/2006/xaml/presentation");
-            }
-
-            return str;
-        }
-
-        private string PreParse(string str)
+      private string PreParse(string str)
         {
             while (str.Contains("?COLOR"))
             {

diff --git a/Kaxaml/MainWindow.xaml.cs b/Kaxaml/MainWindow.xaml.cs
@@ -49,12 +49,6 @@ public MainWindow()
             this.InputBindings.Add(new InputBinding(binding.Command, new KeyGesture(Key.T, ModifierKeys.Control, "Ctrl+T")));
             this.CommandBindings.Add(binding);
 
-            binding = new CommandBinding(NewAgTabCommand);
-            binding.Executed += new ExecutedRoutedEventHandler(this.NewAgTab_Executed);
-            binding.CanExecute += new CanExecuteRoutedEventHandler(this.NewAgTab_CanExecute);
-            this.InputBindings.Add(new InputBinding(binding.Command, new KeyGesture(Key.L, ModifierKeys.Control, "Ctrl+L")));
-            this.CommandBindings.Add(binding);
-
             binding = new CommandBinding(CloseTabCommand);
             binding.Executed += new ExecutedRoutedEventHandler(this.CloseTab_Executed);
             binding.CanExecute += new CanExecuteRoutedEventHandler(this.CloseTab_CanExecute);
@@ -301,32 +295,6 @@ void NewWPFTab_CanExecute(object sender, CanExecuteRoutedEventArgs args)
 
         #endregion
 
-        #region NewAgTabCommand
-
-        public readonly static RoutedUICommand NewAgTabCommand = new RoutedUICommand("New Silverlight Tab", "NewAgTabCommand", typeof(MainWindow));
-
-        void NewAgTab_Executed(object sender, ExecutedRoutedEventArgs args)
-        {
-            if (sender == this)
-            {
-                AgDocument doc = new AgDocument(System.IO.Directory.GetCurrentDirectory());
-                XamlDocuments.Add(doc);
-
-                this.DocumentsView.SelectedDocument = doc;
-
-            }
-        }
-
-        void NewAgTab_CanExecute(object sender, CanExecuteRoutedEventArgs args)
-        {
-            if (sender == this)
-            {
-                args.CanExecute = true;
-            }
-        }
-
-        #endregion
-
         #region CloseTabCommand
 
         public readonly static RoutedUICommand CloseTabCommand = new RoutedUICommand("Close Tab", "CloseTabCommand", typeof(MainWindow));

diff --git a/Kaxaml/Properties/Settings.Designer.cs b/Kaxaml/Properties/Settings.Designer.cs
diff --git a/Kaxaml/Properties/Settings.settings b/Kaxaml/Properties/Settings.settings
@@ -68,9 +68,6 @@
   &lt;/Grid&gt;
 &lt;/Page&gt;</Value>
     </Setting>
-    <Setting Name="EnablePseudoSilverlight" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">True</Value>
-    </Setting>
     <Setting Name="AgDefaultXaml" Type="System.String" Scope="User">
       <Value Profile="(Default)">&lt;Grid
   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 

diff --git a/Kaxaml/Views/MenuView.xaml b/Kaxaml/Views/MenuView.xaml
@@ -17,7 +17,6 @@
 
     <MenuItem Header="_File"  >
       <MenuItem Command="k:MainWindow.NewWPFTabCommand" InputGestureText="Ctrl+T" />
-      <MenuItem Command="k:MainWindow.NewAgTabCommand" InputGestureText="Ctrl+L" />
       <MenuItem Command="k:MainWindow.CloseTabCommand" InputGestureText="Ctrl+W" />
       <Separator />
       <MenuItem Command="k:MainWindow.OpenCommand" InputGestureText="Ctrl+O" />

diff --git a/Kaxaml/app.config b/Kaxaml/app.config
@@ -73,9 +73,6 @@
   &lt;/Grid&gt;
 &lt;/Page&gt;</value>
             </setting>
-            <setting name="EnablePseudoSilverlight" serializeAs="String">
-                <value>True</value>
-            </setting>
             <setting name="AgDefaultXaml" serializeAs="String">
                 <value>&lt;Grid
   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"