Skip to content

Commit d37980f

Browse files
axx0axx0
committed
Mostly styling work on menu
1 parent 680927a commit d37980f

File tree

9 files changed

+129
-33
lines changed

9 files changed

+129
-33
lines changed

‎Civ2/Civ2Interface.cs

+17-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,23 @@ public IList<DropdownMenuContents> ConfigureGameCommands(IList<IGameCommand> com
156156
var map = MenuMap;
157157
foreach (var menu in map)
158158
{
159-
var menuContent = new DropdownMenuContents { Commands = new List<MenuCommand>()};
159+
// Find rows with separator and remove them
160+
List<int> separatorRows = new();
161+
for (int i = 0; i < menu.Defaults.Count; i++)
162+
{
163+
if (menu.Defaults[i].MenuText == "-")
164+
{
165+
separatorRows.Add(i);
166+
}
167+
}
168+
for (int i = separatorRows.Count; i-- > 0;)
169+
{
170+
menu.Defaults.RemoveAt(separatorRows[i]);
171+
separatorRows[i] -= i + 2;
172+
}
173+
174+
//separatorRows = new List<int> { 0, 1, 2, 3, 4, 5, 6 };
175+
var menuContent = new DropdownMenuContents { Commands = new List<MenuCommand>(), SeparatorRows = separatorRows.ToArray() };
160176
var loaded = MenuLoader.For(menu.Key);
161177
if (loaded.Count > 0)
162178
{

‎Civ2/MenuDetails.cs

+1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ public class MenuDetails
77
{
88
public string Key { get; init; }
99
public IList<MenuElement> Defaults { get;init; }
10+
public int[] SeparatorRows { get; init; }
1011
}

‎Civ2Gold/Civ2GoldInterface.cs

+32-9
Original file line numberDiff line numberDiff line change
@@ -218,27 +218,33 @@ public override void Initialize()
218218
new MenuElement("M&ultiplayer Options|Ctrl+Y", new Shortcut(KeyboardKey.Y, ctrl: true),
219219
KeyboardKey.U),
220220
new MenuElement("&Game Profile", Shortcut.None, KeyboardKey.G),
221+
new MenuElement("-", Shortcut.None, KeyboardKey.Null),
221222
new MenuElement("Pick &Music", Shortcut.None, KeyboardKey.M),
223+
new MenuElement("-", Shortcut.None, KeyboardKey.Null),
222224
new MenuElement("&Save Game|Ctrl+S", new Shortcut(KeyboardKey.S, ctrl: true), KeyboardKey.S, commandId: SaveGame),
223225
new MenuElement("&Load Game|Ctrl+L", new Shortcut(KeyboardKey.L, ctrl: true), KeyboardKey.L, commandId: LoadGame),
224226
new MenuElement("&Join Game|Ctrl+J", new Shortcut(KeyboardKey.J, ctrl: true), KeyboardKey.J),
227+
new MenuElement("-", Shortcut.None, KeyboardKey.Null),
225228
new MenuElement("Set Pass&word|Ctrl+W", new Shortcut(KeyboardKey.W, ctrl: true), KeyboardKey.W),
226229
new MenuElement("Change &Timer|Ctrl+T", new Shortcut(KeyboardKey.T, ctrl: true), KeyboardKey.T),
230+
new MenuElement("-", Shortcut.None, KeyboardKey.Null),
227231
new MenuElement("&Retire|Ctrl+R", new Shortcut(KeyboardKey.R, ctrl: true), KeyboardKey.R),
228232
new MenuElement("&Quit|Ctrl+Q", new Shortcut(KeyboardKey.Q, ctrl: true), KeyboardKey.Q, commandId: QuitGame )
229-
}
233+
},
230234
},
231235
new MenuDetails
232236
{
233237
Key = "KINGDOM", Defaults = new List<MenuElement>
234238
{
235239
new MenuElement("&Kingdom", Shortcut.None, KeyboardKey.K),
236240
new MenuElement("&Tax Rate|Shift+T", new Shortcut(KeyboardKey.T, shift: true), KeyboardKey.T),
241+
new MenuElement("-", Shortcut.None, KeyboardKey.Null),
237242
new MenuElement("View T&hrone Room|Shift+H", new Shortcut(KeyboardKey.H, shift: true),
238243
KeyboardKey.H),
239244
new MenuElement("Find &City|Shift+C", new Shortcut(KeyboardKey.C, shift: true), KeyboardKey.C),
245+
new MenuElement("-", Shortcut.None, KeyboardKey.Null),
240246
new MenuElement("&REVOLUTION|Shift+R", new Shortcut(KeyboardKey.R, shift: true), KeyboardKey.R)
241-
}
247+
},
242248
},
243249

