corrade-vassal – Diff between revs 7 and 8
?pathlinks?
Rev 7 | Rev 8 | |||
---|---|---|---|---|
Line -... | Line 1... | |||
- | 1 | /////////////////////////////////////////////////////////////////////////// |
||
- | 2 | // Copyright (C) Wizardry and Steamworks 2015 - License: GNU GPLv3 // |
||
- | 3 | // Please see: http://www.gnu.org/licenses/gpl.html for legal details, // |
||
- | 4 | // rights of fair usage, the disclaimer and warranty conditions. // |
||
- | 5 | /////////////////////////////////////////////////////////////////////////// |
||
- | 6 | |
||
1 | using System; |
7 | using System; |
|
2 | using System.Collections.Generic; |
8 | using System.Collections.Generic; |
|
3 | using System.ComponentModel; |
- | ||
4 | using System.Data; |
- | ||
5 | using System.Drawing; |
9 | using System.Drawing; |
|
6 | using System.IO; |
10 | using System.IO; |
|
7 | using System.Linq; |
11 | using System.Linq; |
|
8 | using System.Text; |
12 | using System.Text; |
|
9 | using System.Threading; |
13 | using System.Threading; |
|
10 | using System.Threading.Tasks; |
- | ||
11 | using System.Windows.Forms; |
14 | using System.Windows.Forms; |
|
12 | using OpenMetaverse; |
15 | using OpenMetaverse; |
|
Line 13... | Line 16... | |||
13 | |
16 | |
|
14 | namespace Vassal |
17 | namespace Vassal |
|
Line 23... | Line 26... | |||
23 | mainForm = this; |
26 | mainForm = this; |
|
24 | } |
27 | } |
|
Line 25... | Line 28... | |||
25 | |
28 | |
|
26 | private void LoadRegionsRequested(object sender, EventArgs e) |
29 | private void LoadRegionsRequested(object sender, EventArgs e) |
|
27 | { |
30 | { |
|
28 | mainForm.BeginInvoke((MethodInvoker)(() => |
31 | mainForm.BeginInvoke((MethodInvoker) (() => |
|
29 | { |
32 | { |
|
30 | switch (mainForm.LoadRegionsDialog.ShowDialog()) |
33 | switch (mainForm.LoadRegionsDialog.ShowDialog()) |
|
31 | { |
34 | { |
|
32 | case DialogResult.OK: |
35 | case DialogResult.OK: |
|
33 | string file = mainForm.LoadRegionsDialog.FileName; |
36 | string file = mainForm.LoadRegionsDialog.FileName; |
|
34 | new Thread(() => |
37 | new Thread(() => |
|
35 | { |
38 | { |
|
36 | mainForm.BeginInvoke((MethodInvoker)(() => |
39 | mainForm.BeginInvoke((MethodInvoker) (() => |
|
37 | { |
40 | { |
|
38 | try |
41 | try |
|
39 | { |
42 | { |
|
40 | mainForm.StatusText.Text = @"loading regions..."; |
43 | mainForm.StatusText.Text = @"loading regions..."; |
|
Line 41... | Line 44... | |||
41 | mainForm.StatusProgress.Value = 0; |
44 | mainForm.StatusProgress.Value = 0; |
|
42 | |
45 | |
|
43 | // import CSV regions |
46 | // import CSV regions |
|
- | 47 | Vector3 localPosition; |
||
44 | Vector3 localPosition; |
48 | List<KeyValuePair<string, Vector3>> ConfiguredRegions = new List |
|
45 | List<KeyValuePair<string, Vector3>> ConfiguredRegions = new List<KeyValuePair<string, Vector3>>( |
49 | <KeyValuePair<string, Vector3>>( |
|
46 | File.ReadAllLines(file) |
50 | File.ReadAllLines(file) |
|
47 | .AsParallel() |
51 | .AsParallel() |
|
48 | .Select(o => new List<string>(Vassal.wasCSVToEnumerable(o))) |
52 | .Select(o => new List<string>(Vassal.wasCSVToEnumerable(o))) |
|
Line 53... | Line 57... | |||
53 | ? localPosition |
57 | ? localPosition |
|
54 | : Vector3.Zero)); |
58 | : Vector3.Zero)); |
|
Line 55... | Line 59... | |||
55 | |
59 | |
|
56 | Vassal.vassalForm.BeginInvoke((MethodInvoker) (() => |
60 | Vassal.vassalForm.BeginInvoke((MethodInvoker) (() => |
|
57 | { |
61 | { |
|
58 | Vassal.vassalForm.LoadedRegions.Items.Clear(); |
62 | Vassal.vassalForm.LoadedRegionsBox.Items.Clear(); |
|
59 | Vassal.vassalForm.LoadedRegions.Items.AddRange( |
63 | Vassal.vassalForm.LoadedRegionsBox.Items.AddRange( |
|
60 | ConfiguredRegions.Select( |
64 | ConfiguredRegions.Select( |
|
61 | o => (object) new ListViewItem {Text = o.Key, Tag = o.Value}) |
65 | o => (object) new ListViewItem {Text = o.Key, Tag = o.Value}) |
|
62 | .ToArray()); |
66 | .ToArray()); |
|
63 | // Update batch restart grid view. |
67 | // Update batch restart grid view. |
|
Line 76... | Line 80... | |||
76 | } |
80 | } |
|
77 | })); |
81 | })); |
|
Line 78... | Line 82... | |||
78 | |
82 | |
|
79 | Regions.Items.Clear(); |
83 | Regions.Items.Clear(); |
|
- | 84 | Regions.Items.AddRange( |
||
- | 85 | ConfiguredRegions.Select( |
||
- | 86 | o => |
||
- | 87 | (object) |
||
- | 88 | new ListViewItem |
||
80 | Regions.Items.AddRange( |
89 | { |
|
- | 90 | Text = o.Key + @" " + @"(" + o.Value.ToString() + @")", |
||
- | 91 | Tag = o |
||
81 | ConfiguredRegions.Select(o => (object)new ListViewItem { Text = o.Key + @" " + @"(" + o.Value.ToString() + @")", Tag = o }) |
92 | }) |
|
Line 82... | Line 93... | |||
82 | .ToArray()); |
93 | .ToArray()); |
|
83 | |
94 | |
|
84 | mainForm.StatusText.Text = @"regions loaded"; |
95 | mainForm.StatusText.Text = @"regions loaded"; |
|
Line 88... | Line 99... | |||
88 | { |
99 | { |
|
89 | mainForm.StatusText.Text = ex.Message; |
100 | mainForm.StatusText.Text = ex.Message; |
|
90 | } |
101 | } |
|
91 | })); |
102 | })); |
|
92 | }) |
103 | }) |
|
93 | { IsBackground = true, Priority = ThreadPriority.Normal }.Start(); |
104 | {IsBackground = true, Priority = ThreadPriority.Normal}.Start(); |
|
94 | break; |
105 | break; |
|
95 | } |
106 | } |
|
96 | })); |
107 | })); |
|
97 | } |
108 | } |
|
Line 98... | Line 109... | |||
98 | |
109 | |
|
99 | private void SaveRegionsRequested(object sender, EventArgs e) |
110 | private void SaveRegionsRequested(object sender, EventArgs e) |
|
100 | { |
111 | { |
|
101 | mainForm.BeginInvoke((MethodInvoker)(() => |
112 | mainForm.BeginInvoke((MethodInvoker) (() => |
|
102 | { |
113 | { |
|
103 | switch (mainForm.SaveRegionsDialog.ShowDialog()) |
114 | switch (mainForm.SaveRegionsDialog.ShowDialog()) |
|
104 | { |
115 | { |
|
105 | case DialogResult.OK: |
116 | case DialogResult.OK: |
|
106 | string file = mainForm.SaveRegionsDialog.FileName; |
117 | string file = mainForm.SaveRegionsDialog.FileName; |
|
107 | new Thread(() => |
118 | new Thread(() => |
|
108 | { |
119 | { |
|
109 | mainForm.BeginInvoke((MethodInvoker)(() => |
120 | mainForm.BeginInvoke((MethodInvoker) (() => |
|
110 | { |
121 | { |
|
111 | try |
122 | try |
|
112 | { |
123 | { |
|
113 | mainForm.StatusText.Text = @"saving regions..."; |
124 | mainForm.StatusText.Text = @"saving regions..."; |
|
Line 137... | Line 148... | |||
137 | { |
148 | { |
|
138 | mainForm.StatusText.Text = ex.Message; |
149 | mainForm.StatusText.Text = ex.Message; |
|
139 | } |
150 | } |
|
140 | })); |
151 | })); |
|
141 | }) |
152 | }) |
|
142 | { IsBackground = true, Priority = ThreadPriority.Normal }.Start(); |
153 | {IsBackground = true, Priority = ThreadPriority.Normal}.Start(); |
|
143 | break; |
154 | break; |
|
144 | } |
155 | } |
|
145 | })); |
156 | })); |
|
146 | } |
157 | } |
|
Line 147... | Line -... | |||
147 | |
- | ||
148 | |
158 | |
|
149 | private void RegionEditShown(object sender, EventArgs e) |
159 | private void RegionEditShown(object sender, EventArgs e) |
|
150 | { |
160 | { |
|
151 | Regions.Items.Clear(); |
161 | Regions.Items.Clear(); |
|
152 | // Get all the regions if they exist. |
162 | // Get all the regions if they exist. |
|
Line 169... | Line 179... | |||
169 | } |
179 | } |
|
170 | } |
180 | } |
|
Line 171... | Line 181... | |||
171 | |
181 | |
|
172 | private void RequestAddRegion(object sender, EventArgs e) |
182 | private void RequestAddRegion(object sender, EventArgs e) |
|
173 | { |
183 | { |
|
174 | mainForm.BeginInvoke((MethodInvoker)(() => |
184 | mainForm.BeginInvoke((MethodInvoker) (() => |
|
175 | { |
185 | { |
|
176 | if (string.IsNullOrEmpty(RegionName.Text)) |
186 | if (string.IsNullOrEmpty(RegionName.Text)) |
|
177 | { |
187 | { |
|
178 | RegionName.BackColor = Color.MistyRose; |
188 | RegionName.BackColor = Color.MistyRose; |
|
Line 193... | Line 203... | |||
193 | }); |
203 | }); |
|
Line 194... | Line 204... | |||
194 | |
204 | |
|
195 | // Update drop down box. |
205 | // Update drop down box. |
|
196 | Vassal.vassalForm.BeginInvoke((MethodInvoker) (() => |
206 | Vassal.vassalForm.BeginInvoke((MethodInvoker) (() => |
|
197 | { |
207 | { |
|
198 | Vassal.vassalForm.LoadedRegions.Items.Add(new ListViewItem |
208 | Vassal.vassalForm.LoadedRegionsBox.Items.Add(new ListViewItem |
|
199 | { |
209 | { |
|
200 | Text = RegionName.Text, |
210 | Text = RegionName.Text, |
|
201 | Tag = position |
211 | Tag = position |
|
202 | }); |
212 | }); |
|
Line 209... | Line 219... | |||
209 | })); |
219 | })); |
|
210 | } |
220 | } |
|
Line 211... | Line 221... | |||
211 | |
221 | |
|
212 | private void RequestRemoveRegion(object sender, EventArgs e) |
222 | private void RequestRemoveRegion(object sender, EventArgs e) |
|
213 | { |
223 | { |
|
214 | mainForm.BeginInvoke((MethodInvoker)(() => |
224 | mainForm.BeginInvoke((MethodInvoker) (() => |
|
215 | { |
225 | { |
|
216 | ListViewItem listViewItem = Regions.SelectedItem as ListViewItem; |
226 | ListViewItem listViewItem = Regions.SelectedItem as ListViewItem; |
|
217 | if (listViewItem == null) |
227 | if (listViewItem == null) |
|
218 | { |
228 | { |
|
Line 223... | Line 233... | |||
223 | int selectedItemIndex = Regions.SelectedIndex; |
233 | int selectedItemIndex = Regions.SelectedIndex; |
|
224 | if (selectedItemIndex == -1) |
234 | if (selectedItemIndex == -1) |
|
225 | return; |
235 | return; |
|
Line 226... | Line 236... | |||
226 | |
236 | |
|
227 | Regions.BackColor = Color.Empty; |
237 | Regions.BackColor = Color.Empty; |
|
228 | |
238 | |
|
229 | Vassal.vassalForm.BeginInvoke((MethodInvoker)(() => |
239 | Vassal.vassalForm.BeginInvoke((MethodInvoker) (() => |
|
230 | { |
240 | { |
|
231 | Vassal.vassalForm.LoadedRegions.Items.RemoveAt(selectedItemIndex); |
241 | Vassal.vassalForm.LoadedRegionsBox.Items.RemoveAt(selectedItemIndex); |
|
232 | // Update the batch restart grid view. |
242 | // Update the batch restart grid view. |
|
233 | Vassal.vassalForm.BatchRestartGridView.Rows.RemoveAt(selectedItemIndex); |
243 | Vassal.vassalForm.BatchRestartGridView.Rows.RemoveAt(selectedItemIndex); |
|
234 | Vassal.vassalForm.RegionsStateGridView.Rows.RemoveAt(selectedItemIndex); |
244 | Vassal.vassalForm.RegionsStateGridView.Rows.RemoveAt(selectedItemIndex); |
|
Line 235... | Line 245... | |||
235 | })); |
245 | })); |
|
236 | |
- | ||
237 | Regions.Items.RemoveAt(Regions.SelectedIndex); |
246 | |
|
238 | |
247 | Regions.Items.RemoveAt(Regions.SelectedIndex); |
|
Line 239... | Line 248... | |||
239 | })); |
248 | })); |
|
240 | } |
249 | } |
|
241 | |
250 | |
|
242 | private void RegionSettingChanged(object sender, EventArgs e) |
251 | private void RegionSettingChanged(object sender, EventArgs e) |
|
243 | { |
252 | { |
|
244 | mainForm.BeginInvoke((MethodInvoker)(() => |
253 | mainForm.BeginInvoke((MethodInvoker) (() => |
|
245 | { |
254 | { |
|
Line 265... | Line 274... | |||
265 | return; |
274 | return; |
|
266 | } |
275 | } |
|
Line 267... | Line 276... | |||
267 | |
276 | |
|
268 | RegionName.BackColor = Color.Empty; |
277 | RegionName.BackColor = Color.Empty; |
|
269 | RegionPosition.BackColor = Color.Empty; |
- | ||
Line -... | Line 278... | |||
- | 278 | RegionPosition.BackColor = Color.Empty; |
||
270 | |
279 | |
|
271 | |
280 | |
|
272 | Vassal.vassalForm.BeginInvoke((MethodInvoker)(() => |
281 | Vassal.vassalForm.BeginInvoke((MethodInvoker) (() => |
|
273 | { |
282 | { |
|
274 | if (Vassal.vassalForm.LoadedRegions.Items.Count > selectedItemIndex) |
283 | if (Vassal.vassalForm.LoadedRegionsBox.Items.Count > selectedItemIndex) |
|
275 | { |
284 | { |
|
276 | Vassal.vassalForm.LoadedRegions.Items[selectedItemIndex] = new ListViewItem |
285 | Vassal.vassalForm.LoadedRegionsBox.Items[selectedItemIndex] = new ListViewItem |
|
277 | { |
286 | { |
|
278 | Text = RegionName.Text, |
287 | Text = RegionName.Text, |
|
279 | Tag = position |
288 | Tag = position |
|
Line 308... | Line 317... | |||
308 | Regions.Items[selectedItemIndex] = new ListViewItem |
317 | Regions.Items[selectedItemIndex] = new ListViewItem |
|
309 | { |
318 | { |
|
310 | Text = RegionName.Text + @" " + @"(" + position + @")", |
319 | Text = RegionName.Text + @" " + @"(" + position + @")", |
|
311 | Tag = new KeyValuePair<string, Vector3>(RegionName.Text, position) |
320 | Tag = new KeyValuePair<string, Vector3>(RegionName.Text, position) |
|
312 | }; |
321 | }; |
|
313 | |
- | ||
314 | })); |
322 | })); |
|
315 | } |
323 | } |
|
Line 316... | Line 324... | |||
316 | |
324 | |
|
317 | private void RegionSelected(object sender, EventArgs e) |
325 | private void RegionSelected(object sender, EventArgs e) |
|
318 | { |
326 | { |
|
319 | mainForm.BeginInvoke((MethodInvoker)(() => |
327 | mainForm.BeginInvoke((MethodInvoker) (() => |
|
320 | { |
328 | { |
|
321 | ListViewItem listViewItem = Regions.SelectedItem as ListViewItem; |
329 | ListViewItem listViewItem = Regions.SelectedItem as ListViewItem; |
|
322 | if (listViewItem == null) |
330 | if (listViewItem == null) |
|
Line 330... | Line 338... | |||
330 | RegionName.Text = region.Key; |
338 | RegionName.Text = region.Key; |
|
331 | RegionPosition.Text = region.Value.ToString(); |
339 | RegionPosition.Text = region.Value.ToString(); |
|
332 | })); |
340 | })); |
|
333 | } |
341 | } |
|
334 | } |
342 | } |
|
335 | } |
343 | } |
|
336 | |
344 | |