Release 1.7.2

AntMeNet · Apr 29, 2016 · 75a4344 · 75a4344
1 parent 51f1cd1
commit 75a4344
Show file tree

Hide file tree

Showing 123 changed files with 20,145 additions and 1,247 deletions.
diff --git a/AntMe.Online.Client/Properties/AssemblyInfo.cs b/AntMe.Online.Client/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("AntMe! GmbH")]
 [assembly: AssemblyProduct("AntMe!")]
-[assembly: AssemblyCopyright("Copyright © 2014 AntMe! GmbH")]
+[assembly: AssemblyCopyright("Copyright © 2015 AntMe! GmbH")]
 [assembly: AssemblyTrademark("AntMe!")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.7.1.6")]
-[assembly: AssemblyFileVersion("1.7.1.6")]
+[assembly: AssemblyVersion("1.7.2.23")]
+[assembly: AssemblyFileVersion("1.7.2.23")]
diff --git a/AntMe.sln b/AntMe.sln
@@ -23,6 +23,8 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Setup", "Setup\Setup.wixpro
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XnaPluginContent", "XnaPlugin\XnaPluginContent\XnaPluginContent.contentproj", "{B09C7823-AFF3-45A4-AAAC-88821B464DEC}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlayerManagement", "PlayerManagement\PlayerManagement.csproj", "{5D566A2A-C112-4543-95EA-F3E81A53CDE9}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x86 = Debug|x86
@@ -67,6 +69,10 @@ Global
 		{EC7AA916-0218-436F-B4DC-510BDB769260}.Release|x86.Build.0 = Release|x86
 		{B09C7823-AFF3-45A4-AAAC-88821B464DEC}.Debug|x86.ActiveCfg = Debug|x86
 		{B09C7823-AFF3-45A4-AAAC-88821B464DEC}.Release|x86.ActiveCfg = Release|x86
+		{5D566A2A-C112-4543-95EA-F3E81A53CDE9}.Debug|x86.ActiveCfg = Debug|x86
+		{5D566A2A-C112-4543-95EA-F3E81A53CDE9}.Debug|x86.Build.0 = Debug|x86
+		{5D566A2A-C112-4543-95EA-F3E81A53CDE9}.Release|x86.ActiveCfg = Release|x86
+		{5D566A2A-C112-4543-95EA-F3E81A53CDE9}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/AntMe/AntMe.csproj b/AntMe/AntMe.csproj
@@ -271,10 +271,17 @@
     <ProjectReference Include="..\AntMe.Online.Client\AntMe.Online.Client.csproj">
       <Project>{43e44b6c-78f6-4515-88f2-c238b51886c5}</Project>
       <Name>AntMe.Online.Client</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\PlayerManagement\PlayerManagement.csproj">
+      <Project>{5d566a2a-c112-4543-95ea-f3e81a53cde9}</Project>
+      <Name>PlayerManagement</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\SharedComponents\SharedComponents.csproj">
       <Project>{415F50C3-BD70-4634-B1F7-A15B42F0B0C6}</Project>
       <Name>SharedComponents</Name>
+      <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/AntMe/Main.Designer.cs b/AntMe/Main.Designer.cs
diff --git a/AntMe/Main.cs b/AntMe/Main.cs
@@ -3,6 +3,7 @@
 using System.IO;
 using System.Threading;
 using System.Windows.Forms;
+using System.Linq;
 
 using AntMe.Gui.Properties;
 using AntMe.SharedComponents.Plugin;
@@ -11,6 +12,7 @@
 using System.Diagnostics;
 using System.Drawing;
 using System.Threading.Tasks;
+using AntMe.PlayerManagement;
 
 namespace AntMe.Gui
 {
@@ -51,6 +53,14 @@ public Main(string[] parameter)
                     break;
             }
 
+            // Load Player
+            Task t = new Task(() => { PlayerStore.Instance.ToString(); });
+            t.Start();
+
+            // Prüfe auf Updates
+            t = new Task(BackgroundUpdateCheck);
+            t.Start();
+
             // Load welcomepage
             try
             {
@@ -99,10 +109,6 @@ public Main(string[] parameter)
             }
 
             initPhase = false;
-
-            // Prüfe auf Updates
-            Task t = new Task(BackgroundUpdateCheck);
-            t.Start();
         }
 
         #endregion
@@ -158,30 +164,42 @@ private void updatePanel()
                 speedDropDownToolItem.Text = Resource.MainSpeedMaximal;
             }
 
-            // producer-list
-            List<PluginItem> producerList = new List<PluginItem>(manager.ProducerPlugins);
-            for (int i = 0; i < producerComboBoxToolItem.Items.Count; i++)
+            // Producer List (Button-Based)
+            List<ToolStripItem> remove = new List<ToolStripItem>();
+            foreach (ToolStripItem item in producerButton.DropDownItems)
             {
-                PluginItem item = (PluginItem)producerComboBoxToolItem.Items[i];
-                if (!producerList.Contains(item))
-                {
-                    producerComboBoxToolItem.Items.Remove(item);
-                    i--;
-                }
+                if (!manager.ProducerPlugins.Any(p => p == item.Tag))
+                    remove.Add(item);
             }
