Skip to content

Commit 75a4344

Browse files
author
tomwendel
committed
Release 1.7.2
1 parent 51f1cd1 commit 75a4344

File tree

123 files changed

+20145
-1247
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+20145
-1247
lines changed

‎AntMe.Online.Client/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("AntMe! GmbH")]
1212
[assembly: AssemblyProduct("AntMe!")]
13-
[assembly: AssemblyCopyright("Copyright © 2014 AntMe! GmbH")]
13+
[assembly: AssemblyCopyright("Copyright © 2015 AntMe! GmbH")]
1414
[assembly: AssemblyTrademark("AntMe!")]
1515
[assembly: AssemblyCulture("")]
1616

@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.7.1.6")]
36-
[assembly: AssemblyFileVersion("1.7.1.6")]
35+
[assembly: AssemblyVersion("1.7.2.23")]
36+
[assembly: AssemblyFileVersion("1.7.2.23")]

‎AntMe.sln

+6
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Setup", "Setup\Setup.wixpro
2323
EndProject
2424
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XnaPluginContent", "XnaPlugin\XnaPluginContent\XnaPluginContent.contentproj", "{B09C7823-AFF3-45A4-AAAC-88821B464DEC}"
2525
EndProject
26+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlayerManagement", "PlayerManagement\PlayerManagement.csproj", "{5D566A2A-C112-4543-95EA-F3E81A53CDE9}"
27+
EndProject
2628
Global
2729
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2830
Debug|x86 = Debug|x86
@@ -67,6 +69,10 @@ Global
6769
{EC7AA916-0218-436F-B4DC-510BDB769260}.Release|x86.Build.0 = Release|x86
6870
{B09C7823-AFF3-45A4-AAAC-88821B464DEC}.Debug|x86.ActiveCfg = Debug|x86
6971
{B09C7823-AFF3-45A4-AAAC-88821B464DEC}.Release|x86.ActiveCfg = Release|x86
72+
{5D566A2A-C112-4543-95EA-F3E81A53CDE9}.Debug|x86.ActiveCfg = Debug|x86
73+
{5D566A2A-C112-4543-95EA-F3E81A53CDE9}.Debug|x86.Build.0 = Debug|x86
74+
{5D566A2A-C112-4543-95EA-F3E81A53CDE9}.Release|x86.ActiveCfg = Release|x86
75+
{5D566A2A-C112-4543-95EA-F3E81A53CDE9}.Release|x86.Build.0 = Release|x86
7076
EndGlobalSection
7177
GlobalSection(SolutionProperties) = preSolution
7278
HideSolutionNode = FALSE

‎AntMe/AntMe.csproj

+7
Original file line numberDiff line numberDiff line change
@@ -271,10 +271,17 @@
271271
<ProjectReference Include="..\AntMe.Online.Client\AntMe.Online.Client.csproj">
272272
<Project>{43e44b6c-78f6-4515-88f2-c238b51886c5}</Project>
273273
<Name>AntMe.Online.Client</Name>
274+
<Private>False</Private>
275+
</ProjectReference>
276+
<ProjectReference Include="..\PlayerManagement\PlayerManagement.csproj">
277+
<Project>{5d566a2a-c112-4543-95ea-f3e81a53cde9}</Project>
278+
<Name>PlayerManagement</Name>
279+
<Private>False</Private>
274280
</ProjectReference>
275281
<ProjectReference Include="..\SharedComponents\SharedComponents.csproj">
276282
<Project>{415F50C3-BD70-4634-B1F7-A15B42F0B0C6}</Project>
277283
<Name>SharedComponents</Name>
284+
<Private>False</Private>
278285
</ProjectReference>
279286
</ItemGroup>
280287
<ItemGroup>

‎AntMe/Main.Designer.cs

+8-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎AntMe/Main.cs

+44-34
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using System.IO;
44
using System.Threading;
55
using System.Windows.Forms;
6+
using System.Linq;
67

78
using AntMe.Gui.Properties;
89
using AntMe.SharedComponents.Plugin;
@@ -11,6 +12,7 @@
1112
using System.Diagnostics;
1213
using System.Drawing;
1314
using System.Threading.Tasks;
15+
using AntMe.PlayerManagement;
1416

1517
namespace AntMe.Gui
1618
{
@@ -51,6 +53,14 @@ public Main(string[] parameter)
5153
break;
5254
}
5355

