Merge pull request #49 from RickDB/dev_installerReducedSize

MPEI installer size reduction and misc fixes + improvements
ShokoAnime · Sep 9, 2016 · aad6146 · aad6146
2 parents 65ca985 + ef2b127
commit aad6146
Show file tree

Hide file tree

Showing 651 changed files with 1,659 additions and 10,340 deletions.
diff --git a/MPEI/MyAnime3.xmp2 b/MPEI/MyAnime3.xmp2
diff --git a/MyAnimePlugin3.sln b/MyAnimePlugin3.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyAnimePlugin3", "MyAnimePlugin3\MyAnimePlugin3.csproj", "{3951B061-720C-4D6A-A03D-87E033B71F41}"
 EndProject

diff --git a/MyAnimePlugin3/ConfigFiles/AnimePluginSettings.cs b/MyAnimePlugin3/ConfigFiles/AnimePluginSettings.cs
@@ -30,9 +30,11 @@ public class AnimePluginSettings
 		public int FfdshowNotificationsAutoCloseTime = 3000;
 		public int FfdshowNotificationsLockTime = 5000;
 	    public bool UseStreaming = true;
-	    private string _subPaths;
+	    public string ModeToggleKey = "]";
+	    public string StartTextToggleKey = "[";
+        private string _subPaths;
 
-		public Dictionary<int, string> ImportFolderMappings
+        public Dictionary<int, string> ImportFolderMappings
 		{
 			get
 			{
@@ -436,8 +438,9 @@ public void Load()
 			FfdshowNotificationsAutoCloseTime = int.Parse(xmlreader.GetValueAsString("Anime3", "FfdshowNotificationsAutoCloseTime", "3000"));
 			FfdshowNotificationsLockTime = int.Parse(xmlreader.GetValueAsString("Anime3", "FfdshowNotificationsLockTime", "5000"));
             UseStreaming = xmlreader.GetValueAsString("Anime3", "UseStreaming", "1") == "1";
+            ModeToggleKey = xmlreader.GetValueAsString("Anime3", "ModeToggleKey", "]");
+            StartTextToggleKey = xmlreader.GetValueAsString("Anime3", "StartTextToggleKey", "[");
             _subPaths = xmlreader.GetValueAsString("subtitles", "paths", @".\");
-
             xmlreader.Dispose();
 
 
@@ -533,8 +536,10 @@ public void Save()
 				xmlwriter.SetValue("Anime3", "FfdshowNotificationsAutoCloseTime", ((int)FfdshowNotificationsAutoCloseTime).ToString());
 				xmlwriter.SetValue("Anime3", "FfdshowNotificationsLockTime", ((int)FfdshowNotificationsLockTime).ToString());
 			    xmlwriter.SetValue("Anime3", "UseStreaming", UseStreaming ? "1" : "0");
+                xmlwriter.SetValue("Anime3", "ModeToggleKey", ModeToggleKey);
+                xmlwriter.SetValue("Anime3", "StartTextToggleKey", StartTextToggleKey);
 
-			    string pth = Path.GetTempPath();
+                string pth = Path.GetTempPath();
                 if (!_subPaths.Contains(pth))
                 {
                     _subPaths += "," + pth;

diff --git a/MyAnimePlugin3/ConfigFiles/frmConfig.Designer.cs b/MyAnimePlugin3/ConfigFiles/frmConfig.Designer.cs
diff --git a/MyAnimePlugin3/ConfigFiles/frmConfig.cs b/MyAnimePlugin3/ConfigFiles/frmConfig.cs
@@ -129,9 +129,8 @@ public frmConfig()
             this.chkLoadlocalThumbnails.Text = Translation.TryToUseLocalThumb;
             this.Text = Translation.Anime3Config;
             this.chkUseStreaming.Text = Translation.UseStreaming;
-
-
-
+            this.lblModeToggleKey.Text = Translation.ModeToggle;
+            this.lblStarttextToggleKey.Text = Translation.StartTextToggle;
 
             btnImagesLocation.Click += new EventHandler(btnImagesLocation_Click);
 			btnSelectLocalFolderPath.Click += new EventHandler(btnSelectLocalFolderPath_Click);
@@ -610,6 +609,24 @@ private void SaveSettings()
 			}
             BaseConfig.Settings.UseStreaming = chkUseStreaming.Checked;
 
+            if (tbModeToggleKey.Text.Length == 1 && tbModeToggleKey.Text != tbStarttextToggleKey.Text)
+            {
+                BaseConfig.Settings.ModeToggleKey = tbModeToggleKey.Text.ToLower();
+            }
+            else
+            {
+                BaseConfig.Settings.ModeToggleKey = "]";
+            }
+
+            if (tbStarttextToggleKey.Text.Length == 1 && tbStarttextToggleKey.Text != tbModeToggleKey.Text)
+            {
+                BaseConfig.Settings.StartTextToggleKey = tbStarttextToggleKey.Text.ToLower();
+            }
+            else
+            {
+                BaseConfig.Settings.StartTextToggleKey = "[";
+            }
+
             BaseConfig.Settings.Save();
             AddTempPathToSubtilePaths();
 
@@ -798,12 +815,15 @@ private void LoadSettingsIntoForm()
 			}
             chkUseStreaming.Checked = BaseConfig.Settings.UseStreaming;
             chkUseStreaming_CheckedChanged(null, null);
+
+            tbModeToggleKey.Text = BaseConfig.Settings.ModeToggleKey;
+            tbStarttextToggleKey.Text = BaseConfig.Settings.StartTextToggleKey;
         }
         #endregion
 
         #region Tab 'Main'
 
-		void btnImagesLocation_Click(object sender, EventArgs e)
+        void btnImagesLocation_Click(object sender, EventArgs e)
 		{
 			FolderBrowserDialog dlg = new FolderBrowserDialog();
 		    dlg.Description = Translation.SelectAFolder;
@@ -854,5 +874,52 @@ private void chkUseStreaming_CheckedChanged(object sender, EventArgs e)
         {
             groupBox2.Enabled = !chkUseStreaming.Checked;
         }
+        public static string TruncateText(string value, int maxLength)
+        {
+            if (string.IsNullOrEmpty(value)) return value;
+            return value.Length <= maxLength ? value : value.Substring(0, maxLength);
+        }
+
+        private void btnResetModeText_Click(object sender, EventArgs e)
+        {
+            tbModeToggleKey.Text = @"]";
+        }
+
+        private void btnClearStartText_Click(object sender, EventArgs e)
+        {
+            tbStarttextToggleKey.Text = @"[";
+        }
+
+        private void tbModeToggleKey_Validating(object sender, CancelEventArgs e)
+        {
+            if (tbModeToggleKey.Text.Length > 1)
+            {
+                tbModeToggleKey.Text =  TruncateText(tbModeToggleKey.Text, 1);
+            }
+        }
+
+        private void tbStarttextToggleKey_Validating(object sender, CancelEventArgs e)
+        {
+            if (tbStarttextToggleKey.Text.Length > 1)
+            {
+                tbStarttextToggleKey.Text =  TruncateText(tbStarttextToggleKey.Text, 1);
+            }
+        }
+
+        private void tbModeToggleKey_TextChanged(object sender, EventArgs e)
+        {
+            if (tbModeToggleKey.Text.Length > 1)
+            {
+                tbModeToggleKey.Text = TruncateText(tbModeToggleKey.Text, 1);
+            }
+        }
+
+        private void tbStarttextToggleKey_TextChanged(object sender, EventArgs e)
+        {
+            if (tbStarttextToggleKey.Text.Length > 1)
+            {
+                tbStarttextToggleKey.Text = TruncateText(tbStarttextToggleKey.Text, 1);
+            }
+        }
     }
 }