244250
new MenuDetails
@@ -248,8 +254,10 @@ public override void Initialize()
248254
new MenuElement("&View", Shortcut.None, KeyboardKey.V),
249255
new MenuElement("&Move Pieces|v", new Shortcut(KeyboardKey.V), KeyboardKey.M),
250256
new MenuElement("&View Pieces|v", new Shortcut(KeyboardKey.V), KeyboardKey.V),
257+
new MenuElement("-", Shortcut.None, KeyboardKey.Null),
251258
new MenuElement("Zoom &In|z", new Shortcut(KeyboardKey.Z), KeyboardKey.I, commandId: ZoomIn),
252259
new MenuElement("Zoom &Out|X", new Shortcut(KeyboardKey.X), KeyboardKey.O, commandId: ZoomOut),
260+
new MenuElement("-", Shortcut.None, KeyboardKey.Null),
253261
new MenuElement("Max Zoom In|Ctrl+Z", new Shortcut(KeyboardKey.Z, ctrl: true),
254262
KeyboardKey.Null, commandId: MaxZoomIn),
255263
new MenuElement("Standard Zoom|Shift+Z", new Shortcut(KeyboardKey.Z, shift: true),
@@ -258,12 +266,13 @@ public override void Initialize()
258266
KeyboardKey.Null, commandId: MediumZoomOut),
259267
new MenuElement("Max Zoom Out|Ctrl+X", new Shortcut(KeyboardKey.X, ctrl: true),
260268
KeyboardKey.Null, commandId: MaxZoomOut),
269+
new MenuElement("-", Shortcut.None, KeyboardKey.Null),
261270
new MenuElement("Show Map Grid|Ctrl+G", new Shortcut(KeyboardKey.G, ctrl: true),
262271
KeyboardKey.Null, commandId: ShowMapGrid),
263272
new MenuElement("Arrange Windows", Shortcut.None, KeyboardKey.Null),
264273
new MenuElement("Show Hidden Terrain|t", new Shortcut(KeyboardKey.T), KeyboardKey.T),
265274
new MenuElement("&Center View|c", new Shortcut(KeyboardKey.C), KeyboardKey.C)
266-
}
275+
},
267276
},
268277

269278
new MenuDetails
@@ -306,15 +315,18 @@ public override void Initialize()
306315
new MenuElement("Chat with &Kings|Ctrl+C", new Shortcut(KeyboardKey.C, ctrl: true),
307316
KeyboardKey.K),
308317
new MenuElement("Consult &High Council", Shortcut.None, KeyboardKey.H),
318+
new MenuElement("-", Shortcut.None, KeyboardKey.Null),
309319
new MenuElement("&City Status|F1", new Shortcut(KeyboardKey.F1), KeyboardKey.C),
310320
new MenuElement("&Defense Minister|F2", new Shortcut(KeyboardKey.F2), KeyboardKey.D),
311321
new MenuElement("&Foreign Minister|F3", new Shortcut(KeyboardKey.F3), KeyboardKey.F),
322+
new MenuElement("-", Shortcut.None, KeyboardKey.Null),
312323
new MenuElement("&Attitude Advisor|F4", new Shortcut(KeyboardKey.F4), KeyboardKey.A),
313324
new MenuElement("&Trade Advisor|F5", new Shortcut(KeyboardKey.F5), KeyboardKey.T),
314325
new MenuElement("&Science Advisor|F6", new Shortcut(KeyboardKey.F6), KeyboardKey.S),
326+
new MenuElement("-", Shortcut.None, KeyboardKey.Null),
315327
new MenuElement("Cas&ualty Timeline|Ctrl-D", new Shortcut(KeyboardKey.D, ctrl: true),
316328
KeyboardKey.U)
317-
}
329+
},
318330
},
319331

320332
new MenuDetails
@@ -325,9 +337,10 @@ public override void Initialize()
325337
new MenuElement("&Wonders of the World|F7", new Shortcut(KeyboardKey.F7), KeyboardKey.W),
326338
new MenuElement("&Top 5 Cities|F8", new Shortcut(KeyboardKey.F8), KeyboardKey.T),
327339
new MenuElement("&Civilization Score|F9", new Shortcut(KeyboardKey.F9), KeyboardKey.C),
340+
new MenuElement("-", Shortcut.None, KeyboardKey.Null),
328341
new MenuElement("&Demographics|F11", new Shortcut(KeyboardKey.F11), KeyboardKey.D),
329342
new MenuElement("&Spaceships|F12", new Shortcut(KeyboardKey.F12), KeyboardKey.S)
330-
}
343+
},
331344
},
332345