56+
// Load Player
57+
Task t = new Task(() => { PlayerStore.Instance.ToString(); });
58+
t.Start();
59+
60+
// Prüfe auf Updates
61+
t = new Task(BackgroundUpdateCheck);
62+
t.Start();
63+
5464
// Load welcomepage
5565
try
5666
{
@@ -99,10 +109,6 @@ public Main(string[] parameter)
99109
}
100110

101111
initPhase = false;
102-
103-
// Prüfe auf Updates
104-
Task t = new Task(BackgroundUpdateCheck);
105-
t.Start();
106112
}
107113

108114
#endregion
@@ -158,30 +164,42 @@ private void updatePanel()
158164
speedDropDownToolItem.Text = Resource.MainSpeedMaximal;
159165
}
160166

161-
// producer-list
162-
List<PluginItem> producerList = new List<PluginItem>(manager.ProducerPlugins);
163-
for (int i = 0; i < producerComboBoxToolItem.Items.Count; i++)
167+
// Producer List (Button-Based)
168+
List<ToolStripItem> remove = new List<ToolStripItem>();
169+
foreach (ToolStripItem item in producerButton.DropDownItems)
164170
{
165-
PluginItem item = (PluginItem)producerComboBoxToolItem.Items[i];
166-
if (!producerList.Contains(item))
167-
{
168-
producerComboBoxToolItem.Items.Remove(item);
169-
i--;
170-
}
171+
if (!manager.ProducerPlugins.Any(p => p == item.Tag))
172+
remove.Add(item);
171173
}
172-
foreach (PluginItem item in producerList)
174+
foreach (var item in remove)
173175
{
174-
if (!producerComboBoxToolItem.Items.Contains(item))
176+
producerButton.DropDownItems.Remove(item);
177+
}
178+
179+
foreach (var item in manager.ProducerPlugins)
180+
{
181+
if (producerButton.DropDownItems.Find(item.Guid.ToString(), false).Count() == 0)
175182
{
176-
producerComboBoxToolItem.Items.Add(item);
183+
var menuItem = new ToolStripMenuItem()
184+
{
185+
Text = item.Name,
186+
Name = item.Guid.ToString(),
187+
Tag = item
188+
};
189+
190+
menuItem.Click += button_producer;
191+
192+
producerButton.DropDownItems.Add(menuItem);
177193
}
178194
}
179195

180196
// manage tabs
181197
if (activeProducer != manager.ActiveProducerPlugin)
182198
{
183-
// Update Combobox
184-
producerComboBoxToolItem.SelectedItem = manager.ActiveProducerPlugin;
199+
bool isSelected = tabControl.SelectedIndex == 1;
200+
201+
// Update Mode Display
202+
producerButton.Text = (manager.ActiveProducerPlugin == null ? Resource.MainNoModeSelected : manager.ActiveProducerPlugin.Name);
185203

186204
// remove old tab
187205
if (activeProducer != null)
@@ -202,6 +220,7 @@ private void updatePanel()
202220
page.Controls.Add(manager.ActiveProducerPlugin.Producer.Control);
203221
tabControl.TabPages.Insert(1, page);
204222
manager.ActiveProducerPlugin.Producer.Control.Dock = DockStyle.Fill;
223+
if (isSelected) tabControl.SelectedIndex = 1;
205224
}
206225
activeProducer = manager.ActiveProducerPlugin;
207226
}
@@ -417,6 +436,7 @@ private void button_plugins(object sender, EventArgs e)
417436
ignoreTimerEvents = true;
418437
Plugins pluginForm = new Plugins(manager);
419438
pluginForm.ShowDialog(this);
439+
manager.SaveSettings();
420440
ignoreTimerEvents = false;
421441
updatePanel();
422442
}
@@ -582,27 +602,17 @@ private void button_switchAutoupdate(object sender, EventArgs e)
582602
}
583603
}
584604

585-
#endregion
586-
587-
#region combos
588-
589-
private void combo_producer(object sender, EventArgs e)
605+
private void button_producer(object sender, EventArgs e)
590606
{
591607
if (ignoreTimerEvents)
592-
{
593608
return;
594-
}
595609

596610
ignoreTimerEvents = true;
597-
if (producerComboBoxToolItem.SelectedItem != null)
598-
{
599-
PluginItem plugin = (PluginItem)producerComboBoxToolItem.SelectedItem;
600-
manager.ActivateProducer(plugin.Guid);
601-
}
602-
else
603-
{
604-
manager.ActivateProducer(new Guid());
605-
}
611+
612+
ToolStripMenuItem menuItem = sender as ToolStripMenuItem;
613+
PluginItem plugin = menuItem.Tag as PluginItem;
614+
manager.ActivateProducer(plugin.Guid);
615+
606616
updatePanel();
607617
ignoreTimerEvents = false;
608618
}

