Automatically enable 3D Models

Lazrius · Aug 16, 2020 · d34de3c · d34de3c
1 parent a182fb1
commit d34de3c
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 91 deletions.
diff --git a/FreelancerModStudio/Data/Settings.cs b/FreelancerModStudio/Data/Settings.cs
@@ -117,6 +117,10 @@ public class General
             [DisplayName("Automatically Open 3D Editor")]
             public bool AutomaticallyOpen3DEditor { get; set; } = true;
 
+            [Category("INI Editor")]
+            [DisplayName("Automatically Display 3D Models")]
+            public bool AutomaticallyDisplay3DModels { get; set; } = true;
+
             [Category("INI Formatting")]
             [DisplayName("Spaces around equal sign")]
             public bool FormattingSpaces { get; set; }

diff --git a/FreelancerModStudio/Forms/MainForm.Designer.cs b/FreelancerModStudio/Forms/MainForm.Designer.cs
diff --git a/FreelancerModStudio/Forms/MainForm.cs b/FreelancerModStudio/Forms/MainForm.cs
@@ -476,7 +476,7 @@ private void OpenRecentFile(string file, int templateIndex)
             {
                 this.OpenFile(file, templateIndex);
             }
-            catch
+            catch (Exception ex)
             {
                 if (MessageBox.Show(
                         string.Format(Strings.FileErrorOpenRecent, file),
@@ -728,7 +728,7 @@ private void ShowSystemEditor(FrmTableEditor tableEditor)
                 {
                     case ViewerType.System:
                         // set model mode as it was reset if the editor was closed
-                        this.systemEditorForm.IsModelMode = this.mnuShowModels.Checked;
+                        this.systemEditorForm.IsModelMode = this.mnuShowModels.Checked || Helper.Settings.Data.Data.General.AutomaticallyDisplay3DModels;
                         this.systemEditorForm.ShowData(tableEditor.Data);
                         break;
                     case ViewerType.Universe:

diff --git a/FreelancerModStudio/Forms/MainForm.resx b/FreelancerModStudio/Forms/MainForm.resx
@@ -643,7 +643,7 @@
     <value>&amp;Options...</value>
   </data>
   <data name="mnuTools.Size" type="System.Drawing.Size, System.Drawing">
-    <value>47, 20</value>
+    <value>46, 20</value>
   </data>
   <data name="mnuTools.Text" xml:space="preserve">
     <value>&amp;Tools</value>
@@ -823,7 +823,7 @@
     <value>dockPanel1</value>
   </data>
   <data name="&gt;&gt;dockPanel1.Type" xml:space="preserve">
-    <value>WeifenLuo.WinFormsUI.Docking.DockPanel, WeifenLuo.WinFormsUI.Docking, Version=2.3.7392.25597, Culture=neutral, PublicKeyToken=null</value>
+    <value>WeifenLuo.WinFormsUI.Docking.DockPanel, WeifenLuo.WinFormsUI.Docking, Version=3.0.6.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481</value>
   </data>
   <data name="&gt;&gt;dockPanel1.Parent" xml:space="preserve">
     <value>$this</value>
@@ -910,7 +910,7 @@
     <value>Open containing &amp;folder</value>
   </data>
   <data name="contextMenuStrip1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>198, 186</value>
+    <value>198, 164</value>
   </data>
   <data name="&gt;&gt;contextMenuStrip1.Name" xml:space="preserve">
     <value>contextMenuStrip1</value>
@@ -1329,6 +1329,18 @@
   <data name="&gt;&gt;mnuClose2.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;mnuCloseOther.Name" xml:space="preserve">
+    <value>mnuCloseOther</value>
+  </data>
+  <data name="&gt;&gt;mnuCloseOther.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;MnuCloseAllUnchanged.Name" xml:space="preserve">
+    <value>MnuCloseAllUnchanged</value>
+  </data>
+  <data name="&gt;&gt;MnuCloseAllUnchanged.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;MnuCloseAllToLeft.Name" xml:space="preserve">
     <value>MnuCloseAllToLeft</value>
   </data>
@@ -1341,12 +1353,6 @@
   <data name="&gt;&gt;MnuCloseAllToRight.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;mnuCloseOther.Name" xml:space="preserve">
-    <value>mnuCloseOther</value>
-  </data>
-  <data name="&gt;&gt;mnuCloseOther.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="&gt;&gt;mnuCopyFullPathSeperator.Name" xml:space="preserve">
     <value>mnuCopyFullPathSeperator</value>
   </data>
@@ -1365,12 +1371,6 @@
   <data name="&gt;&gt;mnuOpenContainingFolder.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;MnuCloseAllUnchanged.Name" xml:space="preserve">
-    <value>MnuCloseAllUnchanged</value>
-  </data>
-  <data name="&gt;&gt;MnuCloseAllUnchanged.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>MainForm</value>
   </data>