-            foreach (PluginItem item in producerList)
+            foreach (var item in remove)
             {
-                if (!producerComboBoxToolItem.Items.Contains(item))
+                producerButton.DropDownItems.Remove(item);
+            }
+
+            foreach (var item in manager.ProducerPlugins)
+            {
+                if (producerButton.DropDownItems.Find(item.Guid.ToString(), false).Count() == 0)
                 {
-                    producerComboBoxToolItem.Items.Add(item);
+                    var menuItem = new ToolStripMenuItem()
+                    {
+                        Text = item.Name,
+                        Name = item.Guid.ToString(),
+                        Tag = item
+                    };
+
+                    menuItem.Click += button_producer;
+
+                    producerButton.DropDownItems.Add(menuItem);
                 }
             }
 
             // manage tabs
             if (activeProducer != manager.ActiveProducerPlugin)
             {
-                // Update Combobox
-                producerComboBoxToolItem.SelectedItem = manager.ActiveProducerPlugin;
+                bool isSelected = tabControl.SelectedIndex == 1;
+
+                // Update Mode Display
+                producerButton.Text = (manager.ActiveProducerPlugin == null ? Resource.MainNoModeSelected : manager.ActiveProducerPlugin.Name);
 
                 // remove old tab
                 if (activeProducer != null)
@@ -202,6 +220,7 @@ private void updatePanel()
                         page.Controls.Add(manager.ActiveProducerPlugin.Producer.Control);
                         tabControl.TabPages.Insert(1, page);
                         manager.ActiveProducerPlugin.Producer.Control.Dock = DockStyle.Fill;
+                        if (isSelected) tabControl.SelectedIndex = 1;
                     }
                     activeProducer = manager.ActiveProducerPlugin;
                 }
@@ -417,6 +436,7 @@ private void button_plugins(object sender, EventArgs e)
             ignoreTimerEvents = true;
             Plugins pluginForm = new Plugins(manager);
             pluginForm.ShowDialog(this);
+            manager.SaveSettings();
             ignoreTimerEvents = false;
             updatePanel();
         }
@@ -582,27 +602,17 @@ private void button_switchAutoupdate(object sender, EventArgs e)
             }
         }
 
-        #endregion
-
-        #region combos
-
-        private void combo_producer(object sender, EventArgs e)
+        private void button_producer(object sender, EventArgs e)
         {
             if (ignoreTimerEvents)
-            {
                 return;
-            }
 
             ignoreTimerEvents = true;
-            if (producerComboBoxToolItem.SelectedItem != null)
-            {
-                PluginItem plugin = (PluginItem)producerComboBoxToolItem.SelectedItem;
-                manager.ActivateProducer(plugin.Guid);
-            }
-            else
-            {
-                manager.ActivateProducer(new Guid());
-            }
+
+            ToolStripMenuItem menuItem = sender as ToolStripMenuItem;
+            PluginItem plugin = menuItem.Tag as PluginItem;
+            manager.ActivateProducer(plugin.Guid);
+
             updatePanel();
             ignoreTimerEvents = false;
         }

diff --git a/AntMe/Main.de.resx b/AntMe/Main.de.resx
@@ -118,21 +118,6 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="programMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>76, 20</value>
-  </data>
-  <data name="programMenuItem.Text" xml:space="preserve">
-    <value>Programm</value>
-  </data>
-  <data name="settingsMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>90, 20</value>
-  </data>
-  <data name="settingsMenuItem.Text" xml:space="preserve">
-    <value>Einstellungen</value>
-  </data>
-  <data name="helpMenuItem.Text" xml:space="preserve">
-    <value>Hilfe</value>
-  </data>
   <data name="startMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>125, 22</value>
   </data>
@@ -154,6 +139,12 @@
   <data name="closeMenuItem.Text" xml:space="preserve">
     <value>Schließen</value>
   </data>
+  <data name="programMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>76, 20</value>
+  </data>
+  <data name="programMenuItem.Text" xml:space="preserve">
+    <value>Programm</value>
+  </data>
   <data name="pluginSettingsMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>161, 22</value>
   </data>
@@ -163,12 +154,6 @@
   <data name="speedMenuItem.Text" xml:space="preserve">
     <value>Geschwindigkeit</value>
   </data>
-  <data name="languageMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>161, 22</value>
-  </data>
-  <data name="languageMenuItem.Text" xml:space="preserve">
-    <value>Sprache</value>
-  </data>
   <data name="germanMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>118, 22</value>
   </data>
@@ -181,12 +166,24 @@
   <data name="englishMenuItem.Text" xml:space="preserve">
     <value>Englisch</value>
   </data>
+  <data name="languageMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>161, 22</value>
+  </data>
+  <data name="languageMenuItem.Text" xml:space="preserve">
+    <value>Sprache</value>
+  </data>
   <data name="updateMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>161, 22</value>
   </data>
   <data name="updateMenuItem.Text" xml:space="preserve">
     <value>Updates suchen</value>
   </data>
+  <data name="settingsMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>90, 20</value>
+  </data>
+  <data name="settingsMenuItem.Text" xml:space="preserve">
+    <value>Einstellungen</value>
+  </data>
   <data name="tutorialsMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>185, 22</value>
   </data>
@@ -211,14 +208,32 @@
   <data name="infoBoxMenuItem.Text" xml:space="preserve">
     <value>Über AntMe!...</value>
   </data>
+  <data name="helpMenuItem.Text" xml:space="preserve">
+    <value>Hilfe</value>
+  </data>
   <data name="stopToolItem.Text" xml:space="preserve">
     <value>Stopp</value>
   </data>
   <data name="sourceLabelToolItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>44, 22</value>
+    <value>47, 22</value>
   </data>
   <data name="sourceLabelToolItem.Text" xml:space="preserve">
-    <value>Quelle:</value>
+    <value>Modus:</value>
+  </data>
+  <data name="producerButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
+        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
+        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
+        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
+        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
+        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
+        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
+        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
+        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
+</value>
   </data>
   <data name="speedLabelToolItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>97, 22</value>