diff --git a/MyAnimePlugin3/Skins/Avallonis/Anime3_Main.xml b/MyAnimePlugin3/Skins/Avallonis/Anime3_Main.xml
@@ -115,7 +115,7 @@
             <posY>915</posY>
             <width>600</width>
             <font>AvalonLight12</font>
-            <label>[ =Start Word (#Anime3.FindStartWord) TAB=Next Match</label>
+            <label>#Anime3.StartTextToggle =Start Word (#Anime3.FindStartWord) TAB=Next Match</label>
             <visible>Control.IsVisible(3463)+Control.IsVisible(3465)+!Player.hasmedia</visible>
         </control>
 		<control>
@@ -127,7 +127,7 @@
             <width>600</width>
             <font>AvalonLight12</font>
             <align>left</align>
-            <label>] =Mode (#Anime3.FindMode)</label>
+            <label>#Anime3.ModeToggleKey =Mode (#Anime3.FindMode)</label>
             <visible>Control.IsVisible(3463)</visible>
         </control>
   </controls>

diff --git a/MyAnimePlugin3/Skins/Avalon/Anime3_Main.xml b/MyAnimePlugin3/Skins/Avalon/Anime3_Main.xml
@@ -118,7 +118,7 @@
             <width>600</width>
             <font>AvalonLight12</font>
 			<textcolor>6aa5cb</textcolor>
-            <label>[ =Start Word (#Anime3.FindStartWord) TAB=Next Match</label>
+            <label>#Anime3.StartTextToggle =Start Word (#Anime3.FindStartWord) TAB=Next Match</label>
             <visible>Control.IsVisible(3463)+Control.IsVisible(3465)+!Player.hasmedia</visible>
         </control>
 		<control>
@@ -131,7 +131,7 @@
             <font>AvalonLight12</font>
 			<textcolor>6aa5cb</textcolor>
             <align>left</align>
-            <label>] =Mode (#Anime3.FindMode)</label>
+            <label>#Anime3.ModeToggleKey =Mode (#Anime3.FindMode)</label>
             <visible>Control.IsVisible(3463)</visible>
         </control>
   </controls>

diff --git a/MyAnimePlugin3/Skins/Default/Anime3_Main.xml b/MyAnimePlugin3/Skins/Default/Anime3_Main.xml
@@ -150,7 +150,7 @@
       <posY>75</posY>
       <width>266</width>
       <font>font10</font>
-      <label>[ =Start Word (#Anime3.FindStartWord)</label>
+      <label>#Anime3.StartTextToggle =Start Word (#Anime3.FindStartWord)</label>
       <visible>[facadeview.list|facadeview.largeicons]+Control.IsVisible(3463)+Control.IsVisible(3465)</visible>
     </control>
 
@@ -174,7 +174,7 @@
       <posY>95</posY>
       <width>266</width>
       <font>font10</font>
-      <label>] =Mode (#Anime3.FindMode)</label>
+      <label>#Anime3.ModeToggleKey =Mode (#Anime3.FindMode)</label>
       <visible>[facadeview.list|facadeview.largeicons]+Control.IsVisible(3463)</visible>
     </control>