333346
new MenuDetails
@@ -337,16 +350,19 @@ public override void Initialize()
337350
new MenuElement("&Cheat", Shortcut.None, KeyboardKey.C),
338351
new MenuElement("Toggle Cheat Mode|Ctrl+K", new Shortcut(KeyboardKey.K, ctrl: true),
339352
KeyboardKey.Null),
353+
new MenuElement("-", Shortcut.None, KeyboardKey.Null),
340354
new MenuElement("Create &Unit|Shift+F1", new Shortcut(KeyboardKey.F1, shift: true),
341355
KeyboardKey.U),
342356
new MenuElement("Reveal &Map|Shift+F2", new Shortcut(KeyboardKey.F2, shift: true),
343357
KeyboardKey.M, CheatRevealMapCommand),
344358
new MenuElement("Set &Human Player|Shift+F3", new Shortcut(KeyboardKey.F3, shift: true),
345359
KeyboardKey.H),
360+
new MenuElement("-", Shortcut.None, KeyboardKey.Null),
346361
new MenuElement("Set Game Year|Shift+F4", new Shortcut(KeyboardKey.F4, shift: true),
347362
KeyboardKey.Null),
348363
new MenuElement("&Kill Civilization|Shift+F5", new Shortcut(KeyboardKey.F5, shift: true),
349364
KeyboardKey.K),
365+
new MenuElement("-", Shortcut.None, KeyboardKey.Null),
350366
new MenuElement("Te&chnology Advance|Shift+F6", new Shortcut(KeyboardKey.F6, shift: true),
351367
KeyboardKey.C),
352368
new MenuElement("&Edit Technologies|Ctrl+Shift+F6",
@@ -359,17 +375,19 @@ public override void Initialize()
359375
new Shortcut(KeyboardKey.D, ctrl: true, shift: true), KeyboardKey.Y),
360376
new MenuElement("Change Money|Shift+F9", new Shortcut(KeyboardKey.F9, shift: true),
361377
KeyboardKey.Null),
362-
new MenuElement("Edit Unit|Ctrl+Shift+U", new Shortcut(KeyboardKey.U, ctrl: true, shift: true),
378+
new MenuElement("-", Shortcut.None, KeyboardKey.Null),
379+
new MenuElement("Edit Unit|Ctrl+Shift+U", new Shortcut(KeyboardKey.U, ctrl: true, shift: true),
363380
KeyboardKey.Null),
364381
new MenuElement("Edit City|Ctrl+Shift+C", new Shortcut(KeyboardKey.C, ctrl: true, shift: true),
365382
KeyboardKey.Null),
366383
new MenuElement("Edit King|Ctrl+Shift+K", new Shortcut(KeyboardKey.K, ctrl: true, shift: true),
367384
KeyboardKey.Null),
385+
new MenuElement("-", Shortcut.None, KeyboardKey.Null),
368386
new MenuElement("Scenario Parameters|Ctrl+Shift+P",
369387
new Shortcut(KeyboardKey.P, ctrl: true, shift: true), KeyboardKey.Null),
370388
new MenuElement("Save As Scenario|Ctrl+Shift+S",
371389
new Shortcut(KeyboardKey.S, ctrl: true, shift: true), KeyboardKey.Null)
372-
}
390+
},
373391
},
374392

375393
new MenuDetails
@@ -379,6 +397,7 @@ public override void Initialize()
379397
new MenuElement("&Editor", Shortcut.None, KeyboardKey.E),
380398
new MenuElement("Toggle &Scenario Flag|Ctrl+F", new Shortcut(KeyboardKey.F, ctrl: true),
381399
KeyboardKey.S),
400+
new MenuElement("-", Shortcut.None, KeyboardKey.Null),
382401
new MenuElement("&Advances Editor|Ctrl+Shift+1",
383402
new Shortcut(KeyboardKey.One, ctrl: true, shift: true), KeyboardKey.A),
384403
new MenuElement("&Cities Editor|Ctrl+Shift+2",
@@ -395,8 +414,9 @@ public override void Initialize()
395414
new Shortcut(KeyboardKey.Seven, ctrl: true, shift: true), KeyboardKey.U),
396415
new MenuElement("&Events Editor|Ctrl+Shift+8",
397416
new Shortcut(KeyboardKey.Eight, ctrl: true, shift: true), KeyboardKey.E),
417+
new MenuElement("-", Shortcut.None, KeyboardKey.Null),
398418
new MenuElement("Lua Console|Ctrl+Shift+9", new Shortcut(KeyboardKey.Nine,true,true), KeyboardKey.L, omitIfNoCommand: true, commandId: OpenLuaConsole)
399-
}
419+
},
400420
},
401421

402422
new MenuDetails
@@ -408,11 +428,14 @@ public override void Initialize()
408428
new MenuElement("City &Improvements", Shortcut.None, KeyboardKey.I),
409429
new MenuElement("&Wonders of the World", Shortcut.None, KeyboardKey.W),
410430
new MenuElement("Military &Units", Shortcut.None, KeyboardKey.U),
431+
new MenuElement("-", Shortcut.None, KeyboardKey.Null),
411432
new MenuElement("&Governments", Shortcut.None, KeyboardKey.G),
412433
new MenuElement("&Terrain Types", Shortcut.None, KeyboardKey.T),
434+
new MenuElement("-", Shortcut.None, KeyboardKey.Null),
413435
new MenuElement("Game &Concepts", Shortcut.None, KeyboardKey.C),
436+
new MenuElement("-", Shortcut.None, KeyboardKey.Null),
414437
new MenuElement("&About Civilization II", Shortcut.None, KeyboardKey.A)
415-
}
438+
},
416439
}
417440
};
418441

0 commit comments

Comments
 (0)