‎AntMe/Main.de.resx

+38-23
Original file line numberDiff line numberDiff line change
@@ -118,21 +118,6 @@
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120120
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
121-
<data name="programMenuItem.Size" type="System.Drawing.Size, System.Drawing">
122-
<value>76, 20</value>
123-
</data>
124-
<data name="programMenuItem.Text" xml:space="preserve">
125-
<value>Programm</value>
126-
</data>
127-
<data name="settingsMenuItem.Size" type="System.Drawing.Size, System.Drawing">
128-
<value>90, 20</value>
129-
</data>
130-
<data name="settingsMenuItem.Text" xml:space="preserve">
131-
<value>Einstellungen</value>
132-
</data>
133-
<data name="helpMenuItem.Text" xml:space="preserve">
134-
<value>Hilfe</value>
135-
</data>
136121
<data name="startMenuItem.Size" type="System.Drawing.Size, System.Drawing">
137122
<value>125, 22</value>
138123
</data>
@@ -154,6 +139,12 @@
154139
<data name="closeMenuItem.Text" xml:space="preserve">
155140
<value>Schließen</value>
156141
</data>
142+
<data name="programMenuItem.Size" type="System.Drawing.Size, System.Drawing">
143+
<value>76, 20</value>
144+
</data>
145+
<data name="programMenuItem.Text" xml:space="preserve">
146+
<value>Programm</value>
147+
</data>
157148
<data name="pluginSettingsMenuItem.Size" type="System.Drawing.Size, System.Drawing">
158149
<value>161, 22</value>
159150
</data>
@@ -163,12 +154,6 @@
163154
<data name="speedMenuItem.Text" xml:space="preserve">
164155
<value>Geschwindigkeit</value>
165156
</data>
166-
<data name="languageMenuItem.Size" type="System.Drawing.Size, System.Drawing">
167-
<value>161, 22</value>
168-
</data>
169-
<data name="languageMenuItem.Text" xml:space="preserve">
170-
<value>Sprache</value>
171-
</data>
172157
<data name="germanMenuItem.Size" type="System.Drawing.Size, System.Drawing">
173158
<value>118, 22</value>
174159
</data>
@@ -181,12 +166,24 @@
181166
<data name="englishMenuItem.Text" xml:space="preserve">
182167
<value>Englisch</value>
183168
</data>
169+
<data name="languageMenuItem.Size" type="System.Drawing.Size, System.Drawing">
170+
<value>161, 22</value>
171+
</data>
172+
<data name="languageMenuItem.Text" xml:space="preserve">
173+
<value>Sprache</value>
174+
</data>
184175
<data name="updateMenuItem.Size" type="System.Drawing.Size, System.Drawing">
185176
<value>161, 22</value>
186177
</data>
187178
<data name="updateMenuItem.Text" xml:space="preserve">
188179
<value>Updates suchen</value>
189180
</data>
181+
<data name="settingsMenuItem.Size" type="System.Drawing.Size, System.Drawing">
182+
<value>90, 20</value>
183+
</data>
184+
<data name="settingsMenuItem.Text" xml:space="preserve">
185+
<value>Einstellungen</value>
186+
</data>
190187
<data name="tutorialsMenuItem.Size" type="System.Drawing.Size, System.Drawing">
191188
<value>185, 22</value>
192189
</data>
@@ -211,14 +208,32 @@
211208
<data name="infoBoxMenuItem.Text" xml:space="preserve">
212209
<value>Über AntMe!...</value>
213210
</data>
211+
<data name="helpMenuItem.Text" xml:space="preserve">
212+
<value>Hilfe</value>
213+
</data>
214214
<data name="stopToolItem.Text" xml:space="preserve">
215215
<value>Stopp</value>
216216
</data>
217217
<data name="sourceLabelToolItem.Size" type="System.Drawing.Size, System.Drawing">
218-
<value>44, 22</value>
218+
<value>47, 22</value>
219219
</data>
220220
<data name="sourceLabelToolItem.Text" xml:space="preserve">
221-
<value>Quelle:</value>
221+
<value>Modus:</value>
222+
</data>
223+
<data name="producerButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
224+
<value>
225+
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
226+
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
227+
YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
228+
0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
229+
bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
230+
VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
231+
c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
232+
Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
233+
mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
234+
kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
235+
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
236+
</value>
222237
</data>
223238
<data name="speedLabelToolItem.Size" type="System.Drawing.Size, System.Drawing">
224239
<value>97, 22</value>

0 commit comments

Comments
 (0)