# HG changeset patch # User IBBoard # Date 1280608230 0 # Node ID 7eaa8a1715e2840d8ea0d8a38fde93e0154e44db # Parent 55d4f16c982bec05317e7eb898d73c42265aa878 Re #242: Complete initial Qt# UI for WarFoundry * Made New Army dialog behave more like WinForms: * Disable everything until we need it * Make default selections where we can (single items) diff -r 55d4f16c982b -r 7eaa8a1715e2 NewArmyDialog.cs --- a/NewArmyDialog.cs Sat Jul 31 16:03:14 2010 +0000 +++ b/NewArmyDialog.cs Sat Jul 31 20:30:30 2010 +0000 @@ -46,6 +46,11 @@ { layout.gameSystems.AddItem(system.Name); } + + if (gameSystems.Length == 1) + { + layout.gameSystems.CurrentIndex = 0; + } } private void GameSystemSelectionChanged() @@ -61,7 +66,18 @@ { layout.raceList.AddItem(race.Name); } - } + + if (races.Length == 1) + { + layout.raceList.SetCurrentRow(0, (uint)QItemSelectionModel.SelectionFlag.ClearAndSelect); + } + + layout.raceList.Enabled = true; + } + else + { + layout.raceList.Enabled = false; + } } private void ValidateForm() @@ -86,9 +102,12 @@ return system; } - private void RaceTypeChanged() + private void RaceTypeChanged() { - ValidateForm(); + ValidateForm(); + bool raceSelected = (layout.raceList.CurrentRow != -1); + layout.armyName.Enabled = raceSelected; + layout.armySize.Enabled = raceSelected; } public Race GetSelectedRace() diff -r 55d4f16c982b -r 7eaa8a1715e2 qt-gui/CreateNewArmyLayout.cs --- a/qt-gui/CreateNewArmyLayout.cs Sat Jul 31 16:03:14 2010 +0000 +++ b/qt-gui/CreateNewArmyLayout.cs Sat Jul 31 20:30:30 2010 +0000 @@ -1,8 +1,8 @@ /******************************************************************************** ** Form generated from reading ui file 'CreateNewArmyLayout.ui' ** -** Created: Sat Jan 30 20:56:06 2010 -** by: Qt User Interface Compiler for C# version 4.5.3 +** Created: Sat Jul 31 20:16:09 2010 +** by: Qt User Interface Compiler for C# version 4.6.3 ** ** WARNING! All changes made in this file will be lost when recompiling ui file! ********************************************************************************/ @@ -71,6 +71,7 @@ armySize = new QSpinBox(CreateNewArmyLayout); armySize.ObjectName = "armySize"; + armySize.Enabled = false; armySize.Frame = true; armySize.buttonSymbols = QAbstractSpinBox.ButtonSymbols.UpDownArrows; armySize.Maximum = 100000; @@ -81,11 +82,13 @@ armyName = new QLineEdit(CreateNewArmyLayout); armyName.ObjectName = "armyName"; + armyName.Enabled = false; gridLayout.AddWidget(armyName, 2, 2, 1, 1); raceList = new QListWidget(CreateNewArmyLayout); raceList.ObjectName = "raceList"; + raceList.Enabled = false; gridLayout.AddWidget(raceList, 1, 2, 1, 1); diff -r 55d4f16c982b -r 7eaa8a1715e2 qt-gui/CreateNewArmyLayout.ui --- a/qt-gui/CreateNewArmyLayout.ui Sat Jul 31 16:03:14 2010 +0000 +++ b/qt-gui/CreateNewArmyLayout.ui Sat Jul 31 20:30:30 2010 +0000 @@ -72,6 +72,9 @@ + + false + true @@ -90,10 +93,18 @@ - + + + false + + - + + + false + +