From 05733a028a7976a57dbfb6e145c45ee02ff85cf6 Mon Sep 17 00:00:00 2001 From: Ed Kolis Date: Sun, 21 Apr 2024 12:48:06 -0400 Subject: [PATCH] 304 port UI to blazor proof of concept (#308) * Add a Razor class library but for some reason the Razor component can't be referenced from WinForms * Add HTML boilerplate * Rename FrEee.WinForms to FrEee.UI.WinForms * Update namespaces * Update project/solutoin * Undo some accidentally committed changes * Blazorified the GameProgressBar * Adjust styling * Don't allow progress bar to overflow * Set up the new font thingy, not using it yet because I haven't found a good place to put it in the progress bar * Fix right text of progress bar not getting set * Fix crashing when refreshing progress bar * comments for things to clean up * Wrap view model properties without having useless local fields * Move some code from WinForms to the Blazor view model * Fix crash when calling a WinForms modal dialog from Blazor while debugging * Remove references to nonexitent FrEee.UI project * Add comment, that's weird that it's inconsistent * Fix progress bar not refreshing again * Add resource display but it's broken. Also added Blazor test form. * Actually render the Blazor view in the resource display * Try to fix the resource displays' colors and icons but not quite. Icons are not appearing, not sure how to make that work in Blazor outside of wwwroot. Seems like we need middleware but how to install it in a WinForms app? Also trying to fix the margins on the GameProgressBar but no luck there iether... * Fixed resource displays (hopefully the symlinks will persist in the builds or we'll need to find another way to display images in Blazor) * Fix Blazor image path issue by moving index.html to the root. This feels so dastardly... * Delete empty wwwroot folder * Install a couple NuGet packages to fix inability to put Blazor-based controls on form * Combine multile ResourceDisplays into a ResourceQuantityDisplay * Refactor some code into a base BlazorControl * Remove unneeded analytics packages and a using statement * Adjust a few things in the BlazorControl * Get rid of a generic type parameter, somehow partially fix resource displays for empire inventory * Get rid of the other generic type parameter for BlazorControl * Fix BlazorWebView based controls in WinForms designer by using some sort of abtsractoin * Fix resource inventory display * Delerte an unused method * Move controls that have been converted to Blazor to their own namespace, for organization * Adjust namespaces of moved controls * Moved the wrong control oops * GamePictureBox is now Blazor; for some reason there's a scvroll bar * Actually show text on full size GamePictureBox forms * Display name of Blazor control in WinForms designer * Add a pie chart Blazor component, the HTML checks out in a browser bu tfor some reason it's not rendering in the test form. * Fix pie chart rendering * Blazor galaxy map WIP * Somewhat fix layout of galaxy map, somewhat break that of resource display * Fix image alignment/sizing * Implement presence map mode * Set up MEF and dropdown for galaxy map modes * Trying to draw warp lines * Draw warp lines, but they're scaled wrong * Delete unused function * Cleaning up the map, add green grid because green grids are cool * Don't place star systems off the lower or right edges of the map * Fixed map rendering * Render the selected star system with a white border * Clicking a system actually selects it * Get rid of background click handler for galaxy map because it's causing weird errors when clicked repeatedly * Fix numbers being hidden on the resourve display * Fix vertical alignment of resource display text --- Kwajong.otf => FrEee.Assets/Fonts/Kwajong.otf | Bin .../Fonts/kwajong-readme.txt | 0 FrEee.Assets/FrEee.Assets.csproj | 8 + FrEee.UI.Blazor/Component1.razor | 3 + FrEee.UI.Blazor/Component1.razor.css | 6 + FrEee.UI.Blazor/ExampleJsInterop.cs | 37 + FrEee.UI.Blazor/FodyWeavers.xml | 6 + FrEee.UI.Blazor/FodyWeavers.xsd | 74 + FrEee.UI.Blazor/FrEee.UI.Blazor.csproj | 35 + FrEee.UI.Blazor/Views/GalaxyMap.razor | 100 + .../GalaxyMapModes/GalaxyMapModeLibrary.cs | 36 + .../Views/GalaxyMapModes/IGalaxyMapMode.cs | 27 + .../Views/GalaxyMapModes/PresenceMode.cs | 50 + FrEee.UI.Blazor/Views/GalaxyMapViewModel.cs | 119 + FrEee.UI.Blazor/Views/ImageDisplay.razor | 29 + .../Views/ImageDisplayViewModel.cs | 45 + FrEee.UI.Blazor/Views/PieChart.razor | 41 + FrEee.UI.Blazor/Views/PieChartViewModel.cs | 75 + FrEee.UI.Blazor/Views/ProgressBar.razor | 47 + FrEee.UI.Blazor/Views/ProgressBarViewModel.cs | 74 + FrEee.UI.Blazor/Views/ProgressDisplayType.cs | 17 + FrEee.UI.Blazor/Views/ResourceDisplay.razor | 34 + .../Views/ResourceDisplayViewModel.cs | 90 + .../Views/ResourceQuantityDisplay.razor | 36 + .../Views/ResourceQuantityDisplayViewModel.cs | 52 + FrEee.UI.Blazor/WebExtensions.cs | 19 + FrEee.UI.Blazor/_Imports.razor | 1 + FrEee.UI.Blazor/wwwroot/background.png | Bin 0 -> 378 bytes FrEee.UI.Blazor/wwwroot/exampleJsInterop.js | 6 + .../Assets/Splash.jpg | Bin .../Assets/Splash.pdn | 0 .../Assets/Splash.png | Bin FrEee.UI.WinForms/Assets/css/app.css | 102 + FrEee.UI.WinForms/Assets/fonts/Kwajong.otf | Bin 0 -> 33284 bytes .../Assets/fonts/kwajong-readme.txt | 16 + .../Controls/AbilityTreeView.Designer.cs | 2 +- .../Controls/AbilityTreeView.cs | 2 +- .../Controls/AbilityTreeView.resx | 0 .../Controls/AptitudePicker.Designer.cs | 2 +- .../Controls/AptitudePicker.cs | 2 +- .../Controls/AptitudePicker.resx | 0 .../Controls/AsteroidFieldReport.Designer.cs | 11 +- .../Controls/AsteroidFieldReport.cs | 4 +- .../Controls/AsteroidFieldReport.resx | 0 .../Controls/BattleView.Designer.cs | 2 +- .../Controls/BattleView.cs | 2 +- .../Controls/BattleView.resx | 0 .../Blazor}/GamePictureBox.Designer.cs | 73 +- .../Controls/Blazor/GamePictureBox.cs | 66 + .../Controls/Blazor/GamePictureBox.resx | 120 + .../Blazor/GameProgressBar.Designer.cs | 61 + .../Controls/Blazor/GameProgressBar.cs | 94 + .../Controls/Blazor}/GameProgressBar.resx | 238 +- .../Controls/Blazor/PieChart.Designer.cs | 87 +- FrEee.UI.WinForms/Controls/Blazor/PieChart.cs | 43 + .../Controls/Blazor/PieChart.resx | 120 + .../Blazor/ResourceDisplay.Designer.cs | 60 + .../Controls/Blazor/ResourceDisplay.cs | 54 + .../Controls/Blazor}/ResourceDisplay.resx | 238 +- .../ResourceQuantityDisplay.Designer.cs | 52 + .../Blazor/ResourceQuantityDisplay.cs | 44 + .../Blazor}/ResourceQuantityDisplay.resx | 238 +- FrEee.UI.WinForms/Controls/BlazorControl.cs | 74 + FrEee.UI.WinForms/Controls/BlazorControl.resx | 123 + .../Controls/Cargolist.Designer.cs | 2 +- .../Controls/Cargolist.cs | 6 +- .../Controls/Cargolist.resx | 0 .../Controls/ComponentReport.Designer.cs | 17 +- .../Controls/ComponentReport.cs | 4 +- .../Controls/ComponentReport.resx | 0 .../Controls/DesignReport.Designer.cs | 23 +- .../Controls/DesignReport.cs | 6 +- .../Controls/DesignReport.resx | 0 .../Controls/EmpireReport.Designer.cs | 11 +- .../Controls/EmpireReport.cs | 4 +- .../Controls/EmpireReport.resx | 0 .../Controls/FacilityReport.Designer.cs | 15 +- .../Controls/FacilityReport.cs | 4 +- .../Controls/FacilityReport.resx | 0 .../Controls/FleetReport.Designer.cs | 73 +- .../Controls/FleetReport.cs | 6 +- .../Controls/FleetReport.resx | 0 .../Controls/GalaxyView.Designer.cs | 2 +- .../Controls/GalaxyView.cs | 143 +- .../Controls/GalaxyView.resx | 0 .../Controls/GameButton.Designer.cs | 2 +- .../Controls/GameButton.cs | 2 +- .../Controls/GameGridView.Designer.cs | 12 +- .../Controls/GameGridView.cs | 4 +- .../Controls/GameGridView.resx | 0 .../Controls/GamePanel.Designer.cs | 2 +- .../Controls/GamePanel.cs | 2 +- .../Controls/GameTabControl.Designer.cs | 2 +- .../Controls/GameTabControl.cs | 2 +- .../Controls/GameTableLayoutPanel.Designer.cs | 2 +- .../Controls/GameTableLayoutPanel.cs | 2 +- .../Controls/LineGraph.Designer.cs | 2 +- .../Controls/LineGraph.cs | 2 +- .../Controls/MountReport.Designer.cs | 9 +- .../Controls/MountReport.cs | 6 +- .../Controls/MountReport.resx | 0 .../Controls/Pager.Designer.cs | 2 +- .../Controls/Pager.cs | 2 +- .../Controls/Pager.resx | 0 .../Controls/PlanetReport.Designer.cs | 31 +- .../Controls/PlanetReport.cs | 6 +- .../Controls/PlanetReport.resx | 0 .../Controls/SearchBox.Designer.cs | 2 +- .../Controls/SearchBox.cs | 4 +- .../Controls/SearchBox.resx | 0 .../Controls/SpaceVehicleReport.Designer.cs | 75 +- .../Controls/SpaceVehicleReport.cs | 6 +- .../Controls/SpaceVehicleReport.resx | 0 .../Controls/StarReport.Designer.cs | 7 +- .../Controls/StarReport.cs | 4 +- .../Controls/StarReport.resx | 0 .../Controls/StarSystemReport.Designer.cs | 9 +- .../Controls/StarSystemReport.cs | 4 +- .../Controls/StarSystemReport.resx | 0 .../Controls/StarSystemView.Designer.cs | 2 +- .../Controls/StarSystemView.cs | 2 +- .../Controls/StarSystemView.resx | 0 .../Controls/StormReport.Designer.cs | 9 +- .../Controls/StormReport.cs | 4 +- .../Controls/StormReport.resx | 0 .../Controls/TraitPicker.Designer.cs | 2 +- .../Controls/TraitPicker.cs | 2 +- .../Controls/TraitPicker.resx | 0 .../Controls/WarpPointReport.Designer.cs | 9 +- .../Controls/WarpPointReport.cs | 4 +- .../Controls/WarpPointReport.resx | 0 .../DataGridView/DataGridViewProgressCell.cs | 2 +- .../DataGridViewProgressColumn.cs | 2 +- .../DataGridView/Filter.cs | 2 +- .../DataGridView/Format.cs | 2 +- .../DataGridView/GridColumnConfig.cs | 2 +- .../DataGridView/GridConfig.cs | 2 +- .../DataGridView/Sort.cs | 2 +- .../Forms/ActivateAbilityForm.Designer.cs | 6 +- .../Forms/ActivateAbilityForm.cs | 4 +- .../Forms/ActivateAbilityForm.resx | 0 .../Forms/BattleReplayForm.Designer.cs | 16 +- .../Forms/BattleReplayForm.cs | 8 +- .../Forms/BattleReplayForm.resx | 0 .../Forms/BattleResultsForm.Designer.cs | 10 +- .../Forms/BattleResultsForm.cs | 10 +- .../Forms/BattleResultsForm.resx | 0 .../Forms/BlazorTestForm.Designer.cs | 96 + FrEee.UI.WinForms/Forms/BlazorTestForm.cs | 55 + FrEee.UI.WinForms/Forms/BlazorTestForm.resx | 120 + .../Forms/CargoTransferForm.Designer.cs | 18 +- .../Forms/CargoTransferForm.cs | 6 +- .../Forms/CargoTransferForm.resx | 0 .../Forms/CombatSimulatorForm.Designer.cs | 38 +- .../Forms/CombatSimulatorForm.cs | 6 +- .../Forms/CombatSimulatorForm.resx | 0 .../Forms/CommandsForm.Designer.cs | 2 +- .../Forms/CommandsForm.cs | 6 +- .../Forms/CommandsForm.resx | 0 .../Forms/ConstructionQueueForm.Designer.cs | 58 +- .../Forms/ConstructionQueueForm.cs | 8 +- .../Forms/ConstructionQueueForm.resx | 0 .../ConstructionQueueListForm.Designer.cs | 10 +- .../Forms/ConstructionQueueListForm.cs | 6 +- .../Forms/ConstructionQueueListForm.resx | 0 .../Forms/CultureComparisonForm.Designer.cs | 4 +- .../Forms/CultureComparisonForm.cs | 4 +- .../Forms/CultureComparisonForm.resx | 0 .../Forms/DebugForm.Designer.cs | 4 +- .../Forms/DebugForm.cs | 2 +- .../Forms/DebugForm.resx | 0 .../Forms/DesignListForm.Designer.cs | 30 +- .../Forms/DesignListForm.cs | 6 +- .../Forms/DesignListForm.resx | 0 .../Forms/DiplomacyForm.Designer.cs | 16 +- .../Forms/DiplomacyForm.cs | 8 +- .../Forms/DiplomacyForm.resx | 0 .../Forms/EditorForm.Designer.cs | 8 +- .../Forms/EditorForm.cs | 8 +- .../Forms/EditorForm.resx | 0 .../Forms/EmpireListForm.Designer.cs | 108 +- .../Forms/EmpireListForm.cs | 32 +- .../Forms/EmpireListForm.resx | 0 .../Forms/EmpireSetupForm.Designer.cs | 44 +- .../Forms/EmpireSetupForm.cs | 6 +- .../Forms/EmpireSetupForm.resx | 0 .../Forms/FleetTransferForm.Designer.cs | 14 +- .../Forms/FleetTransferForm.cs | 8 +- .../Forms/FleetTransferForm.resx | 0 .../Forms/GameForm.Designer.cs | 2 +- .../Forms/GameForm.cs | 4 +- .../Forms/GameForm.resx | 0 .../Forms/GameOverForm.Designer.cs | 8 +- .../Forms/GameOverForm.cs | 4 +- .../Forms/GameOverForm.resx | 0 .../Forms/GameSetupForm.Designer.cs | 2665 +++++++++++++++ .../Forms/GameSetupForm.cs | 11 +- .../Forms/GameSetupForm.resx | 50 +- .../Forms/GenericPickerForm.Designer.cs | 6 +- .../Forms/GenericPickerForm.cs | 6 +- .../Forms/GenericPickerForm.resx | 0 .../Forms/HostConsoleForm.Designer.cs | 12 +- .../Forms/HostConsoleForm.cs | 6 +- .../Forms/HostConsoleForm.resx | 0 .../Forms/HullPickerForm.Designer.cs | 6 +- .../Forms/HullPickerForm.cs | 6 +- .../Forms/HullPickerForm.resx | 0 .../Forms/LogForm.Designer.cs | 2 +- .../Forms/LogForm.cs | 6 +- .../Forms/LogForm.resx | 0 .../Forms/MainGameForm.Designer.cs | 946 ++++++ .../Forms/MainGameForm.cs | 38 +- FrEee.UI.WinForms/Forms/MainGameForm.resx | 189 ++ .../Forms/MainMenuForm.Designer.cs | 20 +- .../Forms/MainMenuForm.cs | 10 +- .../Forms/MainMenuForm.resx | 0 .../Forms/MinistersForm.Designer.cs | 8 +- .../Forms/MinistersForm.cs | 4 +- .../Forms/MinistersForm.resx | 0 .../Forms/ModErrorsForm.Designer.cs | 12 +- .../Forms/ModErrorsForm.cs | 8 +- .../Forms/ModErrorsForm.resx | 0 .../Forms/ModPickerForm.Designer.cs | 10 +- .../Forms/ModPickerForm.cs | 6 +- .../Forms/ModPickerForm.resx | 0 .../Forms/MountPickerForm.Designer.cs | 6 +- .../Forms/MountPickerForm.cs | 4 +- .../Forms/MountPickerForm.resx | 0 FrEee.UI.WinForms/Forms/OptionsForm.cs | 549 ++++ FrEee.UI.WinForms/Forms/OptionsForm.resx | 120 + .../Forms/PlanetListForm.Designer.cs | 31 +- .../Forms/PlanetListForm.cs | 8 +- .../Forms/PlanetListForm.resx | 0 .../Forms/RecycleForm.Designer.cs | 16 +- .../Forms/RecycleForm.cs | 6 +- .../Forms/RecycleForm.resx | 0 .../Forms/ResearchForm.Designer.cs | 40 +- .../Forms/ResearchForm.cs | 6 +- .../Forms/ResearchForm.resx | 0 .../Forms/ScoresForm.Designer.cs | 6 +- .../Forms/ScoresForm.cs | 4 +- .../Forms/ScoresForm.resx | 0 .../Forms/SearchBoxResultsForm.Designer.cs | 4 +- .../Forms/SearchBoxResultsForm.cs | 6 +- .../Forms/SearchBoxResultsForm.resx | 0 .../Forms/ShipListForm.Designer.cs | 21 +- .../Forms/ShipListForm.cs | 8 +- .../Forms/ShipListForm.resx | 0 .../Forms/SpaceObjectPickerForm.Designer.cs | 6 +- .../Forms/SpaceObjectPickerForm.cs | 6 +- .../Forms/SpaceObjectPickerForm.resx | 0 .../Forms/StatusForm.Designer.cs | 7 +- .../Forms/StatusForm.cs | 2 +- .../Forms/StatusForm.resx | 0 .../Forms/TechTreeForm.Designer.cs | 267 ++ .../Forms/TechTreeForm.cs | 10 +- .../Forms/TechTreeForm.resx | 50 +- .../Forms/VehicleDesignForm.Designer.cs | 58 +- .../Forms/VehicleDesignForm.cs | 12 +- .../Forms/VehicleDesignForm.resx | 0 .../FrEee.UI.WinForms.csproj | 119 +- .../FrEee.ico | Bin .../GamePropertyGrid.Designer.cs | 4 +- .../GamePropertyGrid.cs | 6 +- .../GamePropertyGrid.resx | 0 .../Interfaces/IBindable.cs | 2 +- .../Objects/ClientSettings.cs | 4 +- .../Objects/GalaxyViewModes/ArgbMode.cs | 4 +- .../Objects/GalaxyViewModes/ColoniesMode.cs | 2 +- .../GalaxyViewModes/ConstructionMode.cs | 2 +- .../Objects/GalaxyViewModes/ForcesMode.cs | 2 +- .../GalaxyViewModes/GalaxyViewModes.cs | 2 +- .../GalaxyViewModes/IGalaxyViewMode.cs | 2 +- .../Objects/GalaxyViewModes/PieMode.cs | 4 +- .../Objects/GalaxyViewModes/PresenceMode.cs | 2 +- .../Objects/GalaxyViewModes/RepairMode.cs | 2 +- .../GalaxyViewModes/ResearchIntelMode.cs | 2 +- .../Objects/GalaxyViewModes/ResourcesMode.cs | 2 +- .../Objects/GalaxyViewModes/SpaceYardMode.cs | 2 +- .../Objects/GalaxyViewModes/UtilityMode.cs | 2 +- .../Objects/GalaxyViewModes/WarpPointsMode.cs | 2 +- .../Objects/Music.cs | 2 +- .../Program.cs | 15 +- .../FrEee.Game.Interfaces.IHull.datasource | 0 ....Civilization.ConstructionQueue.datasource | 0 ...me.Objects.Civilization.Culture.datasource | 0 ...ame.Objects.Civilization.Empire.datasource | 0 ...jects.Civilization.EmpireStatus.datasource | 0 ...e.Game.Objects.Technology.Mount.datasource | 0 ...e.Objects.Technology.Technology.datasource | 0 ...gies.WarpPointPlacementStrategy.datasource | 0 ...FrEee.Modding.StellarObjectSize.datasource | 0 ...odding.Templates.GalaxyTemplate.datasource | 0 .../Properties/Resources.Designer.cs | 5 +- .../Properties/Resources.resx | 0 .../Properties/Settings.Designer.cs | 5 +- .../Properties/Settings.settings | 0 .../Resources/check_ethernet_checked.bmp | Bin .../Resources/check_ethernet_clear.bmp | Bin .../Utility/Extensions/GuiExtensions.cs | 24 +- .../Utility/Gui.cs | 6 +- .../app.config | 0 FrEee.UI.WinForms/index.html | 25 + .../post-build.bat | 4 +- .../post-build.sh | 2 +- .../xbuild.sh | 0 FrEee.WinForms/Controls/GamePictureBox.cs | 31 - FrEee.WinForms/Controls/GameProgressBar.cs | 175 - .../Controls/ResourceDisplay.Designer.cs | 50 - FrEee.WinForms/Controls/ResourceDisplay.cs | 101 - .../ResourceQuantityDisplay.Designer.cs | 102 - .../Controls/ResourceQuantityDisplay.cs | 46 - .../Forms/GameSetupForm.Designer.cs | 2864 ----------------- FrEee.WinForms/Forms/MainGameForm.Designer.cs | 1022 ------ FrEee.WinForms/Forms/MainGameForm.resx | 63 - FrEee.WinForms/Forms/OptionsForm.cs | 531 --- FrEee.WinForms/Forms/OptionsForm.resx | 60 - FrEee.WinForms/Forms/TechTreeForm.Designer.cs | 257 -- FrEee.sln | 46 +- FrEee/ClassDiagram1.cd | 2 +- FrEee/Extensions/CommonExtensions.cs | 4 +- FrEee/Extensions/MathExtensions.cs | 10 + FrEee/Utility/ProgressDisplayMode.cs | 2 +- 323 files changed, 8563 insertions(+), 6705 deletions(-) rename Kwajong.otf => FrEee.Assets/Fonts/Kwajong.otf (100%) rename kwajong-readme.txt => FrEee.Assets/Fonts/kwajong-readme.txt (100%) create mode 100644 FrEee.UI.Blazor/Component1.razor create mode 100644 FrEee.UI.Blazor/Component1.razor.css create mode 100644 FrEee.UI.Blazor/ExampleJsInterop.cs create mode 100644 FrEee.UI.Blazor/FodyWeavers.xml create mode 100644 FrEee.UI.Blazor/FodyWeavers.xsd create mode 100644 FrEee.UI.Blazor/FrEee.UI.Blazor.csproj create mode 100644 FrEee.UI.Blazor/Views/GalaxyMap.razor create mode 100644 FrEee.UI.Blazor/Views/GalaxyMapModes/GalaxyMapModeLibrary.cs create mode 100644 FrEee.UI.Blazor/Views/GalaxyMapModes/IGalaxyMapMode.cs create mode 100644 FrEee.UI.Blazor/Views/GalaxyMapModes/PresenceMode.cs create mode 100644 FrEee.UI.Blazor/Views/GalaxyMapViewModel.cs create mode 100644 FrEee.UI.Blazor/Views/ImageDisplay.razor create mode 100644 FrEee.UI.Blazor/Views/ImageDisplayViewModel.cs create mode 100644 FrEee.UI.Blazor/Views/PieChart.razor create mode 100644 FrEee.UI.Blazor/Views/PieChartViewModel.cs create mode 100644 FrEee.UI.Blazor/Views/ProgressBar.razor create mode 100644 FrEee.UI.Blazor/Views/ProgressBarViewModel.cs create mode 100644 FrEee.UI.Blazor/Views/ProgressDisplayType.cs create mode 100644 FrEee.UI.Blazor/Views/ResourceDisplay.razor create mode 100644 FrEee.UI.Blazor/Views/ResourceDisplayViewModel.cs create mode 100644 FrEee.UI.Blazor/Views/ResourceQuantityDisplay.razor create mode 100644 FrEee.UI.Blazor/Views/ResourceQuantityDisplayViewModel.cs create mode 100644 FrEee.UI.Blazor/WebExtensions.cs create mode 100644 FrEee.UI.Blazor/_Imports.razor create mode 100644 FrEee.UI.Blazor/wwwroot/background.png create mode 100644 FrEee.UI.Blazor/wwwroot/exampleJsInterop.js rename {FrEee.WinForms => FrEee.UI.WinForms}/Assets/Splash.jpg (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Assets/Splash.pdn (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Assets/Splash.png (100%) create mode 100644 FrEee.UI.WinForms/Assets/css/app.css create mode 100644 FrEee.UI.WinForms/Assets/fonts/Kwajong.otf create mode 100644 FrEee.UI.WinForms/Assets/fonts/kwajong-readme.txt rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/AbilityTreeView.Designer.cs (94%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/AbilityTreeView.cs (93%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/AbilityTreeView.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/AptitudePicker.Designer.cs (95%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/AptitudePicker.cs (95%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/AptitudePicker.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/AsteroidFieldReport.Designer.cs (95%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/AsteroidFieldReport.cs (92%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/AsteroidFieldReport.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/BattleView.Designer.cs (94%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/BattleView.cs (96%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/BattleView.resx (100%) rename {FrEee.WinForms/Controls => FrEee.UI.WinForms/Controls/Blazor}/GamePictureBox.Designer.cs (83%) create mode 100644 FrEee.UI.WinForms/Controls/Blazor/GamePictureBox.cs create mode 100644 FrEee.UI.WinForms/Controls/Blazor/GamePictureBox.resx create mode 100644 FrEee.UI.WinForms/Controls/Blazor/GameProgressBar.Designer.cs create mode 100644 FrEee.UI.WinForms/Controls/Blazor/GameProgressBar.cs rename {FrEee.WinForms/Controls => FrEee.UI.WinForms/Controls/Blazor}/GameProgressBar.resx (91%) rename FrEee.WinForms/Controls/GameProgressBar.Designer.cs => FrEee.UI.WinForms/Controls/Blazor/PieChart.Designer.cs (52%) create mode 100644 FrEee.UI.WinForms/Controls/Blazor/PieChart.cs create mode 100644 FrEee.UI.WinForms/Controls/Blazor/PieChart.resx create mode 100644 FrEee.UI.WinForms/Controls/Blazor/ResourceDisplay.Designer.cs create mode 100644 FrEee.UI.WinForms/Controls/Blazor/ResourceDisplay.cs rename {FrEee.WinForms/Controls => FrEee.UI.WinForms/Controls/Blazor}/ResourceDisplay.resx (91%) create mode 100644 FrEee.UI.WinForms/Controls/Blazor/ResourceQuantityDisplay.Designer.cs create mode 100644 FrEee.UI.WinForms/Controls/Blazor/ResourceQuantityDisplay.cs rename {FrEee.WinForms/Controls => FrEee.UI.WinForms/Controls/Blazor}/ResourceQuantityDisplay.resx (91%) create mode 100644 FrEee.UI.WinForms/Controls/BlazorControl.cs create mode 100644 FrEee.UI.WinForms/Controls/BlazorControl.resx rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/Cargolist.Designer.cs (95%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/Cargolist.cs (96%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/Cargolist.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/ComponentReport.Designer.cs (95%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/ComponentReport.cs (94%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/ComponentReport.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/DesignReport.Designer.cs (94%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/DesignReport.cs (94%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/DesignReport.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/EmpireReport.Designer.cs (94%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/EmpireReport.cs (87%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/EmpireReport.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/FacilityReport.Designer.cs (89%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/FacilityReport.cs (91%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/FacilityReport.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/FleetReport.Designer.cs (92%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/FleetReport.cs (95%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/FleetReport.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/GalaxyView.Designer.cs (93%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/GalaxyView.cs (69%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/GalaxyView.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/GameButton.Designer.cs (91%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/GameButton.cs (94%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/GameGridView.Designer.cs (95%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/GameGridView.cs (96%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/GameGridView.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/GamePanel.Designer.cs (91%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/GamePanel.cs (92%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/GameTabControl.Designer.cs (91%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/GameTabControl.cs (94%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/GameTableLayoutPanel.Designer.cs (91%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/GameTableLayoutPanel.cs (78%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/LineGraph.Designer.cs (91%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/LineGraph.cs (95%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/MountReport.Designer.cs (96%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/MountReport.cs (94%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/MountReport.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/Pager.Designer.cs (97%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/Pager.cs (93%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/Pager.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/PlanetReport.Designer.cs (95%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/PlanetReport.cs (95%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/PlanetReport.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/SearchBox.Designer.cs (95%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/SearchBox.cs (94%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/SearchBox.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/SpaceVehicleReport.Designer.cs (93%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/SpaceVehicleReport.cs (96%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/SpaceVehicleReport.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/StarReport.Designer.cs (95%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/StarReport.cs (90%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/StarReport.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/StarSystemReport.Designer.cs (96%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/StarSystemReport.cs (95%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/StarSystemReport.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/StarSystemView.Designer.cs (93%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/StarSystemView.cs (96%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/StarSystemView.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/StormReport.Designer.cs (92%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/StormReport.cs (89%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/StormReport.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/TraitPicker.Designer.cs (94%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/TraitPicker.cs (93%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/TraitPicker.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/WarpPointReport.Designer.cs (92%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/WarpPointReport.cs (90%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Controls/WarpPointReport.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/DataGridView/DataGridViewProgressCell.cs (96%) rename {FrEee.WinForms => FrEee.UI.WinForms}/DataGridView/DataGridViewProgressColumn.cs (93%) rename {FrEee.WinForms => FrEee.UI.WinForms}/DataGridView/Filter.cs (86%) rename {FrEee.WinForms => FrEee.UI.WinForms}/DataGridView/Format.cs (69%) rename {FrEee.WinForms => FrEee.UI.WinForms}/DataGridView/GridColumnConfig.cs (94%) rename {FrEee.WinForms => FrEee.UI.WinForms}/DataGridView/GridConfig.cs (84%) rename {FrEee.WinForms => FrEee.UI.WinForms}/DataGridView/Sort.cs (64%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/ActivateAbilityForm.Designer.cs (95%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/ActivateAbilityForm.cs (95%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/ActivateAbilityForm.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/BattleReplayForm.Designer.cs (91%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/BattleReplayForm.cs (93%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/BattleReplayForm.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/BattleResultsForm.Designer.cs (91%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/BattleResultsForm.cs (93%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/BattleResultsForm.resx (100%) create mode 100644 FrEee.UI.WinForms/Forms/BlazorTestForm.Designer.cs create mode 100644 FrEee.UI.WinForms/Forms/BlazorTestForm.cs create mode 100644 FrEee.UI.WinForms/Forms/BlazorTestForm.resx rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/CargoTransferForm.Designer.cs (94%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/CargoTransferForm.cs (95%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/CargoTransferForm.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/CombatSimulatorForm.Designer.cs (94%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/CombatSimulatorForm.cs (95%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/CombatSimulatorForm.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/CommandsForm.Designer.cs (95%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/CommandsForm.cs (70%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/CommandsForm.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/ConstructionQueueForm.Designer.cs (93%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/ConstructionQueueForm.cs (96%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/ConstructionQueueForm.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/ConstructionQueueListForm.Designer.cs (95%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/ConstructionQueueListForm.cs (91%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/ConstructionQueueListForm.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/CultureComparisonForm.Designer.cs (97%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/CultureComparisonForm.cs (85%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/CultureComparisonForm.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/DebugForm.Designer.cs (94%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/DebugForm.cs (95%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/DebugForm.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/DesignListForm.Designer.cs (92%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/DesignListForm.cs (95%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/DesignListForm.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/DiplomacyForm.Designer.cs (95%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/DiplomacyForm.cs (95%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/DiplomacyForm.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/EditorForm.Designer.cs (92%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/EditorForm.cs (89%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/EditorForm.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/EmpireListForm.Designer.cs (90%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/EmpireListForm.cs (86%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/EmpireListForm.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/EmpireSetupForm.Designer.cs (93%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/EmpireSetupForm.cs (94%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/EmpireSetupForm.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/FleetTransferForm.Designer.cs (95%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/FleetTransferForm.cs (94%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/FleetTransferForm.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/GameForm.Designer.cs (94%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/GameForm.cs (92%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/GameForm.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/GameOverForm.Designer.cs (88%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/GameOverForm.cs (86%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/GameOverForm.resx (100%) create mode 100644 FrEee.UI.WinForms/Forms/GameSetupForm.Designer.cs rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/GameSetupForm.cs (96%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/GameSetupForm.resx (92%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/GenericPickerForm.Designer.cs (93%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/GenericPickerForm.cs (84%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/GenericPickerForm.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/HostConsoleForm.Designer.cs (95%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/HostConsoleForm.cs (94%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/HostConsoleForm.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/HullPickerForm.Designer.cs (95%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/HullPickerForm.cs (92%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/HullPickerForm.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/LogForm.Designer.cs (95%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/LogForm.cs (92%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/LogForm.resx (100%) create mode 100644 FrEee.UI.WinForms/Forms/MainGameForm.Designer.cs rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/MainGameForm.cs (94%) create mode 100644 FrEee.UI.WinForms/Forms/MainGameForm.resx rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/MainMenuForm.Designer.cs (94%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/MainMenuForm.cs (93%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/MainMenuForm.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/MinistersForm.Designer.cs (92%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/MinistersForm.cs (91%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/MinistersForm.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/ModErrorsForm.Designer.cs (94%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/ModErrorsForm.cs (88%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/ModErrorsForm.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/ModPickerForm.Designer.cs (95%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/ModPickerForm.cs (91%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/ModPickerForm.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/MountPickerForm.Designer.cs (95%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/MountPickerForm.cs (88%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/MountPickerForm.resx (100%) create mode 100644 FrEee.UI.WinForms/Forms/OptionsForm.cs create mode 100644 FrEee.UI.WinForms/Forms/OptionsForm.resx rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/PlanetListForm.Designer.cs (94%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/PlanetListForm.cs (95%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/PlanetListForm.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/RecycleForm.Designer.cs (92%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/RecycleForm.cs (95%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/RecycleForm.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/ResearchForm.Designer.cs (93%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/ResearchForm.cs (95%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/ResearchForm.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/ScoresForm.Designer.cs (91%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/ScoresForm.cs (91%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/ScoresForm.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/SearchBoxResultsForm.Designer.cs (94%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/SearchBoxResultsForm.cs (83%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/SearchBoxResultsForm.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/ShipListForm.Designer.cs (93%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/ShipListForm.cs (92%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/ShipListForm.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/SpaceObjectPickerForm.Designer.cs (94%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/SpaceObjectPickerForm.cs (84%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/SpaceObjectPickerForm.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/StatusForm.Designer.cs (89%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/StatusForm.cs (93%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/StatusForm.resx (100%) create mode 100644 FrEee.UI.WinForms/Forms/TechTreeForm.Designer.cs rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/TechTreeForm.cs (94%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/TechTreeForm.resx (91%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/VehicleDesignForm.Designer.cs (92%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/VehicleDesignForm.cs (94%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Forms/VehicleDesignForm.resx (100%) rename FrEee.WinForms/FrEee.WinForms.csproj => FrEee.UI.WinForms/FrEee.UI.WinForms.csproj (64%) rename {FrEee.WinForms => FrEee.UI.WinForms}/FrEee.ico (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/GamePropertyGrid.Designer.cs (91%) rename {FrEee.WinForms => FrEee.UI.WinForms}/GamePropertyGrid.cs (94%) rename {FrEee.WinForms => FrEee.UI.WinForms}/GamePropertyGrid.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Interfaces/IBindable.cs (88%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Objects/ClientSettings.cs (97%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Objects/GalaxyViewModes/ArgbMode.cs (87%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Objects/GalaxyViewModes/ColoniesMode.cs (95%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Objects/GalaxyViewModes/ConstructionMode.cs (92%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Objects/GalaxyViewModes/ForcesMode.cs (95%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Objects/GalaxyViewModes/GalaxyViewModes.cs (85%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Objects/GalaxyViewModes/IGalaxyViewMode.cs (89%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Objects/GalaxyViewModes/PieMode.cs (90%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Objects/GalaxyViewModes/PresenceMode.cs (91%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Objects/GalaxyViewModes/RepairMode.cs (89%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Objects/GalaxyViewModes/ResearchIntelMode.cs (91%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Objects/GalaxyViewModes/ResourcesMode.cs (92%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Objects/GalaxyViewModes/SpaceYardMode.cs (92%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Objects/GalaxyViewModes/UtilityMode.cs (94%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Objects/GalaxyViewModes/WarpPointsMode.cs (91%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Objects/Music.cs (95%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Program.cs (93%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Properties/DataSources/FrEee.Game.Interfaces.IHull.datasource (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Properties/DataSources/FrEee.Game.Objects.Civilization.ConstructionQueue.datasource (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Properties/DataSources/FrEee.Game.Objects.Civilization.Culture.datasource (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Properties/DataSources/FrEee.Game.Objects.Civilization.Empire.datasource (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Properties/DataSources/FrEee.Game.Objects.Civilization.EmpireStatus.datasource (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Properties/DataSources/FrEee.Game.Objects.Technology.Mount.datasource (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Properties/DataSources/FrEee.Game.Objects.Technology.Technology.datasource (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Properties/DataSources/FrEee.Game.Setup.WarpPointPlacementStrategies.WarpPointPlacementStrategy.datasource (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Properties/DataSources/FrEee.Modding.StellarObjectSize.datasource (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Properties/DataSources/FrEee.Modding.Templates.GalaxyTemplate.datasource (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Properties/Resources.Designer.cs (94%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Properties/Resources.resx (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Properties/Settings.Designer.cs (91%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Properties/Settings.settings (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Resources/check_ethernet_checked.bmp (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Resources/check_ethernet_clear.bmp (100%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Utility/Extensions/GuiExtensions.cs (90%) rename {FrEee.WinForms => FrEee.UI.WinForms}/Utility/Gui.cs (88%) rename {FrEee.WinForms => FrEee.UI.WinForms}/app.config (100%) create mode 100644 FrEee.UI.WinForms/index.html rename {FrEee.WinForms => FrEee.UI.WinForms}/post-build.bat (95%) rename {FrEee.WinForms => FrEee.UI.WinForms}/post-build.sh (93%) rename {FrEee.WinForms => FrEee.UI.WinForms}/xbuild.sh (100%) delete mode 100644 FrEee.WinForms/Controls/GamePictureBox.cs delete mode 100644 FrEee.WinForms/Controls/GameProgressBar.cs delete mode 100644 FrEee.WinForms/Controls/ResourceDisplay.Designer.cs delete mode 100644 FrEee.WinForms/Controls/ResourceDisplay.cs delete mode 100644 FrEee.WinForms/Controls/ResourceQuantityDisplay.Designer.cs delete mode 100644 FrEee.WinForms/Controls/ResourceQuantityDisplay.cs delete mode 100644 FrEee.WinForms/Forms/GameSetupForm.Designer.cs delete mode 100644 FrEee.WinForms/Forms/MainGameForm.Designer.cs delete mode 100644 FrEee.WinForms/Forms/MainGameForm.resx delete mode 100644 FrEee.WinForms/Forms/OptionsForm.cs delete mode 100644 FrEee.WinForms/Forms/OptionsForm.resx delete mode 100644 FrEee.WinForms/Forms/TechTreeForm.Designer.cs diff --git a/Kwajong.otf b/FrEee.Assets/Fonts/Kwajong.otf similarity index 100% rename from Kwajong.otf rename to FrEee.Assets/Fonts/Kwajong.otf diff --git a/kwajong-readme.txt b/FrEee.Assets/Fonts/kwajong-readme.txt similarity index 100% rename from kwajong-readme.txt rename to FrEee.Assets/Fonts/kwajong-readme.txt diff --git a/FrEee.Assets/FrEee.Assets.csproj b/FrEee.Assets/FrEee.Assets.csproj index f987cd313..e650fad08 100644 --- a/FrEee.Assets/FrEee.Assets.csproj +++ b/FrEee.Assets/FrEee.Assets.csproj @@ -37,6 +37,14 @@ + + + + PreserveNewest + + + PreserveNewest + false diff --git a/FrEee.UI.Blazor/Component1.razor b/FrEee.UI.Blazor/Component1.razor new file mode 100644 index 000000000..b9822b7e2 --- /dev/null +++ b/FrEee.UI.Blazor/Component1.razor @@ -0,0 +1,3 @@ +
+ This component is defined in the FrEee.UI.Blazor library. +
diff --git a/FrEee.UI.Blazor/Component1.razor.css b/FrEee.UI.Blazor/Component1.razor.css new file mode 100644 index 000000000..c6afca404 --- /dev/null +++ b/FrEee.UI.Blazor/Component1.razor.css @@ -0,0 +1,6 @@ +.my-component { + border: 2px dashed red; + padding: 1em; + margin: 1em 0; + background-image: url('background.png'); +} diff --git a/FrEee.UI.Blazor/ExampleJsInterop.cs b/FrEee.UI.Blazor/ExampleJsInterop.cs new file mode 100644 index 000000000..c59095108 --- /dev/null +++ b/FrEee.UI.Blazor/ExampleJsInterop.cs @@ -0,0 +1,37 @@ +using Microsoft.JSInterop; + +namespace FrEee.UI.Blazor +{ + // This class provides an example of how JavaScript functionality can be wrapped + // in a .NET class for easy consumption. The associated JavaScript module is + // loaded on demand when first needed. + // + // This class can be registered as scoped DI service and then injected into Blazor + // components for use. + + public class ExampleJsInterop : IAsyncDisposable + { + private readonly Lazy> moduleTask; + + public ExampleJsInterop(IJSRuntime jsRuntime) + { + moduleTask = new(() => jsRuntime.InvokeAsync( + "import", "./_content/FrEee.UI.Blazor/exampleJsInterop.js").AsTask()); + } + + public async ValueTask Prompt(string message) + { + var module = await moduleTask.Value; + return await module.InvokeAsync("showPrompt", message); + } + + public async ValueTask DisposeAsync() + { + if (moduleTask.IsValueCreated) + { + var module = await moduleTask.Value; + await module.DisposeAsync(); + } + } + } +} diff --git a/FrEee.UI.Blazor/FodyWeavers.xml b/FrEee.UI.Blazor/FodyWeavers.xml new file mode 100644 index 000000000..25661458e --- /dev/null +++ b/FrEee.UI.Blazor/FodyWeavers.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/FrEee.UI.Blazor/FodyWeavers.xsd b/FrEee.UI.Blazor/FodyWeavers.xsd new file mode 100644 index 000000000..69dbe488c --- /dev/null +++ b/FrEee.UI.Blazor/FodyWeavers.xsd @@ -0,0 +1,74 @@ + + + + + + + + + + + Used to control if the On_PropertyName_Changed feature is enabled. + + + + + Used to control if the Dependent properties feature is enabled. + + + + + Used to control if the IsChanged property feature is enabled. + + + + + Used to change the name of the method that fires the notify event. This is a string that accepts multiple values in a comma separated form. + + + + + Used to control if equality checks should be inserted. If false, equality checking will be disabled for the project. + + + + + Used to control if equality checks should use the Equals method resolved from the base class. + + + + + Used to control if equality checks should use the static Equals method resolved from the base class. + + + + + Used to turn off build warnings from this weaver. + + + + + Used to turn off build warnings about mismatched On_PropertyName_Changed methods. + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/FrEee.UI.Blazor/FrEee.UI.Blazor.csproj b/FrEee.UI.Blazor/FrEee.UI.Blazor.csproj new file mode 100644 index 000000000..1cfa4cfa8 --- /dev/null +++ b/FrEee.UI.Blazor/FrEee.UI.Blazor.csproj @@ -0,0 +1,35 @@ + + + + net8.0-windows + enable + enable + + + + + + + + + + + + + + + + + + + + + true + + + + + false + + + diff --git a/FrEee.UI.Blazor/Views/GalaxyMap.razor b/FrEee.UI.Blazor/Views/GalaxyMap.razor new file mode 100644 index 000000000..dad623176 --- /dev/null +++ b/FrEee.UI.Blazor/Views/GalaxyMap.razor @@ -0,0 +1,100 @@ +@using System.Drawing +@using System.ComponentModel +@using System.Numerics +@using FrEee.Extensions +@using Excubo.Blazor.Canvas + +@code { + [Parameter] + public GalaxyMapViewModel VM { get; set; } = new(); + + /// + /// When the view model's properties change, update the UI. + /// + /// + /// + private void ViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e) + { + StateHasChanged(); + } + + protected override void OnInitialized() + { + VM.PropertyChanged += ViewModelPropertyChanged; + } + + public void Dispose() + { + VM.PropertyChanged -= ViewModelPropertyChanged; + } + + private Canvas helper_canvas; + private ElementReference normal_canvas; + protected override async Task OnAfterRenderAsync(bool firstRender) + { + var size = VM.Scale + 1; + var xoffset = VM.Width / 2d; + var yoffset = VM.Height / 2d; + + await using (var ctx = await helper_canvas.GetContext2DAsync()) + { + await ctx.ClearRectAsync(0, 0, VM.Width, VM.Height); + await ctx.SetTransformAsync(size, 0, 0, size, (xoffset + 0.5) * size, (yoffset + 0.5) * size); + await ctx.RestoreAsync(); + await ctx.SaveAsync(); + await ctx.StrokeStyleAsync("white"); + await ctx.LineWidthAsync(0.1); + foreach (var connections in VM.WarpGraph.Connections) + { + var src = connections.Key; + foreach (var dest in connections.Value) + { + // TODO: display one way warps differently (arrows, incomplete lines, gradients?) + await ctx.MoveToAsync(src.Location.X, src.Location.Y); + await ctx.LineToAsync(dest.Location.X, dest.Location.Y); + await ctx.StrokeAsync(); + } + } + } + + await base.OnAfterRenderAsync(firstRender); + } +} + +
+
+ +
+
+ +
+
+ @for (var x = VM.MinX; x <= VM.MaxX; x++) + { + for (var y = VM.MinY; y <= VM.MaxY; y++) + { + var sysloc = VM.StarSystemLocations.SingleOrDefault(q => q.Location.X == x && q.Location.Y == y); + var row = y - VM.MinY + 1; + var col = x - VM.MinX + 1; + if (sysloc is not null) + { + // system pie + string border = "1px solid black"; + if (sysloc.Item == VM.SelectedStarSystem) + { + // making the border thicker breaks the layout for some reason + border = "1px solid white"; + } +
+ +
+ } + else + { + // placeholder +
+ } + } + } +
+
\ No newline at end of file diff --git a/FrEee.UI.Blazor/Views/GalaxyMapModes/GalaxyMapModeLibrary.cs b/FrEee.UI.Blazor/Views/GalaxyMapModes/GalaxyMapModeLibrary.cs new file mode 100644 index 000000000..1ce42bb23 --- /dev/null +++ b/FrEee.UI.Blazor/Views/GalaxyMapModes/GalaxyMapModeLibrary.cs @@ -0,0 +1,36 @@ +using System.Collections.Generic; +using System.ComponentModel.Composition; +using System.ComponentModel.Composition.Hosting; + +namespace FrEee.UI.Blazor.Views.GalaxyMapModes; + +public class GalaxyMapModeLibrary +{ + private CompositionContainer container; + + private static GalaxyMapModeLibrary Instance { get; set; } = new GalaxyMapModeLibrary(); + + private GalaxyMapModeLibrary() + { + var catalog = new AggregateCatalog(); + catalog.Catalogs.Add(new AssemblyCatalog(typeof(IGalaxyMapMode).Assembly)); + container = new CompositionContainer(catalog); + container.ComposeParts(this); + } + + [ImportMany(typeof(IGalaxyMapMode))] + public IEnumerable AllOfThem { get; private set; } + + public static IEnumerable All => Instance.AllOfThem; + + public static IGalaxyMapMode? Find(string name = "") + where T : IGalaxyMapMode + { + var results = All.OfType(); + if (!string.IsNullOrWhiteSpace(name)) + { + results = results.Where(q => q.Name.Contains(name)); + } + return results.FirstOrDefault(); + } +} diff --git a/FrEee.UI.Blazor/Views/GalaxyMapModes/IGalaxyMapMode.cs b/FrEee.UI.Blazor/Views/GalaxyMapModes/IGalaxyMapMode.cs new file mode 100644 index 000000000..a608bc387 --- /dev/null +++ b/FrEee.UI.Blazor/Views/GalaxyMapModes/IGalaxyMapMode.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using FrEee.Objects.Space; + +namespace FrEee.UI.Blazor.Views.GalaxyMapModes; + +/// +/// Rendering modes for the galaxy map. +/// +public interface IGalaxyMapMode +{ + /// + /// The name of this mode. + /// + string Name { get; } + + /// + /// Gets a to represent a star system. + /// + /// The star system to represent. + /// Action to take when the star system is clicked. + /// The view model. + PieChartViewModel GetStarSystemViewModel(StarSystem starSystem, Action starSystemClicked); +} diff --git a/FrEee.UI.Blazor/Views/GalaxyMapModes/PresenceMode.cs b/FrEee.UI.Blazor/Views/GalaxyMapModes/PresenceMode.cs new file mode 100644 index 000000000..e5e419e9c --- /dev/null +++ b/FrEee.UI.Blazor/Views/GalaxyMapModes/PresenceMode.cs @@ -0,0 +1,50 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.Composition; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using FrEee.Extensions; +using FrEee.Objects.Civilization; +using FrEee.Objects.Space; + +namespace FrEee.UI.Blazor.Views.GalaxyMapModes +{ + [Export(typeof(IGalaxyMapMode))] + public class PresenceMode : IGalaxyMapMode + { + public string Name => "Presence"; + + public PieChartViewModel GetStarSystemViewModel(StarSystem starSystem, Action starSystemClicked) + { + var owners = FindOwners(starSystem); + if (owners.Any()) + { + return new() + { + // weight all empires equally + Entries = owners.Select(empire => + new PieChartViewModel.Entry(empire.Name, empire.Color, 1)), + OnClick = () => starSystemClicked(starSystem) + }; + } + else + { + return new() + { + // put a dummy "no one" empire so something is rendered + Entries = [new PieChartViewModel.Entry("(no one)", Color.Black, 1)], + OnClick = () => starSystemClicked(starSystem) + }; + } + } + + + private IEnumerable FindOwners(StarSystem sys) => + sys.FindSpaceObjects() + .Select(x => x.Owner) + .ExceptNull() + .Distinct(); + } +} diff --git a/FrEee.UI.Blazor/Views/GalaxyMapViewModel.cs b/FrEee.UI.Blazor/Views/GalaxyMapViewModel.cs new file mode 100644 index 000000000..bf97ea96a --- /dev/null +++ b/FrEee.UI.Blazor/Views/GalaxyMapViewModel.cs @@ -0,0 +1,119 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Drawing.Imaging; +using System.Linq; +using System.Numerics; +using System.Text; +using System.Threading.Tasks; +using FrEee.Objects.GameState; +using FrEee.Objects.Space; +using FrEee.UI.Blazor.Views.GalaxyMapModes; +using FrEee.Utility; + +namespace FrEee.UI.Blazor.Views +{ + public class GalaxyMapViewModel : INotifyPropertyChanged + { + public event PropertyChangedEventHandler PropertyChanged; + + /// + /// A star system has been clicked. + /// + public Action StarSystemClicked { get; set; } = starSystem => { }; + + /// + /// A star system has been selected or deselected. + /// + public Action StarSystemSelected { get; set; } = starSystem => { }; + + /// + /// The current galaxy. + /// + private Galaxy Galaxy => Galaxy.Current; + + /// + /// Any star systems in the galaxy, along with their locations. + /// + public IEnumerable> StarSystemLocations => Galaxy?.StarSystemLocations ?? Enumerable.Empty>(); + + /// + /// The image to display as the background of the map. + /// + public Image? BackgroundImage { get; set; } = null; + + public ImageDisplayViewModel BackgroundImageVM => new() { Image = BackgroundImage }; + + /// + /// The render mode for the map. Controls how star systems are displayed. + /// + public IGalaxyMapMode Mode { get; set; } = GalaxyMapModeLibrary.Find(); + + private StarSystem? selectedStarSystem; + + /// + /// The currently selected star system. + /// + public StarSystem? SelectedStarSystem + { + get => selectedStarSystem; + set + { + selectedStarSystem = value; + StarSystemSelected?.Invoke(selectedStarSystem); + } + } + + public int MinX => Galaxy?.MinX ?? 0; + + public int MaxX => Galaxy?.MaxX ?? 0; + + public int MinY => Galaxy?.MinY ?? 0; + + public int MaxY => Galaxy?.MaxY ?? 0; + + /// + /// The number of star systems which can be lined up horizontally on the map. + /// + public int Width => Galaxy?.UsedWidth ?? 0; + + /// + /// The number of star systems which can be lined up vertically on the map. + /// + public int Height => Galaxy?.UsedHeight ?? 0; + + public double AspectRatio => (double)Width / Height; + + /// + /// Graph linking any star systems that are connected by warp points. + /// + public ConnectivityGraph> WarpGraph { get; set; } = new(); + + /// + /// Computes connectivity of warp points in the galaxy. + /// + public void ComputeWarpPointConnectivity() + { + WarpGraph = new(Galaxy.StarSystemLocations); + + foreach (var ssl in WarpGraph) + { + foreach (var wp in ssl.Item.FindSpaceObjects()) + { + // can't make connection if we don't know where warp point ends! + if (wp.TargetStarSystemLocation is not null) + { + WarpGraph.Connect(ssl, wp.TargetStarSystemLocation); + } + } + } + } + + public double Scale { get; set; } = 100d; + + public double ScaledWidth => Width * Scale; + + public double ScaledHeight => Height * Scale; + } +} diff --git a/FrEee.UI.Blazor/Views/ImageDisplay.razor b/FrEee.UI.Blazor/Views/ImageDisplay.razor new file mode 100644 index 000000000..7921983a9 --- /dev/null +++ b/FrEee.UI.Blazor/Views/ImageDisplay.razor @@ -0,0 +1,29 @@ +@using System.Drawing +@using System.ComponentModel + +@code { + [Parameter] + public ImageDisplayViewModel VM { get; set; } = new(); + + /// + /// When the view model's properties change, update the UI. + /// + /// + /// + private void ViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e) + { + StateHasChanged(); + } + + protected override void OnInitialized() + { + VM.PropertyChanged += ViewModelPropertyChanged; + } + + public void Dispose() + { + VM.PropertyChanged -= ViewModelPropertyChanged; + } +} + + \ No newline at end of file diff --git a/FrEee.UI.Blazor/Views/ImageDisplayViewModel.cs b/FrEee.UI.Blazor/Views/ImageDisplayViewModel.cs new file mode 100644 index 000000000..d29b73e75 --- /dev/null +++ b/FrEee.UI.Blazor/Views/ImageDisplayViewModel.cs @@ -0,0 +1,45 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Drawing.Imaging; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using FrEee.Extensions; +using FrEee.Properties; +using FrEee.Utility; +using Microsoft.AspNetCore.Components; + +namespace FrEee.UI.Blazor.Views +{ + public class ImageDisplayViewModel : INotifyPropertyChanged + { + public event PropertyChangedEventHandler PropertyChanged; + + public Image Image { get; set; } = new Bitmap(1, 1); + + public string ImageSource + { + get + { + if (Image is null) + { + return null; + } + + // TODO: cache image source until image changes + ImageConverter converter = new(); + var bytes = (byte[])converter.ConvertTo(Image, typeof(byte[])); + var dataString = Convert.ToBase64String(bytes); + var format = Image.RawFormat.ToString().ToLower(); + return $"data:image/{format};base64,{dataString}"; + } + } + + public double AspectRatio => + Image == null ? 1 : ((double)Image.Width / (double)Image.Height); + + public Action OnClick { get; set; } = () => { }; + } +} diff --git a/FrEee.UI.Blazor/Views/PieChart.razor b/FrEee.UI.Blazor/Views/PieChart.razor new file mode 100644 index 000000000..7cf012b36 --- /dev/null +++ b/FrEee.UI.Blazor/Views/PieChart.razor @@ -0,0 +1,41 @@ +@using System.Drawing +@using System.ComponentModel +@using System.Numerics +@using FrEee.Extensions + +@typeparam T where T : INumber, IMultiplyOperators, IDivisionOperators + +@code { + [Parameter] + public PieChartViewModel VM { get; set; } = new(); + + /// + /// When the view model's properties change, update the UI. + /// + /// + /// + private void ViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e) + { + StateHasChanged(); + } + + protected override void OnInitialized() + { + VM.PropertyChanged += ViewModelPropertyChanged; + } + + public void Dispose() + { + VM.PropertyChanged -= ViewModelPropertyChanged; + } +} + + +
\ No newline at end of file diff --git a/FrEee.UI.Blazor/Views/PieChartViewModel.cs b/FrEee.UI.Blazor/Views/PieChartViewModel.cs new file mode 100644 index 000000000..be31bd9d7 --- /dev/null +++ b/FrEee.UI.Blazor/Views/PieChartViewModel.cs @@ -0,0 +1,75 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Drawing.Imaging; +using System.Linq; +using System.Numerics; +using System.Text; +using System.Threading.Tasks; +using FrEee.Extensions; +using FrEee.Properties; +using FrEee.Utility; +using Microsoft.AspNetCore.Components; + +namespace FrEee.UI.Blazor.Views +{ + public class PieChartViewModel : INotifyPropertyChanged + where T : INumber, IMultiplyOperators, IDivisionOperators + { + public event PropertyChangedEventHandler PropertyChanged; + + /// + /// The pie chart data entries. + /// + public IEnumerable Entries { get; set; } = new HashSet(); + + public IEnumerable<(Entry Entry, T PreviousSum)> SortedEntries + { + get + { + var sum = T.Zero; + foreach (var entry in Entries.OrderByDescending(q => q.Value)) + { + yield return (entry, sum); + sum += entry.Value; + } + } + } + + public T Sum => Entries.Sum(q => q.Value); + + public string GradientString + { + get + { + var result = ""; + foreach (var x in SortedEntries) + { + var degrees = x.PreviousSum * 360 / Sum; + var newDegrees = (x.PreviousSum + x.Entry.Value) * 360 / Sum; + result += $"#{x.Entry.Color.ToRgba()} {degrees}deg {newDegrees}deg,"; + } + if (result.EndsWith(",")) + { + result = result.Substring(0, result.Length - 1); + } + return result; + } + } + + /// + /// Action to take when the pie chart is clicked. + /// + public Action OnClick { get; set; } = () => { }; + + /// + /// An entry in the pie chart data. + /// + /// + /// + /// + /// + public record Entry(string Text, Color Color, T Value); + } +} diff --git a/FrEee.UI.Blazor/Views/ProgressBar.razor b/FrEee.UI.Blazor/Views/ProgressBar.razor new file mode 100644 index 000000000..89834f212 --- /dev/null +++ b/FrEee.UI.Blazor/Views/ProgressBar.razor @@ -0,0 +1,47 @@ +@using System.Drawing +@using System.ComponentModel + +@code { + [Parameter] + public ProgressBarViewModel VM { get; set; } = new(); + + /// + /// When the view model's properties change, update the UI. + /// + /// + /// + private void ViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e) + { + StateHasChanged(); + } + + protected override void OnInitialized() + { + VM.PropertyChanged += ViewModelPropertyChanged; + } + + public void Dispose() + { + VM.PropertyChanged -= ViewModelPropertyChanged; + } +} + +
+
+
+
+
+
+
+
+ + @VM.LeftText + + + @VM.CenterText + + + @VM.RightText + +
+
\ No newline at end of file diff --git a/FrEee.UI.Blazor/Views/ProgressBarViewModel.cs b/FrEee.UI.Blazor/Views/ProgressBarViewModel.cs new file mode 100644 index 000000000..55c338524 --- /dev/null +++ b/FrEee.UI.Blazor/Views/ProgressBarViewModel.cs @@ -0,0 +1,74 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using FrEee.Extensions; +using FrEee.Utility; +using Microsoft.AspNetCore.Components; + +namespace FrEee.UI.Blazor.Views +{ + public class ProgressBarViewModel : INotifyPropertyChanged + { + public event PropertyChangedEventHandler PropertyChanged; + + public long Maximum { get; set; } = 0; + + public long Value { get; set; } = 0; + + public long Increment { get; set; } = 0; + + public Color BarColor { get; set; } = Color.Blue; + + public string LeftText { get; set; } = ""; + + public string CenterText + { + get + { + switch (ProgressDisplayType) + { + case ProgressDisplayType.None: + return ""; + case ProgressDisplayType.Percentage: + return Math.Round(((double)Value / (double)Maximum * 100)) + "%"; + case ProgressDisplayType.Numeric: + return Value.ToUnitString(true) + " / " + Maximum.ToUnitString(true); + case ProgressDisplayType.Both: + return Math.Round(((double)Value / (double)Maximum * 100)) + "% (" + Value.ToUnitString(true) + " / " + Maximum.ToUnitString(true) + ")"; + default: + return ""; + } + } + } + + public string RightText { get; set; } = ""; + + public Action OnClick { get; set; } = () => { }; + + public Color IncrementColor1 => Color.FromArgb(BarColor.A / 2, BarColor); + + public Color IncrementColor2 => Color.FromArgb(BarColor.A / 4, BarColor); + + public Color IncrementColor3 => Color.FromArgb(BarColor.A / 8, BarColor); + + public Progress Progress + { + get + { + return new Progress(Value, Maximum, Increment); + } + set + { + Value = value.Value; + Maximum = value.Maximum; + Increment = value.IncrementalProgressBeforeDelay; + } + } + + public ProgressDisplayType ProgressDisplayType { get; set; } = ProgressDisplayType.Percentage; + } +} diff --git a/FrEee.UI.Blazor/Views/ProgressDisplayType.cs b/FrEee.UI.Blazor/Views/ProgressDisplayType.cs new file mode 100644 index 000000000..3b8826151 --- /dev/null +++ b/FrEee.UI.Blazor/Views/ProgressDisplayType.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FrEee.UI.Blazor.Views; + +// TODO: put this in a FrEee.UI project? +[Flags] +public enum ProgressDisplayType +{ + None = 0, + Percentage = 1, + Numeric = 2, + Both = 3, +} \ No newline at end of file diff --git a/FrEee.UI.Blazor/Views/ResourceDisplay.razor b/FrEee.UI.Blazor/Views/ResourceDisplay.razor new file mode 100644 index 000000000..dd4193e71 --- /dev/null +++ b/FrEee.UI.Blazor/Views/ResourceDisplay.razor @@ -0,0 +1,34 @@ +@using System.Drawing +@using System.ComponentModel + +@code { + [Parameter] + public ResourceDisplayViewModel VM { get; set; } = new(); + + /// + /// When the view model's properties change, update the UI. + /// + /// + /// + private void ViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e) + { + StateHasChanged(); + } + + protected override void OnInitialized() + { + VM.PropertyChanged += ViewModelPropertyChanged; + } + + public void Dispose() + { + VM.PropertyChanged -= ViewModelPropertyChanged; + } +} + +
+
+ +
+ @VM.Text +
\ No newline at end of file diff --git a/FrEee.UI.Blazor/Views/ResourceDisplayViewModel.cs b/FrEee.UI.Blazor/Views/ResourceDisplayViewModel.cs new file mode 100644 index 000000000..dadd186b6 --- /dev/null +++ b/FrEee.UI.Blazor/Views/ResourceDisplayViewModel.cs @@ -0,0 +1,90 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using FrEee.Extensions; +using FrEee.Properties; +using FrEee.Utility; +using Microsoft.AspNetCore.Components; + +namespace FrEee.UI.Blazor.Views +{ + public class ResourceDisplayViewModel : INotifyPropertyChanged + { + public event PropertyChangedEventHandler PropertyChanged; + + public int Amount { get; set; } = 0; + + public int? Change { get; set; } = null; + + public string Text + { + get + { + if (Change is null || Change == 0) + { + return Amount.ToUnitString(); + } + else if (Change > 0) + { + return $"{Amount.ToUnitString()} (+{Change.ToUnitString()})"; + } + else if (Change < 0) + { + return $"{Amount.ToUnitString()} ({Change.ToUnitString()})"; + } + else + { + // shouldn't happen + return Amount.ToUnitString(); + } + } + } + + public Resource? Resource { get; set; } = null; + + public Color Color => Resource?.Color ?? Color.White; + + public Image? Icon + { + get + { + try + { + return Resource?.Icon; + } + catch (NullReferenceException) + { + // HACK - stupid forms designer thinks it's null and not null at the same time, WTF?! + var icon = new Bitmap(1, 1); + var color = Color.Gray; + if (Resource is not null) + { + color = Color; + } + var g = Graphics.FromImage(icon); + g.Clear(color); + return icon; + } + } + } + + // TODO: generalize IconSource, rewrite Pictures class, allow other images besides PNG + public string? IconSource => Resource?.IconPaths + .Select(it => Path.Combine("Pictures", it + ".png")) + .FirstOrDefault(File.Exists); + + public string? Name + { + get => Resource?.Name; + set => Resource = Resource.Find(value ?? ""); + } + + public string? Abbreviation => Name?.Substring(0, 3); + + public ImageDisplayViewModel IconVM => new() { Image = Icon }; + } +} diff --git a/FrEee.UI.Blazor/Views/ResourceQuantityDisplay.razor b/FrEee.UI.Blazor/Views/ResourceQuantityDisplay.razor new file mode 100644 index 000000000..fa7db72a7 --- /dev/null +++ b/FrEee.UI.Blazor/Views/ResourceQuantityDisplay.razor @@ -0,0 +1,36 @@ +@using System.Drawing +@using System.ComponentModel + +@code { + [Parameter] + public ResourceQuantityDisplayViewModel VM { get; set; } = new(); + + /// + /// When the view model's properties change, update the UI. + /// + /// + /// + private void ViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e) + { + StateHasChanged(); + } + + protected override void OnInitialized() + { + VM.PropertyChanged += ViewModelPropertyChanged; + } + + public void Dispose() + { + VM.PropertyChanged -= ViewModelPropertyChanged; + } +} + +
+ @foreach (var resourceVM in VM.ResourceViewModels) + { +
+ +
+ } +
\ No newline at end of file diff --git a/FrEee.UI.Blazor/Views/ResourceQuantityDisplayViewModel.cs b/FrEee.UI.Blazor/Views/ResourceQuantityDisplayViewModel.cs new file mode 100644 index 000000000..a5ed04def --- /dev/null +++ b/FrEee.UI.Blazor/Views/ResourceQuantityDisplayViewModel.cs @@ -0,0 +1,52 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using FrEee.Extensions; +using FrEee.Properties; +using FrEee.Utility; +using Microsoft.AspNetCore.Components; + +namespace FrEee.UI.Blazor.Views +{ + public class ResourceQuantityDisplayViewModel : INotifyPropertyChanged + { + public event PropertyChangedEventHandler PropertyChanged; + + public ResourceQuantity Amounts { get; set; } = new(); + + public ResourceQuantity Changes { get; set; } = new(); + + /// + /// Resources to show. Resources not in this list will be hidden. + /// + public IEnumerable ResourcesToShow { get; set; } = Resource.All.Where(it => it.IsGlobal).ToArray(); + + /// + /// Should resources with amounts and changes of zero be shown? + /// + public bool ShowZeroes { get; set; } = true; + + public IEnumerable ResourceViewModels + { + get + { + foreach (var resource in ResourcesToShow) + { + if (ShowZeroes || Amounts[resource] != 0 || Changes[resource] != 0) + { + yield return new ResourceDisplayViewModel + { + Resource = resource, + Amount = Amounts[resource], + Change = Changes[resource] + }; + } + } + } + } + } +} diff --git a/FrEee.UI.Blazor/WebExtensions.cs b/FrEee.UI.Blazor/WebExtensions.cs new file mode 100644 index 000000000..57ed02655 --- /dev/null +++ b/FrEee.UI.Blazor/WebExtensions.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; + +namespace FrEee.UI.Blazor +{ + public static class WebExtensions + { + public static string ToRgba(this Color color) + { + var argb = color.ToArgb().ToString("x"); + return argb.Substring(2) + argb.Substring(0, 2); + } + } +} diff --git a/FrEee.UI.Blazor/_Imports.razor b/FrEee.UI.Blazor/_Imports.razor new file mode 100644 index 000000000..77285129d --- /dev/null +++ b/FrEee.UI.Blazor/_Imports.razor @@ -0,0 +1 @@ +@using Microsoft.AspNetCore.Components.Web diff --git a/FrEee.UI.Blazor/wwwroot/background.png b/FrEee.UI.Blazor/wwwroot/background.png new file mode 100644 index 0000000000000000000000000000000000000000..e15a3bde6e2bdb380df6a0b46d7ed00bdeb0aaa8 GIT binary patch literal 378 zcmeAS@N?(olHy`uVBq!ia0vp^x**KK1SGdsl%54rjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJwr2>%=KS^ie7oTIEF;HpS|GCbyPusHSqiXaCu3qf)82(9Gq&mZq2{Kq}M*X&MWtJ zSi1Jo7ZzfImg%g=t(qo=wsSR2lZoP(Rj#3wacN=q0?Br(rXzgZEGK2$ID{|A=5S{xJEuzSH>!M+7wSY6hB<=-E^*n0W7 S8wY^CX7F_Nb6Mw<&;$S{dxtsz literal 0 HcmV?d00001 diff --git a/FrEee.UI.Blazor/wwwroot/exampleJsInterop.js b/FrEee.UI.Blazor/wwwroot/exampleJsInterop.js new file mode 100644 index 000000000..ea8d76ad2 --- /dev/null +++ b/FrEee.UI.Blazor/wwwroot/exampleJsInterop.js @@ -0,0 +1,6 @@ +// This is a JavaScript module that is loaded on demand. It can export any number of +// functions, and may import other JavaScript modules if required. + +export function showPrompt(message) { + return prompt(message, 'Type anything here'); +} diff --git a/FrEee.WinForms/Assets/Splash.jpg b/FrEee.UI.WinForms/Assets/Splash.jpg similarity index 100% rename from FrEee.WinForms/Assets/Splash.jpg rename to FrEee.UI.WinForms/Assets/Splash.jpg diff --git a/FrEee.WinForms/Assets/Splash.pdn b/FrEee.UI.WinForms/Assets/Splash.pdn similarity index 100% rename from FrEee.WinForms/Assets/Splash.pdn rename to FrEee.UI.WinForms/Assets/Splash.pdn diff --git a/FrEee.WinForms/Assets/Splash.png b/FrEee.UI.WinForms/Assets/Splash.png similarity index 100% rename from FrEee.WinForms/Assets/Splash.png rename to FrEee.UI.WinForms/Assets/Splash.png diff --git a/FrEee.UI.WinForms/Assets/css/app.css b/FrEee.UI.WinForms/Assets/css/app.css new file mode 100644 index 000000000..22d91beae --- /dev/null +++ b/FrEee.UI.WinForms/Assets/css/app.css @@ -0,0 +1,102 @@ +html, body { + font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; + font-size: small; + background-color: black; + color: white; +} + +* { + padding: 0px; + margin: 0px; +} + +@font-face { + font-family: "Kwajong"; + src: url("../fonts/Kwajong.otf") +} + +h1, h2, h3 { + font-family: Kwajong, Consolas, 'Courier New', Courier, monospace +} + + h1:focus { + outline: none; + } + +a, .btn-link { + color: #0071c1; +} + +.btn-primary { + color: #fff; + background-color: #1b6ec2; + border-color: #1861ac; +} + +.valid.modified:not([type=checkbox]) { + outline: 1px solid #26b050; +} + +.invalid { + outline: 1px solid red; +} + +.validation-message { + color: red; +} + +#blazor-error-ui { + background: lightyellow; + bottom: 0; + box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2); + display: none; + left: 0; + padding: 0.6rem 1.25rem 0.7rem 1.25rem; + position: fixed; + width: 100%; + z-index: 1000; +} + +#blazor-error-ui .dismiss { + cursor: pointer; + position: absolute; + right: 0.75rem; + top: 0.5rem; +} + +/* Element will fill its container, regardless of any other content */ +.fill { + position: absolute; + width: 100%; + height: 100%; + top: 0; + left: 0; + bottom: 0; + right: 0; + margin: 0px; + padding: 0px; + overflow: hidden; +} + +/* Element will fill its container, regardless of any other content, but can maintain an aspect ratio if specified. */ +.zoom { + position: absolute; + max-width: 100%; + max-height: 100%; + top: 0; + left: 0; + bottom: 0; + right: 0; + margin: 0px; + padding: 0px; + overflow: hidden; +} + +.overlay { + z-index: 999 +} + + +.overlay2 { + z-index: 9999 +} \ No newline at end of file diff --git a/FrEee.UI.WinForms/Assets/fonts/Kwajong.otf b/FrEee.UI.WinForms/Assets/fonts/Kwajong.otf new file mode 100644 index 0000000000000000000000000000000000000000..a94cf8c1655d38b06cad54034a7673445aae5a1f GIT binary patch literal 33284 zcmeHw34B|{wfD?jCE1oNTZ-Hu=5+(Uve*=83MsFpE%c);(3W3YyA)#i`=7az7qa!eukZK! z-uoi?`p%s@%b7FhoH=vm%!qNun3e5gGV5HvYI;T8?`|q#jBi0~=ceslJN9nR>19mW zhqyO3?b+qEKW+XYV@?m=SN81a-F{!S{RPIf^H7Mhx9gG}h)-qg>f^YZdbeHL^Qo7U zhZu838S5?D(%rS$nUs1r-o1~jdJ7^_KBIkvvJ3EBux0zMzBzvz{Wm;6$C&igwu?4( z&Fw8*hx%F(w_$r%-wtJqxdq|HNbkL{YkPOqMI8qjyYd*)-?!tUOLpDWbf=TCeSJuC z?T($@JGLx*?(>W}b|L*kjM|Fp`k(#rhaI*#!z{&w2*zF?{?Rky{&(fIF>7o{`#`P2 zvnJBh3*^xrk8NOYn)EU2*gM(><8SCKeI6AtkMdu!Qt>RYSNSS-E1)XXGDM85yukaJ z%1r7(HH;#&jl28`>ygrsj;SirNk&@nKmKoVi`UB{jO9DkgRveqq&?0bz$W1=hvi8H-6r#$rk}3o7|cmI|3q zMmnjHZISmNUD?tS3^o67sYtXo=! z`rkmie+j%&d!Jw*nslborKB-cVcbjj5b)6Zsh6Uo-2y*^n@JacVJw6zhU+d|R`ubr zyG5H5_?dKZVVzWa=I6K$QMZuG-eT$zHl*0QZci}FRx zr&{7P_Q2S2qB&5n9KSqqt~!bsqHYh!8$HB|K;Md>?i{wBUCHieUkASpu*cai*{HnN zo8`^*7J3`J-^@?TcaDuA2V*(N)4{&PzQ!IADZkHtg_Idy&yyN&GY*5{RM%-V9~VVl2B>c^zs=M;mWG& zn%bGOX3v>BZ+?U=sH<;iT)1fQlBVXCrOTGLu2{Kh^_p|mwzaQ2_q_ERIvBfP+l4#& zuDte!>u)@8)6KWuep~+?pZWA>@4Wlodk%j7b6@)6{SU;!xo*=&*4@RnU&S_02Jn{q zdOG9J56ivhUqRuAzV?-`egXGyeA9UI;MdvKi?{5&XxHvNmt1x^yY%X7_8BkY|D!DA zjj}aujqP4<^Ha>aqB*LqTGtk>%#IedclLM>tZ9o%fv)eE(7Bs7`8Q_!d{NdOW%d4s zLqK1BXI*KOhoaujp3GSmPR#!ZeYT@c|hM-=cSj_+-w7U z`j2#to1$v54=?Mz2fPPR*Fd=%0ESkyb+%@At!!`exBJ??(a5ScyvruM#6c;I>Y=E) zzT^-XLtx#6M}M6k6IIO zD~+aynpdLklfZ*ML!&DNz zxg*sdV4{0o zXuwSOk`T~hbVO9^1j_y1vM66qY*QKyO?v4Xe|fR-vUJkR!ts|ojhEgKi`q&~)nIDt zw~e+^LnpV-hxT~^S3cTDcR$)k_X4z!?g6xq?uBR{-GgW!-HXsZx=%y<=w6KW(Y-9> zog+AEdI%`a==4JR@lGO+F5IJKM7-sp==754bTH-&@WdjJ?nyb*-&N};34huYpv%%| zMWU|v1t| zHO%wZ4ped{wY3`fKm$&irxRS$Ra+XZ36;6$ltydMloS-c3CU-oiM8YI*$8*GLr{D&PZvPLK;U24Rh#Wc4GYmu+(a!X?8X*g5WTed;$`b*hRw@0U_gmT%=Ca1!9?#z=anOsD*J{_~!skbH`srEs!Bz??V3~ zs+4+hUgDi-jDhJWTisUXor95`pqGqD6gu7&Q7wR{C3rQi#2B4;BIR}Z+xp+n1}*Jx zNnm9$o@ST$sLu#5@z#u^UE~VoXcOIn^q4ktbgf>t*5$d2i8ZCvy)k%SkR3`;CQJTdFY^F36=%zFj=%F+e=oN4^AhbomMWL+%E()D5;G)n40xk+| z6L3*zyMT*A7Yev2bP;eoXS@S%>AKmosT1?B`dw$bzEhJhk_ ze#*p*2-eV^JrJa*!=` z&M>btKVW{tl403wxzRF`v@q%Xq|YWjoOCql-Q>L~)hU;yylS0g-D!QmI%vzVHQ73C z58D2eYDt}yx-s>esqfp*vp;D6OPVWfaoUAxUrGB*dRcl~`W5N-q#sFtBmKA|;<(4j zoVCs^&QCkvbfvlqUE5rbyIyuPcaeLi`%p$f#)TP&Gv3Th&8*JcmU%dHB+Hw%IBRp( zfvjlO8=l2EPvm@%Yt4Ni_iuTN^F9w7OP}`xU#;(m@1y)#`F;66$bZXk!jN{J|0@Mj z!McLS1IdBg0v{Aw3%^qM+h9@f{NNKsQqhK@=rmkiX22@?-o>En~r4z752d ziLN!nmUA&%0SlCiWpSN-$QnUp4m`=Mg?+?+&wj_=W^b~ev7_u&_A>hk8w7p)m_5s$ z20Y(mN7#2^#rhiH`y9KM-OcV~pJAV7``Oj7WL2|DR?NJxR;95N*usJ+cZrzSN8Vbq zxoOiPwXT6T)a{%Rl4O=qR?2pEgr&0T(y|?Pt`uf!%FZpTd*zj@_=@_KD|*javQVyH zySPzqfN7`~;LFpw+*`q?m-Et$>7~6J7tHHYsw4BInZfFry)B(pB}%ZlvPdpef`z>s z{JvZzBj1}RX9hAdd#CY0F)yeM6!gyJwX=AQv$m$Ud)e%qY`5lI%ICB?=k)gQR<>Mg zUEZ5^UTV9kP1DkCx~!Ttb&EAgGN+uIyiT!r%$8o}SRHFP5td@nwn8oy;t<=fBUvZ{`X0mnZe5T3F7@9(@u;W z3;xc3hVLu*4&nPOzTe09JNSMJ-%s;9_^tR}hi?bI3wa~= zmapO~`EtILH}NIF+Bv}8IS}FXypAv6^Y~molh^P{9_Hn|4C1|n7xQVnhzEh)LU9Fn z0Ytx#dwCwPohz;!?g7@b#Ffc2fPI&^oZNw4NE4Txr*a#&Vo;gO=CIjp7MsaxSq?SjqY;0!WA`@;mUCJTwWL~4C;ZZ%3z^ivvGG#wT{Tj=@ehW^L0&kS0gSQl>Jpc zCob-CIuNVr{$Ne@d|r*5{-B<(TO}k9=A*RA8sw-6yLFVOIUVi_XIMm3xb>Q_?$;f< zTMuF#pn5j1aJ$?Ny#~*?+%;|+ceq_nDjj*J^P1{#br{eZY5YNvE{KwYeyW~|3F^~< zof>x#$&k^h=Q}k&K|w{jkV8CGRnF%K>VU?DT5G0ryhef=d)V%;@}pg9RoLmn74}z! zYw#?G?O~_ijogKEdD!V7i~%tS$%vOHVvR^GJ?t!zs=}fuhgQO?!WBRbP>6sl;CCWZ zRXAYO71l+SVW%6BfeIjWN(MciI*2?$N`ahCKl0E`{Fmcl%Fl68$LQkqi>k_HRgp1c z;fkc_yi=C3NF$|4N=wIZfv3LCSJ3sWsWta7r-|5M$>Ilu6z1q_-y{y2OgU=;_4(w!zRn-=KjyTC7gn|ohnGiZtzGfxqrC1Be%&J-p4Q6s8gK+m0V#wdi(f*B zt4fljwosfZ0Rd=LzQiSKs`SGze(~DTT3J;U37v!t_(Q)SKP3Vp(G!Rx{8OJHj>2Jy za0A3is;mRqN^P>5T4+~OEGcS=m2;D(ASZfADyF=WY~qqs&U5@=q@2uhj^#NoFXfWo zi=qNPUaV+D3#d>9N>h{|S2I*6FsSayn6Pt&z9Hc`^%nvcBZsG7TYza_}OQ3OGl+S4JR0awvJ%4a}mJdPEDMb?uolF6)_deKRM zI*FUjHuEwMTIb303JpTHQ@0YpDr#)1fSEV`)Y7Ud;qb} zADgZZ()=KqfVeUbkm=XW{$YljD4#b@yF;4knQJbW1b5Wo@} zJE#mQJ-|Xb<|FGP>+GqZJl>LGm6*u}8f0=WvoO`7Zb}A%%^d`_b*YXPC>`K^#ilGv zPUftle0o`FsHAvW5NddCjt32KC#NT;*-{jVAy2CAD&gTOe?BC!(-E#vosg?lg?^uq zfh5ZC6*9LH!vk=PHX@0Ouekf}4&G$u_uR8a)7J2F`nyL)Vov_va8G}K&+rI;H|84Y z?w5Lo=Bw(g<`;)5wpI+S>Fenk8tPk}2#9u$Nw1@aZOq34EF3Aa*u2Y0M^DO@KZfLjnfKaD_Wu0Sxs=FKykd1Oh$=s|!RY2eMXnz$T>+Y9vtdP98{ z^y6lJ%oOV)^O>T9SX4W@ly~v)c|zwI}J> zB^V-rUcWEDu*yzot#IX_4}jZnRi!^)7oEY;1Lz80MV0#OaDUHe9^n-j9T_=3Z3Ljt z>fq9EM)MGo0vn{BLEyA+jnqT`hlYmsH*qv17R5b+HgMJ@$M{;oS9uYS%!r-Hv~zbJ)ik0mL*q9ol8Vku+*p4B+DzmB{fd!IXA zACV)Y`(9l4QW4KMB3*cdXB54(jtUp~-;L+D$dtb_Smk0)yMyUf)m48Rd7V3B?@@lr z9sB)}(N7I~*&Igu=bf$=lrZS_}VMQD_>r` z?VQDbwvF}-EIa+Q29_%0Ng1}`A4tkp2^5x%ICF%SS(3SW*|lUR}v2D<1`pWSZ< zuRwp1t731B#NOh$Bj^^OE7CI$={Nk~AjNMP8{->LpUg5NF2ZC7jb?%@5hvSa z$YH8!3)MnpLI9JTgcT%`iqeGuw=r-Y6+ex0AK2xu{6%g>A|{RfaqMknuaW~qxY>^8 zs2`J2H?m1xs*s~(!IHZ$8i08*EyucV#3ACC+&z(uFUyW(BLnJ}_*T4^W!9d^%H$R8 z?UD2p2(om0vOC4CV_e`#8ag{5)H#1X6k1n$1#>!>Kc7`qGO6mG!-wyoE5@5+-^OtF z1aFGIa@AF@&?Rq=J$dwK>`A`l=uy6eXcK68S834;FckN zaCP5;mdFq|e0AR>81h&}1jDByV|d+%20+`u;Gn8n2h%iw0u=;AOC9ec|C2zPuIH3+ zhaRtxs!o8AxVxP4;ic8#+aY(PYXQcGl1TvbOi#bGyT{fMzJE>MP^4wSpaBozL>dFT zDt7}X$v__@xs8K;T6Azrv#OCg1;zmj$+EzXAVX^k5-0n?Mmh#^5{oq8gfY(8r*XS- z_uv0Enx{y={M+b7{0sab!>f2O^Xx)AH=O-7MAFOxE_Koum^ns zU#g~iz$DHDqN&}OEI|SR{dS-H`e+`1kEATMxr6hL(JSTG<*+eciD3*w16YvSO8?|{ zQ8$eV(<33G0CcYkb;Ce5+NdbRoa^58g%y(u5%wmhWxZVx<2-Xlrsv}SB@)aFi8M>loco^o0ZUnHB!SQo#_(W zhj^VSd!gznst$B(n%rUZDW)57GOG#KR9CvHQcZepi5T3B_M%OxG6YsGpEQ7uaW)zP1ojndc1}_ZY zaSFmfjtM(P?upj)_wccv+rdBW(vl92p1f818+tGHZv;EEB7$-BAed;p|KcD5J|VZ| zFnU2}fk-}LFkk~b(EKU1X_DeJ4cPrjGu0JJe|{ zONw#!FB!!n!39&e7OU;qliffX*2JJI1l=}t6U;`iN?5y)oA?gp2s@wcVGAPj;7yKsC^yMl(Sv4*n|qTi61YZ_AiXtBAj+mM zyWoNg_FQnuh1)i7XliVjXTQ4G9wXY!0`_SLot9V>f%Nrg`0|78pH_#y;SwM=`rj zvS<22wfXtAAz!B5qVWsvTF)1olaxn;vG(hg=i9?bU+MQmr`aiL}oeD(~uH+B|c_D)if+jhVtNY(oh*E3H5!bo};-V zcXUf{_4FSvlHS6cXY>skFz}HpN$SL~#?s6efXMJsh5$z@w3tFRGg6KDuZct5)p~WZ zFOf6{M_>;@Cz4|L$j(l)XBTGsy&g=2v(hpgKEGMd#JEke&<;9u!(Qji<;1;Jg(MNV z(+5MHL9)tFf6wu0&}VK@dEvUcD{{&XzI5m+ zNotOD4~f|rXfXkA5nFF?b3T|==8U*ml6L^w#K@0Ha3|1+IdC@Y5h4*ZBeJAPdrz9I zJz}n^PusoH&=J5^2^O=9NtkE@OpP#Dg05-OhKZTWsSJ$}e*e9LFEJ-cK{R6I=HAil zp8lJ9q~AkR>b(||N=(B_n>la3c4+l(nPZODyK1-Ex5l6YdnKWkRW>S7Js2T&1-3_$UxG5j&zT=MW<3%IV{tX)xR5N-np>k;S z-U$C)git5&r#^%7lMIao1GtO<9OP+qG{!+Sp|K$S$@Fgb3iOGkVnTeV;q4SA}6G}#zMZ?Mg&I?`__QXUv`B>O* z4`Z~)`vg3MClBF?WI9B6FObEw4q%OD0aNhgVIIdydwP8WPlh%_h@wu88y+fyn9-_F zll391_h#wJ*rkM>LSW~sg0j~1ae4P@z-^GZlrupGg3fXc?FwpwuJA2H-qxiiuImi* zP$5qMc`nNq*lF+)egaOz)I{8ei5HLr9hD>sMhqB3)MrL|`XMJquYguEop0m|V_&#) z-EJ@+tV(O30~6gqzF|uf1jtf=mB5WmHYQcfgA<0yP6z@>SUc=WkYP1ww>>;8y>)!r zFi|ydI`$r>65m2Fg?S@6Nh;J0vO|(ggylgrAkCg{hdC1#9T^&v8S|EOzl^1#lEoih z`61uVx8t@r_R~K|%SI2OXKSSA_{U@Pkbq0@i-qMzvMpi^Xn{Bb`^V?$_H=tHSvWZ@ zif}>*myaa~MnO?rijFQv!Pv<*NuH!KFUb>{Nyo(rO~@07PtwMTVdP^y{Sa+gJ^crIHcK;BZ5Vxnc*PJjljPd*!3O?z#9)?jm?Jl~9Ymi()?tc9#>!-Ovcr~QF+vC6lnmSppHTA>CB{?Hi^+736jsc)Iy!A zb-*`6vuVq6bJFZHriWlS4fu0va;q~Oc28PXLD-uNY6*lVO;%tHb*gd89kEVaIAhhw zF&iR?^dS5bB1n3E0Mlro?w39Nv74^~;qF^(k@~y)4{Z5I>w_R}{N2<$6rZsi?_0Cl z(#(^ZtllH5^`P^`WanGG8;zRO=T?m2vm>>z|0*!-p@mq;z$i`eQDT=# zI7e;JD_YR!epVhSwLpWE0FnxjREg$TiTR>oz9PMXB(~2lrsqPHz_d!(pc5)&e2Q#{ zC705If$m}H!!^3TW;8~0AlHlr4bd%i-yxKUp^Ecoz)V6$3RQ(^w~zRF|JazA)9TC@ z$t4jagFPmjBR~^6q>(Cg8pEKctcW>a*H+lj@j;qZ#bvGFTNlfYWKcPvVW>-SfwD8b zKEbr(`a*bIji{1ekLw5{37tXV#|I4-k}F4Dq$&W`n<0Ca0*4yGiYYwIwZNC?M`2U~ zAehP10!T&)grpgAlD|3n2o|HC#iD)A=p!igZ*ua-V<_u3r2P!avNC_fYXyHPU_9O; zgxI*ONyqdrRfsYamxSVcJRJf!UER-Zv1zei-gsl|7qMxOnCtEvzF)|mX)y@ZQ5#m) z?~QGXeVMx5=zGuu3zE$Axl>@1Lhl#U83f3TYMwcP6GP9#EZhwF z2N)!&1y_OMHXEr-y~n~afQ6~_}$7&LqjiNCOil{D=;ko88&sD zJ&T%qNlb9#FFzH5IS`Jz^ND(6kX>k0{!^5;jqx5`SIi$goCHgCF^EGV5-y5$VX`ymJmqgWT;~J&J$Lp6-H%xkd&ff<&ji}*& z92`<$qDK7?x#}})2z7Y}w9O5tvTYB*cXAr9@6 zdIR(ac@vDwtOM3AXt_zSiDEe^?mJW(;w(HpR8v|tE$H{ccM0w*$rj8Kv6`AZVGcXl zjEkRcrUs+g)R`Cm`AOzy3Om{C>-Y(?Gz=j^pAh57+4-0-rJbFRot=;Ue=#3pu_37y z^PzOCi>7L{E~>+yj=ZGi@?Z`8Qs5}%$3e`eWWcd14u@6vYLSZrEy=mz z6i5D6b9v2&!>@5?cX#Z)*M_?#0|t0q2^b8&t1ZXkvTWS1lh&b8H90g0i=AOQfoG4R zD7vBx+d*atxoBs?T1j?kSWJebR}y}mA1XcaOQJnGs}QrbAgy_gyL4hH0>dp|4znN} z3>5f^iWb7#y(BSlBM-R`N8TM#;6sQd2NMh+>$MN$uVWR>4%lQ`F9zJuwog6?qg^i*zD)2&zzcEfz8 zDqB;ytVwcva)uctaE)PQ%+76TX|{IUY-wE%o@Ps1ksVnTFH&QCAC;+b9Uc-W)VB9O zU21z|epO{bL5_#BuYUOppS$xjH(Yn=r!Kyzx4V69^OA_>mu^A)_<04@W&h_w#gD+$d3v%$^htofH5{TthS0KNtG7NV~H{AYVe1Wk8 z1{kDKPm@Qb4F;kF+7v+k`}8Ge{D61^Cm>YuW&$WF9I#cT z<>dHh=KKBr>SexKb4p5bt<@@rXV0GPfuXYe+H&2Le7q%KtF-6j`fHI4>GEqWDJe-a zZC1W_QTp4Sxxw{*Yy*)j*-8#x<=jG+*&7QYx`Kr|| zOXtkZ^Lo8=`=SF%=H-{}d-UPGS6p$~qu97tke!>B=Fguur@%iqCtWu+=Q|wl0F2o# zlPUR|Lqp$8Hkn>NS)zwJ?^rm0-i)5^@Vxn06Q5r(BP%OAE8O|%en7GH=39Duq^oBy zZ8_(hmX=v_QMY%_+?JNrtCudFd-|Dm)k{PE=) z$axvoV0axs5@T(U)+@0%a1u8hSZ1xpVg*J8V+R2_$An=Um1)&3?sr=z{d$<^CR}gf z^Aa13#ke#GIgfG1t6)jq7*ECMkPiDOYr^;gpBG{2loIk1p8MR(pLM< zf;Sa85NX)>0e2!SD#69^d?Yu#hcHIMrKl7B9PpGG_amCfqiE{BGi1UtF4ALSw2vw| zbA|~&qFgw{Oz|VaDpVDG@8CQ{$^iK>#9fMv6&10I3LYF-q>?TeiQUxSUC<%?h~U=% zr;PFq@FR*jy8AJt4`CT9;Yoy*6?n-@a50Nj;1CHKNFCN z-5^r{HGKIKOZstFtV!-T>7b=k0s0q^*h#@8s+)k*3?A{Z+DMhb1De(ZX9H}B!QO2w zrg0wk@ukIeC}XLqslHSnxe8^jOr-_&bhsEBt}HyLSJk*VjC+OyLIPU29vD7C(u%i# z``fpruTJ(L;s=GV5O!1fS zZ7ODy#k>`3z$PWhv{g$!9W8`sOfM}g$oEb`bjq11!l_$1X%lcUv+=5$d6@Q-Qc_)W zD)dX=OG{g`q`azOS3{fA<#erWTt9c_;)?d1lk|xcdC6+cap&h)Z7*4EIeFPRHng4A zUnkSMpDm3LAz71BWV2#2_nxkuUhI8i%)5M?In-T#L$CXc8MKSS(zAJ@JXvkwa|Vqa8nRIzM^roHs=>Ucxb6_g#Tb^?7a=@ zw$Uc(iQ}td5x}orFxo6Vf&I>{OL$W(Iy5*qC<9zLHeuKiehDyZv8#+(NeMhru`_Ka zPIy(+9nb)ElfH?TmE&G`m>6|Jii%~*Z1|*#)EGp_>m2Ubr%m4;$&_d(SZQ&v!0*e# z93jP`v#=DlV9=Y!Cp_B33alY79PaToYh!%Sg*TPhKU*bfu@4enZYObp`xSO7J=i+# z>K6A8n(PL*7%TJj@qSUC!I+T*IS2m*n^n@9FgMe#BO0CRpJsS7pvQzGJB~k0c&M4c zEt5Ue#P~4DOO1;$A>peg-;04DK@;P3MyfapwoQypVwq)Bl0OXcA82};o zCjmgRexiCqtuSa()URU11WlqRF(uY`(}_)=?3#xSp>~ak((V?U2@-OB+(A!XBn0`D z6K;A+iICqPAH~YNaMv^Bb^`C|tU0n64No>F$#53au}9;RxVH#T5(D?Csf2*k^wjh; zJD~xaI1)WUa(XHv;&N&dG9<{R31k=oNg4~GY{TB6lf^^VB&mtku&=`ymsp*TyK0f+ z8@9NsFfvFq*ekr7dQ|9X{C~x53*5(Dq9lybDCtAe_;`1s zZ^rI|Cbu4Ck?*`Gk~z^glfZF_T~`ACGWlk$C%pH<^btolyx!0%dCZEkejA4?iIqi4 zAVYOk181l6JDlUA$-ZN^rgW;{yD?fRO~r3?B7FZtA!OXXjeE)QxTqRQcEV+ zli>l>oWzO4A-6PjE5xzFbY<(5l@=UYP)MF{V)w`-&$m;K@e@9A1*aI)r})arZ=Gy7 z2hHQ7kd2D`=L%?MQs9?xj5xN%KpMf9&Tv=5bY+S!UA}L!H{B$swNrc3k$^gdM;*V@ zAZbGCDg5f>gF=9P65e@{+5UXMiw#$&2H58#_dj2OuV6CJw2e0505;vg$~3x^jgOhNo!|c!dNdd4k?9{Y>tHz|$UsmA0ZJKnIf0i6huEEH(c8=lzMl z+Ys}DPgzGmoaK@1HHiW<2*T`atsyA%uLA38lr(lp)`-@$>& ze>yf16^uBgZT{=wm^D-e^iwXmNPgaI6GYIZ6tLLwMIEHdah_lq4Z}g0tj54Dt9$k4bsCkcm_4#}4ky4Af6s5tQpr z0Kn~bXSuTo3b7I4|_>uplDYp`R*H=hT>bKl%X5DvD1SIx8)e)TREn- zu~#;X@B=;kgZLIHXj$MhZXBV(2lqjr<&lryP{{imo1`S`jzmA7wYyE;2KO(pyOBN1 zNBf?A;@A{TY5Es#(=*hQQyOoCA?{@68^a8DLZ6?tyPdVW!5r}awB0QYBM{l$bS!S_ z@KiU!wrG-jX|qjY(~C0NWt*gTZYuT;%2<5GZUA_Kk~J&75~9VNt?sO??vvZA&)VvUX=wTIf0C_kE6y{0XwrG6&TwR!wsb- z%sc2%;1|Vdnl$&rIm7?a^H7a5g^~9^e~zbw->i+vwojaIOt53MfPkk(193bGPW4Qj zZ)`MxwxY+I!M%yLhy#u>8Tqd{HyQ1eo)hPlCXp@wpE--!IJnd}i&-3BN@p?C8KwrL zGM#Ow6o@lPX&k`mdocB);T{cCstap{fejXRPUz0uqcx@WH`B+v-l7*9`+OPJg9EdUFS(1D4^U zs&!(c8cqnw#&IShJv=mN`+}JMdgf z_}suLb1o9$c#/cZAPmFI@(csDu(aYw8lhe+^mBw3aWU%z?u_MZOBFUQeSyLxVv zdW;i*_YdOEoAwW_+^yn-l%c^Ptl;28^WCdJ$7ecIRy*NLSvuSEE{x$=M*y;~z-5H# zY>5N$u!Qgx@vw~FSx&?&lhUZHj~$Aq(I&;4SQ#&l$D3jA&xnUDY#(onhm%=3KNb(C z;Aa#n*=p?j*ulD459?x^aQCu}i18wRH{!iG;<$@l$Ts86PId{NOL5gB+>Q8M*fp|8 zQ7s&lJ|@v<4LjFsbis`%O1#j*)?U4%L*rx&zY#X{mks5QF~B5Z6HPeJiat=fjK5BS@HT!f2> z)YLwT*(6FL{B!$ohmp!8kn z!C7oNzMm4`GQ?1?5*!nKT88j8Vt-utj0HiZC;L2#NIG+Z{2y_GC3H~}Yzr1hqGX)% zWW}ORD(paM*u~|*Y11yO_-4SbCJSo;9{iqCF1(t(z)L>%8x^ns=1)P;_cZ+4QVIH~ z6mU;R-_8Ku!@zkJFkgcnn+f=5<7YqS;^#l+vk0q0&o$upo))r2X#Em6J~X54OK~{s za@LC9gj&f~0rP7>BWqb3YiH}&x$HdrM)?M8zUpLOX1B4M!Bd}Mx3UNDJLJ#fSD_w7 z?`~rK=!X~48_(gFqUiUchS*E&55V+K@%vG)ux|mkAK(|QUc)a+{S26WkKF`1-O4Ti zp0@#eUjoK2240C;iQ4x7!|#GiF9RoCj$f6!0>3wPKf8+UW&7CG?0xnGdy+kaUrYZs ZdzO8J9f6zZpOwblJ1-*q;&c#Z`#(+4mBRo4 literal 0 HcmV?d00001 diff --git a/FrEee.UI.WinForms/Assets/fonts/kwajong-readme.txt b/FrEee.UI.WinForms/Assets/fonts/kwajong-readme.txt new file mode 100644 index 000000000..78b98e0bc --- /dev/null +++ b/FrEee.UI.WinForms/Assets/fonts/kwajong-readme.txt @@ -0,0 +1,16 @@ +Free font by Tup Wanders +http://www.tupwanders.nl + +Licensed with a Creative Commons attribution license. + +If you add to the font, please send me a copy! If you've made fun stuff with the font that you would like to show me, please send me that as well. I like that. + +Have fun, +Tuppus +tupwanders@tupwanders.nl + +If this font suddenly makes you feel like spending huge amounts of money, please do so by going to Paypal and transferring your fortune to tupwanders@tupwanders.nl +And if this font suddenly makes feel like spending small or fairly large amounts of money, you can do that via Paypal as well. + +More fonts here: +http://www.dafont.com/tup-wanders.d2245 \ No newline at end of file diff --git a/FrEee.WinForms/Controls/AbilityTreeView.Designer.cs b/FrEee.UI.WinForms/Controls/AbilityTreeView.Designer.cs similarity index 94% rename from FrEee.WinForms/Controls/AbilityTreeView.Designer.cs rename to FrEee.UI.WinForms/Controls/AbilityTreeView.Designer.cs index b2b12af22..0909b553c 100644 --- a/FrEee.WinForms/Controls/AbilityTreeView.Designer.cs +++ b/FrEee.UI.WinForms/Controls/AbilityTreeView.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; partial class AbilityTreeView { diff --git a/FrEee.WinForms/Controls/AbilityTreeView.cs b/FrEee.UI.WinForms/Controls/AbilityTreeView.cs similarity index 93% rename from FrEee.WinForms/Controls/AbilityTreeView.cs rename to FrEee.UI.WinForms/Controls/AbilityTreeView.cs index be2a52c64..8a66a6e97 100644 --- a/FrEee.WinForms/Controls/AbilityTreeView.cs +++ b/FrEee.UI.WinForms/Controls/AbilityTreeView.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Windows.Forms; -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; public partial class AbilityTreeView : UserControl { diff --git a/FrEee.WinForms/Controls/AbilityTreeView.resx b/FrEee.UI.WinForms/Controls/AbilityTreeView.resx similarity index 100% rename from FrEee.WinForms/Controls/AbilityTreeView.resx rename to FrEee.UI.WinForms/Controls/AbilityTreeView.resx diff --git a/FrEee.WinForms/Controls/AptitudePicker.Designer.cs b/FrEee.UI.WinForms/Controls/AptitudePicker.Designer.cs similarity index 95% rename from FrEee.WinForms/Controls/AptitudePicker.Designer.cs rename to FrEee.UI.WinForms/Controls/AptitudePicker.Designer.cs index fc4a8c969..cede2c329 100644 --- a/FrEee.WinForms/Controls/AptitudePicker.Designer.cs +++ b/FrEee.UI.WinForms/Controls/AptitudePicker.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; partial class AptitudePicker { diff --git a/FrEee.WinForms/Controls/AptitudePicker.cs b/FrEee.UI.WinForms/Controls/AptitudePicker.cs similarity index 95% rename from FrEee.WinForms/Controls/AptitudePicker.cs rename to FrEee.UI.WinForms/Controls/AptitudePicker.cs index 667edefde..c21422468 100644 --- a/FrEee.WinForms/Controls/AptitudePicker.cs +++ b/FrEee.UI.WinForms/Controls/AptitudePicker.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Windows.Forms; -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; public partial class AptitudePicker : UserControl { diff --git a/FrEee.WinForms/Controls/AptitudePicker.resx b/FrEee.UI.WinForms/Controls/AptitudePicker.resx similarity index 100% rename from FrEee.WinForms/Controls/AptitudePicker.resx rename to FrEee.UI.WinForms/Controls/AptitudePicker.resx diff --git a/FrEee.WinForms/Controls/AsteroidFieldReport.Designer.cs b/FrEee.UI.WinForms/Controls/AsteroidFieldReport.Designer.cs similarity index 95% rename from FrEee.WinForms/Controls/AsteroidFieldReport.Designer.cs rename to FrEee.UI.WinForms/Controls/AsteroidFieldReport.Designer.cs index 20fce2447..dace67fde 100644 --- a/FrEee.WinForms/Controls/AsteroidFieldReport.Designer.cs +++ b/FrEee.UI.WinForms/Controls/AsteroidFieldReport.Designer.cs @@ -1,4 +1,7 @@ -namespace FrEee.WinForms.Controls; +using FrEee.UI.WinForms.Controls.Blazor; +using FrEee.UI.WinForms.Controls; + +namespace FrEee.UI.WinForms.Controls; partial class AsteroidFieldReport { @@ -28,13 +31,13 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.gameTabControl1 = new FrEee.WinForms.Controls.GameTabControl(); + this.gameTabControl1 = new FrEee.UI.WinForms.Controls.GameTabControl(); this.pageDetail = new System.Windows.Forms.TabPage(); this.txtAge = new System.Windows.Forms.Label(); this.txtValueRadioactives = new System.Windows.Forms.Label(); this.txtValueOrganics = new System.Windows.Forms.Label(); this.txtValueMinerals = new System.Windows.Forms.Label(); - this.picPortrait = new FrEee.WinForms.Controls.GamePictureBox(); + this.picPortrait = new FrEee.UI.WinForms.Controls.Blazor.GamePictureBox(); this.txtDescription = new System.Windows.Forms.Label(); this.lblValue = new System.Windows.Forms.Label(); this.txtConditions = new System.Windows.Forms.Label(); @@ -44,7 +47,7 @@ private void InitializeComponent() this.txtSizeSurface = new System.Windows.Forms.Label(); this.txtName = new System.Windows.Forms.Label(); this.pageAbility = new System.Windows.Forms.TabPage(); - this.abilityTreeView = new FrEee.WinForms.Controls.AbilityTreeView(); + this.abilityTreeView = new FrEee.UI.WinForms.Controls.AbilityTreeView(); this.gameTabControl1.SuspendLayout(); this.pageDetail.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.picPortrait)).BeginInit(); diff --git a/FrEee.WinForms/Controls/AsteroidFieldReport.cs b/FrEee.UI.WinForms/Controls/AsteroidFieldReport.cs similarity index 92% rename from FrEee.WinForms/Controls/AsteroidFieldReport.cs rename to FrEee.UI.WinForms/Controls/AsteroidFieldReport.cs index 75384df58..e7c1052a3 100644 --- a/FrEee.WinForms/Controls/AsteroidFieldReport.cs +++ b/FrEee.UI.WinForms/Controls/AsteroidFieldReport.cs @@ -1,11 +1,11 @@ using FrEee.Objects.Space; using FrEee.Utility; using FrEee.Extensions; -using FrEee.WinForms.Interfaces; +using FrEee.UI.WinForms.Interfaces; using System.Drawing; using System.Windows.Forms; -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; public partial class AsteroidFieldReport : UserControl, IBindable { diff --git a/FrEee.WinForms/Controls/AsteroidFieldReport.resx b/FrEee.UI.WinForms/Controls/AsteroidFieldReport.resx similarity index 100% rename from FrEee.WinForms/Controls/AsteroidFieldReport.resx rename to FrEee.UI.WinForms/Controls/AsteroidFieldReport.resx diff --git a/FrEee.WinForms/Controls/BattleView.Designer.cs b/FrEee.UI.WinForms/Controls/BattleView.Designer.cs similarity index 94% rename from FrEee.WinForms/Controls/BattleView.Designer.cs rename to FrEee.UI.WinForms/Controls/BattleView.Designer.cs index 01196bb9b..7269967dd 100644 --- a/FrEee.WinForms/Controls/BattleView.Designer.cs +++ b/FrEee.UI.WinForms/Controls/BattleView.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; partial class BattleView { diff --git a/FrEee.WinForms/Controls/BattleView.cs b/FrEee.UI.WinForms/Controls/BattleView.cs similarity index 96% rename from FrEee.WinForms/Controls/BattleView.cs rename to FrEee.UI.WinForms/Controls/BattleView.cs index 47812f3cd..6ac3f2f0e 100644 --- a/FrEee.WinForms/Controls/BattleView.cs +++ b/FrEee.UI.WinForms/Controls/BattleView.cs @@ -11,7 +11,7 @@ using System.Linq; using System.Windows.Forms; -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; /// /// Displays a map of a star system. diff --git a/FrEee.WinForms/Controls/BattleView.resx b/FrEee.UI.WinForms/Controls/BattleView.resx similarity index 100% rename from FrEee.WinForms/Controls/BattleView.resx rename to FrEee.UI.WinForms/Controls/BattleView.resx diff --git a/FrEee.WinForms/Controls/GamePictureBox.Designer.cs b/FrEee.UI.WinForms/Controls/Blazor/GamePictureBox.Designer.cs similarity index 83% rename from FrEee.WinForms/Controls/GamePictureBox.Designer.cs rename to FrEee.UI.WinForms/Controls/Blazor/GamePictureBox.Designer.cs index 95b859a50..f95fb45be 100644 --- a/FrEee.WinForms/Controls/GamePictureBox.Designer.cs +++ b/FrEee.UI.WinForms/Controls/Blazor/GamePictureBox.Designer.cs @@ -1,35 +1,38 @@ -namespace FrEee.WinForms.Controls; - -partial class GamePictureBox -{ - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - components = new System.ComponentModel.Container(); - } - - #endregion -} +using FrEee.UI.WinForms.Controls; +using FrEee.UI.WinForms.Controls.Blazor; +using FrEee.UI.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls.Blazor; + +partial class GamePictureBox +{ + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + components = new System.ComponentModel.Container(); + } + + #endregion +} diff --git a/FrEee.UI.WinForms/Controls/Blazor/GamePictureBox.cs b/FrEee.UI.WinForms/Controls/Blazor/GamePictureBox.cs new file mode 100644 index 000000000..a35c86473 --- /dev/null +++ b/FrEee.UI.WinForms/Controls/Blazor/GamePictureBox.cs @@ -0,0 +1,66 @@ +using FrEee.UI.Blazor.Views; +using FrEee.UI.WinForms.Forms; +using FrEee.UI.WinForms.Utility.Extensions; +using FrEee.Utility; +using System; +using System.ComponentModel; +using System.Drawing; +using System.Threading.Tasks; +using System.Windows.Forms; +using BlazorImageDisplay = FrEee.UI.Blazor.Views.ImageDisplay; + +namespace FrEee.UI.WinForms.Controls.Blazor; + +public partial class GamePictureBox : BlazorControl, ISupportInitialize +{ + public GamePictureBox() + { + InitializeComponent(); + + // set up view model + VM.OnClick = () => + { + // HACK: https://github.com/MicrosoftEdge/WebView2Feedback/issues/3028#issuecomment-1461207168 + Task.Delay(0).ContinueWith(_ => MainGameForm.Instance.Invoke(() => + { + OnClick(new EventArgs()); + })); + }; + } + + protected override Type BlazorComponentType { get; } = typeof(BlazorImageDisplay); + + protected override ImageDisplayViewModel VM { get; } = new(); + + #region viewmodel property wrappers for winforms + public Image Image + { + get => VM.Image; + set => VM.Image = value; + } + #endregion + + /// + /// Shows a full-size version of the picture in its own window. + /// + /// The title for the form. + public void ShowFullSize(string text) + { + if (Image != null) + { + var pic = new PictureBox(); + pic.Image = Image; + pic.Size = Image.Size; + pic.BackColor = Color.Black; + pic.SizeMode = PictureBoxSizeMode.Zoom; + this.FindForm().ShowChildForm(pic.CreatePopupForm(text)); + } + } + + // TODO: remove this stupid ISupportInitialize interface and anything that references GamePictureBox as it + public void BeginInit() { } + public void EndInit() { } + + [Obsolete] + public PictureBoxSizeMode SizeMode { get; set; } +} diff --git a/FrEee.UI.WinForms/Controls/Blazor/GamePictureBox.resx b/FrEee.UI.WinForms/Controls/Blazor/GamePictureBox.resx new file mode 100644 index 000000000..1af7de150 --- /dev/null +++ b/FrEee.UI.WinForms/Controls/Blazor/GamePictureBox.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/FrEee.UI.WinForms/Controls/Blazor/GameProgressBar.Designer.cs b/FrEee.UI.WinForms/Controls/Blazor/GameProgressBar.Designer.cs new file mode 100644 index 000000000..a33ceeb51 --- /dev/null +++ b/FrEee.UI.WinForms/Controls/Blazor/GameProgressBar.Designer.cs @@ -0,0 +1,61 @@ +using FrEee.UI.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls.Blazor; + +partial class GameProgressBar +{ + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + blazorView = new Microsoft.AspNetCore.Components.WebView.WindowsForms.BlazorWebView(); + SuspendLayout(); + // + // blazorView + // + blazorView.Dock = System.Windows.Forms.DockStyle.Fill; + blazorView.Location = new System.Drawing.Point(0, 0); + blazorView.Margin = new System.Windows.Forms.Padding(0); + blazorView.Name = "blazorView"; + blazorView.Size = new System.Drawing.Size(429, 37); + blazorView.StartPath = "/"; + blazorView.TabIndex = 0; + blazorView.Text = "blazorWebView1"; + // + // GameProgressBar + // + BackColor = System.Drawing.Color.Black; + Controls.Add(blazorView); + ForeColor = System.Drawing.Color.White; + Margin = new System.Windows.Forms.Padding(0); + Name = "GameProgressBar"; + Size = new System.Drawing.Size(429, 37); + ResumeLayout(false); + } + + #endregion + + + private Microsoft.AspNetCore.Components.WebView.WindowsForms.BlazorWebView blazorView; +} diff --git a/FrEee.UI.WinForms/Controls/Blazor/GameProgressBar.cs b/FrEee.UI.WinForms/Controls/Blazor/GameProgressBar.cs new file mode 100644 index 000000000..7a6f636e8 --- /dev/null +++ b/FrEee.UI.WinForms/Controls/Blazor/GameProgressBar.cs @@ -0,0 +1,94 @@ +using FrEee.Utility; +using System; +using System.Drawing; +using System.Windows.Forms; +using FrEee.UI.Blazor; +using Microsoft.AspNetCore.Components.WebView.WindowsForms; +using Microsoft.Extensions.DependencyInjection; +using BlazorProgressBar = FrEee.UI.Blazor.Views.ProgressBar; +using System.Collections.Generic; +using System.Linq; +using FrEee.UI.Blazor.Views; +using System.Threading.Tasks; +using FrEee.UI.WinForms.Forms; +using FrEee.UI.WinForms.Controls; + +namespace FrEee.UI.WinForms.Controls.Blazor; + +public partial class GameProgressBar : BlazorControl +{ + public GameProgressBar() + { + InitializeComponent(); + this.SizeChanged += GameProgressBar_SizeChanged; + + // set up view model + VM.OnClick = () => + { + // HACK: https://github.com/MicrosoftEdge/WebView2Feedback/issues/3028#issuecomment-1461207168 + Task.Delay(0).ContinueWith(_ => MainGameForm.Instance.Invoke(() => + { + OnClick(new EventArgs()); + })); + }; + } + private void GameProgressBar_SizeChanged(object sender, EventArgs e) + { + Invalidate(); + } + + protected override Type BlazorComponentType { get; } = typeof(BlazorProgressBar); + + protected override ProgressBarViewModel VM { get; } = new(); + + #region viewmodel property wrappers for winforms + public Color BarColor + { + get => VM.BarColor; + set => VM.BarColor = value; + } + + public long IncrementalProgress + { + get => VM.Increment; + set => VM.Increment = value; + } + + public string LeftText + { + get => VM.LeftText; + set => VM.LeftText = value; + } + + public long Maximum + { + get => VM.Maximum; + set => VM.Maximum = value; + } + + public Progress Progress + { + get => VM.Progress; + set => VM.Progress = value; + } + + public ProgressDisplayType ProgressDisplayType + { + get => VM.ProgressDisplayType; + set => VM.ProgressDisplayType = value; + } + + public string RightText + { + get => VM.RightText; + set => VM.RightText = value; + } + + public long Value + { + get => VM.Value; + set => VM.Value = value; + } + #endregion + +} diff --git a/FrEee.WinForms/Controls/GameProgressBar.resx b/FrEee.UI.WinForms/Controls/Blazor/GameProgressBar.resx similarity index 91% rename from FrEee.WinForms/Controls/GameProgressBar.resx rename to FrEee.UI.WinForms/Controls/Blazor/GameProgressBar.resx index 29dcb1b3a..af32865ec 100644 --- a/FrEee.WinForms/Controls/GameProgressBar.resx +++ b/FrEee.UI.WinForms/Controls/Blazor/GameProgressBar.resx @@ -1,120 +1,120 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/FrEee.WinForms/Controls/GameProgressBar.Designer.cs b/FrEee.UI.WinForms/Controls/Blazor/PieChart.Designer.cs similarity index 52% rename from FrEee.WinForms/Controls/GameProgressBar.Designer.cs rename to FrEee.UI.WinForms/Controls/Blazor/PieChart.Designer.cs index 484ca8351..638d9f32e 100644 --- a/FrEee.WinForms/Controls/GameProgressBar.Designer.cs +++ b/FrEee.UI.WinForms/Controls/Blazor/PieChart.Designer.cs @@ -1,49 +1,38 @@ -namespace FrEee.WinForms.Controls; - -partial class GameProgressBar -{ - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.SuspendLayout(); - // - // GameProgressBar - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.Black; - this.ForeColor = System.Drawing.Color.White; - this.Margin = new System.Windows.Forms.Padding(0); - this.Name = "GameProgressBar"; - this.Size = new System.Drawing.Size(368, 32); - this.ResumeLayout(false); - - } - - #endregion - - -} +using FrEee.UI.WinForms.Controls; +using FrEee.UI.WinForms.Controls.Blazor; +using FrEee.UI.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls.Blazor; + +partial class PieChart +{ + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + components = new System.ComponentModel.Container(); + } + + #endregion +} diff --git a/FrEee.UI.WinForms/Controls/Blazor/PieChart.cs b/FrEee.UI.WinForms/Controls/Blazor/PieChart.cs new file mode 100644 index 000000000..8d569c929 --- /dev/null +++ b/FrEee.UI.WinForms/Controls/Blazor/PieChart.cs @@ -0,0 +1,43 @@ +using FrEee.UI.Blazor.Views; +using FrEee.UI.WinForms.Forms; +using FrEee.UI.WinForms.Utility.Extensions; +using FrEee.Utility; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Threading.Tasks; +using System.Windows.Forms; +using BlazorPieChart = FrEee.UI.Blazor.Views.PieChart; + +namespace FrEee.UI.WinForms.Controls.Blazor; + +public partial class PieChart : BlazorControl +{ + public PieChart() + { + InitializeComponent(); + + // set up view model + VM.OnClick = () => + { + // HACK: https://github.com/MicrosoftEdge/WebView2Feedback/issues/3028#issuecomment-1461207168 + Task.Delay(0).ContinueWith(_ => MainGameForm.Instance.Invoke(() => + { + MessageBox.Show($"You clicked the pie chart!"); + })); + }; + } + + protected override Type BlazorComponentType { get; } = typeof(BlazorPieChart); + + protected override PieChartViewModel VM { get; } = new(); + + #region viewmodel property wrappers for winforms + public IEnumerable.Entry> Entries + { + get => VM.Entries; + set => VM.Entries = value; + } + #endregion +} diff --git a/FrEee.UI.WinForms/Controls/Blazor/PieChart.resx b/FrEee.UI.WinForms/Controls/Blazor/PieChart.resx new file mode 100644 index 000000000..1af7de150 --- /dev/null +++ b/FrEee.UI.WinForms/Controls/Blazor/PieChart.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/FrEee.UI.WinForms/Controls/Blazor/ResourceDisplay.Designer.cs b/FrEee.UI.WinForms/Controls/Blazor/ResourceDisplay.Designer.cs new file mode 100644 index 000000000..74c359271 --- /dev/null +++ b/FrEee.UI.WinForms/Controls/Blazor/ResourceDisplay.Designer.cs @@ -0,0 +1,60 @@ +using FrEee.UI.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls.Blazor; + +partial class ResourceDisplay +{ + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + blazorView = new Microsoft.AspNetCore.Components.WebView.WindowsForms.BlazorWebView(); + SuspendLayout(); + // + // blazorView + // + blazorView.Dock = System.Windows.Forms.DockStyle.Fill; + blazorView.Location = new System.Drawing.Point(0, 0); + blazorView.Margin = new System.Windows.Forms.Padding(0); + blazorView.Name = "blazorView"; + blazorView.Size = new System.Drawing.Size(150, 24); + blazorView.StartPath = "/"; + blazorView.TabIndex = 0; + blazorView.Text = "blazorWebView1"; + // + // ResourceDisplay + // + BackColor = System.Drawing.Color.Black; + Controls.Add(blazorView); + ForeColor = System.Drawing.Color.White; + Margin = new System.Windows.Forms.Padding(0); + Name = "ResourceDisplay"; + Size = new System.Drawing.Size(150, 24); + ResumeLayout(false); + } + + #endregion + + private Microsoft.AspNetCore.Components.WebView.WindowsForms.BlazorWebView blazorView; +} diff --git a/FrEee.UI.WinForms/Controls/Blazor/ResourceDisplay.cs b/FrEee.UI.WinForms/Controls/Blazor/ResourceDisplay.cs new file mode 100644 index 000000000..0c1aa978f --- /dev/null +++ b/FrEee.UI.WinForms/Controls/Blazor/ResourceDisplay.cs @@ -0,0 +1,54 @@ +using FrEee.Utility; +using FrEee.Extensions; +using System; +using System.ComponentModel; +using System.Drawing; +using System.Windows.Forms; +using FrEee.UI.Blazor.Views; +using Microsoft.Extensions.DependencyInjection; +using BlazorResourceDisplay = FrEee.UI.Blazor.Views.ResourceDisplay; +using Microsoft.AspNetCore.Components.WebView.WindowsForms; +using System.Collections.Generic; +using FrEee.UI.WinForms.Controls; + +namespace FrEee.UI.WinForms.Controls.Blazor; + +public partial class ResourceDisplay : BlazorControl +{ + public ResourceDisplay() + { + InitializeComponent(); + } + + protected override Type BlazorComponentType { get; } = typeof(BlazorResourceDisplay); + + protected override ResourceDisplayViewModel VM { get; } = new(); + + #region viewmodel property wrappers for winforms + + public int Amount + { + get => VM.Amount; + set => VM.Amount = value; + } + + public int? Change + { + get => VM.Change; + set => VM.Change = value; + } + + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] + public Resource? Resource + { + get => VM.Resource; + set => VM.Resource = value; + } + + public string? ResourceName + { + get => VM.Name; + set => VM.Name = value; + } + #endregion +} diff --git a/FrEee.WinForms/Controls/ResourceDisplay.resx b/FrEee.UI.WinForms/Controls/Blazor/ResourceDisplay.resx similarity index 91% rename from FrEee.WinForms/Controls/ResourceDisplay.resx rename to FrEee.UI.WinForms/Controls/Blazor/ResourceDisplay.resx index 29dcb1b3a..af32865ec 100644 --- a/FrEee.WinForms/Controls/ResourceDisplay.resx +++ b/FrEee.UI.WinForms/Controls/Blazor/ResourceDisplay.resx @@ -1,120 +1,120 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/FrEee.UI.WinForms/Controls/Blazor/ResourceQuantityDisplay.Designer.cs b/FrEee.UI.WinForms/Controls/Blazor/ResourceQuantityDisplay.Designer.cs new file mode 100644 index 000000000..68d7bbee9 --- /dev/null +++ b/FrEee.UI.WinForms/Controls/Blazor/ResourceQuantityDisplay.Designer.cs @@ -0,0 +1,52 @@ +using FrEee.UI.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls.Blazor; + +partial class ResourceQuantityDisplay +{ + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + blazorView = new Microsoft.AspNetCore.Components.WebView.WindowsForms.BlazorWebView(); + SuspendLayout(); + // + // blazorView + // + blazorView.Dock = System.Windows.Forms.DockStyle.Fill; + blazorView.Location = new System.Drawing.Point(0, 0); + blazorView.Margin = new System.Windows.Forms.Padding(0); + blazorView.Name = "blazorView"; + blazorView.Size = new System.Drawing.Size(150, 150); + blazorView.StartPath = "/"; + blazorView.TabIndex = 1; + blazorView.Text = "blazorWebView1"; + // + // ResourceQuantityDisplay + // + Controls.Add(blazorView); + Name = "ResourceQuantityDisplay"; + ResumeLayout(false); + } + + private Microsoft.AspNetCore.Components.WebView.WindowsForms.BlazorWebView blazorView; +} diff --git a/FrEee.UI.WinForms/Controls/Blazor/ResourceQuantityDisplay.cs b/FrEee.UI.WinForms/Controls/Blazor/ResourceQuantityDisplay.cs new file mode 100644 index 000000000..12e4f77c9 --- /dev/null +++ b/FrEee.UI.WinForms/Controls/Blazor/ResourceQuantityDisplay.cs @@ -0,0 +1,44 @@ +using FrEee.Utility; +using FrEee.UI.WinForms.Interfaces; +using System.Windows.Forms; +using Microsoft.AspNetCore.Components.WebView.WindowsForms; +using Microsoft.Extensions.DependencyInjection; +using System.Collections.Generic; +using BlazorResourceQuantityDisplay = FrEee.UI.Blazor.Views.ResourceQuantityDisplay; +using FrEee.UI.Blazor.Views; +using System; +using FrEee.UI.WinForms.Controls; + +namespace FrEee.UI.WinForms.Controls.Blazor; + +public partial class ResourceQuantityDisplay : BlazorControl +{ + public ResourceQuantityDisplay() + { + InitializeComponent(); + } + + protected override Type BlazorComponentType { get; } = typeof(BlazorResourceQuantityDisplay); + + protected override ResourceQuantityDisplayViewModel VM { get; } = new(); + + #region viewmodel property wrappers for winforms + public ResourceQuantity Amounts + { + get => VM.Amounts; + set => VM.Amounts = value; + } + + public ResourceQuantity Changes + { + get => VM.Changes; + set => VM.Changes = value; + } + + public IEnumerable ResourcesToShow + { + get => VM.ResourcesToShow; + set => VM.ResourcesToShow = value; + } + #endregion +} diff --git a/FrEee.WinForms/Controls/ResourceQuantityDisplay.resx b/FrEee.UI.WinForms/Controls/Blazor/ResourceQuantityDisplay.resx similarity index 91% rename from FrEee.WinForms/Controls/ResourceQuantityDisplay.resx rename to FrEee.UI.WinForms/Controls/Blazor/ResourceQuantityDisplay.resx index 29dcb1b3a..af32865ec 100644 --- a/FrEee.WinForms/Controls/ResourceQuantityDisplay.resx +++ b/FrEee.UI.WinForms/Controls/Blazor/ResourceQuantityDisplay.resx @@ -1,120 +1,120 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/FrEee.UI.WinForms/Controls/BlazorControl.cs b/FrEee.UI.WinForms/Controls/BlazorControl.cs new file mode 100644 index 000000000..e8cfe32c4 --- /dev/null +++ b/FrEee.UI.WinForms/Controls/BlazorControl.cs @@ -0,0 +1,74 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using FrEee.UI.WinForms.Utility.Extensions; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.WebView.WindowsForms; +using Microsoft.Extensions.DependencyInjection; + +namespace FrEee.UI.WinForms.Controls +{ + public partial class BlazorControl : Control + { + public BlazorControl() + { + // set up control + SuspendLayout(); + BackColor = Color.Black; + ForeColor = Color.White; + Margin = new(0); + Name = "BlazorControl"; + + // set up Blazor + try + { + var parameters = new Dictionary { ["VM"] = VM }; + var blazorView = new BlazorWebView + { + HostPage = "index.html", + Padding = new(0), + Margin = new(0), + Dock = DockStyle.Fill, + Location = new(0, 0), + Name = "blazorView", + StartPath = "/", + TabIndex = 0, + Text = "blazorWebView1", + AutoScroll = false + }; + blazorView.InitializeServices(); // the code in this method can't go here directly because it crashes th eWinForms designer + blazorView.RootComponents.Add(new RootComponent("#app", BlazorComponentType, parameters)); + Controls.Add(blazorView); + } + catch + { + // Blazor could not be loaded, display a dummy label + VM = new(); + Controls.Add(new Label { Text = "Blazor " + BlazorComponentType.Name, Dock = DockStyle.Fill }); + } + + ResumeLayout(false); + } + + /// + /// The type of Blazor component to display. Should be overridden. + /// + protected virtual Type BlazorComponentType { get; } = typeof(ComponentBase); + + /// + /// The view model for this Blazor control. Should be overridden. + /// + protected virtual object VM { get; } = new(); + + private void InitializeComponent() + { + + } + } +} diff --git a/FrEee.UI.WinForms/Controls/BlazorControl.resx b/FrEee.UI.WinForms/Controls/BlazorControl.resx new file mode 100644 index 000000000..e584a6c07 --- /dev/null +++ b/FrEee.UI.WinForms/Controls/BlazorControl.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + False + + \ No newline at end of file diff --git a/FrEee.WinForms/Controls/Cargolist.Designer.cs b/FrEee.UI.WinForms/Controls/Cargolist.Designer.cs similarity index 95% rename from FrEee.WinForms/Controls/Cargolist.Designer.cs rename to FrEee.UI.WinForms/Controls/Cargolist.Designer.cs index e9cac467a..4a5eb497e 100644 --- a/FrEee.WinForms/Controls/Cargolist.Designer.cs +++ b/FrEee.UI.WinForms/Controls/Cargolist.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; partial class CargoList { diff --git a/FrEee.WinForms/Controls/Cargolist.cs b/FrEee.UI.WinForms/Controls/Cargolist.cs similarity index 96% rename from FrEee.WinForms/Controls/Cargolist.cs rename to FrEee.UI.WinForms/Controls/Cargolist.cs index 4ad38f95c..50d879724 100644 --- a/FrEee.WinForms/Controls/Cargolist.cs +++ b/FrEee.UI.WinForms/Controls/Cargolist.cs @@ -2,15 +2,15 @@ using FrEee.Modding; using FrEee.Utility; using FrEee.Extensions; -using FrEee.WinForms.Interfaces; -using FrEee.WinForms.Utility.Extensions; +using FrEee.UI.WinForms.Interfaces; +using FrEee.UI.WinForms.Utility.Extensions; using System.Collections.Generic; using System.Linq; using System.Windows.Forms; using FrEee.Objects.Civilization.CargoStorage; using FrEee.Objects.Vehicles; -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; public partial class CargoList : UserControl, IBindable, IBindable { diff --git a/FrEee.WinForms/Controls/Cargolist.resx b/FrEee.UI.WinForms/Controls/Cargolist.resx similarity index 100% rename from FrEee.WinForms/Controls/Cargolist.resx rename to FrEee.UI.WinForms/Controls/Cargolist.resx diff --git a/FrEee.WinForms/Controls/ComponentReport.Designer.cs b/FrEee.UI.WinForms/Controls/ComponentReport.Designer.cs similarity index 95% rename from FrEee.WinForms/Controls/ComponentReport.Designer.cs rename to FrEee.UI.WinForms/Controls/ComponentReport.Designer.cs index fbef33631..d1f2a22cc 100644 --- a/FrEee.WinForms/Controls/ComponentReport.Designer.cs +++ b/FrEee.UI.WinForms/Controls/ComponentReport.Designer.cs @@ -1,4 +1,7 @@ -namespace FrEee.WinForms.Controls; +using FrEee.UI.WinForms.Controls.Blazor; +using FrEee.UI.WinForms.Controls; + +namespace FrEee.UI.WinForms.Controls; partial class ComponentReport { @@ -57,13 +60,13 @@ private void InitializeComponent() this.pnlAccuracy = new System.Windows.Forms.Panel(); this.txtAccuracy = new System.Windows.Forms.Label(); this.label16 = new System.Windows.Forms.Label(); - this.resRad = new FrEee.WinForms.Controls.ResourceDisplay(); - this.resOrg = new FrEee.WinForms.Controls.ResourceDisplay(); - this.resMin = new FrEee.WinForms.Controls.ResourceDisplay(); - this.abilityTree = new FrEee.WinForms.Controls.AbilityTreeView(); - this.picPortrait = new FrEee.WinForms.Controls.GamePictureBox(); + this.resRad = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); + this.resOrg = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); + this.resMin = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); + this.abilityTree = new FrEee.UI.WinForms.Controls.AbilityTreeView(); + this.picPortrait = new FrEee.UI.WinForms.Controls.Blazor.GamePictureBox(); this.pnlDamage = new System.Windows.Forms.Panel(); - this.damageGraph = new FrEee.WinForms.Controls.LineGraph(); + this.damageGraph = new FrEee.UI.WinForms.Controls.LineGraph(); this.label11 = new System.Windows.Forms.Label(); this.table.SuspendLayout(); this.pnlWeapon.SuspendLayout(); diff --git a/FrEee.WinForms/Controls/ComponentReport.cs b/FrEee.UI.WinForms/Controls/ComponentReport.cs similarity index 94% rename from FrEee.WinForms/Controls/ComponentReport.cs rename to FrEee.UI.WinForms/Controls/ComponentReport.cs index 531e57e68..9a707576e 100644 --- a/FrEee.WinForms/Controls/ComponentReport.cs +++ b/FrEee.UI.WinForms/Controls/ComponentReport.cs @@ -3,7 +3,7 @@ using FrEee.Modding.Templates; using FrEee.Utility; using FrEee.Extensions; -using FrEee.WinForms.Interfaces; +using FrEee.UI.WinForms.Interfaces; using System; using System.Collections.Generic; using System.Data; @@ -12,7 +12,7 @@ using System.Windows.Forms; using Component = FrEee.Objects.Technology.Component; -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; public partial class ComponentReport : UserControl, IBindable, IBindable, IBindable { diff --git a/FrEee.WinForms/Controls/ComponentReport.resx b/FrEee.UI.WinForms/Controls/ComponentReport.resx similarity index 100% rename from FrEee.WinForms/Controls/ComponentReport.resx rename to FrEee.UI.WinForms/Controls/ComponentReport.resx diff --git a/FrEee.WinForms/Controls/DesignReport.Designer.cs b/FrEee.UI.WinForms/Controls/DesignReport.Designer.cs similarity index 94% rename from FrEee.WinForms/Controls/DesignReport.Designer.cs rename to FrEee.UI.WinForms/Controls/DesignReport.Designer.cs index c1887d180..ce1aa8db2 100644 --- a/FrEee.WinForms/Controls/DesignReport.Designer.cs +++ b/FrEee.UI.WinForms/Controls/DesignReport.Designer.cs @@ -1,4 +1,7 @@ -namespace FrEee.WinForms.Controls; +using FrEee.UI.WinForms.Controls.Blazor; +using FrEee.UI.WinForms.Controls; + +namespace FrEee.UI.WinForms.Controls; partial class DesignReport { @@ -31,9 +34,9 @@ private void InitializeComponent() System.Windows.Forms.ListViewItem listViewItem1 = new System.Windows.Forms.ListViewItem("6x Ion Engine"); System.Windows.Forms.ListViewItem listViewItem2 = new System.Windows.Forms.ListViewItem("2x Phased Shield Generator"); System.Windows.Forms.ListViewItem listViewItem3 = new System.Windows.Forms.ListViewItem("3x Anti-Proton Beam"); - this.tabs = new FrEee.WinForms.Controls.GameTabControl(); + this.tabs = new FrEee.UI.WinForms.Controls.GameTabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); - this.pnlStats = new FrEee.WinForms.Controls.GamePanel(); + this.pnlStats = new FrEee.UI.WinForms.Controls.GamePanel(); this.txtEvasion = new System.Windows.Forms.Label(); this.label18 = new System.Windows.Forms.Label(); this.txtAccuracy = new System.Windows.Forms.Label(); @@ -50,15 +53,15 @@ private void InitializeComponent() this.txtSupplyStorage = new System.Windows.Forms.Label(); this.label17 = new System.Windows.Forms.Label(); this.label12 = new System.Windows.Forms.Label(); - this.resCostRad = new FrEee.WinForms.Controls.ResourceDisplay(); - this.resCostOrg = new FrEee.WinForms.Controls.ResourceDisplay(); - this.resCostMin = new FrEee.WinForms.Controls.ResourceDisplay(); + this.resCostRad = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); + this.resCostOrg = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); + this.resCostMin = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); this.label10 = new System.Windows.Forms.Label(); this.txtDate = new System.Windows.Forms.Label(); this.lblDate = new System.Windows.Forms.Label(); this.txtStrategy = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); - this.picPortrait = new FrEee.WinForms.Controls.GamePictureBox(); + this.picPortrait = new FrEee.UI.WinForms.Controls.Blazor.GamePictureBox(); this.txtRole = new System.Windows.Forms.Label(); this.lblRole = new System.Windows.Forms.Label(); this.txtHull = new System.Windows.Forms.Label(); @@ -67,9 +70,9 @@ private void InitializeComponent() this.txtName = new System.Windows.Forms.Label(); this.tabPage2 = new System.Windows.Forms.TabPage(); this.lstComponents = new System.Windows.Forms.ListView(); - this.resMaintRad = new FrEee.WinForms.Controls.ResourceDisplay(); - this.resMaintOrg = new FrEee.WinForms.Controls.ResourceDisplay(); - this.resMaintMin = new FrEee.WinForms.Controls.ResourceDisplay(); + this.resMaintRad = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); + this.resMaintOrg = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); + this.resMaintMin = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); this.tabs.SuspendLayout(); this.tabPage1.SuspendLayout(); this.pnlStats.SuspendLayout(); diff --git a/FrEee.WinForms/Controls/DesignReport.cs b/FrEee.UI.WinForms/Controls/DesignReport.cs similarity index 94% rename from FrEee.WinForms/Controls/DesignReport.cs rename to FrEee.UI.WinForms/Controls/DesignReport.cs index 454571a9a..2341a10d8 100644 --- a/FrEee.WinForms/Controls/DesignReport.cs +++ b/FrEee.UI.WinForms/Controls/DesignReport.cs @@ -1,13 +1,13 @@ using FrEee.Objects.Technology; using FrEee.Utility; using FrEee.Extensions; -using FrEee.WinForms.Interfaces; -using FrEee.WinForms.Utility.Extensions; +using FrEee.UI.WinForms.Interfaces; +using FrEee.UI.WinForms.Utility.Extensions; using System.Linq; using System.Windows.Forms; using FrEee.Objects.Vehicles; -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; /// /// Displays a report on a vehicle design. diff --git a/FrEee.WinForms/Controls/DesignReport.resx b/FrEee.UI.WinForms/Controls/DesignReport.resx similarity index 100% rename from FrEee.WinForms/Controls/DesignReport.resx rename to FrEee.UI.WinForms/Controls/DesignReport.resx diff --git a/FrEee.WinForms/Controls/EmpireReport.Designer.cs b/FrEee.UI.WinForms/Controls/EmpireReport.Designer.cs similarity index 94% rename from FrEee.WinForms/Controls/EmpireReport.Designer.cs rename to FrEee.UI.WinForms/Controls/EmpireReport.Designer.cs index 3883a374e..6e6f60db9 100644 --- a/FrEee.WinForms/Controls/EmpireReport.Designer.cs +++ b/FrEee.UI.WinForms/Controls/EmpireReport.Designer.cs @@ -1,4 +1,7 @@ -namespace FrEee.WinForms.Controls; +using FrEee.UI.WinForms.Controls.Blazor; +using FrEee.UI.WinForms.Controls; + +namespace FrEee.UI.WinForms.Controls; partial class EmpireReport { @@ -28,7 +31,7 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.gameTabControl1 = new FrEee.WinForms.Controls.GameTabControl(); + this.gameTabControl1 = new FrEee.UI.WinForms.Controls.GameTabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.txtPortrait = new System.Windows.Forms.Label(); this.label7 = new System.Windows.Forms.Label(); @@ -38,9 +41,9 @@ private void InitializeComponent() this.label2 = new System.Windows.Forms.Label(); this.txtCulture = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); - this.picInsignia = new FrEee.WinForms.Controls.GamePictureBox(); + this.picInsignia = new FrEee.UI.WinForms.Controls.Blazor.GamePictureBox(); this.txtName = new System.Windows.Forms.Label(); - this.picPortrait = new FrEee.WinForms.Controls.GamePictureBox(); + this.picPortrait = new FrEee.UI.WinForms.Controls.Blazor.GamePictureBox(); this.tabPage2 = new System.Windows.Forms.TabPage(); this.tabPage3 = new System.Windows.Forms.TabPage(); this.gameTabControl1.SuspendLayout(); diff --git a/FrEee.WinForms/Controls/EmpireReport.cs b/FrEee.UI.WinForms/Controls/EmpireReport.cs similarity index 87% rename from FrEee.WinForms/Controls/EmpireReport.cs rename to FrEee.UI.WinForms/Controls/EmpireReport.cs index ed707fafe..28ceb589f 100644 --- a/FrEee.WinForms/Controls/EmpireReport.cs +++ b/FrEee.UI.WinForms/Controls/EmpireReport.cs @@ -1,8 +1,8 @@ using FrEee.Objects.Civilization; -using FrEee.WinForms.Interfaces; +using FrEee.UI.WinForms.Interfaces; using System.Windows.Forms; -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; public partial class EmpireReport : UserControl, IBindable { diff --git a/FrEee.WinForms/Controls/EmpireReport.resx b/FrEee.UI.WinForms/Controls/EmpireReport.resx similarity index 100% rename from FrEee.WinForms/Controls/EmpireReport.resx rename to FrEee.UI.WinForms/Controls/EmpireReport.resx diff --git a/FrEee.WinForms/Controls/FacilityReport.Designer.cs b/FrEee.UI.WinForms/Controls/FacilityReport.Designer.cs similarity index 89% rename from FrEee.WinForms/Controls/FacilityReport.Designer.cs rename to FrEee.UI.WinForms/Controls/FacilityReport.Designer.cs index 585503d85..23a96e608 100644 --- a/FrEee.WinForms/Controls/FacilityReport.Designer.cs +++ b/FrEee.UI.WinForms/Controls/FacilityReport.Designer.cs @@ -1,4 +1,7 @@ -namespace FrEee.WinForms.Controls; +using FrEee.UI.WinForms.Controls.Blazor; +using FrEee.UI.WinForms.Controls; + +namespace FrEee.UI.WinForms.Controls; partial class FacilityReport { @@ -28,14 +31,14 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.resRad = new FrEee.WinForms.Controls.ResourceDisplay(); - this.resOrg = new FrEee.WinForms.Controls.ResourceDisplay(); - this.resMin = new FrEee.WinForms.Controls.ResourceDisplay(); + this.resRad = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); + this.resOrg = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); + this.resMin = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); this.label2 = new System.Windows.Forms.Label(); this.txtDescription = new System.Windows.Forms.Label(); this.txtName = new System.Windows.Forms.Label(); - this.picPortrait = new FrEee.WinForms.Controls.GamePictureBox(); - this.abilityTree = new FrEee.WinForms.Controls.AbilityTreeView(); + this.picPortrait = new FrEee.UI.WinForms.Controls.Blazor.GamePictureBox(); + this.abilityTree = new FrEee.UI.WinForms.Controls.AbilityTreeView(); ((System.ComponentModel.ISupportInitialize)(this.picPortrait)).BeginInit(); this.SuspendLayout(); // diff --git a/FrEee.WinForms/Controls/FacilityReport.cs b/FrEee.UI.WinForms/Controls/FacilityReport.cs similarity index 91% rename from FrEee.WinForms/Controls/FacilityReport.cs rename to FrEee.UI.WinForms/Controls/FacilityReport.cs index acd4afc47..3c5fb3b36 100644 --- a/FrEee.WinForms/Controls/FacilityReport.cs +++ b/FrEee.UI.WinForms/Controls/FacilityReport.cs @@ -2,11 +2,11 @@ using FrEee.Modding; using FrEee.Utility; using FrEee.Extensions; -using FrEee.WinForms.Interfaces; +using FrEee.UI.WinForms.Interfaces; using System; using System.Windows.Forms; -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; public partial class FacilityReport : UserControl, IBindable, IBindable, IBindable { diff --git a/FrEee.WinForms/Controls/FacilityReport.resx b/FrEee.UI.WinForms/Controls/FacilityReport.resx similarity index 100% rename from FrEee.WinForms/Controls/FacilityReport.resx rename to FrEee.UI.WinForms/Controls/FacilityReport.resx diff --git a/FrEee.WinForms/Controls/FleetReport.Designer.cs b/FrEee.UI.WinForms/Controls/FleetReport.Designer.cs similarity index 92% rename from FrEee.WinForms/Controls/FleetReport.Designer.cs rename to FrEee.UI.WinForms/Controls/FleetReport.Designer.cs index 6710aa276..38494fe74 100644 --- a/FrEee.WinForms/Controls/FleetReport.Designer.cs +++ b/FrEee.UI.WinForms/Controls/FleetReport.Designer.cs @@ -1,4 +1,7 @@ -namespace FrEee.WinForms.Controls; +using FrEee.UI.WinForms.Controls.Blazor; +using FrEee.UI.WinForms.Controls; + +namespace FrEee.UI.WinForms.Controls; partial class FleetReport { @@ -35,35 +38,35 @@ private void InitializeComponent() this.txtAge = new System.Windows.Forms.Label(); this.txtCargoSpaceFree = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); - this.picPortrait = new FrEee.WinForms.Controls.GamePictureBox(); - this.resMaintMin = new FrEee.WinForms.Controls.ResourceDisplay(); + this.picPortrait = new FrEee.UI.WinForms.Controls.Blazor.GamePictureBox(); + this.resMaintMin = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); this.lblComponents = new System.Windows.Forms.Label(); - this.resMaintOrg = new FrEee.WinForms.Controls.ResourceDisplay(); - this.resMaintRad = new FrEee.WinForms.Controls.ResourceDisplay(); + this.resMaintOrg = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); + this.resMaintRad = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); this.lblIncome = new System.Windows.Forms.Label(); this.txtExperience = new System.Windows.Forms.Label(); this.lblExperience = new System.Windows.Forms.Label(); this.txtOrder = new System.Windows.Forms.Label(); this.lblOrder = new System.Windows.Forms.Label(); - this.gamePanel1 = new FrEee.WinForms.Controls.GamePanel(); + this.gamePanel1 = new FrEee.UI.WinForms.Controls.GamePanel(); this.lstVehicleSummary = new System.Windows.Forms.ListView(); this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.pnlStats = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.lblSupplies = new System.Windows.Forms.Label(); - this.progSupplies = new FrEee.WinForms.Controls.GameProgressBar(); + this.progSupplies = new FrEee.UI.WinForms.Controls.Blazor.GameProgressBar(); this.lblAmmunition = new System.Windows.Forms.Label(); - this.progAmmunition = new FrEee.WinForms.Controls.GameProgressBar(); + this.progAmmunition = new FrEee.UI.WinForms.Controls.Blazor.GameProgressBar(); this.label3 = new System.Windows.Forms.Label(); - this.progFuel = new FrEee.WinForms.Controls.GameProgressBar(); + this.progFuel = new FrEee.UI.WinForms.Controls.Blazor.GameProgressBar(); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); - this.progHull = new FrEee.WinForms.Controls.GameProgressBar(); - this.progArmor = new FrEee.WinForms.Controls.GameProgressBar(); + this.progHull = new FrEee.UI.WinForms.Controls.Blazor.GameProgressBar(); + this.progArmor = new FrEee.UI.WinForms.Controls.Blazor.GameProgressBar(); this.lblShields = new System.Windows.Forms.Label(); - this.progShields = new FrEee.WinForms.Controls.GameProgressBar(); + this.progShields = new FrEee.UI.WinForms.Controls.Blazor.GameProgressBar(); this.lblArmor = new System.Windows.Forms.Label(); this.lblHull = new System.Windows.Forms.Label(); - this.progMovement = new FrEee.WinForms.Controls.GameProgressBar(); + this.progMovement = new FrEee.UI.WinForms.Controls.Blazor.GameProgressBar(); this.lblMovement = new System.Windows.Forms.Label(); this.txtHullSize = new System.Windows.Forms.Label(); this.lblHullSize = new System.Windows.Forms.Label(); @@ -75,17 +78,17 @@ private void InitializeComponent() this.pageVehicles = new System.Windows.Forms.TabPage(); this.treeVehicles = new System.Windows.Forms.TreeView(); this.pageAbility = new System.Windows.Forms.TabPage(); - this.abilityTreeView = new FrEee.WinForms.Controls.AbilityTreeView(); - this.gameTabControl1 = new FrEee.WinForms.Controls.GameTabControl(); + this.abilityTreeView = new FrEee.UI.WinForms.Controls.AbilityTreeView(); + this.gameTabControl1 = new FrEee.UI.WinForms.Controls.GameTabControl(); this.pageOrders = new System.Windows.Forms.TabPage(); this.chkOnHold = new System.Windows.Forms.CheckBox(); this.chkRepeat = new System.Windows.Forms.CheckBox(); - this.btnDeleteOrder = new FrEee.WinForms.Controls.GameButton(); - this.btnOrderGoesDown = new FrEee.WinForms.Controls.GameButton(); - this.btnOrderToBottom = new FrEee.WinForms.Controls.GameButton(); - this.btnClearOrders = new FrEee.WinForms.Controls.GameButton(); - this.btnOrderGoesUp = new FrEee.WinForms.Controls.GameButton(); - this.btnOrderToTop = new FrEee.WinForms.Controls.GameButton(); + this.btnDeleteOrder = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnOrderGoesDown = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnOrderToBottom = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnClearOrders = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnOrderGoesUp = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnOrderToTop = new FrEee.UI.WinForms.Controls.GameButton(); this.lstOrdersDetail = new System.Windows.Forms.ListBox(); this.pageDetail.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.picPortrait)).BeginInit(); @@ -390,8 +393,6 @@ private void InitializeComponent() // this.progSupplies.BackColor = System.Drawing.Color.Black; this.progSupplies.BarColor = System.Drawing.Color.Blue; - this.progSupplies.BorderColor = System.Drawing.Color.CornflowerBlue; - this.progSupplies.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.progSupplies.Dock = System.Windows.Forms.DockStyle.Fill; this.progSupplies.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.progSupplies.ForeColor = System.Drawing.Color.White; @@ -402,7 +403,7 @@ private void InitializeComponent() this.progSupplies.Maximum = ((long)(3000)); this.progSupplies.Name = "progSupplies"; this.progSupplies.Padding = new System.Windows.Forms.Padding(5); - this.progSupplies.ProgressDisplayType = FrEee.WinForms.Controls.ProgressDisplayType.Numeric; + this.progSupplies.ProgressDisplayType = FrEee.UI.Blazor.Views.ProgressDisplayType.Numeric; this.progSupplies.RightText = ""; this.progSupplies.Size = new System.Drawing.Size(133, 19); this.progSupplies.TabIndex = 18; @@ -423,8 +424,6 @@ private void InitializeComponent() // this.progAmmunition.BackColor = System.Drawing.Color.Black; this.progAmmunition.BarColor = System.Drawing.Color.Blue; - this.progAmmunition.BorderColor = System.Drawing.Color.CornflowerBlue; - this.progAmmunition.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.progAmmunition.Dock = System.Windows.Forms.DockStyle.Fill; this.progAmmunition.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.progAmmunition.ForeColor = System.Drawing.Color.White; @@ -435,7 +434,7 @@ private void InitializeComponent() this.progAmmunition.Maximum = ((long)(500)); this.progAmmunition.Name = "progAmmunition"; this.progAmmunition.Padding = new System.Windows.Forms.Padding(5); - this.progAmmunition.ProgressDisplayType = FrEee.WinForms.Controls.ProgressDisplayType.Numeric; + this.progAmmunition.ProgressDisplayType = FrEee.UI.Blazor.Views.ProgressDisplayType.Numeric; this.progAmmunition.RightText = ""; this.progAmmunition.Size = new System.Drawing.Size(133, 19); this.progAmmunition.TabIndex = 20; @@ -456,8 +455,6 @@ private void InitializeComponent() // this.progFuel.BackColor = System.Drawing.Color.Black; this.progFuel.BarColor = System.Drawing.Color.Blue; - this.progFuel.BorderColor = System.Drawing.Color.CornflowerBlue; - this.progFuel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.progFuel.Dock = System.Windows.Forms.DockStyle.Fill; this.progFuel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.progFuel.ForeColor = System.Drawing.Color.White; @@ -468,7 +465,7 @@ private void InitializeComponent() this.progFuel.Maximum = ((long)(2000)); this.progFuel.Name = "progFuel"; this.progFuel.Padding = new System.Windows.Forms.Padding(5); - this.progFuel.ProgressDisplayType = FrEee.WinForms.Controls.ProgressDisplayType.Numeric; + this.progFuel.ProgressDisplayType = FrEee.UI.Blazor.Views.ProgressDisplayType.Numeric; this.progFuel.RightText = ""; this.progFuel.Size = new System.Drawing.Size(133, 19); this.progFuel.TabIndex = 22; @@ -505,8 +502,6 @@ private void InitializeComponent() // this.progHull.BackColor = System.Drawing.Color.Black; this.progHull.BarColor = System.Drawing.Color.Blue; - this.progHull.BorderColor = System.Drawing.Color.CornflowerBlue; - this.progHull.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.progHull.Dock = System.Windows.Forms.DockStyle.Fill; this.progHull.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.progHull.ForeColor = System.Drawing.Color.White; @@ -517,7 +512,7 @@ private void InitializeComponent() this.progHull.Maximum = ((long)(200)); this.progHull.Name = "progHull"; this.progHull.Padding = new System.Windows.Forms.Padding(5); - this.progHull.ProgressDisplayType = FrEee.WinForms.Controls.ProgressDisplayType.Numeric; + this.progHull.ProgressDisplayType = FrEee.UI.Blazor.Views.ProgressDisplayType.Numeric; this.progHull.RightText = ""; this.progHull.Size = new System.Drawing.Size(133, 19); this.progHull.TabIndex = 30; @@ -527,8 +522,6 @@ private void InitializeComponent() // this.progArmor.BackColor = System.Drawing.Color.Black; this.progArmor.BarColor = System.Drawing.Color.Blue; - this.progArmor.BorderColor = System.Drawing.Color.CornflowerBlue; - this.progArmor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.progArmor.Dock = System.Windows.Forms.DockStyle.Fill; this.progArmor.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.progArmor.ForeColor = System.Drawing.Color.White; @@ -539,7 +532,7 @@ private void InitializeComponent() this.progArmor.Maximum = ((long)(300)); this.progArmor.Name = "progArmor"; this.progArmor.Padding = new System.Windows.Forms.Padding(5); - this.progArmor.ProgressDisplayType = FrEee.WinForms.Controls.ProgressDisplayType.Numeric; + this.progArmor.ProgressDisplayType = FrEee.UI.Blazor.Views.ProgressDisplayType.Numeric; this.progArmor.RightText = ""; this.progArmor.Size = new System.Drawing.Size(133, 19); this.progArmor.TabIndex = 29; @@ -560,8 +553,6 @@ private void InitializeComponent() // this.progShields.BackColor = System.Drawing.Color.Black; this.progShields.BarColor = System.Drawing.Color.Blue; - this.progShields.BorderColor = System.Drawing.Color.CornflowerBlue; - this.progShields.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.progShields.Dock = System.Windows.Forms.DockStyle.Fill; this.progShields.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.progShields.ForeColor = System.Drawing.Color.White; @@ -572,7 +563,7 @@ private void InitializeComponent() this.progShields.Maximum = ((long)(200)); this.progShields.Name = "progShields"; this.progShields.Padding = new System.Windows.Forms.Padding(5); - this.progShields.ProgressDisplayType = FrEee.WinForms.Controls.ProgressDisplayType.Numeric; + this.progShields.ProgressDisplayType = FrEee.UI.Blazor.Views.ProgressDisplayType.Numeric; this.progShields.RightText = ""; this.progShields.Size = new System.Drawing.Size(133, 19); this.progShields.TabIndex = 24; @@ -604,8 +595,6 @@ private void InitializeComponent() // this.progMovement.BackColor = System.Drawing.Color.Black; this.progMovement.BarColor = System.Drawing.Color.Blue; - this.progMovement.BorderColor = System.Drawing.Color.CornflowerBlue; - this.progMovement.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.progMovement.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); this.progMovement.ForeColor = System.Drawing.Color.White; this.progMovement.IncrementalProgress = ((long)(0)); @@ -615,7 +604,7 @@ private void InitializeComponent() this.progMovement.Maximum = ((long)(6)); this.progMovement.Name = "progMovement"; this.progMovement.Padding = new System.Windows.Forms.Padding(5); - this.progMovement.ProgressDisplayType = FrEee.WinForms.Controls.ProgressDisplayType.Numeric; + this.progMovement.ProgressDisplayType = FrEee.UI.Blazor.Views.ProgressDisplayType.Numeric; this.progMovement.RightText = ""; this.progMovement.Size = new System.Drawing.Size(103, 18); this.progMovement.TabIndex = 18; diff --git a/FrEee.WinForms/Controls/FleetReport.cs b/FrEee.UI.WinForms/Controls/FleetReport.cs similarity index 95% rename from FrEee.WinForms/Controls/FleetReport.cs rename to FrEee.UI.WinForms/Controls/FleetReport.cs index 041b25df0..850f53392 100644 --- a/FrEee.WinForms/Controls/FleetReport.cs +++ b/FrEee.UI.WinForms/Controls/FleetReport.cs @@ -4,15 +4,15 @@ using FrEee.Objects.Vehicles; using FrEee.Utility; using FrEee.Extensions; -using FrEee.WinForms.Interfaces; -using FrEee.WinForms.Utility.Extensions; +using FrEee.UI.WinForms.Interfaces; +using FrEee.UI.WinForms.Utility.Extensions; using System; using System.Drawing; using System.Linq; using System.Windows.Forms; using FrEee.Objects.Civilization.Orders; -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; /// /// A report on a ship or base. diff --git a/FrEee.WinForms/Controls/FleetReport.resx b/FrEee.UI.WinForms/Controls/FleetReport.resx similarity index 100% rename from FrEee.WinForms/Controls/FleetReport.resx rename to FrEee.UI.WinForms/Controls/FleetReport.resx diff --git a/FrEee.WinForms/Controls/GalaxyView.Designer.cs b/FrEee.UI.WinForms/Controls/GalaxyView.Designer.cs similarity index 93% rename from FrEee.WinForms/Controls/GalaxyView.Designer.cs rename to FrEee.UI.WinForms/Controls/GalaxyView.Designer.cs index d183647d3..52aa49c2b 100644 --- a/FrEee.WinForms/Controls/GalaxyView.Designer.cs +++ b/FrEee.UI.WinForms/Controls/GalaxyView.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; partial class GalaxyView { diff --git a/FrEee.WinForms/Controls/GalaxyView.cs b/FrEee.UI.WinForms/Controls/GalaxyView.cs similarity index 69% rename from FrEee.WinForms/Controls/GalaxyView.cs rename to FrEee.UI.WinForms/Controls/GalaxyView.cs index 763f63a91..432474e44 100644 --- a/FrEee.WinForms/Controls/GalaxyView.cs +++ b/FrEee.UI.WinForms/Controls/GalaxyView.cs @@ -1,71 +1,74 @@ using FrEee.Objects.Space; using FrEee.Utility; using FrEee.Extensions; -using FrEee.WinForms.Objects.GalaxyViewModes; +using FrEee.UI.WinForms.Objects.GalaxyViewModes; using System; using System.Drawing; using System.Linq; using System.Windows.Forms; using FrEee.Objects.GameState; +using FrEee.UI.Blazor.Views; +using System.Threading.Tasks; +using FrEee.UI.WinForms.Forms; +using FrEee.UI.Blazor.Views.GalaxyMapModes; -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; /// /// Displays a galaxy map. /// -public partial class GalaxyView : Control +public partial class GalaxyView : BlazorControl { public GalaxyView() { InitializeComponent(); + + // set up view model + VM.StarSystemClicked = starSystem => + { + // HACK: https://github.com/MicrosoftEdge/WebView2Feedback/issues/3028#issuecomment-1461207168 + Task.Delay(0).ContinueWith(_ => MainGameForm.Instance.Invoke(() => + { + StarSystemClicked?.Invoke(this, starSystem); + StarSystemSelected?.Invoke(this, starSystem); + })); + }; + BackColor = Color.Black; this.SizeChanged += GalaxyView_SizeChanged; - this.MouseDown += GalaxyView_MouseDown; this.MouseMove += GalaxyView_MouseMove; DoubleBuffered = true; } + protected override Type BlazorComponentType { get; } = typeof(GalaxyMap); + + protected override GalaxyMapViewModel VM { get; } = new(); + + #region viewmodel property wrappers for winforms /// /// An image to display as the background for this galaxy view. /// public override Image? BackgroundImage { - get - { - return backgroundImage; - } - set - { - backgroundImage = value; - Invalidate(); - } + get => VM.BackgroundImage; + set => VM.BackgroundImage = value; } - public IGalaxyViewMode Mode + public IGalaxyMapMode Mode { - get - { - return mode; - } - set - { - mode = value; - Invalidate(); - } + get => VM.Mode; + set => VM.Mode = value; } - public StarSystem SelectedStarSystem + public StarSystem? SelectedStarSystem { - get { return selectedStarSystem; } - set - { - selectedStarSystem = value; - if (StarSystemSelected != null) - StarSystemSelected(this, value); - Invalidate(); - } + get => VM.SelectedStarSystem; + set => VM.SelectedStarSystem = value; } + public void ComputeWarpPointConnectivity() => VM.ComputeWarpPointConnectivity(); + #endregion + /// /// The size at which each star system will be drawn, in pixels. /// @@ -73,33 +76,9 @@ public int StarSystemDrawSize { get { - if (Galaxy.Current == null) + if (!VM.StarSystemLocations.Any()) return 0; - return (int)Math.Min((float)Width / (float)Galaxy.Current.UsedWidth, (float)Height / Galaxy.Current.UsedHeight); - } - } - - private Image? backgroundImage; - - private IGalaxyViewMode mode = GalaxyViewModes.All.First(); - - private StarSystem selectedStarSystem; - - private ConnectivityGraph> warpGraph; - - public void ComputeWarpPointConnectivity() - { - warpGraph = new ConnectivityGraph>(Galaxy.Current.StarSystemLocations); - - foreach (var ssl in warpGraph) - { - foreach (var wp in ssl.Item.FindSpaceObjects()) - { - if (wp.TargetStarSystemLocation == null) - continue; // can't make connection if we don't know where warp point ends! - - warpGraph.Connect(ssl, wp.TargetStarSystemLocation); - } + return (int)Math.Min((float)Width / (float)VM.Width, (float)Height / VM.Height); } } @@ -108,22 +87,23 @@ public void ComputeWarpPointConnectivity() /// /// The screen coordinates. /// - public StarSystem GetStarSystemAtPoint(Point p) + public StarSystem? GetStarSystemAtPoint(Point p) { - if (Galaxy.Current == null) - return null; // no such sector var drawsize = StarSystemDrawSize; - var avgx = (Galaxy.Current.StarSystemLocations.Min(l => l.Location.X) + Galaxy.Current.StarSystemLocations.Max(l => l.Location.X)) / 2f; - var avgy = (Galaxy.Current.StarSystemLocations.Min(l => l.Location.Y) + Galaxy.Current.StarSystemLocations.Max(l => l.Location.Y)) / 2f; - var x = (int)Math.Round(((float)p.X - Width / 2f) / drawsize + avgx); - var y = (int)Math.Round(((float)p.Y - Height / 2f) / drawsize + avgy); - var p2 = new Point(x, y); - var ssloc = Galaxy.Current.StarSystemLocations.FirstOrDefault(ssl => ssl.Location == p2); - if (ssloc == null) + if (drawsize == 0) + { return null; - return ssloc.Item; + } + var midx = (VM.StarSystemLocations.Min(l => l.Location.X) + VM.StarSystemLocations.Max(l => l.Location.X)) / 2f; + var midy = (VM.StarSystemLocations.Min(l => l.Location.Y) + VM.StarSystemLocations.Max(l => l.Location.Y)) / 2f; + var x = (int)Math.Round(((float)p.X - Width / 2f) / drawsize + midx); + var y = (int)Math.Round(((float)p.Y - Height / 2f) / drawsize + midy); + var p2 = new Point(x, y); + var ssloc = VM.StarSystemLocations.FirstOrDefault(ssl => ssl.Location == p2); + return ssloc?.Item; } + /* protected override void OnPaint(PaintEventArgs pe) { base.OnPaint(pe); @@ -191,15 +171,15 @@ protected override void OnPaint(PaintEventArgs pe) pe.Graphics.DrawImage(backgroundImage, x, y, w, h); } - if (Galaxy.Current != null) + if (VM.Galaxy != null) { var drawsize = StarSystemDrawSize; var whitePen = new Pen(Color.White); // draw star systems - var avgx = (Galaxy.Current.StarSystemLocations.Min(l => l.Location.X) + Galaxy.Current.StarSystemLocations.Max(l => l.Location.X)) / 2f; - var avgy = (Galaxy.Current.StarSystemLocations.Min(l => l.Location.Y) + Galaxy.Current.StarSystemLocations.Max(l => l.Location.Y)) / 2f; - foreach (var ssl in Galaxy.Current.StarSystemLocations) + var avgx = (VM.Galaxy.StarSystemLocations.Min(l => l.Location.X) + VM.Galaxy.StarSystemLocations.Max(l => l.Location.X)) / 2f; + var avgy = (VM.Galaxy.StarSystemLocations.Min(l => l.Location.Y) + VM.Galaxy.StarSystemLocations.Max(l => l.Location.Y)) / 2f; + foreach (var ssl in VM.Galaxy.StarSystemLocations) { // where will we draw the star system? var x = ssl.Location.X;// - minx; @@ -277,15 +257,11 @@ protected override void OnPaint(PaintEventArgs pe) } } } + */ - private void GalaxyView_MouseDown(object sender, MouseEventArgs e) - { - if (StarSystemClicked != null) - StarSystemClicked(this, GetStarSystemAtPoint(e.Location)); - } - - private void GalaxyView_MouseMove(object sender, MouseEventArgs e) + private void GalaxyView_MouseMove(object? sender, MouseEventArgs e) { + // TODO: translate tooltips to Blazor var sys = GetStarSystemAtPoint(e.Location); if (sys == null) toolTip.SetToolTip(this, null); @@ -293,7 +269,7 @@ private void GalaxyView_MouseMove(object sender, MouseEventArgs e) toolTip.SetToolTip(this, sys.Name); } - private void GalaxyView_SizeChanged(object sender, EventArgs e) + private void GalaxyView_SizeChanged(object? sender, EventArgs e) { Invalidate(); } @@ -308,6 +284,11 @@ private void GalaxyView_SizeChanged(object sender, EventArgs e) /// public event StarSystemSelectionDelegate StarSystemSelected; + /// + /// The background has been clicked. + /// + public event Action BackgroundClicked; + /// /// Delegate for events related to star system selection. /// diff --git a/FrEee.WinForms/Controls/GalaxyView.resx b/FrEee.UI.WinForms/Controls/GalaxyView.resx similarity index 100% rename from FrEee.WinForms/Controls/GalaxyView.resx rename to FrEee.UI.WinForms/Controls/GalaxyView.resx diff --git a/FrEee.WinForms/Controls/GameButton.Designer.cs b/FrEee.UI.WinForms/Controls/GameButton.Designer.cs similarity index 91% rename from FrEee.WinForms/Controls/GameButton.Designer.cs rename to FrEee.UI.WinForms/Controls/GameButton.Designer.cs index d2cd3f5a9..73b6ecc2e 100644 --- a/FrEee.WinForms/Controls/GameButton.Designer.cs +++ b/FrEee.UI.WinForms/Controls/GameButton.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; partial class GameButton { diff --git a/FrEee.WinForms/Controls/GameButton.cs b/FrEee.UI.WinForms/Controls/GameButton.cs similarity index 94% rename from FrEee.WinForms/Controls/GameButton.cs rename to FrEee.UI.WinForms/Controls/GameButton.cs index dbb6b193e..f879d47e8 100644 --- a/FrEee.WinForms/Controls/GameButton.cs +++ b/FrEee.UI.WinForms/Controls/GameButton.cs @@ -1,7 +1,7 @@ using System.Drawing; using System.Windows.Forms; -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; public partial class GameButton : Button { diff --git a/FrEee.WinForms/Controls/GameGridView.Designer.cs b/FrEee.UI.WinForms/Controls/GameGridView.Designer.cs similarity index 95% rename from FrEee.WinForms/Controls/GameGridView.Designer.cs rename to FrEee.UI.WinForms/Controls/GameGridView.Designer.cs index 89a73ed81..cdb7dbb64 100644 --- a/FrEee.WinForms/Controls/GameGridView.Designer.cs +++ b/FrEee.UI.WinForms/Controls/GameGridView.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; partial class GameGridView { @@ -38,12 +38,12 @@ private void InitializeComponent() this.atLeastToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.atMostToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.clearAllFiltersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.pnlConfigsBorder = new FrEee.WinForms.Controls.GamePanel(); + this.pnlConfigsBorder = new FrEee.UI.WinForms.Controls.GamePanel(); this.pnlConfigs = new System.Windows.Forms.FlowLayoutPanel(); - this.pnlConfigEdit = new FrEee.WinForms.Controls.GamePanel(); - this.btnReset = new FrEee.WinForms.Controls.GameButton(); - this.btnColumns = new FrEee.WinForms.Controls.GameButton(); - this.btnDeleteConfig = new FrEee.WinForms.Controls.GameButton(); + this.pnlConfigEdit = new FrEee.UI.WinForms.Controls.GamePanel(); + this.btnReset = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnColumns = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnDeleteConfig = new FrEee.UI.WinForms.Controls.GameButton(); this.label17 = new System.Windows.Forms.Label(); this.txtConfigName = new System.Windows.Forms.TextBox(); ((System.ComponentModel.ISupportInitialize)(this.gridData)).BeginInit(); diff --git a/FrEee.WinForms/Controls/GameGridView.cs b/FrEee.UI.WinForms/Controls/GameGridView.cs similarity index 96% rename from FrEee.WinForms/Controls/GameGridView.cs rename to FrEee.UI.WinForms/Controls/GameGridView.cs index 27fa5d9d9..f12b5dfe9 100644 --- a/FrEee.WinForms/Controls/GameGridView.cs +++ b/FrEee.UI.WinForms/Controls/GameGridView.cs @@ -1,5 +1,5 @@ using FrEee.Extensions; -using FrEee.WinForms.DataGridView; +using FrEee.UI.WinForms.DataGridView; using System; using System.Collections.Generic; using System.Data; @@ -7,7 +7,7 @@ using System.Linq; using System.Windows.Forms; -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; public partial class GameGridView : UserControl { diff --git a/FrEee.WinForms/Controls/GameGridView.resx b/FrEee.UI.WinForms/Controls/GameGridView.resx similarity index 100% rename from FrEee.WinForms/Controls/GameGridView.resx rename to FrEee.UI.WinForms/Controls/GameGridView.resx diff --git a/FrEee.WinForms/Controls/GamePanel.Designer.cs b/FrEee.UI.WinForms/Controls/GamePanel.Designer.cs similarity index 91% rename from FrEee.WinForms/Controls/GamePanel.Designer.cs rename to FrEee.UI.WinForms/Controls/GamePanel.Designer.cs index 76c893c79..599ed9e2e 100644 --- a/FrEee.WinForms/Controls/GamePanel.Designer.cs +++ b/FrEee.UI.WinForms/Controls/GamePanel.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; partial class GamePanel { diff --git a/FrEee.WinForms/Controls/GamePanel.cs b/FrEee.UI.WinForms/Controls/GamePanel.cs similarity index 92% rename from FrEee.WinForms/Controls/GamePanel.cs rename to FrEee.UI.WinForms/Controls/GamePanel.cs index 81841f8c0..715998e78 100644 --- a/FrEee.WinForms/Controls/GamePanel.cs +++ b/FrEee.UI.WinForms/Controls/GamePanel.cs @@ -2,7 +2,7 @@ using System.Drawing; using System.Windows.Forms; -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; public partial class GamePanel : Panel { diff --git a/FrEee.WinForms/Controls/GameTabControl.Designer.cs b/FrEee.UI.WinForms/Controls/GameTabControl.Designer.cs similarity index 91% rename from FrEee.WinForms/Controls/GameTabControl.Designer.cs rename to FrEee.UI.WinForms/Controls/GameTabControl.Designer.cs index 5833e67a9..140b7a8e5 100644 --- a/FrEee.WinForms/Controls/GameTabControl.Designer.cs +++ b/FrEee.UI.WinForms/Controls/GameTabControl.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; partial class GameTabControl { diff --git a/FrEee.WinForms/Controls/GameTabControl.cs b/FrEee.UI.WinForms/Controls/GameTabControl.cs similarity index 94% rename from FrEee.WinForms/Controls/GameTabControl.cs rename to FrEee.UI.WinForms/Controls/GameTabControl.cs index 9d98df293..4b3273d9f 100644 --- a/FrEee.WinForms/Controls/GameTabControl.cs +++ b/FrEee.UI.WinForms/Controls/GameTabControl.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Windows.Forms; -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; public partial class GameTabControl : TabControl { diff --git a/FrEee.WinForms/Controls/GameTableLayoutPanel.Designer.cs b/FrEee.UI.WinForms/Controls/GameTableLayoutPanel.Designer.cs similarity index 91% rename from FrEee.WinForms/Controls/GameTableLayoutPanel.Designer.cs rename to FrEee.UI.WinForms/Controls/GameTableLayoutPanel.Designer.cs index f513e65a4..7cc25c7bc 100644 --- a/FrEee.WinForms/Controls/GameTableLayoutPanel.Designer.cs +++ b/FrEee.UI.WinForms/Controls/GameTableLayoutPanel.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; partial class GameTableLayoutPanel { diff --git a/FrEee.WinForms/Controls/GameTableLayoutPanel.cs b/FrEee.UI.WinForms/Controls/GameTableLayoutPanel.cs similarity index 78% rename from FrEee.WinForms/Controls/GameTableLayoutPanel.cs rename to FrEee.UI.WinForms/Controls/GameTableLayoutPanel.cs index 6f6dbb96a..846b9ed9b 100644 --- a/FrEee.WinForms/Controls/GameTableLayoutPanel.cs +++ b/FrEee.UI.WinForms/Controls/GameTableLayoutPanel.cs @@ -1,6 +1,6 @@ using System.Windows.Forms; -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; public partial class GameTableLayoutPanel : TableLayoutPanel { diff --git a/FrEee.WinForms/Controls/LineGraph.Designer.cs b/FrEee.UI.WinForms/Controls/LineGraph.Designer.cs similarity index 91% rename from FrEee.WinForms/Controls/LineGraph.Designer.cs rename to FrEee.UI.WinForms/Controls/LineGraph.Designer.cs index e1c668d6d..eb7cb99b1 100644 --- a/FrEee.WinForms/Controls/LineGraph.Designer.cs +++ b/FrEee.UI.WinForms/Controls/LineGraph.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; partial class LineGraph { diff --git a/FrEee.WinForms/Controls/LineGraph.cs b/FrEee.UI.WinForms/Controls/LineGraph.cs similarity index 95% rename from FrEee.WinForms/Controls/LineGraph.cs rename to FrEee.UI.WinForms/Controls/LineGraph.cs index 3eb14a407..d71993c81 100644 --- a/FrEee.WinForms/Controls/LineGraph.cs +++ b/FrEee.UI.WinForms/Controls/LineGraph.cs @@ -5,7 +5,7 @@ using System.Windows.Forms; using FrEee.Extensions; -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; public partial class LineGraph : Control { diff --git a/FrEee.WinForms/Controls/MountReport.Designer.cs b/FrEee.UI.WinForms/Controls/MountReport.Designer.cs similarity index 96% rename from FrEee.WinForms/Controls/MountReport.Designer.cs rename to FrEee.UI.WinForms/Controls/MountReport.Designer.cs index 65b5c2d8b..d2b82f7af 100644 --- a/FrEee.WinForms/Controls/MountReport.Designer.cs +++ b/FrEee.UI.WinForms/Controls/MountReport.Designer.cs @@ -1,4 +1,7 @@ -namespace FrEee.WinForms.Controls; +using FrEee.UI.WinForms.Controls.Blazor; +using FrEee.UI.WinForms.Controls; + +namespace FrEee.UI.WinForms.Controls; partial class MountReport { @@ -55,11 +58,11 @@ private void InitializeComponent() this.label1 = new System.Windows.Forms.Label(); this.txtComponentFamily = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); - this.gamePanel1 = new FrEee.WinForms.Controls.GamePanel(); + this.gamePanel1 = new FrEee.UI.WinForms.Controls.GamePanel(); this.lstAbilities = new System.Windows.Forms.ListView(); this.colAbility = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.colModifier = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.picPortrait = new FrEee.WinForms.Controls.GamePictureBox(); + this.picPortrait = new FrEee.UI.WinForms.Controls.Blazor.GamePictureBox(); this.gamePanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.picPortrait)).BeginInit(); this.SuspendLayout(); diff --git a/FrEee.WinForms/Controls/MountReport.cs b/FrEee.UI.WinForms/Controls/MountReport.cs similarity index 94% rename from FrEee.WinForms/Controls/MountReport.cs rename to FrEee.UI.WinForms/Controls/MountReport.cs index 03368ad35..db2c9d589 100644 --- a/FrEee.WinForms/Controls/MountReport.cs +++ b/FrEee.UI.WinForms/Controls/MountReport.cs @@ -2,15 +2,15 @@ using FrEee.Modding; using FrEee.Utility; using FrEee.Extensions; -using FrEee.WinForms.Interfaces; -using FrEee.WinForms.Utility.Extensions; +using FrEee.UI.WinForms.Interfaces; +using FrEee.UI.WinForms.Utility.Extensions; using System; using System.Data; using System.Drawing; using System.Linq; using System.Windows.Forms; -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; public partial class MountReport : UserControl, IBindable { diff --git a/FrEee.WinForms/Controls/MountReport.resx b/FrEee.UI.WinForms/Controls/MountReport.resx similarity index 100% rename from FrEee.WinForms/Controls/MountReport.resx rename to FrEee.UI.WinForms/Controls/MountReport.resx diff --git a/FrEee.WinForms/Controls/Pager.Designer.cs b/FrEee.UI.WinForms/Controls/Pager.Designer.cs similarity index 97% rename from FrEee.WinForms/Controls/Pager.Designer.cs rename to FrEee.UI.WinForms/Controls/Pager.Designer.cs index 5adcd8d8f..388c35881 100644 --- a/FrEee.WinForms/Controls/Pager.Designer.cs +++ b/FrEee.UI.WinForms/Controls/Pager.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; partial class Pager { diff --git a/FrEee.WinForms/Controls/Pager.cs b/FrEee.UI.WinForms/Controls/Pager.cs similarity index 93% rename from FrEee.WinForms/Controls/Pager.cs rename to FrEee.UI.WinForms/Controls/Pager.cs index 3ba7b1ad8..d45818836 100644 --- a/FrEee.WinForms/Controls/Pager.cs +++ b/FrEee.UI.WinForms/Controls/Pager.cs @@ -3,7 +3,7 @@ using System.Drawing; using System.Windows.Forms; -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; public partial class Pager : UserControl { diff --git a/FrEee.WinForms/Controls/Pager.resx b/FrEee.UI.WinForms/Controls/Pager.resx similarity index 100% rename from FrEee.WinForms/Controls/Pager.resx rename to FrEee.UI.WinForms/Controls/Pager.resx diff --git a/FrEee.WinForms/Controls/PlanetReport.Designer.cs b/FrEee.UI.WinForms/Controls/PlanetReport.Designer.cs similarity index 95% rename from FrEee.WinForms/Controls/PlanetReport.Designer.cs rename to FrEee.UI.WinForms/Controls/PlanetReport.Designer.cs index a375a8b4f..05f8e43d8 100644 --- a/FrEee.WinForms/Controls/PlanetReport.Designer.cs +++ b/FrEee.UI.WinForms/Controls/PlanetReport.Designer.cs @@ -1,4 +1,7 @@ -namespace FrEee.WinForms.Controls; +using FrEee.UI.WinForms.Controls.Blazor; +using FrEee.UI.WinForms.Controls; + +namespace FrEee.UI.WinForms.Controls; partial class PlanetReport { @@ -36,17 +39,17 @@ private void InitializeComponent() System.Windows.Forms.ListViewItem listViewItem6 = new System.Windows.Forms.ListViewItem("1000M Eee (Jubilant: 0)"); System.Windows.Forms.ListViewItem listViewItem7 = new System.Windows.Forms.ListViewItem("10x \"Buster\" class Weapon Platform"); System.Windows.Forms.ListViewItem listViewItem8 = new System.Windows.Forms.ListViewItem("500x \"Guard\" class Troop"); - this.gameTabControl1 = new FrEee.WinForms.Controls.GameTabControl(); + this.gameTabControl1 = new FrEee.UI.WinForms.Controls.GameTabControl(); this.pageDetail = new System.Windows.Forms.TabPage(); this.txtAge = new System.Windows.Forms.Label(); - this.picPortrait = new FrEee.WinForms.Controls.GamePictureBox(); - this.pnlColony = new FrEee.WinForms.Controls.GamePanel(); + this.picPortrait = new FrEee.UI.WinForms.Controls.Blazor.GamePictureBox(); + this.pnlColony = new FrEee.UI.WinForms.Controls.GamePanel(); this.txtConstructionTime = new System.Windows.Forms.Label(); this.lblConstructionTime = new System.Windows.Forms.Label(); this.txtConstructionItem = new System.Windows.Forms.Label(); this.lblConstructionItem = new System.Windows.Forms.Label(); - this.resIntel = new FrEee.WinForms.Controls.ResourceDisplay(); - this.resResearch = new FrEee.WinForms.Controls.ResourceDisplay(); + this.resIntel = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); + this.resResearch = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); this.label1 = new System.Windows.Forms.Label(); this.txtMood = new System.Windows.Forms.Label(); this.lblMood = new System.Windows.Forms.Label(); @@ -54,9 +57,9 @@ private void InitializeComponent() this.lblPopulation = new System.Windows.Forms.Label(); this.txtColonyType = new System.Windows.Forms.Label(); this.lblColonyType = new System.Windows.Forms.Label(); - this.resIncomeMinerals = new FrEee.WinForms.Controls.ResourceDisplay(); - this.resIncomeOrganics = new FrEee.WinForms.Controls.ResourceDisplay(); - this.resIncomeRadioactives = new FrEee.WinForms.Controls.ResourceDisplay(); + this.resIncomeMinerals = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); + this.resIncomeOrganics = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); + this.resIncomeRadioactives = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); this.lblIncome = new System.Windows.Forms.Label(); this.txtDescription = new System.Windows.Forms.Label(); this.txtValueRadioactives = new System.Windows.Forms.Label(); @@ -82,13 +85,13 @@ private void InitializeComponent() this.pageOrders = new System.Windows.Forms.TabPage(); this.chkOnHold = new System.Windows.Forms.CheckBox(); this.chkRepeat = new System.Windows.Forms.CheckBox(); - this.btnOrdersClear = new FrEee.WinForms.Controls.GameButton(); - this.btnOrderDelete = new FrEee.WinForms.Controls.GameButton(); - this.btnOrderDown = new FrEee.WinForms.Controls.GameButton(); - this.btnOrderUp = new FrEee.WinForms.Controls.GameButton(); + this.btnOrdersClear = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnOrderDelete = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnOrderDown = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnOrderUp = new FrEee.UI.WinForms.Controls.GameButton(); this.lstOrdersDetail = new System.Windows.Forms.ListBox(); this.pageAbility = new System.Windows.Forms.TabPage(); - this.abilityTreeView = new FrEee.WinForms.Controls.AbilityTreeView(); + this.abilityTreeView = new FrEee.UI.WinForms.Controls.AbilityTreeView(); this.gameTabControl1.SuspendLayout(); this.pageDetail.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.picPortrait)).BeginInit(); diff --git a/FrEee.WinForms/Controls/PlanetReport.cs b/FrEee.UI.WinForms/Controls/PlanetReport.cs similarity index 95% rename from FrEee.WinForms/Controls/PlanetReport.cs rename to FrEee.UI.WinForms/Controls/PlanetReport.cs index 374b14336..37e60101d 100644 --- a/FrEee.WinForms/Controls/PlanetReport.cs +++ b/FrEee.UI.WinForms/Controls/PlanetReport.cs @@ -4,15 +4,15 @@ using FrEee.Objects.Technology; using FrEee.Utility; using FrEee.Extensions; -using FrEee.WinForms.Interfaces; -using FrEee.WinForms.Utility.Extensions; +using FrEee.UI.WinForms.Interfaces; +using FrEee.UI.WinForms.Utility.Extensions; using System; using System.Drawing; using System.Linq; using System.Windows.Forms; using FrEee.Objects.GameState; -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; public partial class PlanetReport : UserControl, IBindable { diff --git a/FrEee.WinForms/Controls/PlanetReport.resx b/FrEee.UI.WinForms/Controls/PlanetReport.resx similarity index 100% rename from FrEee.WinForms/Controls/PlanetReport.resx rename to FrEee.UI.WinForms/Controls/PlanetReport.resx diff --git a/FrEee.WinForms/Controls/SearchBox.Designer.cs b/FrEee.UI.WinForms/Controls/SearchBox.Designer.cs similarity index 95% rename from FrEee.WinForms/Controls/SearchBox.Designer.cs rename to FrEee.UI.WinForms/Controls/SearchBox.Designer.cs index 59c499267..d12fa59c2 100644 --- a/FrEee.WinForms/Controls/SearchBox.Designer.cs +++ b/FrEee.UI.WinForms/Controls/SearchBox.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; partial class SearchBox { diff --git a/FrEee.WinForms/Controls/SearchBox.cs b/FrEee.UI.WinForms/Controls/SearchBox.cs similarity index 94% rename from FrEee.WinForms/Controls/SearchBox.cs rename to FrEee.UI.WinForms/Controls/SearchBox.cs index 13a422932..0af9fd982 100644 --- a/FrEee.WinForms/Controls/SearchBox.cs +++ b/FrEee.UI.WinForms/Controls/SearchBox.cs @@ -1,13 +1,13 @@ using FrEee.Objects.Space; using FrEee.Extensions; -using FrEee.WinForms.Forms; +using FrEee.UI.WinForms.Forms; using System; using System.Collections.Generic; using System.Data; using System.Linq; using System.Windows.Forms; -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; public partial class SearchBox : UserControl { diff --git a/FrEee.WinForms/Controls/SearchBox.resx b/FrEee.UI.WinForms/Controls/SearchBox.resx similarity index 100% rename from FrEee.WinForms/Controls/SearchBox.resx rename to FrEee.UI.WinForms/Controls/SearchBox.resx diff --git a/FrEee.WinForms/Controls/SpaceVehicleReport.Designer.cs b/FrEee.UI.WinForms/Controls/SpaceVehicleReport.Designer.cs similarity index 93% rename from FrEee.WinForms/Controls/SpaceVehicleReport.Designer.cs rename to FrEee.UI.WinForms/Controls/SpaceVehicleReport.Designer.cs index 2a60cf267..39bfa18bd 100644 --- a/FrEee.WinForms/Controls/SpaceVehicleReport.Designer.cs +++ b/FrEee.UI.WinForms/Controls/SpaceVehicleReport.Designer.cs @@ -1,4 +1,7 @@ -namespace FrEee.WinForms.Controls; +using FrEee.UI.WinForms.Controls.Blazor; +using FrEee.UI.WinForms.Controls; + +namespace FrEee.UI.WinForms.Controls; partial class SpaceVehicleReport { @@ -40,20 +43,20 @@ private void InitializeComponent() System.Windows.Forms.ListViewItem listViewItem10 = new System.Windows.Forms.ListViewItem("3x \"Buster\" class Weapon Platform"); System.Windows.Forms.ListViewItem listViewItem11 = new System.Windows.Forms.ListViewItem("10x \"Guard\" class Troop"); System.Windows.Forms.ListViewItem listViewItem12 = new System.Windows.Forms.ListViewItem("100x Eee Population"); - this.gameTabControl1 = new FrEee.WinForms.Controls.GameTabControl(); + this.gameTabControl1 = new FrEee.UI.WinForms.Controls.GameTabControl(); this.pageDetail = new System.Windows.Forms.TabPage(); this.panel1 = new System.Windows.Forms.Panel(); this.txtAge = new System.Windows.Forms.Label(); - this.picPortrait = new FrEee.WinForms.Controls.GamePictureBox(); + this.picPortrait = new FrEee.UI.WinForms.Controls.Blazor.GamePictureBox(); this.txtConstructionTime = new System.Windows.Forms.Label(); this.lblConstructionTime = new System.Windows.Forms.Label(); this.txtConstructionItem = new System.Windows.Forms.Label(); this.lblConstructionItem = new System.Windows.Forms.Label(); this.txtComponentsFunctional = new System.Windows.Forms.Label(); - this.resIncomeMin = new FrEee.WinForms.Controls.ResourceDisplay(); + this.resIncomeMin = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); this.lblComponents = new System.Windows.Forms.Label(); - this.resIncomeOrg = new FrEee.WinForms.Controls.ResourceDisplay(); - this.resIncomeRad = new FrEee.WinForms.Controls.ResourceDisplay(); + this.resIncomeOrg = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); + this.resIncomeRad = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); this.lblIncome = new System.Windows.Forms.Label(); this.txtFleet = new System.Windows.Forms.Label(); this.lblFleet = new System.Windows.Forms.Label(); @@ -62,29 +65,29 @@ private void InitializeComponent() this.txtOrder = new System.Windows.Forms.Label(); this.lblOrder = new System.Windows.Forms.Label(); this.txtCargoSpaceFree = new System.Windows.Forms.Label(); - this.gamePanel2 = new FrEee.WinForms.Controls.GamePanel(); + this.gamePanel2 = new FrEee.UI.WinForms.Controls.GamePanel(); this.lstCargoSummary = new System.Windows.Forms.ListView(); this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.lblCargo = new System.Windows.Forms.Label(); - this.gamePanel1 = new FrEee.WinForms.Controls.GamePanel(); + this.gamePanel1 = new FrEee.UI.WinForms.Controls.GamePanel(); this.lstComponentsSummary = new System.Windows.Forms.ListView(); this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.pnlStats = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.lblSupplies = new System.Windows.Forms.Label(); - this.progSupplies = new FrEee.WinForms.Controls.GameProgressBar(); + this.progSupplies = new FrEee.UI.WinForms.Controls.Blazor.GameProgressBar(); this.lblAmmunition = new System.Windows.Forms.Label(); - this.progAmmunition = new FrEee.WinForms.Controls.GameProgressBar(); + this.progAmmunition = new FrEee.UI.WinForms.Controls.Blazor.GameProgressBar(); this.label3 = new System.Windows.Forms.Label(); - this.progFuel = new FrEee.WinForms.Controls.GameProgressBar(); + this.progFuel = new FrEee.UI.WinForms.Controls.Blazor.GameProgressBar(); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); - this.progHull = new FrEee.WinForms.Controls.GameProgressBar(); - this.progArmor = new FrEee.WinForms.Controls.GameProgressBar(); + this.progHull = new FrEee.UI.WinForms.Controls.Blazor.GameProgressBar(); + this.progArmor = new FrEee.UI.WinForms.Controls.Blazor.GameProgressBar(); this.lblShields = new System.Windows.Forms.Label(); - this.progShields = new FrEee.WinForms.Controls.GameProgressBar(); + this.progShields = new FrEee.UI.WinForms.Controls.Blazor.GameProgressBar(); this.lblArmor = new System.Windows.Forms.Label(); this.lblHull = new System.Windows.Forms.Label(); - this.progMovement = new FrEee.WinForms.Controls.GameProgressBar(); + this.progMovement = new FrEee.UI.WinForms.Controls.Blazor.GameProgressBar(); this.lblMovement = new System.Windows.Forms.Label(); this.txtHullSize = new System.Windows.Forms.Label(); this.lblHullSize = new System.Windows.Forms.Label(); @@ -96,12 +99,12 @@ private void InitializeComponent() this.pageOrders = new System.Windows.Forms.TabPage(); this.chkOnHold = new System.Windows.Forms.CheckBox(); this.chkRepeat = new System.Windows.Forms.CheckBox(); - this.btnDeleteOrder = new FrEee.WinForms.Controls.GameButton(); - this.btnOrderGoesDown = new FrEee.WinForms.Controls.GameButton(); - this.btnOrderToBottom = new FrEee.WinForms.Controls.GameButton(); - this.btnClearOrders = new FrEee.WinForms.Controls.GameButton(); - this.btnOrderGoesUp = new FrEee.WinForms.Controls.GameButton(); - this.btnOrderToTop = new FrEee.WinForms.Controls.GameButton(); + this.btnDeleteOrder = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnOrderGoesDown = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnOrderToBottom = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnClearOrders = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnOrderGoesUp = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnOrderToTop = new FrEee.UI.WinForms.Controls.GameButton(); this.lstOrdersDetail = new System.Windows.Forms.ListBox(); this.pageComps = new System.Windows.Forms.TabPage(); this.txtComponentsFunctionalDetail = new System.Windows.Forms.Label(); @@ -111,7 +114,7 @@ private void InitializeComponent() this.txtCargoSpaceFreeDetail = new System.Windows.Forms.Label(); this.lstCargoDetail = new System.Windows.Forms.ListView(); this.pageAbility = new System.Windows.Forms.TabPage(); - this.abilityTreeView = new FrEee.WinForms.Controls.AbilityTreeView(); + this.abilityTreeView = new FrEee.UI.WinForms.Controls.AbilityTreeView(); this.gameTabControl1.SuspendLayout(); this.pageDetail.SuspendLayout(); this.panel1.SuspendLayout(); @@ -570,8 +573,6 @@ private void InitializeComponent() // this.progSupplies.BackColor = System.Drawing.Color.Black; this.progSupplies.BarColor = System.Drawing.Color.Blue; - this.progSupplies.BorderColor = System.Drawing.Color.CornflowerBlue; - this.progSupplies.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.progSupplies.Dock = System.Windows.Forms.DockStyle.Fill; this.progSupplies.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.progSupplies.ForeColor = System.Drawing.Color.White; @@ -582,7 +583,7 @@ private void InitializeComponent() this.progSupplies.Maximum = ((long)(3000)); this.progSupplies.Name = "progSupplies"; this.progSupplies.Padding = new System.Windows.Forms.Padding(5); - this.progSupplies.ProgressDisplayType = FrEee.WinForms.Controls.ProgressDisplayType.Numeric; + this.progSupplies.ProgressDisplayType = FrEee.UI.Blazor.Views.ProgressDisplayType.Numeric; this.progSupplies.RightText = ""; this.progSupplies.Size = new System.Drawing.Size(134, 19); this.progSupplies.TabIndex = 18; @@ -603,8 +604,6 @@ private void InitializeComponent() // this.progAmmunition.BackColor = System.Drawing.Color.Black; this.progAmmunition.BarColor = System.Drawing.Color.Blue; - this.progAmmunition.BorderColor = System.Drawing.Color.CornflowerBlue; - this.progAmmunition.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.progAmmunition.Dock = System.Windows.Forms.DockStyle.Fill; this.progAmmunition.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.progAmmunition.ForeColor = System.Drawing.Color.White; @@ -615,7 +614,7 @@ private void InitializeComponent() this.progAmmunition.Maximum = ((long)(500)); this.progAmmunition.Name = "progAmmunition"; this.progAmmunition.Padding = new System.Windows.Forms.Padding(5); - this.progAmmunition.ProgressDisplayType = FrEee.WinForms.Controls.ProgressDisplayType.Numeric; + this.progAmmunition.ProgressDisplayType = FrEee.UI.Blazor.Views.ProgressDisplayType.Numeric; this.progAmmunition.RightText = ""; this.progAmmunition.Size = new System.Drawing.Size(134, 19); this.progAmmunition.TabIndex = 20; @@ -636,8 +635,6 @@ private void InitializeComponent() // this.progFuel.BackColor = System.Drawing.Color.Black; this.progFuel.BarColor = System.Drawing.Color.Blue; - this.progFuel.BorderColor = System.Drawing.Color.CornflowerBlue; - this.progFuel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.progFuel.Dock = System.Windows.Forms.DockStyle.Fill; this.progFuel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.progFuel.ForeColor = System.Drawing.Color.White; @@ -648,7 +645,7 @@ private void InitializeComponent() this.progFuel.Maximum = ((long)(2000)); this.progFuel.Name = "progFuel"; this.progFuel.Padding = new System.Windows.Forms.Padding(5); - this.progFuel.ProgressDisplayType = FrEee.WinForms.Controls.ProgressDisplayType.Numeric; + this.progFuel.ProgressDisplayType = FrEee.UI.Blazor.Views.ProgressDisplayType.Numeric; this.progFuel.RightText = ""; this.progFuel.Size = new System.Drawing.Size(134, 19); this.progFuel.TabIndex = 22; @@ -685,8 +682,6 @@ private void InitializeComponent() // this.progHull.BackColor = System.Drawing.Color.Black; this.progHull.BarColor = System.Drawing.Color.Blue; - this.progHull.BorderColor = System.Drawing.Color.CornflowerBlue; - this.progHull.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.progHull.Dock = System.Windows.Forms.DockStyle.Fill; this.progHull.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.progHull.ForeColor = System.Drawing.Color.White; @@ -697,7 +692,7 @@ private void InitializeComponent() this.progHull.Maximum = ((long)(200)); this.progHull.Name = "progHull"; this.progHull.Padding = new System.Windows.Forms.Padding(5); - this.progHull.ProgressDisplayType = FrEee.WinForms.Controls.ProgressDisplayType.Numeric; + this.progHull.ProgressDisplayType = FrEee.UI.Blazor.Views.ProgressDisplayType.Numeric; this.progHull.RightText = ""; this.progHull.Size = new System.Drawing.Size(135, 19); this.progHull.TabIndex = 30; @@ -707,8 +702,6 @@ private void InitializeComponent() // this.progArmor.BackColor = System.Drawing.Color.Black; this.progArmor.BarColor = System.Drawing.Color.Blue; - this.progArmor.BorderColor = System.Drawing.Color.CornflowerBlue; - this.progArmor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.progArmor.Dock = System.Windows.Forms.DockStyle.Fill; this.progArmor.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.progArmor.ForeColor = System.Drawing.Color.White; @@ -719,7 +712,7 @@ private void InitializeComponent() this.progArmor.Maximum = ((long)(300)); this.progArmor.Name = "progArmor"; this.progArmor.Padding = new System.Windows.Forms.Padding(5); - this.progArmor.ProgressDisplayType = FrEee.WinForms.Controls.ProgressDisplayType.Numeric; + this.progArmor.ProgressDisplayType = FrEee.UI.Blazor.Views.ProgressDisplayType.Numeric; this.progArmor.RightText = ""; this.progArmor.Size = new System.Drawing.Size(135, 19); this.progArmor.TabIndex = 29; @@ -740,8 +733,6 @@ private void InitializeComponent() // this.progShields.BackColor = System.Drawing.Color.Black; this.progShields.BarColor = System.Drawing.Color.Blue; - this.progShields.BorderColor = System.Drawing.Color.CornflowerBlue; - this.progShields.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.progShields.Dock = System.Windows.Forms.DockStyle.Fill; this.progShields.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.progShields.ForeColor = System.Drawing.Color.White; @@ -752,7 +743,7 @@ private void InitializeComponent() this.progShields.Maximum = ((long)(200)); this.progShields.Name = "progShields"; this.progShields.Padding = new System.Windows.Forms.Padding(5); - this.progShields.ProgressDisplayType = FrEee.WinForms.Controls.ProgressDisplayType.Numeric; + this.progShields.ProgressDisplayType = FrEee.UI.Blazor.Views.ProgressDisplayType.Numeric; this.progShields.RightText = ""; this.progShields.Size = new System.Drawing.Size(135, 19); this.progShields.TabIndex = 24; @@ -784,8 +775,6 @@ private void InitializeComponent() // this.progMovement.BackColor = System.Drawing.Color.Black; this.progMovement.BarColor = System.Drawing.Color.Blue; - this.progMovement.BorderColor = System.Drawing.Color.CornflowerBlue; - this.progMovement.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.progMovement.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); this.progMovement.ForeColor = System.Drawing.Color.White; this.progMovement.IncrementalProgress = ((long)(0)); @@ -795,7 +784,7 @@ private void InitializeComponent() this.progMovement.Maximum = ((long)(6)); this.progMovement.Name = "progMovement"; this.progMovement.Padding = new System.Windows.Forms.Padding(5); - this.progMovement.ProgressDisplayType = FrEee.WinForms.Controls.ProgressDisplayType.Numeric; + this.progMovement.ProgressDisplayType = FrEee.UI.Blazor.Views.ProgressDisplayType.Numeric; this.progMovement.RightText = ""; this.progMovement.Size = new System.Drawing.Size(103, 19); this.progMovement.TabIndex = 98; diff --git a/FrEee.WinForms/Controls/SpaceVehicleReport.cs b/FrEee.UI.WinForms/Controls/SpaceVehicleReport.cs similarity index 96% rename from FrEee.WinForms/Controls/SpaceVehicleReport.cs rename to FrEee.UI.WinForms/Controls/SpaceVehicleReport.cs index ed7107a10..6d7d95680 100644 --- a/FrEee.WinForms/Controls/SpaceVehicleReport.cs +++ b/FrEee.UI.WinForms/Controls/SpaceVehicleReport.cs @@ -4,8 +4,8 @@ using FrEee.Objects.Vehicles; using FrEee.Utility; using FrEee.Extensions; -using FrEee.WinForms.Interfaces; -using FrEee.WinForms.Utility.Extensions; +using FrEee.UI.WinForms.Interfaces; +using FrEee.UI.WinForms.Utility.Extensions; using System; using System.Drawing; using System.Linq; @@ -14,7 +14,7 @@ using FrEee.Objects.Civilization.Orders; using FrEee.Objects.Civilization.CargoStorage; -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; /// /// A report on a space vehicle. diff --git a/FrEee.WinForms/Controls/SpaceVehicleReport.resx b/FrEee.UI.WinForms/Controls/SpaceVehicleReport.resx similarity index 100% rename from FrEee.WinForms/Controls/SpaceVehicleReport.resx rename to FrEee.UI.WinForms/Controls/SpaceVehicleReport.resx diff --git a/FrEee.WinForms/Controls/StarReport.Designer.cs b/FrEee.UI.WinForms/Controls/StarReport.Designer.cs similarity index 95% rename from FrEee.WinForms/Controls/StarReport.Designer.cs rename to FrEee.UI.WinForms/Controls/StarReport.Designer.cs index fbe8bc76e..f4f8d2fa2 100644 --- a/FrEee.WinForms/Controls/StarReport.Designer.cs +++ b/FrEee.UI.WinForms/Controls/StarReport.Designer.cs @@ -1,4 +1,7 @@ -namespace FrEee.WinForms.Controls; +using FrEee.UI.WinForms.Controls.Blazor; +using FrEee.UI.WinForms.Controls; + +namespace FrEee.UI.WinForms.Controls; partial class StarReport { @@ -38,7 +41,7 @@ private void InitializeComponent() this.lstAbilities = new System.Windows.Forms.ListView(); this.lblDescription = new System.Windows.Forms.Label(); this.txtDescription = new System.Windows.Forms.Label(); - this.picPortrait = new FrEee.WinForms.Controls.GamePictureBox(); + this.picPortrait = new FrEee.UI.WinForms.Controls.Blazor.GamePictureBox(); this.label1 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.picPortrait)).BeginInit(); this.SuspendLayout(); diff --git a/FrEee.WinForms/Controls/StarReport.cs b/FrEee.UI.WinForms/Controls/StarReport.cs similarity index 90% rename from FrEee.WinForms/Controls/StarReport.cs rename to FrEee.UI.WinForms/Controls/StarReport.cs index 07cbf46ac..c1681629b 100644 --- a/FrEee.WinForms/Controls/StarReport.cs +++ b/FrEee.UI.WinForms/Controls/StarReport.cs @@ -1,10 +1,10 @@ using FrEee.Objects.Space; using FrEee.Extensions; -using FrEee.WinForms.Interfaces; +using FrEee.UI.WinForms.Interfaces; using System.Drawing; using System.Windows.Forms; -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; /// /// Displays a report on a star. diff --git a/FrEee.WinForms/Controls/StarReport.resx b/FrEee.UI.WinForms/Controls/StarReport.resx similarity index 100% rename from FrEee.WinForms/Controls/StarReport.resx rename to FrEee.UI.WinForms/Controls/StarReport.resx diff --git a/FrEee.WinForms/Controls/StarSystemReport.Designer.cs b/FrEee.UI.WinForms/Controls/StarSystemReport.Designer.cs similarity index 96% rename from FrEee.WinForms/Controls/StarSystemReport.Designer.cs rename to FrEee.UI.WinForms/Controls/StarSystemReport.Designer.cs index e19c2ffcb..2152de698 100644 --- a/FrEee.WinForms/Controls/StarSystemReport.Designer.cs +++ b/FrEee.UI.WinForms/Controls/StarSystemReport.Designer.cs @@ -1,4 +1,7 @@ -namespace FrEee.WinForms.Controls; +using FrEee.UI.WinForms.Controls.Blazor; +using FrEee.UI.WinForms.Controls; + +namespace FrEee.UI.WinForms.Controls; partial class StarSystemReport { @@ -28,8 +31,8 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.abilityTreeView = new FrEee.WinForms.Controls.AbilityTreeView(); - this.picPortrait = new FrEee.WinForms.Controls.GamePictureBox(); + this.abilityTreeView = new FrEee.UI.WinForms.Controls.AbilityTreeView(); + this.picPortrait = new FrEee.UI.WinForms.Controls.Blazor.GamePictureBox(); this.txtDescription = new System.Windows.Forms.Label(); this.txtName = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); diff --git a/FrEee.WinForms/Controls/StarSystemReport.cs b/FrEee.UI.WinForms/Controls/StarSystemReport.cs similarity index 95% rename from FrEee.WinForms/Controls/StarSystemReport.cs rename to FrEee.UI.WinForms/Controls/StarSystemReport.cs index ce6d48f3b..4ff52566a 100644 --- a/FrEee.WinForms/Controls/StarSystemReport.cs +++ b/FrEee.UI.WinForms/Controls/StarSystemReport.cs @@ -2,12 +2,12 @@ using FrEee.Objects.Space; using FrEee.Objects.Vehicles; using FrEee.Extensions; -using FrEee.WinForms.Interfaces; +using FrEee.UI.WinForms.Interfaces; using System.Linq; using System.Windows.Forms; using FrEee.Objects.Civilization.CargoStorage; -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; public partial class StarSystemReport : UserControl, IBindable { diff --git a/FrEee.WinForms/Controls/StarSystemReport.resx b/FrEee.UI.WinForms/Controls/StarSystemReport.resx similarity index 100% rename from FrEee.WinForms/Controls/StarSystemReport.resx rename to FrEee.UI.WinForms/Controls/StarSystemReport.resx diff --git a/FrEee.WinForms/Controls/StarSystemView.Designer.cs b/FrEee.UI.WinForms/Controls/StarSystemView.Designer.cs similarity index 93% rename from FrEee.WinForms/Controls/StarSystemView.Designer.cs rename to FrEee.UI.WinForms/Controls/StarSystemView.Designer.cs index dc3f37d3e..7f6a95cd6 100644 --- a/FrEee.WinForms/Controls/StarSystemView.Designer.cs +++ b/FrEee.UI.WinForms/Controls/StarSystemView.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; partial class StarSystemView { diff --git a/FrEee.WinForms/Controls/StarSystemView.cs b/FrEee.UI.WinForms/Controls/StarSystemView.cs similarity index 96% rename from FrEee.WinForms/Controls/StarSystemView.cs rename to FrEee.UI.WinForms/Controls/StarSystemView.cs index a35ab311f..5d653fed6 100644 --- a/FrEee.WinForms/Controls/StarSystemView.cs +++ b/FrEee.UI.WinForms/Controls/StarSystemView.cs @@ -8,7 +8,7 @@ using System.Windows.Forms; using FrEee.Objects.GameState; -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; /// /// Displays a map of a star system. diff --git a/FrEee.WinForms/Controls/StarSystemView.resx b/FrEee.UI.WinForms/Controls/StarSystemView.resx similarity index 100% rename from FrEee.WinForms/Controls/StarSystemView.resx rename to FrEee.UI.WinForms/Controls/StarSystemView.resx diff --git a/FrEee.WinForms/Controls/StormReport.Designer.cs b/FrEee.UI.WinForms/Controls/StormReport.Designer.cs similarity index 92% rename from FrEee.WinForms/Controls/StormReport.Designer.cs rename to FrEee.UI.WinForms/Controls/StormReport.Designer.cs index 8950e4f0c..cd0927ff1 100644 --- a/FrEee.WinForms/Controls/StormReport.Designer.cs +++ b/FrEee.UI.WinForms/Controls/StormReport.Designer.cs @@ -1,4 +1,7 @@ -namespace FrEee.WinForms.Controls; +using FrEee.UI.WinForms.Controls.Blazor; +using FrEee.UI.WinForms.Controls; + +namespace FrEee.UI.WinForms.Controls; partial class StormReport { @@ -28,8 +31,8 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.abilityTreeView = new FrEee.WinForms.Controls.AbilityTreeView(); - this.picPortrait = new FrEee.WinForms.Controls.GamePictureBox(); + this.abilityTreeView = new FrEee.UI.WinForms.Controls.AbilityTreeView(); + this.picPortrait = new FrEee.UI.WinForms.Controls.Blazor.GamePictureBox(); this.txtDescription = new System.Windows.Forms.Label(); this.txtSize = new System.Windows.Forms.Label(); this.txtName = new System.Windows.Forms.Label(); diff --git a/FrEee.WinForms/Controls/StormReport.cs b/FrEee.UI.WinForms/Controls/StormReport.cs similarity index 89% rename from FrEee.WinForms/Controls/StormReport.cs rename to FrEee.UI.WinForms/Controls/StormReport.cs index 29ac9ffe6..f90fde9c4 100644 --- a/FrEee.WinForms/Controls/StormReport.cs +++ b/FrEee.UI.WinForms/Controls/StormReport.cs @@ -1,10 +1,10 @@ using FrEee.Objects.Space; using FrEee.Extensions; -using FrEee.WinForms.Interfaces; +using FrEee.UI.WinForms.Interfaces; using System.Drawing; using System.Windows.Forms; -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; public partial class StormReport : UserControl, IBindable { diff --git a/FrEee.WinForms/Controls/StormReport.resx b/FrEee.UI.WinForms/Controls/StormReport.resx similarity index 100% rename from FrEee.WinForms/Controls/StormReport.resx rename to FrEee.UI.WinForms/Controls/StormReport.resx diff --git a/FrEee.WinForms/Controls/TraitPicker.Designer.cs b/FrEee.UI.WinForms/Controls/TraitPicker.Designer.cs similarity index 94% rename from FrEee.WinForms/Controls/TraitPicker.Designer.cs rename to FrEee.UI.WinForms/Controls/TraitPicker.Designer.cs index 5c396fea9..4960ce234 100644 --- a/FrEee.WinForms/Controls/TraitPicker.Designer.cs +++ b/FrEee.UI.WinForms/Controls/TraitPicker.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; partial class TraitPicker { diff --git a/FrEee.WinForms/Controls/TraitPicker.cs b/FrEee.UI.WinForms/Controls/TraitPicker.cs similarity index 93% rename from FrEee.WinForms/Controls/TraitPicker.cs rename to FrEee.UI.WinForms/Controls/TraitPicker.cs index 8aac896d4..b5abac6d0 100644 --- a/FrEee.WinForms/Controls/TraitPicker.cs +++ b/FrEee.UI.WinForms/Controls/TraitPicker.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Windows.Forms; -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; public partial class TraitPicker : UserControl { diff --git a/FrEee.WinForms/Controls/TraitPicker.resx b/FrEee.UI.WinForms/Controls/TraitPicker.resx similarity index 100% rename from FrEee.WinForms/Controls/TraitPicker.resx rename to FrEee.UI.WinForms/Controls/TraitPicker.resx diff --git a/FrEee.WinForms/Controls/WarpPointReport.Designer.cs b/FrEee.UI.WinForms/Controls/WarpPointReport.Designer.cs similarity index 92% rename from FrEee.WinForms/Controls/WarpPointReport.Designer.cs rename to FrEee.UI.WinForms/Controls/WarpPointReport.Designer.cs index 232d2f85a..05f35af72 100644 --- a/FrEee.WinForms/Controls/WarpPointReport.Designer.cs +++ b/FrEee.UI.WinForms/Controls/WarpPointReport.Designer.cs @@ -1,4 +1,7 @@ -namespace FrEee.WinForms.Controls; +using FrEee.UI.WinForms.Controls.Blazor; +using FrEee.UI.WinForms.Controls; + +namespace FrEee.UI.WinForms.Controls; partial class WarpPointReport { @@ -28,8 +31,8 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.abilityTreeView = new FrEee.WinForms.Controls.AbilityTreeView(); - this.picPortrait = new FrEee.WinForms.Controls.GamePictureBox(); + this.abilityTreeView = new FrEee.UI.WinForms.Controls.AbilityTreeView(); + this.picPortrait = new FrEee.UI.WinForms.Controls.Blazor.GamePictureBox(); this.txtDescription = new System.Windows.Forms.Label(); this.txtSize = new System.Windows.Forms.Label(); this.txtName = new System.Windows.Forms.Label(); diff --git a/FrEee.WinForms/Controls/WarpPointReport.cs b/FrEee.UI.WinForms/Controls/WarpPointReport.cs similarity index 90% rename from FrEee.WinForms/Controls/WarpPointReport.cs rename to FrEee.UI.WinForms/Controls/WarpPointReport.cs index 4dae8d29f..aa8f82aae 100644 --- a/FrEee.WinForms/Controls/WarpPointReport.cs +++ b/FrEee.UI.WinForms/Controls/WarpPointReport.cs @@ -1,10 +1,10 @@ using FrEee.Objects.Space; using FrEee.Extensions; -using FrEee.WinForms.Interfaces; +using FrEee.UI.WinForms.Interfaces; using System.Drawing; using System.Windows.Forms; -namespace FrEee.WinForms.Controls; +namespace FrEee.UI.WinForms.Controls; public partial class WarpPointReport : UserControl, IBindable { diff --git a/FrEee.WinForms/Controls/WarpPointReport.resx b/FrEee.UI.WinForms/Controls/WarpPointReport.resx similarity index 100% rename from FrEee.WinForms/Controls/WarpPointReport.resx rename to FrEee.UI.WinForms/Controls/WarpPointReport.resx diff --git a/FrEee.WinForms/DataGridView/DataGridViewProgressCell.cs b/FrEee.UI.WinForms/DataGridView/DataGridViewProgressCell.cs similarity index 96% rename from FrEee.WinForms/DataGridView/DataGridViewProgressCell.cs rename to FrEee.UI.WinForms/DataGridView/DataGridViewProgressCell.cs index 73b43c228..9ff24609e 100644 --- a/FrEee.WinForms/DataGridView/DataGridViewProgressCell.cs +++ b/FrEee.UI.WinForms/DataGridView/DataGridViewProgressCell.cs @@ -4,7 +4,7 @@ using System.Drawing; using System.Windows.Forms; -namespace FrEee.WinForms.DataGridView; +namespace FrEee.UI.WinForms.DataGridView; public class DataGridViewProgressCell : DataGridViewCell { diff --git a/FrEee.WinForms/DataGridView/DataGridViewProgressColumn.cs b/FrEee.UI.WinForms/DataGridView/DataGridViewProgressColumn.cs similarity index 93% rename from FrEee.WinForms/DataGridView/DataGridViewProgressColumn.cs rename to FrEee.UI.WinForms/DataGridView/DataGridViewProgressColumn.cs index 99ce0c4c0..9f15fd050 100644 --- a/FrEee.WinForms/DataGridView/DataGridViewProgressColumn.cs +++ b/FrEee.UI.WinForms/DataGridView/DataGridViewProgressColumn.cs @@ -3,7 +3,7 @@ using System.Drawing; using System.Windows.Forms; -namespace FrEee.WinForms.DataGridView; +namespace FrEee.UI.WinForms.DataGridView; /// /// Data grid view column which shows progress. diff --git a/FrEee.WinForms/DataGridView/Filter.cs b/FrEee.UI.WinForms/DataGridView/Filter.cs similarity index 86% rename from FrEee.WinForms/DataGridView/Filter.cs rename to FrEee.UI.WinForms/DataGridView/Filter.cs index 24dc11005..e0b5c8900 100644 --- a/FrEee.WinForms/DataGridView/Filter.cs +++ b/FrEee.UI.WinForms/DataGridView/Filter.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.DataGridView; +namespace FrEee.UI.WinForms.DataGridView; /// /// Type of filter to use for a column. diff --git a/FrEee.WinForms/DataGridView/Format.cs b/FrEee.UI.WinForms/DataGridView/Format.cs similarity index 69% rename from FrEee.WinForms/DataGridView/Format.cs rename to FrEee.UI.WinForms/DataGridView/Format.cs index 2f2d9cbeb..efb91f5a1 100644 --- a/FrEee.WinForms/DataGridView/Format.cs +++ b/FrEee.UI.WinForms/DataGridView/Format.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.DataGridView; +namespace FrEee.UI.WinForms.DataGridView; /// /// Formatting for a cell value. diff --git a/FrEee.WinForms/DataGridView/GridColumnConfig.cs b/FrEee.UI.WinForms/DataGridView/GridColumnConfig.cs similarity index 94% rename from FrEee.WinForms/DataGridView/GridColumnConfig.cs rename to FrEee.UI.WinForms/DataGridView/GridColumnConfig.cs index 983cd3fa0..0bb423193 100644 --- a/FrEee.WinForms/DataGridView/GridColumnConfig.cs +++ b/FrEee.UI.WinForms/DataGridView/GridColumnConfig.cs @@ -3,7 +3,7 @@ using System.Drawing; using System.Windows.Forms; -namespace FrEee.WinForms.DataGridView; +namespace FrEee.UI.WinForms.DataGridView; /// /// Configuration for a grid column. diff --git a/FrEee.WinForms/DataGridView/GridConfig.cs b/FrEee.UI.WinForms/DataGridView/GridConfig.cs similarity index 84% rename from FrEee.WinForms/DataGridView/GridConfig.cs rename to FrEee.UI.WinForms/DataGridView/GridConfig.cs index 6e4c68513..5f1ac8e10 100644 --- a/FrEee.WinForms/DataGridView/GridConfig.cs +++ b/FrEee.UI.WinForms/DataGridView/GridConfig.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace FrEee.WinForms.DataGridView; +namespace FrEee.UI.WinForms.DataGridView; /// /// Configuration for a grid view. diff --git a/FrEee.WinForms/DataGridView/Sort.cs b/FrEee.UI.WinForms/DataGridView/Sort.cs similarity index 64% rename from FrEee.WinForms/DataGridView/Sort.cs rename to FrEee.UI.WinForms/DataGridView/Sort.cs index e9d6095ca..c4c851f15 100644 --- a/FrEee.WinForms/DataGridView/Sort.cs +++ b/FrEee.UI.WinForms/DataGridView/Sort.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.DataGridView; +namespace FrEee.UI.WinForms.DataGridView; /// /// Sorting rules. diff --git a/FrEee.WinForms/Forms/ActivateAbilityForm.Designer.cs b/FrEee.UI.WinForms/Forms/ActivateAbilityForm.Designer.cs similarity index 95% rename from FrEee.WinForms/Forms/ActivateAbilityForm.Designer.cs rename to FrEee.UI.WinForms/Forms/ActivateAbilityForm.Designer.cs index 08cf7abfa..0e852a1a4 100644 --- a/FrEee.WinForms/Forms/ActivateAbilityForm.Designer.cs +++ b/FrEee.UI.WinForms/Forms/ActivateAbilityForm.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; partial class ActivateAbilityForm { @@ -29,8 +29,8 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - this.btnOK = new FrEee.WinForms.Controls.GameButton(); - this.btnCancel = new FrEee.WinForms.Controls.GameButton(); + this.btnOK = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnCancel = new FrEee.UI.WinForms.Controls.GameButton(); this.gridAbilities = new System.Windows.Forms.DataGridView(); this.colAbility = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colSource = new System.Windows.Forms.DataGridViewTextBoxColumn(); diff --git a/FrEee.WinForms/Forms/ActivateAbilityForm.cs b/FrEee.UI.WinForms/Forms/ActivateAbilityForm.cs similarity index 95% rename from FrEee.WinForms/Forms/ActivateAbilityForm.cs rename to FrEee.UI.WinForms/Forms/ActivateAbilityForm.cs index a99420cde..f1c10f700 100644 --- a/FrEee.WinForms/Forms/ActivateAbilityForm.cs +++ b/FrEee.UI.WinForms/Forms/ActivateAbilityForm.cs @@ -3,7 +3,7 @@ using FrEee.Objects.Commands; using FrEee.Objects.Space; using FrEee.Extensions; -using FrEee.WinForms.Utility.Extensions; +using FrEee.UI.WinForms.Utility.Extensions; using System; using System.Collections.Generic; using System.Data; @@ -14,7 +14,7 @@ using FrEee.Objects.GameState; using FrEee.Objects.Civilization.Orders; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; public partial class ActivateAbilityForm : GameForm { diff --git a/FrEee.WinForms/Forms/ActivateAbilityForm.resx b/FrEee.UI.WinForms/Forms/ActivateAbilityForm.resx similarity index 100% rename from FrEee.WinForms/Forms/ActivateAbilityForm.resx rename to FrEee.UI.WinForms/Forms/ActivateAbilityForm.resx diff --git a/FrEee.WinForms/Forms/BattleReplayForm.Designer.cs b/FrEee.UI.WinForms/Forms/BattleReplayForm.Designer.cs similarity index 91% rename from FrEee.WinForms/Forms/BattleReplayForm.Designer.cs rename to FrEee.UI.WinForms/Forms/BattleReplayForm.Designer.cs index 9fae88bf6..fcc0488a0 100644 --- a/FrEee.WinForms/Forms/BattleReplayForm.Designer.cs +++ b/FrEee.UI.WinForms/Forms/BattleReplayForm.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; partial class BattleReplayForm { @@ -31,13 +31,13 @@ private void InitializeComponent() this.components = new System.ComponentModel.Container(); this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.timer = new System.Windows.Forms.Timer(this.components); - this.reportPanel = new FrEee.WinForms.Controls.GamePanel(); - this.battleView = new FrEee.WinForms.Controls.BattleView(); - this.btnForward = new FrEee.WinForms.Controls.GameButton(); - this.btnPause = new FrEee.WinForms.Controls.GameButton(); - this.btnBack = new FrEee.WinForms.Controls.GameButton(); - this.minimap = new FrEee.WinForms.Controls.BattleView(); - this.btnClose = new FrEee.WinForms.Controls.GameButton(); + this.reportPanel = new FrEee.UI.WinForms.Controls.GamePanel(); + this.battleView = new FrEee.UI.WinForms.Controls.BattleView(); + this.btnForward = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnPause = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnBack = new FrEee.UI.WinForms.Controls.GameButton(); + this.minimap = new FrEee.UI.WinForms.Controls.BattleView(); + this.btnClose = new FrEee.UI.WinForms.Controls.GameButton(); this.SuspendLayout(); // // timer diff --git a/FrEee.WinForms/Forms/BattleReplayForm.cs b/FrEee.UI.WinForms/Forms/BattleReplayForm.cs similarity index 93% rename from FrEee.WinForms/Forms/BattleReplayForm.cs rename to FrEee.UI.WinForms/Forms/BattleReplayForm.cs index 1e31d3b1a..bea0bf5a2 100644 --- a/FrEee.WinForms/Forms/BattleReplayForm.cs +++ b/FrEee.UI.WinForms/Forms/BattleReplayForm.cs @@ -4,15 +4,15 @@ using FrEee.Objects.Space; using FrEee.Objects.Vehicles; using FrEee.Extensions; -using FrEee.WinForms.Controls; -using FrEee.WinForms.Interfaces; -using FrEee.WinForms.Objects; +using FrEee.UI.WinForms.Controls; +using FrEee.UI.WinForms.Interfaces; +using FrEee.UI.WinForms.Objects; using System; using System.Drawing; using System.Linq; using System.Windows.Forms; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; public partial class BattleReplayForm : GameForm, IBindable { diff --git a/FrEee.WinForms/Forms/BattleReplayForm.resx b/FrEee.UI.WinForms/Forms/BattleReplayForm.resx similarity index 100% rename from FrEee.WinForms/Forms/BattleReplayForm.resx rename to FrEee.UI.WinForms/Forms/BattleReplayForm.resx diff --git a/FrEee.WinForms/Forms/BattleResultsForm.Designer.cs b/FrEee.UI.WinForms/Forms/BattleResultsForm.Designer.cs similarity index 91% rename from FrEee.WinForms/Forms/BattleResultsForm.Designer.cs rename to FrEee.UI.WinForms/Forms/BattleResultsForm.Designer.cs index 35ecfbfa3..f9e22311d 100644 --- a/FrEee.WinForms/Forms/BattleResultsForm.Designer.cs +++ b/FrEee.UI.WinForms/Forms/BattleResultsForm.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; partial class BattleResultsForm { @@ -28,10 +28,10 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.grid = new FrEee.WinForms.Controls.GameGridView(); - this.btnReplay = new FrEee.WinForms.Controls.GameButton(); - this.btnClose = new FrEee.WinForms.Controls.GameButton(); - this.btnGoTo = new FrEee.WinForms.Controls.GameButton(); + this.grid = new FrEee.UI.WinForms.Controls.GameGridView(); + this.btnReplay = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnClose = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnGoTo = new FrEee.UI.WinForms.Controls.GameButton(); this.SuspendLayout(); // // grid diff --git a/FrEee.WinForms/Forms/BattleResultsForm.cs b/FrEee.UI.WinForms/Forms/BattleResultsForm.cs similarity index 93% rename from FrEee.WinForms/Forms/BattleResultsForm.cs rename to FrEee.UI.WinForms/Forms/BattleResultsForm.cs index cc7c23451..4adb98be7 100644 --- a/FrEee.WinForms/Forms/BattleResultsForm.cs +++ b/FrEee.UI.WinForms/Forms/BattleResultsForm.cs @@ -3,9 +3,9 @@ using FrEee.Objects.Space; using FrEee.Utility; using FrEee.Extensions; -using FrEee.WinForms.DataGridView; -using FrEee.WinForms.Interfaces; -using FrEee.WinForms.Utility.Extensions; +using FrEee.UI.WinForms.DataGridView; +using FrEee.UI.WinForms.Interfaces; +using FrEee.UI.WinForms.Utility.Extensions; using System; using System.Collections.Generic; using System.Drawing; @@ -13,7 +13,7 @@ using System.Windows.Forms; using FrEee.Objects.Vehicles; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; public partial class BattleResultsForm : GameForm, IBindable { @@ -25,7 +25,7 @@ public BattleResultsForm(IBattle battle) try { - this.Icon = new Icon(FrEee.WinForms.Properties.Resources.FrEeeIcon); + this.Icon = new Icon(FrEee.UI.WinForms.Properties.Resources.FrEeeIcon); } catch { } diff --git a/FrEee.WinForms/Forms/BattleResultsForm.resx b/FrEee.UI.WinForms/Forms/BattleResultsForm.resx similarity index 100% rename from FrEee.WinForms/Forms/BattleResultsForm.resx rename to FrEee.UI.WinForms/Forms/BattleResultsForm.resx diff --git a/FrEee.UI.WinForms/Forms/BlazorTestForm.Designer.cs b/FrEee.UI.WinForms/Forms/BlazorTestForm.Designer.cs new file mode 100644 index 000000000..7b792d8a9 --- /dev/null +++ b/FrEee.UI.WinForms/Forms/BlazorTestForm.Designer.cs @@ -0,0 +1,96 @@ +namespace FrEee.UI.WinForms.Forms +{ + partial class BlazorTestForm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + panel = new System.Windows.Forms.Panel(); + btnProgressBar = new System.Windows.Forms.Button(); + btnResourceDisplay = new System.Windows.Forms.Button(); + btnPieChart = new System.Windows.Forms.Button(); + SuspendLayout(); + // + // panel + // + panel.Dock = System.Windows.Forms.DockStyle.Bottom; + panel.Location = new System.Drawing.Point(0, 122); + panel.Name = "panel"; + panel.Size = new System.Drawing.Size(800, 328); + panel.TabIndex = 0; + // + // btnProgressBar + // + btnProgressBar.Location = new System.Drawing.Point(23, 13); + btnProgressBar.Name = "btnProgressBar"; + btnProgressBar.Size = new System.Drawing.Size(187, 23); + btnProgressBar.TabIndex = 1; + btnProgressBar.Text = "Progress Bar"; + btnProgressBar.UseVisualStyleBackColor = true; + btnProgressBar.Click += btnProgressBar_Click; + // + // btnResourceDisplay + // + btnResourceDisplay.Location = new System.Drawing.Point(23, 42); + btnResourceDisplay.Name = "btnResourceDisplay"; + btnResourceDisplay.Size = new System.Drawing.Size(187, 23); + btnResourceDisplay.TabIndex = 2; + btnResourceDisplay.Text = "Resource Dsiplay"; + btnResourceDisplay.UseVisualStyleBackColor = true; + btnResourceDisplay.Click += btnResourceDisplay_Click; + // + // btnPieChart + // + btnPieChart.Location = new System.Drawing.Point(23, 71); + btnPieChart.Name = "btnPieChart"; + btnPieChart.Size = new System.Drawing.Size(187, 23); + btnPieChart.TabIndex = 3; + btnPieChart.Text = "Pie Chart"; + btnPieChart.UseVisualStyleBackColor = true; + btnPieChart.Click += btnPieChart_Click; + // + // BlazorTestForm + // + AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + ClientSize = new System.Drawing.Size(800, 450); + Controls.Add(btnPieChart); + Controls.Add(btnResourceDisplay); + Controls.Add(btnProgressBar); + Controls.Add(panel); + Name = "BlazorTestForm"; + Text = "BlazorTestForm"; + ResumeLayout(false); + } + + #endregion + + private System.Windows.Forms.Panel panel; + private System.Windows.Forms.Button btnProgressBar; + private System.Windows.Forms.Button btnResourceDisplay; + private System.Windows.Forms.Button btnPieChart; + } +} \ No newline at end of file diff --git a/FrEee.UI.WinForms/Forms/BlazorTestForm.cs b/FrEee.UI.WinForms/Forms/BlazorTestForm.cs new file mode 100644 index 000000000..d25f03471 --- /dev/null +++ b/FrEee.UI.WinForms/Forms/BlazorTestForm.cs @@ -0,0 +1,55 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using FrEee.UI.Blazor.Views; +using FrEee.UI.WinForms.Controls; +using FrEee.UI.WinForms.Controls.Blazor; + +namespace FrEee.UI.WinForms.Forms +{ + public partial class BlazorTestForm : Form + { + public BlazorTestForm() + { + InitializeComponent(); + } + + private T ShowControl() where T : Control, new() + { + panel.Controls.Clear(); + var c = new T(); + c.Dock = DockStyle.Fill; + panel.Controls.Add(c); + return c; + } + + private void btnProgressBar_Click(object sender, EventArgs e) + { + ShowControl(); + } + + private void btnResourceDisplay_Click(object sender, EventArgs e) + { + ShowControl(); + } + + private void btnPieChart_Click(object sender, EventArgs e) + { + var chart = ShowControl(); + chart.Entries = new HashSet.Entry> + { + new("Fred", Color.Red, 15), + new("Ginger", Color.Blue, 14), + new("Penny", Color.Green, 12), + new("Pepper", Color.Yellow, 10), + new("Salt", Color.Pink, 7), + }; + } + } +} diff --git a/FrEee.UI.WinForms/Forms/BlazorTestForm.resx b/FrEee.UI.WinForms/Forms/BlazorTestForm.resx new file mode 100644 index 000000000..af32865ec --- /dev/null +++ b/FrEee.UI.WinForms/Forms/BlazorTestForm.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/FrEee.WinForms/Forms/CargoTransferForm.Designer.cs b/FrEee.UI.WinForms/Forms/CargoTransferForm.Designer.cs similarity index 94% rename from FrEee.WinForms/Forms/CargoTransferForm.Designer.cs rename to FrEee.UI.WinForms/Forms/CargoTransferForm.Designer.cs index 0f2292389..709313be2 100644 --- a/FrEee.WinForms/Forms/CargoTransferForm.Designer.cs +++ b/FrEee.UI.WinForms/Forms/CargoTransferForm.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; partial class CargoTransferForm { @@ -29,20 +29,20 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.btnLoad = new FrEee.WinForms.Controls.GameButton(); - this.clDrop = new FrEee.WinForms.Controls.CargoList(); - this.clLoad = new FrEee.WinForms.Controls.CargoList(); - this.clTo = new FrEee.WinForms.Controls.CargoList(); + this.btnLoad = new FrEee.UI.WinForms.Controls.GameButton(); + this.clDrop = new FrEee.UI.WinForms.Controls.CargoList(); + this.clLoad = new FrEee.UI.WinForms.Controls.CargoList(); + this.clTo = new FrEee.UI.WinForms.Controls.CargoList(); this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.txtFromContainer = new System.Windows.Forms.Label(); this.ddlToContainer = new System.Windows.Forms.ComboBox(); - this.clFrom = new FrEee.WinForms.Controls.CargoList(); + this.clFrom = new FrEee.UI.WinForms.Controls.CargoList(); this.panel1 = new System.Windows.Forms.Panel(); this.lblQuantityUnit = new System.Windows.Forms.Label(); - this.btnCancel = new FrEee.WinForms.Controls.GameButton(); - this.btnOK = new FrEee.WinForms.Controls.GameButton(); - this.btnDrop = new FrEee.WinForms.Controls.GameButton(); + this.btnCancel = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnOK = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnDrop = new FrEee.UI.WinForms.Controls.GameButton(); this.chkAll = new System.Windows.Forms.CheckBox(); this.txtQuantity = new System.Windows.Forms.TextBox(); this.tableLayoutPanel1.SuspendLayout(); diff --git a/FrEee.WinForms/Forms/CargoTransferForm.cs b/FrEee.UI.WinForms/Forms/CargoTransferForm.cs similarity index 95% rename from FrEee.WinForms/Forms/CargoTransferForm.cs rename to FrEee.UI.WinForms/Forms/CargoTransferForm.cs index 71558db95..764793692 100644 --- a/FrEee.WinForms/Forms/CargoTransferForm.cs +++ b/FrEee.UI.WinForms/Forms/CargoTransferForm.cs @@ -1,7 +1,7 @@ using FrEee.Objects.Civilization; using FrEee.Objects.Space; using FrEee.Extensions; -using FrEee.WinForms.Controls; +using FrEee.UI.WinForms.Controls; using System; using System.Collections.Generic; using System.Data; @@ -11,7 +11,7 @@ using FrEee.Objects.Civilization.CargoStorage; using FrEee.Objects.Civilization.Orders; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; public partial class CargoTransferForm : GameForm { @@ -19,7 +19,7 @@ public CargoTransferForm(ICargoTransferrer fromContainer, Sector targetSector) { InitializeComponent(); - try { this.Icon = new Icon(FrEee.WinForms.Properties.Resources.FrEeeIcon); } + try { this.Icon = new Icon(FrEee.UI.WinForms.Properties.Resources.FrEeeIcon); } catch { } clFrom.CargoContainer = fromContainer; diff --git a/FrEee.WinForms/Forms/CargoTransferForm.resx b/FrEee.UI.WinForms/Forms/CargoTransferForm.resx similarity index 100% rename from FrEee.WinForms/Forms/CargoTransferForm.resx rename to FrEee.UI.WinForms/Forms/CargoTransferForm.resx diff --git a/FrEee.WinForms/Forms/CombatSimulatorForm.Designer.cs b/FrEee.UI.WinForms/Forms/CombatSimulatorForm.Designer.cs similarity index 94% rename from FrEee.WinForms/Forms/CombatSimulatorForm.Designer.cs rename to FrEee.UI.WinForms/Forms/CombatSimulatorForm.Designer.cs index f4e7b32d5..cafc112da 100644 --- a/FrEee.WinForms/Forms/CombatSimulatorForm.Designer.cs +++ b/FrEee.UI.WinForms/Forms/CombatSimulatorForm.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; partial class CombatSimulatorForm { @@ -29,26 +29,26 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.gamePanel6 = new FrEee.WinForms.Controls.GamePanel(); - this.designReport = new FrEee.WinForms.Controls.DesignReport(); + this.gamePanel6 = new FrEee.UI.WinForms.Controls.GamePanel(); + this.designReport = new FrEee.UI.WinForms.Controls.DesignReport(); this.panel6 = new System.Windows.Forms.Panel(); - this.btnRemoveCargo = new FrEee.WinForms.Controls.GameButton(); - this.btnAddUnit = new FrEee.WinForms.Controls.GameButton(); - this.btnDuplicateCargo = new FrEee.WinForms.Controls.GameButton(); - this.gamePanel5 = new FrEee.WinForms.Controls.GamePanel(); + this.btnRemoveCargo = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnAddUnit = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnDuplicateCargo = new FrEee.UI.WinForms.Controls.GameButton(); + this.gamePanel5 = new FrEee.UI.WinForms.Controls.GamePanel(); this.lstCargo = new System.Windows.Forms.ListView(); this.panel5 = new System.Windows.Forms.Panel(); - this.btnRemoveSpaceObject = new FrEee.WinForms.Controls.GameButton(); - this.btnAddPlanet = new FrEee.WinForms.Controls.GameButton(); - this.btnAddVehicle = new FrEee.WinForms.Controls.GameButton(); - this.btnDuplicateSpaceObject = new FrEee.WinForms.Controls.GameButton(); - this.gamePanel4 = new FrEee.WinForms.Controls.GamePanel(); + this.btnRemoveSpaceObject = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnAddPlanet = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnAddVehicle = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnDuplicateSpaceObject = new FrEee.UI.WinForms.Controls.GameButton(); + this.gamePanel4 = new FrEee.UI.WinForms.Controls.GamePanel(); this.lstSpaceObjects = new System.Windows.Forms.ListView(); this.panel2 = new System.Windows.Forms.Panel(); this.chkHideObsolete = new System.Windows.Forms.CheckBox(); this.chkForeign = new System.Windows.Forms.CheckBox(); this.ddlVehicleType = new System.Windows.Forms.ComboBox(); - this.gamePanel1 = new FrEee.WinForms.Controls.GamePanel(); + this.gamePanel1 = new FrEee.UI.WinForms.Controls.GamePanel(); this.lstDesigns = new System.Windows.Forms.ListView(); this.colDesign = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.colTotalCost = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); @@ -56,15 +56,15 @@ private void InitializeComponent() this.label1 = new System.Windows.Forms.Label(); this.panel1 = new System.Windows.Forms.Panel(); this.lblQuantityUnit = new System.Windows.Forms.Label(); - this.btnCancel = new FrEee.WinForms.Controls.GameButton(); - this.btnOK = new FrEee.WinForms.Controls.GameButton(); + this.btnCancel = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnOK = new FrEee.UI.WinForms.Controls.GameButton(); this.panel3 = new System.Windows.Forms.Panel(); this.panel4 = new System.Windows.Forms.Panel(); - this.btnDuplicateEmpire = new FrEee.WinForms.Controls.GameButton(); - this.btnRemoveEmpire = new FrEee.WinForms.Controls.GameButton(); - this.gamePanel3 = new FrEee.WinForms.Controls.GamePanel(); + this.btnDuplicateEmpire = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnRemoveEmpire = new FrEee.UI.WinForms.Controls.GameButton(); + this.gamePanel3 = new FrEee.UI.WinForms.Controls.GamePanel(); this.lstEmpires = new System.Windows.Forms.ListView(); - this.gamePanel2 = new FrEee.WinForms.Controls.GamePanel(); + this.gamePanel2 = new FrEee.UI.WinForms.Controls.GamePanel(); this.tableLayoutPanel1.SuspendLayout(); this.gamePanel6.SuspendLayout(); this.panel6.SuspendLayout(); diff --git a/FrEee.WinForms/Forms/CombatSimulatorForm.cs b/FrEee.UI.WinForms/Forms/CombatSimulatorForm.cs similarity index 95% rename from FrEee.WinForms/Forms/CombatSimulatorForm.cs rename to FrEee.UI.WinForms/Forms/CombatSimulatorForm.cs index 433b47f0e..c9075c48f 100644 --- a/FrEee.WinForms/Forms/CombatSimulatorForm.cs +++ b/FrEee.UI.WinForms/Forms/CombatSimulatorForm.cs @@ -6,7 +6,7 @@ using FrEee.Objects.Vehicles; using FrEee.Modding; using FrEee.Extensions; -using FrEee.WinForms.Utility.Extensions; +using FrEee.UI.WinForms.Utility.Extensions; using System; using System.Collections.Generic; using System.Data; @@ -15,7 +15,7 @@ using System.Windows.Forms; using FrEee.Objects.GameState; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; public partial class CombatSimulatorForm : GameForm { @@ -30,7 +30,7 @@ public CombatSimulatorForm(bool groundCombat) Empires = new HashSet(Galaxy.Current.Empires.ExceptSingle((Empire)null).Select(e => new SimulatedEmpire(e))); BindEmpireList(); - try { this.Icon = new Icon(FrEee.WinForms.Properties.Resources.FrEeeIcon); } + try { this.Icon = new Icon(FrEee.UI.WinForms.Properties.Resources.FrEeeIcon); } catch { } } diff --git a/FrEee.WinForms/Forms/CombatSimulatorForm.resx b/FrEee.UI.WinForms/Forms/CombatSimulatorForm.resx similarity index 100% rename from FrEee.WinForms/Forms/CombatSimulatorForm.resx rename to FrEee.UI.WinForms/Forms/CombatSimulatorForm.resx diff --git a/FrEee.WinForms/Forms/CommandsForm.Designer.cs b/FrEee.UI.WinForms/Forms/CommandsForm.Designer.cs similarity index 95% rename from FrEee.WinForms/Forms/CommandsForm.Designer.cs rename to FrEee.UI.WinForms/Forms/CommandsForm.Designer.cs index 9f5acd977..e389284c4 100644 --- a/FrEee.WinForms/Forms/CommandsForm.Designer.cs +++ b/FrEee.UI.WinForms/Forms/CommandsForm.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; partial class CommandsForm { diff --git a/FrEee.WinForms/Forms/CommandsForm.cs b/FrEee.UI.WinForms/Forms/CommandsForm.cs similarity index 70% rename from FrEee.WinForms/Forms/CommandsForm.cs rename to FrEee.UI.WinForms/Forms/CommandsForm.cs index 9007ccd47..37ca23018 100644 --- a/FrEee.WinForms/Forms/CommandsForm.cs +++ b/FrEee.UI.WinForms/Forms/CommandsForm.cs @@ -1,10 +1,10 @@ using FrEee.Objects.Civilization; using FrEee.Objects.GameState; -using FrEee.WinForms.Utility.Extensions; +using FrEee.UI.WinForms.Utility.Extensions; using System; using System.Drawing; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; public partial class CommandsForm : GameForm { @@ -12,7 +12,7 @@ public CommandsForm() { InitializeComponent(); - try { this.Icon = new Icon(FrEee.WinForms.Properties.Resources.FrEeeIcon); } catch { } + try { this.Icon = new Icon(FrEee.UI.WinForms.Properties.Resources.FrEeeIcon); } catch { } } private void CommandsForm_Load(object sender, EventArgs e) diff --git a/FrEee.WinForms/Forms/CommandsForm.resx b/FrEee.UI.WinForms/Forms/CommandsForm.resx similarity index 100% rename from FrEee.WinForms/Forms/CommandsForm.resx rename to FrEee.UI.WinForms/Forms/CommandsForm.resx diff --git a/FrEee.WinForms/Forms/ConstructionQueueForm.Designer.cs b/FrEee.UI.WinForms/Forms/ConstructionQueueForm.Designer.cs similarity index 93% rename from FrEee.WinForms/Forms/ConstructionQueueForm.Designer.cs rename to FrEee.UI.WinForms/Forms/ConstructionQueueForm.Designer.cs index 8e1089374..d716f5487 100644 --- a/FrEee.WinForms/Forms/ConstructionQueueForm.Designer.cs +++ b/FrEee.UI.WinForms/Forms/ConstructionQueueForm.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; partial class ConstructionQueueForm { @@ -33,25 +33,25 @@ private void InitializeComponent() this.chkEmergency = new System.Windows.Forms.CheckBox(); this.chkRepeat = new System.Windows.Forms.CheckBox(); this.chkOnHold = new System.Windows.Forms.CheckBox(); - this.btnBottom = new FrEee.WinForms.Controls.GameButton(); - this.btnTop = new FrEee.WinForms.Controls.GameButton(); - this.btnDown = new FrEee.WinForms.Controls.GameButton(); - this.btnUp = new FrEee.WinForms.Controls.GameButton(); - this.btnCancel = new FrEee.WinForms.Controls.GameButton(); - this.btnOK = new FrEee.WinForms.Controls.GameButton(); - this.btnClear = new FrEee.WinForms.Controls.GameButton(); - this.btnLoadQueue = new FrEee.WinForms.Controls.GameButton(); - this.btnSaveQueue = new FrEee.WinForms.Controls.GameButton(); - this.btnClearMoveTo = new FrEee.WinForms.Controls.GameButton(); - this.btnSetMoveTo = new FrEee.WinForms.Controls.GameButton(); - this.gamePanel2 = new FrEee.WinForms.Controls.GamePanel(); + this.btnBottom = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnTop = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnDown = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnUp = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnCancel = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnOK = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnClear = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnLoadQueue = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnSaveQueue = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnClearMoveTo = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnSetMoveTo = new FrEee.UI.WinForms.Controls.GameButton(); + this.gamePanel2 = new FrEee.UI.WinForms.Controls.GamePanel(); this.lstQueue = new System.Windows.Forms.ListView(); this.Item = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.ETA = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.gamePanel1 = new FrEee.WinForms.Controls.GamePanel(); + this.gamePanel1 = new FrEee.UI.WinForms.Controls.GamePanel(); this.lblPresentEmpire = new System.Windows.Forms.Label(); this.lblPresentSystem = new System.Windows.Forms.Label(); this.lblPresentSector = new System.Windows.Forms.Label(); @@ -62,11 +62,11 @@ private void InitializeComponent() this.label4 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); this.txtName = new System.Windows.Forms.Label(); - this.resCostRad = new FrEee.WinForms.Controls.ResourceDisplay(); - this.resCostOrg = new FrEee.WinForms.Controls.ResourceDisplay(); - this.resCostMin = new FrEee.WinForms.Controls.ResourceDisplay(); + this.resCostRad = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); + this.resCostOrg = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); + this.resCostMin = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); this.label2 = new System.Windows.Forms.Label(); - this.gameTabControl1 = new FrEee.WinForms.Controls.GameTabControl(); + this.gameTabControl1 = new FrEee.UI.WinForms.Controls.GameTabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.lstShips = new System.Windows.Forms.ListView(); this.colShipItem = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); @@ -79,14 +79,14 @@ private void InitializeComponent() this.lstUpgrades = new System.Windows.Forms.ListView(); this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader5 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.resRadioactivesRate = new FrEee.WinForms.Controls.ResourceDisplay(); - this.resOrganicsRate = new FrEee.WinForms.Controls.ResourceDisplay(); - this.resMineralsRate = new FrEee.WinForms.Controls.ResourceDisplay(); - this.btnDelete = new FrEee.WinForms.Controls.GameButton(); + this.resRadioactivesRate = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); + this.resOrganicsRate = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); + this.resMineralsRate = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); + this.btnDelete = new FrEee.UI.WinForms.Controls.GameButton(); this.txtCargoStorageFree = new System.Windows.Forms.Label(); this.txtFacilitySlotsFree = new System.Windows.Forms.Label(); this.chkExpanded = new System.Windows.Forms.CheckBox(); - this.btnHelp = new FrEee.WinForms.Controls.GameButton(); + this.btnHelp = new FrEee.UI.WinForms.Controls.GameButton(); this.lblSpaceportWarning = new System.Windows.Forms.Label(); this.gamePanel2.SuspendLayout(); this.gamePanel1.SuspendLayout(); @@ -849,9 +849,9 @@ private void InitializeComponent() #endregion private System.Windows.Forms.Label label1; - private Controls.ResourceDisplay resMineralsRate; - private Controls.ResourceDisplay resOrganicsRate; - private Controls.ResourceDisplay resRadioactivesRate; + private FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay resMineralsRate; + private FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay resOrganicsRate; + private FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay resRadioactivesRate; private Controls.GamePanel gamePanel1; private Controls.GamePanel gamePanel2; private System.Windows.Forms.ListView lstQueue; @@ -869,9 +869,9 @@ private void InitializeComponent() private Controls.GameButton btnCancel; private System.Windows.Forms.ColumnHeader ETA; private System.Windows.Forms.Label txtName; - private Controls.ResourceDisplay resCostRad; - private Controls.ResourceDisplay resCostOrg; - private Controls.ResourceDisplay resCostMin; + private FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay resCostRad; + private FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay resCostOrg; + private FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay resCostMin; private System.Windows.Forms.Label label2; private System.Windows.Forms.ColumnHeader columnHeader1; private System.Windows.Forms.ColumnHeader columnHeader2; diff --git a/FrEee.WinForms/Forms/ConstructionQueueForm.cs b/FrEee.UI.WinForms/Forms/ConstructionQueueForm.cs similarity index 96% rename from FrEee.WinForms/Forms/ConstructionQueueForm.cs rename to FrEee.UI.WinForms/Forms/ConstructionQueueForm.cs index bcea94056..e22e7e890 100644 --- a/FrEee.WinForms/Forms/ConstructionQueueForm.cs +++ b/FrEee.UI.WinForms/Forms/ConstructionQueueForm.cs @@ -5,8 +5,8 @@ using FrEee.Modding; using FrEee.Utility; using FrEee.Extensions; -using FrEee.WinForms.Controls; -using FrEee.WinForms.Utility.Extensions; +using FrEee.UI.WinForms.Controls; +using FrEee.UI.WinForms.Utility.Extensions; using System; using System.Collections.Generic; using System.Data; @@ -19,7 +19,7 @@ using FrEee.Objects.GameState; using FrEee.Objects.Civilization.CargoStorage; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; public partial class ConstructionQueueForm : GameForm { @@ -29,7 +29,7 @@ public ConstructionQueueForm(ConstructionQueue queue) ConstructionQueue = queue; - try { this.Icon = new Icon(FrEee.WinForms.Properties.Resources.FrEeeIcon); } + try { this.Icon = new Icon(FrEee.UI.WinForms.Properties.Resources.FrEeeIcon); } catch { } diff --git a/FrEee.WinForms/Forms/ConstructionQueueForm.resx b/FrEee.UI.WinForms/Forms/ConstructionQueueForm.resx similarity index 100% rename from FrEee.WinForms/Forms/ConstructionQueueForm.resx rename to FrEee.UI.WinForms/Forms/ConstructionQueueForm.resx diff --git a/FrEee.WinForms/Forms/ConstructionQueueListForm.Designer.cs b/FrEee.UI.WinForms/Forms/ConstructionQueueListForm.Designer.cs similarity index 95% rename from FrEee.WinForms/Forms/ConstructionQueueListForm.Designer.cs rename to FrEee.UI.WinForms/Forms/ConstructionQueueListForm.Designer.cs index 4c59c64d1..ad7619d4f 100644 --- a/FrEee.WinForms/Forms/ConstructionQueueListForm.Designer.cs +++ b/FrEee.UI.WinForms/Forms/ConstructionQueueListForm.Designer.cs @@ -1,6 +1,6 @@ using FrEee.Objects.Civilization.Construction; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; partial class ConstructionQueueListForm { @@ -50,10 +50,10 @@ private void InitializeComponent() this.constructionQueueBindingSource = new System.Windows.Forms.BindingSource(this.components); this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.gamePanel1 = new FrEee.WinForms.Controls.GamePanel(); - this.galaxyView = new FrEee.WinForms.Controls.GalaxyView(); - this.gamePanel2 = new FrEee.WinForms.Controls.GamePanel(); - this.starSystemView = new FrEee.WinForms.Controls.StarSystemView(); + this.gamePanel1 = new FrEee.UI.WinForms.Controls.GamePanel(); + this.galaxyView = new FrEee.UI.WinForms.Controls.GalaxyView(); + this.gamePanel2 = new FrEee.UI.WinForms.Controls.GamePanel(); + this.starSystemView = new FrEee.UI.WinForms.Controls.StarSystemView(); ((System.ComponentModel.ISupportInitialize)(this.gridQueues)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.constructionQueueBindingSource)).BeginInit(); this.gamePanel1.SuspendLayout(); diff --git a/FrEee.WinForms/Forms/ConstructionQueueListForm.cs b/FrEee.UI.WinForms/Forms/ConstructionQueueListForm.cs similarity index 91% rename from FrEee.WinForms/Forms/ConstructionQueueListForm.cs rename to FrEee.UI.WinForms/Forms/ConstructionQueueListForm.cs index 26e75f255..33c4a568b 100644 --- a/FrEee.WinForms/Forms/ConstructionQueueListForm.cs +++ b/FrEee.UI.WinForms/Forms/ConstructionQueueListForm.cs @@ -1,7 +1,7 @@ using FrEee.Objects.Civilization; using FrEee.Utility; using FrEee.Extensions; -using FrEee.WinForms.Utility.Extensions; +using FrEee.UI.WinForms.Utility.Extensions; using System; using System.Drawing; using System.IO; @@ -10,7 +10,7 @@ using System.Windows.Forms; using FrEee.Objects.Civilization.Construction; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; public partial class ConstructionQueueListForm : GameForm { @@ -18,7 +18,7 @@ public ConstructionQueueListForm() { InitializeComponent(); - try { this.Icon = new Icon(FrEee.WinForms.Properties.Resources.FrEeeIcon); } catch { } + try { this.Icon = new Icon(FrEee.UI.WinForms.Properties.Resources.FrEeeIcon); } catch { } RateMinerals.DefaultCellStyle.ForeColor = Resource.Minerals.Color; RateOrganics.DefaultCellStyle.ForeColor = Resource.Organics.Color; diff --git a/FrEee.WinForms/Forms/ConstructionQueueListForm.resx b/FrEee.UI.WinForms/Forms/ConstructionQueueListForm.resx similarity index 100% rename from FrEee.WinForms/Forms/ConstructionQueueListForm.resx rename to FrEee.UI.WinForms/Forms/ConstructionQueueListForm.resx diff --git a/FrEee.WinForms/Forms/CultureComparisonForm.Designer.cs b/FrEee.UI.WinForms/Forms/CultureComparisonForm.Designer.cs similarity index 97% rename from FrEee.WinForms/Forms/CultureComparisonForm.Designer.cs rename to FrEee.UI.WinForms/Forms/CultureComparisonForm.Designer.cs index 41faebf38..38876409f 100644 --- a/FrEee.WinForms/Forms/CultureComparisonForm.Designer.cs +++ b/FrEee.UI.WinForms/Forms/CultureComparisonForm.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; partial class CultureComparisonForm { @@ -42,7 +42,7 @@ private void InitializeComponent() this.constructionDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.repairDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.cultureBindingSource = new System.Windows.Forms.BindingSource(this.components); - this.btnClose = new FrEee.WinForms.Controls.GameButton(); + this.btnClose = new FrEee.UI.WinForms.Controls.GameButton(); ((System.ComponentModel.ISupportInitialize)(this.gridCultures)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.cultureBindingSource)).BeginInit(); this.SuspendLayout(); diff --git a/FrEee.WinForms/Forms/CultureComparisonForm.cs b/FrEee.UI.WinForms/Forms/CultureComparisonForm.cs similarity index 85% rename from FrEee.WinForms/Forms/CultureComparisonForm.cs rename to FrEee.UI.WinForms/Forms/CultureComparisonForm.cs index 68a26e0c5..02ee71204 100644 --- a/FrEee.WinForms/Forms/CultureComparisonForm.cs +++ b/FrEee.UI.WinForms/Forms/CultureComparisonForm.cs @@ -3,14 +3,14 @@ using System.Drawing; using System.Windows.Forms; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; public partial class CultureComparisonForm : GameForm { public CultureComparisonForm() { InitializeComponent(); - try { base.Icon = new Icon(FrEee.WinForms.Properties.Resources.FrEeeIcon); } + try { base.Icon = new Icon(FrEee.UI.WinForms.Properties.Resources.FrEeeIcon); } catch { } foreach (DataGridViewColumn col in gridCultures.Columns) { diff --git a/FrEee.WinForms/Forms/CultureComparisonForm.resx b/FrEee.UI.WinForms/Forms/CultureComparisonForm.resx similarity index 100% rename from FrEee.WinForms/Forms/CultureComparisonForm.resx rename to FrEee.UI.WinForms/Forms/CultureComparisonForm.resx diff --git a/FrEee.WinForms/Forms/DebugForm.Designer.cs b/FrEee.UI.WinForms/Forms/DebugForm.Designer.cs similarity index 94% rename from FrEee.WinForms/Forms/DebugForm.Designer.cs rename to FrEee.UI.WinForms/Forms/DebugForm.Designer.cs index 3df17a930..870ee5712 100644 --- a/FrEee.WinForms/Forms/DebugForm.Designer.cs +++ b/FrEee.UI.WinForms/Forms/DebugForm.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; partial class DebugForm { @@ -30,7 +30,7 @@ private void InitializeComponent() { this.txtCommand = new System.Windows.Forms.TextBox(); this.rtbOutput = new System.Windows.Forms.RichTextBox(); - this.btnSubmit = new FrEee.WinForms.Controls.GameButton(); + this.btnSubmit = new FrEee.UI.WinForms.Controls.GameButton(); this.SuspendLayout(); // // txtCommand diff --git a/FrEee.WinForms/Forms/DebugForm.cs b/FrEee.UI.WinForms/Forms/DebugForm.cs similarity index 95% rename from FrEee.WinForms/Forms/DebugForm.cs rename to FrEee.UI.WinForms/Forms/DebugForm.cs index 4941e8136..c2b3c9a02 100644 --- a/FrEee.WinForms/Forms/DebugForm.cs +++ b/FrEee.UI.WinForms/Forms/DebugForm.cs @@ -4,7 +4,7 @@ using System.Drawing; using FrEee.Objects.GameState; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; public partial class DebugForm : GameForm { diff --git a/FrEee.WinForms/Forms/DebugForm.resx b/FrEee.UI.WinForms/Forms/DebugForm.resx similarity index 100% rename from FrEee.WinForms/Forms/DebugForm.resx rename to FrEee.UI.WinForms/Forms/DebugForm.resx diff --git a/FrEee.WinForms/Forms/DesignListForm.Designer.cs b/FrEee.UI.WinForms/Forms/DesignListForm.Designer.cs similarity index 92% rename from FrEee.WinForms/Forms/DesignListForm.Designer.cs rename to FrEee.UI.WinForms/Forms/DesignListForm.Designer.cs index 2f0291c0d..219fb2552 100644 --- a/FrEee.WinForms/Forms/DesignListForm.Designer.cs +++ b/FrEee.UI.WinForms/Forms/DesignListForm.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; partial class DesignListForm { @@ -31,23 +31,23 @@ private void InitializeComponent() this.ddlVehicleType = new System.Windows.Forms.ComboBox(); this.chkForeign = new System.Windows.Forms.CheckBox(); this.chkHideObsolete = new System.Windows.Forms.CheckBox(); - this.btnClose = new FrEee.WinForms.Controls.GameButton(); - this.btnGroundSimulator = new FrEee.WinForms.Controls.GameButton(); - this.btnSpaceSimulator = new FrEee.WinForms.Controls.GameButton(); - this.btnObsolete = new FrEee.WinForms.Controls.GameButton(); - this.btnUpgrade = new FrEee.WinForms.Controls.GameButton(); - this.btnEdit = new FrEee.WinForms.Controls.GameButton(); - this.btnCopy = new FrEee.WinForms.Controls.GameButton(); - this.btnCreate = new FrEee.WinForms.Controls.GameButton(); - this.gamePanel2 = new FrEee.WinForms.Controls.GamePanel(); - this.designReport = new FrEee.WinForms.Controls.DesignReport(); - this.gamePanel1 = new FrEee.WinForms.Controls.GamePanel(); + this.btnClose = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnGroundSimulator = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnSpaceSimulator = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnObsolete = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnUpgrade = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnEdit = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnCopy = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnCreate = new FrEee.UI.WinForms.Controls.GameButton(); + this.gamePanel2 = new FrEee.UI.WinForms.Controls.GamePanel(); + this.designReport = new FrEee.UI.WinForms.Controls.DesignReport(); + this.gamePanel1 = new FrEee.UI.WinForms.Controls.GamePanel(); this.lstDesigns = new System.Windows.Forms.ListView(); this.colDesign = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.colTotalCost = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.btnStrategy = new FrEee.WinForms.Controls.GameButton(); - this.btnDelete = new FrEee.WinForms.Controls.GameButton(); - this.btnExportAll = new FrEee.WinForms.Controls.GameButton(); + this.btnStrategy = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnDelete = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnExportAll = new FrEee.UI.WinForms.Controls.GameButton(); this.gamePanel2.SuspendLayout(); this.gamePanel1.SuspendLayout(); this.SuspendLayout(); diff --git a/FrEee.WinForms/Forms/DesignListForm.cs b/FrEee.UI.WinForms/Forms/DesignListForm.cs similarity index 95% rename from FrEee.WinForms/Forms/DesignListForm.cs rename to FrEee.UI.WinForms/Forms/DesignListForm.cs index e791b6dc1..a2c4a8149 100644 --- a/FrEee.WinForms/Forms/DesignListForm.cs +++ b/FrEee.UI.WinForms/Forms/DesignListForm.cs @@ -3,7 +3,7 @@ using FrEee.Objects.Technology; using FrEee.Utility; using FrEee.Extensions; -using FrEee.WinForms.Utility.Extensions; +using FrEee.UI.WinForms.Utility.Extensions; using System; using System.Collections.Generic; using System.Data; @@ -14,7 +14,7 @@ using FrEee.Objects.Vehicles; using FrEee.Objects.GameState; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; public partial class DesignListForm : GameForm { @@ -24,7 +24,7 @@ public DesignListForm() BindVehicleTypeList(); BindDesignList(); - try { this.Icon = new Icon(FrEee.WinForms.Properties.Resources.FrEeeIcon); } catch { } + try { this.Icon = new Icon(FrEee.UI.WinForms.Properties.Resources.FrEeeIcon); } catch { } } private void BindDesignList() diff --git a/FrEee.WinForms/Forms/DesignListForm.resx b/FrEee.UI.WinForms/Forms/DesignListForm.resx similarity index 100% rename from FrEee.WinForms/Forms/DesignListForm.resx rename to FrEee.UI.WinForms/Forms/DesignListForm.resx diff --git a/FrEee.WinForms/Forms/DiplomacyForm.Designer.cs b/FrEee.UI.WinForms/Forms/DiplomacyForm.Designer.cs similarity index 95% rename from FrEee.WinForms/Forms/DiplomacyForm.Designer.cs rename to FrEee.UI.WinForms/Forms/DiplomacyForm.Designer.cs index 6a12306b3..44f4d6a76 100644 --- a/FrEee.WinForms/Forms/DiplomacyForm.Designer.cs +++ b/FrEee.UI.WinForms/Forms/DiplomacyForm.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; partial class DiplomacyForm { @@ -45,12 +45,12 @@ private void InitializeComponent() this.lblQuantityLevel = new System.Windows.Forms.Label(); this.txtQuantityLevel = new System.Windows.Forms.TextBox(); this.ddlAlliance = new System.Windows.Forms.ComboBox(); - this.btnReturn = new FrEee.WinForms.Controls.GameButton(); - this.btnRequest = new FrEee.WinForms.Controls.GameButton(); - this.btnGive = new FrEee.WinForms.Controls.GameButton(); - this.btnCancel = new FrEee.WinForms.Controls.GameButton(); - this.btnSend = new FrEee.WinForms.Controls.GameButton(); - this.picPortrait = new FrEee.WinForms.Controls.GamePictureBox(); + this.btnReturn = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnRequest = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnGive = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnCancel = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnSend = new FrEee.UI.WinForms.Controls.GameButton(); + this.picPortrait = new FrEee.UI.WinForms.Controls.Blazor.GamePictureBox(); this.pnlQuantityLevel.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.picPortrait)).BeginInit(); this.SuspendLayout(); @@ -372,7 +372,7 @@ private void InitializeComponent() private System.Windows.Forms.Label label1; private System.Windows.Forms.TextBox txtInReplyTo; - private Controls.GamePictureBox picPortrait; + private FrEee.UI.WinForms.Controls.Blazor.GamePictureBox picPortrait; private System.Windows.Forms.Label label2; private System.Windows.Forms.TextBox txtMessage; private Controls.GameButton btnCancel; diff --git a/FrEee.WinForms/Forms/DiplomacyForm.cs b/FrEee.UI.WinForms/Forms/DiplomacyForm.cs similarity index 95% rename from FrEee.WinForms/Forms/DiplomacyForm.cs rename to FrEee.UI.WinForms/Forms/DiplomacyForm.cs index 0739582b9..7d5157e82 100644 --- a/FrEee.WinForms/Forms/DiplomacyForm.cs +++ b/FrEee.UI.WinForms/Forms/DiplomacyForm.cs @@ -8,7 +8,7 @@ using FrEee.Modding; using FrEee.Utility; using FrEee.Extensions; -using FrEee.WinForms.Utility.Extensions; +using FrEee.UI.WinForms.Utility.Extensions; using System; using System.Collections.Generic; using System.Data; @@ -19,14 +19,14 @@ using FrEee.Objects.Civilization.Diplomacy.Actions; using FrEee.Objects.Abilities; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; public partial class DiplomacyForm : GameForm { public DiplomacyForm(Empire targetEmpire) { InitializeComponent(); - try { base.Icon = new Icon(FrEee.WinForms.Properties.Resources.FrEeeIcon); } + try { base.Icon = new Icon(FrEee.UI.WinForms.Properties.Resources.FrEeeIcon); } catch { } TargetEmpire = targetEmpire; picPortrait.Image = TargetEmpire.Portrait; @@ -50,7 +50,7 @@ public DiplomacyForm(Empire targetEmpire) public DiplomacyForm(IMessage inReplyTo) { InitializeComponent(); - try { base.Icon = new Icon(FrEee.WinForms.Properties.Resources.FrEeeIcon); } + try { base.Icon = new Icon(FrEee.UI.WinForms.Properties.Resources.FrEeeIcon); } catch { } TargetEmpire = inReplyTo.Owner; picPortrait.Image = TargetEmpire?.Portrait; diff --git a/FrEee.WinForms/Forms/DiplomacyForm.resx b/FrEee.UI.WinForms/Forms/DiplomacyForm.resx similarity index 100% rename from FrEee.WinForms/Forms/DiplomacyForm.resx rename to FrEee.UI.WinForms/Forms/DiplomacyForm.resx diff --git a/FrEee.WinForms/Forms/EditorForm.Designer.cs b/FrEee.UI.WinForms/Forms/EditorForm.Designer.cs similarity index 92% rename from FrEee.WinForms/Forms/EditorForm.Designer.cs rename to FrEee.UI.WinForms/Forms/EditorForm.Designer.cs index 590cc0244..4a3dc4cb3 100644 --- a/FrEee.WinForms/Forms/EditorForm.Designer.cs +++ b/FrEee.UI.WinForms/Forms/EditorForm.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; partial class EditorForm { @@ -29,9 +29,9 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { this.tree = new System.Windows.Forms.TreeView(); - this.btnCancel = new FrEee.WinForms.Controls.GameButton(); - this.btnSave = new FrEee.WinForms.Controls.GameButton(); - this.propertyGrid = new FrEee.WinForms.GamePropertyGrid(); + this.btnCancel = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnSave = new FrEee.UI.WinForms.Controls.GameButton(); + this.propertyGrid = new FrEee.UI.WinForms.GamePropertyGrid(); this.SuspendLayout(); // // tree diff --git a/FrEee.WinForms/Forms/EditorForm.cs b/FrEee.UI.WinForms/Forms/EditorForm.cs similarity index 89% rename from FrEee.WinForms/Forms/EditorForm.cs rename to FrEee.UI.WinForms/Forms/EditorForm.cs index f69bdbc63..da051ff69 100644 --- a/FrEee.WinForms/Forms/EditorForm.cs +++ b/FrEee.UI.WinForms/Forms/EditorForm.cs @@ -1,7 +1,7 @@ using FrEee.Serialization; using FrEee.Extensions; -using FrEee.WinForms.Interfaces; -using FrEee.WinForms.Utility.Extensions; +using FrEee.UI.WinForms.Interfaces; +using FrEee.UI.WinForms.Utility.Extensions; using System; using System.Collections; using System.Collections.Generic; @@ -9,14 +9,14 @@ using System.Windows.Forms; using FrEee.Objects.GameState; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; public partial class EditorForm : GameForm, IBindable { public EditorForm(object root, Func save, Func cancel) { InitializeComponent(); - try { this.Icon = new Icon(FrEee.WinForms.Properties.Resources.FrEeeIcon); } + try { this.Icon = new Icon(FrEee.UI.WinForms.Properties.Resources.FrEeeIcon); } catch { } Bind(root); this.save = save; diff --git a/FrEee.WinForms/Forms/EditorForm.resx b/FrEee.UI.WinForms/Forms/EditorForm.resx similarity index 100% rename from FrEee.WinForms/Forms/EditorForm.resx rename to FrEee.UI.WinForms/Forms/EditorForm.resx diff --git a/FrEee.WinForms/Forms/EmpireListForm.Designer.cs b/FrEee.UI.WinForms/Forms/EmpireListForm.Designer.cs similarity index 90% rename from FrEee.WinForms/Forms/EmpireListForm.Designer.cs rename to FrEee.UI.WinForms/Forms/EmpireListForm.Designer.cs index b7daaf694..838e2474d 100644 --- a/FrEee.WinForms/Forms/EmpireListForm.Designer.cs +++ b/FrEee.UI.WinForms/Forms/EmpireListForm.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; partial class EmpireListForm { @@ -29,11 +29,11 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - this.tabs = new FrEee.WinForms.Controls.GameTabControl(); + this.tabs = new FrEee.UI.WinForms.Controls.GameTabControl(); this.tabDiplomacy = new System.Windows.Forms.TabPage(); - this.btnDelete = new FrEee.WinForms.Controls.GameButton(); - this.btnCompose = new FrEee.WinForms.Controls.GameButton(); - this.btnReply = new FrEee.WinForms.Controls.GameButton(); + this.btnDelete = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnCompose = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnReply = new FrEee.UI.WinForms.Controls.GameButton(); this.lstMessages = new System.Windows.Forms.ListView(); this.colPortrait = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.colFrom = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); @@ -43,30 +43,30 @@ private void InitializeComponent() this.txtTreaty = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.tabIntel = new System.Windows.Forms.TabPage(); - this.btnBottom = new FrEee.WinForms.Controls.GameButton(); - this.btnTop = new FrEee.WinForms.Controls.GameButton(); - this.btnDown = new FrEee.WinForms.Controls.GameButton(); - this.btnUp = new FrEee.WinForms.Controls.GameButton(); - this.btnDelIntel = new FrEee.WinForms.Controls.GameButton(); - this.btnAdd = new FrEee.WinForms.Controls.GameButton(); + this.btnBottom = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnTop = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnDown = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnUp = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnDelIntel = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnAdd = new FrEee.UI.WinForms.Controls.GameButton(); this.lstIntel = new System.Windows.Forms.ListView(); this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.report = new FrEee.WinForms.Controls.EmpireReport(); + this.report = new FrEee.UI.WinForms.Controls.EmpireReport(); this.tabBudget = new System.Windows.Forms.TabPage(); - this.rqdSpoiledDeficit = new FrEee.WinForms.Controls.ResourceQuantityDisplay(); + this.rqdSpoiledDeficit = new FrEee.UI.WinForms.Controls.Blazor.ResourceQuantityDisplay(); this.label14 = new System.Windows.Forms.Label(); this.lblBudgetWarning = new System.Windows.Forms.Label(); - this.rqdStorage = new FrEee.WinForms.Controls.ResourceQuantityDisplay(); - this.rqdStored = new FrEee.WinForms.Controls.ResourceQuantityDisplay(); - this.rqdNet = new FrEee.WinForms.Controls.ResourceQuantityDisplay(); - this.rqdTributesOut = new FrEee.WinForms.Controls.ResourceQuantityDisplay(); - this.rqdMaintenance = new FrEee.WinForms.Controls.ResourceQuantityDisplay(); - this.rqdConstruction = new FrEee.WinForms.Controls.ResourceQuantityDisplay(); - this.rqExpenses = new FrEee.WinForms.Controls.ResourceQuantityDisplay(); - this.rqdTributesIn = new FrEee.WinForms.Controls.ResourceQuantityDisplay(); - this.rqdTrade = new FrEee.WinForms.Controls.ResourceQuantityDisplay(); - this.rqdExtraction = new FrEee.WinForms.Controls.ResourceQuantityDisplay(); - this.rqdIncome = new FrEee.WinForms.Controls.ResourceQuantityDisplay(); + this.rqdStorage = new FrEee.UI.WinForms.Controls.Blazor.ResourceQuantityDisplay(); + this.rqdStored = new FrEee.UI.WinForms.Controls.Blazor.ResourceQuantityDisplay(); + this.rqdNet = new FrEee.UI.WinForms.Controls.Blazor.ResourceQuantityDisplay(); + this.rqdTributesOut = new FrEee.UI.WinForms.Controls.Blazor.ResourceQuantityDisplay(); + this.rqdMaintenance = new FrEee.UI.WinForms.Controls.Blazor.ResourceQuantityDisplay(); + this.rqdConstruction = new FrEee.UI.WinForms.Controls.Blazor.ResourceQuantityDisplay(); + this.rqExpenses = new FrEee.UI.WinForms.Controls.Blazor.ResourceQuantityDisplay(); + this.rqdTributesIn = new FrEee.UI.WinForms.Controls.Blazor.ResourceQuantityDisplay(); + this.rqdTrade = new FrEee.UI.WinForms.Controls.Blazor.ResourceQuantityDisplay(); + this.rqdExtraction = new FrEee.UI.WinForms.Controls.Blazor.ResourceQuantityDisplay(); + this.rqdIncome = new FrEee.UI.WinForms.Controls.Blazor.ResourceQuantityDisplay(); this.label12 = new System.Windows.Forms.Label(); this.label11 = new System.Windows.Forms.Label(); this.label10 = new System.Windows.Forms.Label(); @@ -93,13 +93,13 @@ private void InitializeComponent() this.label19 = new System.Windows.Forms.Label(); this.label20 = new System.Windows.Forms.Label(); this.label21 = new System.Windows.Forms.Label(); - this.btnClose = new FrEee.WinForms.Controls.GameButton(); - this.gamePanel1 = new FrEee.WinForms.Controls.GamePanel(); + this.btnClose = new FrEee.UI.WinForms.Controls.GameButton(); + this.gamePanel1 = new FrEee.UI.WinForms.Controls.GamePanel(); this.lstEmpires = new System.Windows.Forms.ListView(); - this.btnMinisters = new FrEee.WinForms.Controls.GameButton(); - this.btnAvoidSystems = new FrEee.WinForms.Controls.GameButton(); - this.btnWaypoints = new FrEee.WinForms.Controls.GameButton(); - this.btnScores = new FrEee.WinForms.Controls.GameButton(); + this.btnMinisters = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnAvoidSystems = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnWaypoints = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnScores = new FrEee.UI.WinForms.Controls.GameButton(); this.toolTip = new System.Windows.Forms.ToolTip(this.components); this.tabs.SuspendLayout(); this.tabDiplomacy.SuspendLayout(); @@ -421,7 +421,7 @@ private void InitializeComponent() this.rqdSpoiledDeficit.ForeColor = System.Drawing.Color.White; this.rqdSpoiledDeficit.Location = new System.Drawing.Point(177, 360); this.rqdSpoiledDeficit.Name = "rqdSpoiledDeficit"; - this.rqdSpoiledDeficit.ResourceQuantity = null; + this.rqdSpoiledDeficit.Amounts = null; this.rqdSpoiledDeficit.Size = new System.Drawing.Size(413, 24); this.rqdSpoiledDeficit.TabIndex = 26; // @@ -453,7 +453,7 @@ private void InitializeComponent() this.rqdStorage.ForeColor = System.Drawing.Color.White; this.rqdStorage.Location = new System.Drawing.Point(177, 330); this.rqdStorage.Name = "rqdStorage"; - this.rqdStorage.ResourceQuantity = null; + this.rqdStorage.Amounts = null; this.rqdStorage.Size = new System.Drawing.Size(413, 24); this.rqdStorage.TabIndex = 23; // @@ -464,7 +464,7 @@ private void InitializeComponent() this.rqdStored.ForeColor = System.Drawing.Color.White; this.rqdStored.Location = new System.Drawing.Point(177, 300); this.rqdStored.Name = "rqdStored"; - this.rqdStored.ResourceQuantity = null; + this.rqdStored.Amounts = null; this.rqdStored.Size = new System.Drawing.Size(413, 24); this.rqdStored.TabIndex = 22; // @@ -475,7 +475,7 @@ private void InitializeComponent() this.rqdNet.ForeColor = System.Drawing.Color.White; this.rqdNet.Location = new System.Drawing.Point(177, 270); this.rqdNet.Name = "rqdNet"; - this.rqdNet.ResourceQuantity = null; + this.rqdNet.Amounts = null; this.rqdNet.Size = new System.Drawing.Size(413, 24); this.rqdNet.TabIndex = 21; // @@ -486,7 +486,7 @@ private void InitializeComponent() this.rqdTributesOut.ForeColor = System.Drawing.Color.White; this.rqdTributesOut.Location = new System.Drawing.Point(177, 228); this.rqdTributesOut.Name = "rqdTributesOut"; - this.rqdTributesOut.ResourceQuantity = null; + this.rqdTributesOut.Amounts = null; this.rqdTributesOut.Size = new System.Drawing.Size(413, 24); this.rqdTributesOut.TabIndex = 20; // @@ -497,7 +497,7 @@ private void InitializeComponent() this.rqdMaintenance.ForeColor = System.Drawing.Color.White; this.rqdMaintenance.Location = new System.Drawing.Point(177, 198); this.rqdMaintenance.Name = "rqdMaintenance"; - this.rqdMaintenance.ResourceQuantity = null; + this.rqdMaintenance.Amounts = null; this.rqdMaintenance.Size = new System.Drawing.Size(413, 24); this.rqdMaintenance.TabIndex = 19; // @@ -508,7 +508,7 @@ private void InitializeComponent() this.rqdConstruction.ForeColor = System.Drawing.Color.White; this.rqdConstruction.Location = new System.Drawing.Point(177, 168); this.rqdConstruction.Name = "rqdConstruction"; - this.rqdConstruction.ResourceQuantity = null; + this.rqdConstruction.Amounts = null; this.rqdConstruction.Size = new System.Drawing.Size(413, 24); this.rqdConstruction.TabIndex = 18; // @@ -519,7 +519,7 @@ private void InitializeComponent() this.rqExpenses.ForeColor = System.Drawing.Color.White; this.rqExpenses.Location = new System.Drawing.Point(177, 138); this.rqExpenses.Name = "rqExpenses"; - this.rqExpenses.ResourceQuantity = null; + this.rqExpenses.Amounts = null; this.rqExpenses.Size = new System.Drawing.Size(413, 24); this.rqExpenses.TabIndex = 17; // @@ -530,7 +530,7 @@ private void InitializeComponent() this.rqdTributesIn.ForeColor = System.Drawing.Color.White; this.rqdTributesIn.Location = new System.Drawing.Point(177, 93); this.rqdTributesIn.Name = "rqdTributesIn"; - this.rqdTributesIn.ResourceQuantity = null; + this.rqdTributesIn.Amounts = null; this.rqdTributesIn.Size = new System.Drawing.Size(413, 24); this.rqdTributesIn.TabIndex = 16; // @@ -541,7 +541,7 @@ private void InitializeComponent() this.rqdTrade.ForeColor = System.Drawing.Color.White; this.rqdTrade.Location = new System.Drawing.Point(177, 63); this.rqdTrade.Name = "rqdTrade"; - this.rqdTrade.ResourceQuantity = null; + this.rqdTrade.Amounts = null; this.rqdTrade.Size = new System.Drawing.Size(413, 24); this.rqdTrade.TabIndex = 15; // @@ -552,7 +552,7 @@ private void InitializeComponent() this.rqdExtraction.ForeColor = System.Drawing.Color.White; this.rqdExtraction.Location = new System.Drawing.Point(177, 33); this.rqdExtraction.Name = "rqdExtraction"; - this.rqdExtraction.ResourceQuantity = null; + this.rqdExtraction.Amounts = null; this.rqdExtraction.Size = new System.Drawing.Size(413, 24); this.rqdExtraction.TabIndex = 14; // @@ -563,7 +563,7 @@ private void InitializeComponent() this.rqdIncome.ForeColor = System.Drawing.Color.White; this.rqdIncome.Location = new System.Drawing.Point(177, 3); this.rqdIncome.Name = "rqdIncome"; - this.rqdIncome.ResourceQuantity = null; + this.rqdIncome.Amounts = null; this.rqdIncome.Size = new System.Drawing.Size(413, 24); this.rqdIncome.TabIndex = 12; // @@ -1010,17 +1010,17 @@ private void InitializeComponent() private System.Windows.Forms.Label label12; private System.Windows.Forms.Label label11; private System.Windows.Forms.Label label10; - private Controls.ResourceQuantityDisplay rqdIncome; - private Controls.ResourceQuantityDisplay rqdStored; - private Controls.ResourceQuantityDisplay rqdNet; - private Controls.ResourceQuantityDisplay rqdTributesOut; - private Controls.ResourceQuantityDisplay rqdMaintenance; - private Controls.ResourceQuantityDisplay rqdConstruction; - private Controls.ResourceQuantityDisplay rqExpenses; - private Controls.ResourceQuantityDisplay rqdTributesIn; - private Controls.ResourceQuantityDisplay rqdTrade; - private Controls.ResourceQuantityDisplay rqdExtraction; - private Controls.ResourceQuantityDisplay rqdStorage; + private FrEee.UI.WinForms.Controls.Blazor.ResourceQuantityDisplay rqdIncome; + private FrEee.UI.WinForms.Controls.Blazor.ResourceQuantityDisplay rqdStored; + private FrEee.UI.WinForms.Controls.Blazor.ResourceQuantityDisplay rqdNet; + private FrEee.UI.WinForms.Controls.Blazor.ResourceQuantityDisplay rqdTributesOut; + private FrEee.UI.WinForms.Controls.Blazor.ResourceQuantityDisplay rqdMaintenance; + private FrEee.UI.WinForms.Controls.Blazor.ResourceQuantityDisplay rqdConstruction; + private FrEee.UI.WinForms.Controls.Blazor.ResourceQuantityDisplay rqExpenses; + private FrEee.UI.WinForms.Controls.Blazor.ResourceQuantityDisplay rqdTributesIn; + private FrEee.UI.WinForms.Controls.Blazor.ResourceQuantityDisplay rqdTrade; + private FrEee.UI.WinForms.Controls.Blazor.ResourceQuantityDisplay rqdExtraction; + private FrEee.UI.WinForms.Controls.Blazor.ResourceQuantityDisplay rqdStorage; private System.Windows.Forms.ListView lstMessages; private System.Windows.Forms.Label label13; private System.Windows.Forms.TabPage tabIntel; @@ -1044,7 +1044,7 @@ private void InitializeComponent() private Controls.GameButton btnMinisters; private Controls.GameButton btnAvoidSystems; private Controls.GameButton btnWaypoints; - private Controls.ResourceQuantityDisplay rqdSpoiledDeficit; + private FrEee.UI.WinForms.Controls.Blazor.ResourceQuantityDisplay rqdSpoiledDeficit; private System.Windows.Forms.Label label14; private Controls.GameButton btnScores; private System.Windows.Forms.TabPage tabPlayerInfo; diff --git a/FrEee.WinForms/Forms/EmpireListForm.cs b/FrEee.UI.WinForms/Forms/EmpireListForm.cs similarity index 86% rename from FrEee.WinForms/Forms/EmpireListForm.cs rename to FrEee.UI.WinForms/Forms/EmpireListForm.cs index 9e1a9d4de..c588ea9a3 100644 --- a/FrEee.WinForms/Forms/EmpireListForm.cs +++ b/FrEee.UI.WinForms/Forms/EmpireListForm.cs @@ -2,7 +2,7 @@ using FrEee.Objects.Commands; using FrEee.Utility; using FrEee.Extensions; -using FrEee.WinForms.Utility.Extensions; +using FrEee.UI.WinForms.Utility.Extensions; using System; using System.Data; using System.Diagnostics; @@ -12,14 +12,14 @@ using FrEee.Objects.Civilization.Diplomacy.Messages; using FrEee.Objects.GameState; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; public partial class EmpireListForm : GameForm { public EmpireListForm() { InitializeComponent(); - try { base.Icon = new Icon(FrEee.WinForms.Properties.Resources.FrEeeIcon); } + try { base.Icon = new Icon(FrEee.UI.WinForms.Properties.Resources.FrEeeIcon); } catch { } BindEmpires(); } @@ -105,15 +105,15 @@ private void BindEmpire(Empire emp, TabPage tab = null) // budget if (emp == Empire.Current) - rqdConstruction.ResourceQuantity = emp.ConstructionSpending; + rqdConstruction.Amounts = emp.ConstructionSpending; else // assume other empires' construction queues are running at full capacity - rqdConstruction.ResourceQuantity = emp.ConstructionQueues.Sum(rq => rq.Rate); - rqdExtraction.ResourceQuantity = emp.ColonyIncome + emp.RemoteMiningIncome + emp.RawResourceIncome; - rqdIncome.ResourceQuantity = emp.GrossDomesticIncome; - rqdMaintenance.ResourceQuantity = emp.Maintenance; - rqdNet.ResourceQuantity = emp.NetIncomeLessConstruction; - rqdStorage.ResourceQuantity = emp.ResourceStorage; + rqdConstruction.Amounts = emp.ConstructionQueues.Sum(rq => rq.Rate); + rqdExtraction.Amounts = emp.ColonyIncome + emp.RemoteMiningIncome + emp.RawResourceIncome; + rqdIncome.Amounts = emp.GrossDomesticIncome; + rqdMaintenance.Amounts = emp.Maintenance; + rqdNet.Amounts = emp.NetIncomeLessConstruction; + rqdStorage.Amounts = emp.ResourceStorage; var spoilageOrDeficit = new ResourceQuantity(); var newResources = emp.StoredResources + emp.NetIncomeLessConstruction; foreach (var r in Resource.All) @@ -125,12 +125,12 @@ private void BindEmpire(Empire emp, TabPage tab = null) else spoilageOrDeficit[r] = 0; } - rqdSpoiledDeficit.ResourceQuantity = spoilageOrDeficit; - rqdStored.ResourceQuantity = emp.StoredResources; - rqdTrade.ResourceQuantity = emp.TradeIncome; - rqdTributesIn.ResourceQuantity = new ResourceQuantity(); // TODO - show tributes - rqdTributesOut.ResourceQuantity = new ResourceQuantity(); // TODO - show tributes - rqExpenses.ResourceQuantity = rqdConstruction.ResourceQuantity + rqdMaintenance.ResourceQuantity + rqdTributesOut.ResourceQuantity; + rqdSpoiledDeficit.Amounts = spoilageOrDeficit; + rqdStored.Amounts = emp.StoredResources; + rqdTrade.Amounts = emp.TradeIncome; + rqdTributesIn.Amounts = new ResourceQuantity(); // TODO - show tributes + rqdTributesOut.Amounts = new ResourceQuantity(); // TODO - show tributes + rqExpenses.Amounts = rqdConstruction.Amounts + rqdMaintenance.Amounts + rqdTributesOut.Amounts; lblBudgetWarning.Visible = emp != Empire.Current; // message log diff --git a/FrEee.WinForms/Forms/EmpireListForm.resx b/FrEee.UI.WinForms/Forms/EmpireListForm.resx similarity index 100% rename from FrEee.WinForms/Forms/EmpireListForm.resx rename to FrEee.UI.WinForms/Forms/EmpireListForm.resx diff --git a/FrEee.WinForms/Forms/EmpireSetupForm.Designer.cs b/FrEee.UI.WinForms/Forms/EmpireSetupForm.Designer.cs similarity index 93% rename from FrEee.WinForms/Forms/EmpireSetupForm.Designer.cs rename to FrEee.UI.WinForms/Forms/EmpireSetupForm.Designer.cs index 83ecc11f8..04edd52d0 100644 --- a/FrEee.WinForms/Forms/EmpireSetupForm.Designer.cs +++ b/FrEee.UI.WinForms/Forms/EmpireSetupForm.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; partial class EmpireSetupForm { @@ -29,17 +29,17 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { this.txtPointsAvailable = new System.Windows.Forms.Label(); - this.btnSaveRace = new FrEee.WinForms.Controls.GameButton(); - this.btnLoadRace = new FrEee.WinForms.Controls.GameButton(); - this.btnCancel = new FrEee.WinForms.Controls.GameButton(); - this.btnOK = new FrEee.WinForms.Controls.GameButton(); + this.btnSaveRace = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnLoadRace = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnCancel = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnOK = new FrEee.UI.WinForms.Controls.GameButton(); this.tabGeneral = new System.Windows.Forms.TabPage(); this.label2 = new System.Windows.Forms.Label(); - this.gamePanel1 = new FrEee.WinForms.Controls.GamePanel(); + this.gamePanel1 = new FrEee.UI.WinForms.Controls.GamePanel(); this.txtRaceHappiness = new System.Windows.Forms.Label(); this.ddlRaceHappiness = new System.Windows.Forms.ComboBox(); this.label19 = new System.Windows.Forms.Label(); - this.picRacePopulationIcon = new FrEee.WinForms.Controls.GamePictureBox(); + this.picRacePopulationIcon = new FrEee.UI.WinForms.Controls.Blazor.GamePictureBox(); this.label18 = new System.Windows.Forms.Label(); this.ddlRacePopulationIcon = new System.Windows.Forms.ComboBox(); this.ddlRaceNativeAtmosphere = new System.Windows.Forms.ComboBox(); @@ -50,20 +50,20 @@ private void InitializeComponent() this.label15 = new System.Windows.Forms.Label(); this.chkAIsCanUse = new System.Windows.Forms.CheckBox(); this.label23 = new System.Windows.Forms.Label(); - this.btnCompareCultures = new FrEee.WinForms.Controls.GameButton(); + this.btnCompareCultures = new FrEee.UI.WinForms.Controls.GameButton(); this.txtCulture = new System.Windows.Forms.Label(); this.label22 = new System.Windows.Forms.Label(); this.ddlCulture = new System.Windows.Forms.ComboBox(); this.ddlAI = new System.Windows.Forms.ComboBox(); - this.picShipset = new FrEee.WinForms.Controls.GamePictureBox(); + this.picShipset = new FrEee.UI.WinForms.Controls.Blazor.GamePictureBox(); this.ddlShipset = new System.Windows.Forms.ComboBox(); - this.picInsignia = new FrEee.WinForms.Controls.GamePictureBox(); + this.picInsignia = new FrEee.UI.WinForms.Controls.Blazor.GamePictureBox(); this.ddlInsignia = new System.Windows.Forms.ComboBox(); - this.picColor = new FrEee.WinForms.Controls.GamePictureBox(); + this.picColor = new FrEee.UI.WinForms.Controls.Blazor.GamePictureBox(); this.spnColorBlue = new System.Windows.Forms.NumericUpDown(); this.spnColorGreen = new System.Windows.Forms.NumericUpDown(); this.spnColorRed = new System.Windows.Forms.NumericUpDown(); - this.picLeaderPortrait = new FrEee.WinForms.Controls.GamePictureBox(); + this.picLeaderPortrait = new FrEee.UI.WinForms.Controls.Blazor.GamePictureBox(); this.ddlLeaderPortrait = new System.Windows.Forms.ComboBox(); this.txtLeaderName = new System.Windows.Forms.TextBox(); this.txtName = new System.Windows.Forms.TextBox(); @@ -75,10 +75,10 @@ private void InitializeComponent() this.label1 = new System.Windows.Forms.Label(); this.label32 = new System.Windows.Forms.Label(); this.tabAptitudes = new System.Windows.Forms.TabPage(); - this.aptitudePicker = new FrEee.WinForms.Controls.AptitudePicker(); + this.aptitudePicker = new FrEee.UI.WinForms.Controls.AptitudePicker(); this.tabTraits = new System.Windows.Forms.TabPage(); - this.raceTraitPicker = new FrEee.WinForms.Controls.TraitPicker(); - this.tabs = new FrEee.WinForms.Controls.GameTabControl(); + this.raceTraitPicker = new FrEee.UI.WinForms.Controls.TraitPicker(); + this.tabs = new FrEee.UI.WinForms.Controls.GameTabControl(); this.label8 = new System.Windows.Forms.Label(); this.ddlDesignNames = new System.Windows.Forms.ComboBox(); this.tabGeneral.SuspendLayout(); @@ -680,7 +680,7 @@ private void InitializeComponent() this.aptitudePicker.Size = new System.Drawing.Size(513, 636); this.aptitudePicker.TabIndex = 0; this.aptitudePicker.Values = null; - this.aptitudePicker.AptitudeValueChanged += new FrEee.WinForms.Controls.AptitudePicker.AptitudeValueChangedDelegate(this.aptitudePicker_AptitudeValueChanged); + this.aptitudePicker.AptitudeValueChanged += new FrEee.UI.WinForms.Controls.AptitudePicker.AptitudeValueChangedDelegate(this.aptitudePicker_AptitudeValueChanged); // // tabTraits // @@ -703,7 +703,7 @@ private void InitializeComponent() this.raceTraitPicker.Size = new System.Drawing.Size(519, 722); this.raceTraitPicker.TabIndex = 0; this.raceTraitPicker.Traits = null; - this.raceTraitPicker.TraitToggled += new FrEee.WinForms.Controls.TraitPicker.TraitToggledDelegate(this.raceTraitPicker_TraitToggled); + this.raceTraitPicker.TraitToggled += new FrEee.UI.WinForms.Controls.TraitPicker.TraitToggledDelegate(this.raceTraitPicker_TraitToggled); // // tabs // @@ -796,11 +796,11 @@ private void InitializeComponent() private System.Windows.Forms.Label label22; private System.Windows.Forms.ComboBox ddlCulture; private System.Windows.Forms.ComboBox ddlAI; - private Controls.GamePictureBox picShipset; + private FrEee.UI.WinForms.Controls.Blazor.GamePictureBox picShipset; private System.Windows.Forms.ComboBox ddlShipset; - private Controls.GamePictureBox picInsignia; + private FrEee.UI.WinForms.Controls.Blazor.GamePictureBox picInsignia; private System.Windows.Forms.ComboBox ddlInsignia; - private Controls.GamePictureBox picColor; + private FrEee.UI.WinForms.Controls.Blazor.GamePictureBox picColor; private System.Windows.Forms.NumericUpDown spnColorBlue; private System.Windows.Forms.NumericUpDown spnColorGreen; private System.Windows.Forms.NumericUpDown spnColorRed; @@ -820,7 +820,7 @@ private void InitializeComponent() private System.Windows.Forms.Label txtRaceHappiness; private System.Windows.Forms.ComboBox ddlRaceHappiness; private System.Windows.Forms.Label label19; - private Controls.GamePictureBox picRacePopulationIcon; + private FrEee.UI.WinForms.Controls.Blazor.GamePictureBox picRacePopulationIcon; private System.Windows.Forms.Label label18; private System.Windows.Forms.ComboBox ddlRacePopulationIcon; private System.Windows.Forms.ComboBox ddlRaceNativeAtmosphere; @@ -829,7 +829,7 @@ private void InitializeComponent() private System.Windows.Forms.ComboBox ddlRaceNativeSurface; private System.Windows.Forms.Label label13; private System.Windows.Forms.Label label15; - private Controls.GamePictureBox picLeaderPortrait; + private FrEee.UI.WinForms.Controls.Blazor.GamePictureBox picLeaderPortrait; private System.Windows.Forms.ComboBox ddlLeaderPortrait; private System.Windows.Forms.TextBox txtLeaderName; private System.Windows.Forms.Label label6; diff --git a/FrEee.WinForms/Forms/EmpireSetupForm.cs b/FrEee.UI.WinForms/Forms/EmpireSetupForm.cs similarity index 94% rename from FrEee.WinForms/Forms/EmpireSetupForm.cs rename to FrEee.UI.WinForms/Forms/EmpireSetupForm.cs index 5c1ab6d8b..ae196c608 100644 --- a/FrEee.WinForms/Forms/EmpireSetupForm.cs +++ b/FrEee.UI.WinForms/Forms/EmpireSetupForm.cs @@ -4,7 +4,7 @@ using FrEee.Modding; using FrEee.Utility; using FrEee.Extensions; -using FrEee.WinForms.Utility.Extensions; +using FrEee.UI.WinForms.Utility.Extensions; using System; using System.Data; using System.Drawing; @@ -13,7 +13,7 @@ using System.Reflection; using System.Windows.Forms; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; public partial class EmpireSetupForm : GameForm { @@ -22,7 +22,7 @@ public EmpireSetupForm() InitializeComponent(); BindChoices(); - try { this.Icon = new Icon(FrEee.WinForms.Properties.Resources.FrEeeIcon); } + try { this.Icon = new Icon(FrEee.UI.WinForms.Properties.Resources.FrEeeIcon); } catch { } } diff --git a/FrEee.WinForms/Forms/EmpireSetupForm.resx b/FrEee.UI.WinForms/Forms/EmpireSetupForm.resx similarity index 100% rename from FrEee.WinForms/Forms/EmpireSetupForm.resx rename to FrEee.UI.WinForms/Forms/EmpireSetupForm.resx diff --git a/FrEee.WinForms/Forms/FleetTransferForm.Designer.cs b/FrEee.UI.WinForms/Forms/FleetTransferForm.Designer.cs similarity index 95% rename from FrEee.WinForms/Forms/FleetTransferForm.Designer.cs rename to FrEee.UI.WinForms/Forms/FleetTransferForm.Designer.cs index cce229bc3..f80024319 100644 --- a/FrEee.WinForms/Forms/FleetTransferForm.Designer.cs +++ b/FrEee.UI.WinForms/Forms/FleetTransferForm.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; partial class FleetTransferForm { @@ -32,16 +32,16 @@ private void InitializeComponent() this.treeFleets = new System.Windows.Forms.TreeView(); this.panel1 = new System.Windows.Forms.Panel(); this.lblQuantityUnit = new System.Windows.Forms.Label(); - this.btnCancel = new FrEee.WinForms.Controls.GameButton(); - this.btnOK = new FrEee.WinForms.Controls.GameButton(); - this.btnAdd = new FrEee.WinForms.Controls.GameButton(); - this.btnRemove = new FrEee.WinForms.Controls.GameButton(); + this.btnCancel = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnOK = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnAdd = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnRemove = new FrEee.UI.WinForms.Controls.GameButton(); this.label1 = new System.Windows.Forms.Label(); this.treeVehicles = new System.Windows.Forms.TreeView(); this.panel2 = new System.Windows.Forms.Panel(); this.txtFleetName = new System.Windows.Forms.TextBox(); - this.btnDisband = new FrEee.WinForms.Controls.GameButton(); - this.btnCreate = new FrEee.WinForms.Controls.GameButton(); + this.btnDisband = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnCreate = new FrEee.UI.WinForms.Controls.GameButton(); this.label2 = new System.Windows.Forms.Label(); this.tableLayoutPanel1.SuspendLayout(); this.panel1.SuspendLayout(); diff --git a/FrEee.WinForms/Forms/FleetTransferForm.cs b/FrEee.UI.WinForms/Forms/FleetTransferForm.cs similarity index 94% rename from FrEee.WinForms/Forms/FleetTransferForm.cs rename to FrEee.UI.WinForms/Forms/FleetTransferForm.cs index 2bd75a86b..7e424ec49 100644 --- a/FrEee.WinForms/Forms/FleetTransferForm.cs +++ b/FrEee.UI.WinForms/Forms/FleetTransferForm.cs @@ -5,8 +5,8 @@ using FrEee.Objects.Vehicles; using FrEee.Utility; using FrEee.Extensions; -using FrEee.WinForms.Controls; -using FrEee.WinForms.Utility.Extensions; +using FrEee.UI.WinForms.Controls; +using FrEee.UI.WinForms.Utility.Extensions; using System; using System.Collections.Generic; using System.Data; @@ -14,7 +14,7 @@ using System.Linq; using System.Windows.Forms; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; public partial class FleetTransferForm : GameForm { @@ -22,7 +22,7 @@ public FleetTransferForm(Sector sector) { InitializeComponent(); - try { this.Icon = new Icon(FrEee.WinForms.Properties.Resources.FrEeeIcon); } + try { this.Icon = new Icon(FrEee.UI.WinForms.Properties.Resources.FrEeeIcon); } catch { } this.sector = sector; diff --git a/FrEee.WinForms/Forms/FleetTransferForm.resx b/FrEee.UI.WinForms/Forms/FleetTransferForm.resx similarity index 100% rename from FrEee.WinForms/Forms/FleetTransferForm.resx rename to FrEee.UI.WinForms/Forms/FleetTransferForm.resx diff --git a/FrEee.WinForms/Forms/GameForm.Designer.cs b/FrEee.UI.WinForms/Forms/GameForm.Designer.cs similarity index 94% rename from FrEee.WinForms/Forms/GameForm.Designer.cs rename to FrEee.UI.WinForms/Forms/GameForm.Designer.cs index a7da16f50..977dafbd0 100644 --- a/FrEee.WinForms/Forms/GameForm.Designer.cs +++ b/FrEee.UI.WinForms/Forms/GameForm.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; partial class GameForm { diff --git a/FrEee.WinForms/Forms/GameForm.cs b/FrEee.UI.WinForms/Forms/GameForm.cs similarity index 92% rename from FrEee.WinForms/Forms/GameForm.cs rename to FrEee.UI.WinForms/Forms/GameForm.cs index 6e6b058f8..9bab6d718 100644 --- a/FrEee.WinForms/Forms/GameForm.cs +++ b/FrEee.UI.WinForms/Forms/GameForm.cs @@ -1,9 +1,9 @@ -using FrEee.WinForms.Objects; +using FrEee.UI.WinForms.Objects; using System; using System.Diagnostics; using System.Windows.Forms; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; public partial class GameForm : Form { diff --git a/FrEee.WinForms/Forms/GameForm.resx b/FrEee.UI.WinForms/Forms/GameForm.resx similarity index 100% rename from FrEee.WinForms/Forms/GameForm.resx rename to FrEee.UI.WinForms/Forms/GameForm.resx diff --git a/FrEee.WinForms/Forms/GameOverForm.Designer.cs b/FrEee.UI.WinForms/Forms/GameOverForm.Designer.cs similarity index 88% rename from FrEee.WinForms/Forms/GameOverForm.Designer.cs rename to FrEee.UI.WinForms/Forms/GameOverForm.Designer.cs index d0dfb6ce2..32ba31dce 100644 --- a/FrEee.WinForms/Forms/GameOverForm.Designer.cs +++ b/FrEee.UI.WinForms/Forms/GameOverForm.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; partial class GameOverForm { @@ -28,9 +28,9 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.btnOk = new FrEee.WinForms.Controls.GameButton(); + this.btnOk = new FrEee.UI.WinForms.Controls.GameButton(); this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.pic = new FrEee.WinForms.Controls.GamePictureBox(); + this.pic = new FrEee.UI.WinForms.Controls.Blazor.GamePictureBox(); ((System.ComponentModel.ISupportInitialize)(this.pic)).BeginInit(); this.SuspendLayout(); // @@ -76,5 +76,5 @@ private void InitializeComponent() #endregion private Controls.GameButton btnOk; private System.Windows.Forms.ColumnHeader columnHeader1; - private Controls.GamePictureBox pic; + private FrEee.UI.WinForms.Controls.Blazor.GamePictureBox pic; } \ No newline at end of file diff --git a/FrEee.WinForms/Forms/GameOverForm.cs b/FrEee.UI.WinForms/Forms/GameOverForm.cs similarity index 86% rename from FrEee.WinForms/Forms/GameOverForm.cs rename to FrEee.UI.WinForms/Forms/GameOverForm.cs index 4534fc7aa..5bb0ddd5c 100644 --- a/FrEee.WinForms/Forms/GameOverForm.cs +++ b/FrEee.UI.WinForms/Forms/GameOverForm.cs @@ -1,10 +1,10 @@ using FrEee.Utility; -using FrEee.WinForms.Objects; +using FrEee.UI.WinForms.Objects; using System; using System.IO; using System.Windows.Forms; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; public partial class GameOverForm : GameForm { diff --git a/FrEee.WinForms/Forms/GameOverForm.resx b/FrEee.UI.WinForms/Forms/GameOverForm.resx similarity index 100% rename from FrEee.WinForms/Forms/GameOverForm.resx rename to FrEee.UI.WinForms/Forms/GameOverForm.resx diff --git a/FrEee.UI.WinForms/Forms/GameSetupForm.Designer.cs b/FrEee.UI.WinForms/Forms/GameSetupForm.Designer.cs new file mode 100644 index 000000000..42a380f89 --- /dev/null +++ b/FrEee.UI.WinForms/Forms/GameSetupForm.Designer.cs @@ -0,0 +1,2665 @@ +namespace FrEee.UI.WinForms.Forms; + +partial class GameSetupForm +{ + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + components = new System.ComponentModel.Container(); + Objects.GalaxyViewModes.PresenceMode presenceMode1 = new Objects.GalaxyViewModes.PresenceMode(); + tabs = new Controls.GameTabControl(); + tabGalaxy = new System.Windows.Forms.TabPage(); + btnGenerateSeed = new Controls.GameButton(); + label65 = new System.Windows.Forms.Label(); + spnSeed = new System.Windows.Forms.NumericUpDown(); + btnPreviewMap = new Controls.GameButton(); + galaxyView = new Controls.GalaxyView(); + label62 = new System.Windows.Forms.Label(); + label11 = new System.Windows.Forms.Label(); + spnSystemGroups = new System.Windows.Forms.NumericUpDown(); + txtWarpPointLocation = new System.Windows.Forms.Label(); + ddlMaximumEventSeverity = new System.Windows.Forms.ComboBox(); + label10 = new System.Windows.Forms.Label(); + label9 = new System.Windows.Forms.Label(); + spnHeight = new System.Windows.Forms.NumericUpDown(); + label8 = new System.Windows.Forms.Label(); + spnWidth = new System.Windows.Forms.NumericUpDown(); + label7 = new System.Windows.Forms.Label(); + ddlEventFrequency = new System.Windows.Forms.ComboBox(); + label6 = new System.Windows.Forms.Label(); + chkOmniscient = new System.Windows.Forms.CheckBox(); + label4 = new System.Windows.Forms.Label(); + chkAllSystemsExplored = new System.Windows.Forms.CheckBox(); + ddlWarpPointLocation = new System.Windows.Forms.ComboBox(); + warpPointPlacementStrategyBindingSource = new System.Windows.Forms.BindingSource(components); + label3 = new System.Windows.Forms.Label(); + label2 = new System.Windows.Forms.Label(); + spnStarSystems = new System.Windows.Forms.NumericUpDown(); + label1 = new System.Windows.Forms.Label(); + txtGalaxyTypeDescription = new System.Windows.Forms.Label(); + ddlGalaxyType = new System.Windows.Forms.ComboBox(); + galaxyTemplateBindingSource = new System.Windows.Forms.BindingSource(components); + lblGalaxyType = new System.Windows.Forms.Label(); + tabResources = new System.Windows.Forms.TabPage(); + chkLimitRemote = new System.Windows.Forms.CheckBox(); + chkLimitStandard = new System.Windows.Forms.CheckBox(); + label29 = new System.Windows.Forms.Label(); + label28 = new System.Windows.Forms.Label(); + chkRemote = new System.Windows.Forms.CheckBox(); + btnRefreshGraphs = new Controls.GameButton(); + picMiningGraph = new System.Windows.Forms.PictureBox(); + spnMiningRate = new System.Windows.Forms.NumericUpDown(); + spnStartValue = new System.Windows.Forms.NumericUpDown(); + label27 = new System.Windows.Forms.Label(); + label26 = new System.Windows.Forms.Label(); + picValueGraph = new System.Windows.Forms.PictureBox(); + spnHomeworldValue = new System.Windows.Forms.NumericUpDown(); + label25 = new System.Windows.Forms.Label(); + chkBonusDepletionRemote = new System.Windows.Forms.CheckBox(); + chkBonusDepletionStandard = new System.Windows.Forms.CheckBox(); + label17 = new System.Windows.Forms.Label(); + spnDepletionTurnRemote = new System.Windows.Forms.NumericUpDown(); + spnDepletionTurnStandard = new System.Windows.Forms.NumericUpDown(); + label24 = new System.Windows.Forms.Label(); + spnMaxValuePlanet = new System.Windows.Forms.NumericUpDown(); + spnMaxSpawnValueAsteroid = new System.Windows.Forms.NumericUpDown(); + spnMinSpawnValueAsteroid = new System.Windows.Forms.NumericUpDown(); + spnMinValueAsteroid = new System.Windows.Forms.NumericUpDown(); + spnMaxSpawnValuePlanet = new System.Windows.Forms.NumericUpDown(); + spnMinSpawnValuePlanet = new System.Windows.Forms.NumericUpDown(); + spnMinValuePlanet = new System.Windows.Forms.NumericUpDown(); + label23 = new System.Windows.Forms.Label(); + label22 = new System.Windows.Forms.Label(); + label21 = new System.Windows.Forms.Label(); + label20 = new System.Windows.Forms.Label(); + label19 = new System.Windows.Forms.Label(); + label18 = new System.Windows.Forms.Label(); + spnDepletionResourceRemote = new System.Windows.Forms.NumericUpDown(); + spnBonusRemote = new System.Windows.Forms.NumericUpDown(); + spnRateRemote = new System.Windows.Forms.NumericUpDown(); + spnDepletionResourceStandard = new System.Windows.Forms.NumericUpDown(); + spnBonusStandard = new System.Windows.Forms.NumericUpDown(); + spnRateStandard = new System.Windows.Forms.NumericUpDown(); + label16 = new System.Windows.Forms.Label(); + label15 = new System.Windows.Forms.Label(); + label14 = new System.Windows.Forms.Label(); + label13 = new System.Windows.Forms.Label(); + label12 = new System.Windows.Forms.Label(); + btnLoadResourcePreset = new Controls.GameButton(); + ddlPresets = new System.Windows.Forms.ComboBox(); + label5 = new System.Windows.Forms.Label(); + tabTechnology = new System.Windows.Forms.TabPage(); + ddlTechUniqueness = new System.Windows.Forms.ComboBox(); + label63 = new System.Windows.Forms.Label(); + ddlTechCost = new System.Windows.Forms.ComboBox(); + label61 = new System.Windows.Forms.Label(); + label31 = new System.Windows.Forms.Label(); + lstTechs = new System.Windows.Forms.CheckedListBox(); + ddlStartTech = new System.Windows.Forms.ComboBox(); + label30 = new System.Windows.Forms.Label(); + tabEmpires = new System.Windows.Forms.TabPage(); + lblMaxBonusResearchFromEmpirePoints = new System.Windows.Forms.Label(); + spnResearchPerUnspentEmpirePoint = new System.Windows.Forms.NumericUpDown(); + label64 = new System.Windows.Forms.Label(); + btnEmpireBottom = new Controls.GameButton(); + btnEmpireTop = new Controls.GameButton(); + btnEmpireDown = new Controls.GameButton(); + btnEmpireUp = new Controls.GameButton(); + btnToggleAI = new Controls.GameButton(); + label44 = new System.Windows.Forms.Label(); + spnMaxDispersion = new System.Windows.Forms.NumericUpDown(); + label43 = new System.Windows.Forms.Label(); + ddlHomeworldSize = new System.Windows.Forms.ComboBox(); + label42 = new System.Windows.Forms.Label(); + btnSaveEmpire = new Controls.GameButton(); + btnRemoveEmpire = new Controls.GameButton(); + btnEditEmpire = new Controls.GameButton(); + btnLoadEmpire = new Controls.GameButton(); + btnCreateEmpire = new Controls.GameButton(); + gamePanel1 = new Controls.GamePanel(); + lstEmpires = new System.Windows.Forms.ListView(); + label41 = new System.Windows.Forms.Label(); + spnResourceStorage = new System.Windows.Forms.NumericUpDown(); + label40 = new System.Windows.Forms.Label(); + spnMinorEmpires = new System.Windows.Forms.NumericUpDown(); + spnRandomAIs = new System.Windows.Forms.NumericUpDown(); + spnEmpirePoints = new System.Windows.Forms.NumericUpDown(); + ddlScoreDisplay = new System.Windows.Forms.ComboBox(); + ddlEmpirePlacement = new System.Windows.Forms.ComboBox(); + spnHomeworlds = new System.Windows.Forms.NumericUpDown(); + spnStartResearch = new System.Windows.Forms.NumericUpDown(); + spnStartResources = new System.Windows.Forms.NumericUpDown(); + label39 = new System.Windows.Forms.Label(); + label38 = new System.Windows.Forms.Label(); + label37 = new System.Windows.Forms.Label(); + label36 = new System.Windows.Forms.Label(); + label35 = new System.Windows.Forms.Label(); + label34 = new System.Windows.Forms.Label(); + label33 = new System.Windows.Forms.Label(); + label32 = new System.Windows.Forms.Label(); + tabVictory = new System.Windows.Forms.TabPage(); + label51 = new System.Windows.Forms.Label(); + spnVictoryDelay = new System.Windows.Forms.NumericUpDown(); + label50 = new System.Windows.Forms.Label(); + label49 = new System.Windows.Forms.Label(); + spnVictoryPeace = new System.Windows.Forms.NumericUpDown(); + chkVictoryPeace = new System.Windows.Forms.CheckBox(); + label48 = new System.Windows.Forms.Label(); + spnVictoryTech = new System.Windows.Forms.NumericUpDown(); + chkVictoryTech = new System.Windows.Forms.CheckBox(); + label47 = new System.Windows.Forms.Label(); + spnVictoryScorePercent = new System.Windows.Forms.NumericUpDown(); + chkVictoryScorePercent = new System.Windows.Forms.CheckBox(); + label46 = new System.Windows.Forms.Label(); + spnVictoryTurns = new System.Windows.Forms.NumericUpDown(); + chkVictoryTurns = new System.Windows.Forms.CheckBox(); + spnVictoryScore = new System.Windows.Forms.NumericUpDown(); + chkVictoryScore = new System.Windows.Forms.CheckBox(); + chkVictoryEliminateMajorEmpires = new System.Windows.Forms.CheckBox(); + label45 = new System.Windows.Forms.Label(); + tabSettings = new System.Windows.Forms.TabPage(); + chkAllowAnalysis = new System.Windows.Forms.CheckBox(); + label60 = new System.Windows.Forms.Label(); + chkColonizeOnlyHWSurface = new System.Windows.Forms.CheckBox(); + label59 = new System.Windows.Forms.Label(); + chkColonizeOnlyBreathable = new System.Windows.Forms.CheckBox(); + label58 = new System.Windows.Forms.Label(); + chkUniqueRuins = new System.Windows.Forms.CheckBox(); + label57 = new System.Windows.Forms.Label(); + chkRandomRuins = new System.Windows.Forms.CheckBox(); + label56 = new System.Windows.Forms.Label(); + chkAllowIntel = new System.Windows.Forms.CheckBox(); + label55 = new System.Windows.Forms.Label(); + chkAllowSurrender = new System.Windows.Forms.CheckBox(); + label54 = new System.Windows.Forms.Label(); + label53 = new System.Windows.Forms.Label(); + label52 = new System.Windows.Forms.Label(); + ddlAllowedTrades = new System.Windows.Forms.ComboBox(); + chkHumansVsAI = new System.Windows.Forms.CheckBox(); + txtGalaxyName = new System.Windows.Forms.TextBox(); + labelName = new System.Windows.Forms.Label(); + btnStart = new Controls.GameButton(); + btnCancel = new Controls.GameButton(); + btnLoadSetup = new Controls.GameButton(); + btnSaveSetup = new Controls.GameButton(); + progressBar = new System.Windows.Forms.ProgressBar(); + blazorWebView1 = new Microsoft.AspNetCore.Components.WebView.WindowsForms.BlazorWebView(); + tabs.SuspendLayout(); + tabGalaxy.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)spnSeed).BeginInit(); + ((System.ComponentModel.ISupportInitialize)spnSystemGroups).BeginInit(); + ((System.ComponentModel.ISupportInitialize)spnHeight).BeginInit(); + ((System.ComponentModel.ISupportInitialize)spnWidth).BeginInit(); + ((System.ComponentModel.ISupportInitialize)warpPointPlacementStrategyBindingSource).BeginInit(); + ((System.ComponentModel.ISupportInitialize)spnStarSystems).BeginInit(); + ((System.ComponentModel.ISupportInitialize)galaxyTemplateBindingSource).BeginInit(); + tabResources.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)picMiningGraph).BeginInit(); + ((System.ComponentModel.ISupportInitialize)spnMiningRate).BeginInit(); + ((System.ComponentModel.ISupportInitialize)spnStartValue).BeginInit(); + ((System.ComponentModel.ISupportInitialize)picValueGraph).BeginInit(); + ((System.ComponentModel.ISupportInitialize)spnHomeworldValue).BeginInit(); + ((System.ComponentModel.ISupportInitialize)spnDepletionTurnRemote).BeginInit(); + ((System.ComponentModel.ISupportInitialize)spnDepletionTurnStandard).BeginInit(); + ((System.ComponentModel.ISupportInitialize)spnMaxValuePlanet).BeginInit(); + ((System.ComponentModel.ISupportInitialize)spnMaxSpawnValueAsteroid).BeginInit(); + ((System.ComponentModel.ISupportInitialize)spnMinSpawnValueAsteroid).BeginInit(); + ((System.ComponentModel.ISupportInitialize)spnMinValueAsteroid).BeginInit(); + ((System.ComponentModel.ISupportInitialize)spnMaxSpawnValuePlanet).BeginInit(); + ((System.ComponentModel.ISupportInitialize)spnMinSpawnValuePlanet).BeginInit(); + ((System.ComponentModel.ISupportInitialize)spnMinValuePlanet).BeginInit(); + ((System.ComponentModel.ISupportInitialize)spnDepletionResourceRemote).BeginInit(); + ((System.ComponentModel.ISupportInitialize)spnBonusRemote).BeginInit(); + ((System.ComponentModel.ISupportInitialize)spnRateRemote).BeginInit(); + ((System.ComponentModel.ISupportInitialize)spnDepletionResourceStandard).BeginInit(); + ((System.ComponentModel.ISupportInitialize)spnBonusStandard).BeginInit(); + ((System.ComponentModel.ISupportInitialize)spnRateStandard).BeginInit(); + tabTechnology.SuspendLayout(); + tabEmpires.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)spnResearchPerUnspentEmpirePoint).BeginInit(); + ((System.ComponentModel.ISupportInitialize)spnMaxDispersion).BeginInit(); + gamePanel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)spnResourceStorage).BeginInit(); + ((System.ComponentModel.ISupportInitialize)spnMinorEmpires).BeginInit(); + ((System.ComponentModel.ISupportInitialize)spnRandomAIs).BeginInit(); + ((System.ComponentModel.ISupportInitialize)spnEmpirePoints).BeginInit(); + ((System.ComponentModel.ISupportInitialize)spnHomeworlds).BeginInit(); + ((System.ComponentModel.ISupportInitialize)spnStartResearch).BeginInit(); + ((System.ComponentModel.ISupportInitialize)spnStartResources).BeginInit(); + tabVictory.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)spnVictoryDelay).BeginInit(); + ((System.ComponentModel.ISupportInitialize)spnVictoryPeace).BeginInit(); + ((System.ComponentModel.ISupportInitialize)spnVictoryTech).BeginInit(); + ((System.ComponentModel.ISupportInitialize)spnVictoryScorePercent).BeginInit(); + ((System.ComponentModel.ISupportInitialize)spnVictoryTurns).BeginInit(); + ((System.ComponentModel.ISupportInitialize)spnVictoryScore).BeginInit(); + tabSettings.SuspendLayout(); + SuspendLayout(); + // + // tabs + // + tabs.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; + tabs.Controls.Add(tabGalaxy); + tabs.Controls.Add(tabResources); + tabs.Controls.Add(tabTechnology); + tabs.Controls.Add(tabEmpires); + tabs.Controls.Add(tabVictory); + tabs.Controls.Add(tabSettings); + tabs.DrawMode = System.Windows.Forms.TabDrawMode.OwnerDrawFixed; + tabs.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 0); + tabs.Location = new System.Drawing.Point(0, 0); + tabs.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + tabs.Name = "tabs"; + tabs.SelectedIndex = 0; + tabs.SelectedTabBackColor = System.Drawing.Color.CornflowerBlue; + tabs.SelectedTabForeColor = System.Drawing.Color.Black; + tabs.Size = new System.Drawing.Size(645, 661); + tabs.TabBackColor = System.Drawing.Color.Black; + tabs.TabBorderColor = System.Drawing.Color.CornflowerBlue; + tabs.TabForeColor = System.Drawing.Color.CornflowerBlue; + tabs.TabIndex = 0; + // + // tabGalaxy + // + tabGalaxy.BackColor = System.Drawing.Color.Black; + tabGalaxy.Controls.Add(blazorWebView1); + tabGalaxy.Controls.Add(btnGenerateSeed); + tabGalaxy.Controls.Add(label65); + tabGalaxy.Controls.Add(spnSeed); + tabGalaxy.Controls.Add(btnPreviewMap); + tabGalaxy.Controls.Add(galaxyView); + tabGalaxy.Controls.Add(label62); + tabGalaxy.Controls.Add(label11); + tabGalaxy.Controls.Add(spnSystemGroups); + tabGalaxy.Controls.Add(txtWarpPointLocation); + tabGalaxy.Controls.Add(ddlMaximumEventSeverity); + tabGalaxy.Controls.Add(label10); + tabGalaxy.Controls.Add(label9); + tabGalaxy.Controls.Add(spnHeight); + tabGalaxy.Controls.Add(label8); + tabGalaxy.Controls.Add(spnWidth); + tabGalaxy.Controls.Add(label7); + tabGalaxy.Controls.Add(ddlEventFrequency); + tabGalaxy.Controls.Add(label6); + tabGalaxy.Controls.Add(chkOmniscient); + tabGalaxy.Controls.Add(label4); + tabGalaxy.Controls.Add(chkAllSystemsExplored); + tabGalaxy.Controls.Add(ddlWarpPointLocation); + tabGalaxy.Controls.Add(label3); + tabGalaxy.Controls.Add(label2); + tabGalaxy.Controls.Add(spnStarSystems); + tabGalaxy.Controls.Add(label1); + tabGalaxy.Controls.Add(txtGalaxyTypeDescription); + tabGalaxy.Controls.Add(ddlGalaxyType); + tabGalaxy.Controls.Add(lblGalaxyType); + tabGalaxy.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 0); + tabGalaxy.Location = new System.Drawing.Point(4, 29); + tabGalaxy.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + tabGalaxy.Name = "tabGalaxy"; + tabGalaxy.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3); + tabGalaxy.Size = new System.Drawing.Size(637, 628); + tabGalaxy.TabIndex = 0; + tabGalaxy.Text = "Galaxy"; + // + // btnGenerateSeed + // + btnGenerateSeed.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right; + btnGenerateSeed.BackColor = System.Drawing.Color.Black; + btnGenerateSeed.ForeColor = System.Drawing.Color.CornflowerBlue; + btnGenerateSeed.Location = new System.Drawing.Point(509, 7); + btnGenerateSeed.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + btnGenerateSeed.Name = "btnGenerateSeed"; + btnGenerateSeed.Size = new System.Drawing.Size(113, 27); + btnGenerateSeed.TabIndex = 32; + btnGenerateSeed.Text = "Generate"; + btnGenerateSeed.UseVisualStyleBackColor = false; + btnGenerateSeed.Click += btnGenerateSeed_Click; + // + // label65 + // + label65.AutoSize = true; + label65.ForeColor = System.Drawing.Color.CornflowerBlue; + label65.Location = new System.Drawing.Point(317, 10); + label65.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label65.Name = "label65"; + label65.Size = new System.Drawing.Size(36, 15); + label65.TabIndex = 31; + label65.Text = "Seed"; + // + // spnSeed + // + spnSeed.Location = new System.Drawing.Point(366, 8); + spnSeed.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + spnSeed.Maximum = new decimal(new int[] { int.MaxValue, 0, 0, 0 }); + spnSeed.Minimum = new decimal(new int[] { int.MinValue, 0, 0, int.MinValue }); + spnSeed.Name = "spnSeed"; + spnSeed.Size = new System.Drawing.Size(135, 21); + spnSeed.TabIndex = 30; + // + // btnPreviewMap + // + btnPreviewMap.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right; + btnPreviewMap.BackColor = System.Drawing.Color.Black; + btnPreviewMap.ForeColor = System.Drawing.Color.CornflowerBlue; + btnPreviewMap.Location = new System.Drawing.Point(516, 158); + btnPreviewMap.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + btnPreviewMap.Name = "btnPreviewMap"; + btnPreviewMap.Size = new System.Drawing.Size(113, 27); + btnPreviewMap.TabIndex = 10; + btnPreviewMap.Text = "Preview Map"; + btnPreviewMap.UseVisualStyleBackColor = false; + btnPreviewMap.Click += btnPreviewMap_Click; + // + // galaxyView + // + galaxyView.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; + galaxyView.BackColor = System.Drawing.Color.Black; + galaxyView.Location = new System.Drawing.Point(16, 381); + galaxyView.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); +// galaxyView.Mode = presenceMode1; + galaxyView.Name = "galaxyView"; + galaxyView.SelectedStarSystem = null; + galaxyView.Size = new System.Drawing.Size(612, 235); + galaxyView.TabIndex = 29; + galaxyView.Text = "galaxyView2"; + // + // label62 + // + label62.AutoSize = true; + label62.Location = new System.Drawing.Point(317, 322); + label62.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label62.Name = "label62"; + label62.Size = new System.Drawing.Size(158, 15); + label62.TabIndex = 28; + label62.Text = "Per mille per player per turn"; + // + // label11 + // + label11.AutoSize = true; + label11.Location = new System.Drawing.Point(223, 128); + label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label11.Name = "label11"; + label11.Size = new System.Drawing.Size(287, 15); + label11.TabIndex = 27; + label11.Text = "Fewer groups means more warp point connections."; + // + // spnSystemGroups + // + spnSystemGroups.Location = new System.Drawing.Point(133, 126); + spnSystemGroups.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + spnSystemGroups.Minimum = new decimal(new int[] { 1, 0, 0, 0 }); + spnSystemGroups.Name = "spnSystemGroups"; + spnSystemGroups.Size = new System.Drawing.Size(83, 21); + spnSystemGroups.TabIndex = 4; + spnSystemGroups.Value = new decimal(new int[] { 1, 0, 0, 0 }); + spnSystemGroups.ValueChanged += spnSystemGroups_ValueChanged; + // + // txtWarpPointLocation + // + txtWarpPointLocation.Location = new System.Drawing.Point(22, 188); + txtWarpPointLocation.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + txtWarpPointLocation.MaximumSize = new System.Drawing.Size(545, 42); + txtWarpPointLocation.Name = "txtWarpPointLocation"; + txtWarpPointLocation.Size = new System.Drawing.Size(545, 42); + txtWarpPointLocation.TabIndex = 25; + txtWarpPointLocation.Text = "Choose a warp point placement option."; + // + // ddlMaximumEventSeverity + // + ddlMaximumEventSeverity.DisplayMember = "Value"; + ddlMaximumEventSeverity.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + ddlMaximumEventSeverity.Enabled = false; + ddlMaximumEventSeverity.FormattingEnabled = true; + ddlMaximumEventSeverity.Location = new System.Drawing.Point(133, 352); + ddlMaximumEventSeverity.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + ddlMaximumEventSeverity.Name = "ddlMaximumEventSeverity"; + ddlMaximumEventSeverity.Size = new System.Drawing.Size(177, 23); + ddlMaximumEventSeverity.TabIndex = 9; + // + // label10 + // + label10.AutoSize = true; + label10.ForeColor = System.Drawing.Color.CornflowerBlue; + label10.Location = new System.Drawing.Point(13, 355); + label10.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label10.Name = "label10"; + label10.Size = new System.Drawing.Size(82, 15); + label10.TabIndex = 21; + label10.Text = "Event Severity"; + // + // label9 + // + label9.AutoSize = true; + label9.ForeColor = System.Drawing.Color.White; + label9.Location = new System.Drawing.Point(281, 65); + label9.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label9.Name = "label9"; + label9.Size = new System.Drawing.Size(63, 15); + label9.TabIndex = 20; + label9.Text = "light-years"; + // + // spnHeight + // + spnHeight.Location = new System.Drawing.Point(218, 62); + spnHeight.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + spnHeight.Minimum = new decimal(new int[] { 1, 0, 0, 0 }); + spnHeight.Name = "spnHeight"; + spnHeight.Size = new System.Drawing.Size(56, 21); + spnHeight.TabIndex = 2; + spnHeight.Value = new decimal(new int[] { 30, 0, 0, 0 }); + spnHeight.ValueChanged += spnHeight_ValueChanged; + // + // label8 + // + label8.AutoSize = true; + label8.ForeColor = System.Drawing.Color.White; + label8.Location = new System.Drawing.Point(196, 65); + label8.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label8.Name = "label8"; + label8.Size = new System.Drawing.Size(13, 15); + label8.TabIndex = 18; + label8.Text = "x"; + // + // spnWidth + // + spnWidth.Location = new System.Drawing.Point(133, 62); + spnWidth.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + spnWidth.Minimum = new decimal(new int[] { 1, 0, 0, 0 }); + spnWidth.Name = "spnWidth"; + spnWidth.Size = new System.Drawing.Size(56, 21); + spnWidth.TabIndex = 1; + spnWidth.Value = new decimal(new int[] { 40, 0, 0, 0 }); + spnWidth.ValueChanged += spnWidth_ValueChanged; + // + // label7 + // + label7.AutoSize = true; + label7.ForeColor = System.Drawing.Color.CornflowerBlue; + label7.Location = new System.Drawing.Point(13, 65); + label7.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label7.Name = "label7"; + label7.Size = new System.Drawing.Size(73, 15); + label7.TabIndex = 16; + label7.Text = "Dimensions"; + // + // ddlEventFrequency + // + ddlEventFrequency.DisplayMember = "Name"; + ddlEventFrequency.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + ddlEventFrequency.Enabled = false; + ddlEventFrequency.FormattingEnabled = true; + ddlEventFrequency.Location = new System.Drawing.Point(133, 318); + ddlEventFrequency.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + ddlEventFrequency.Name = "ddlEventFrequency"; + ddlEventFrequency.Size = new System.Drawing.Size(177, 23); + ddlEventFrequency.TabIndex = 8; + ddlEventFrequency.ValueMember = "Value"; + // + // label6 + // + label6.AutoSize = true; + label6.ForeColor = System.Drawing.Color.CornflowerBlue; + label6.Location = new System.Drawing.Point(13, 322); + label6.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label6.Name = "label6"; + label6.Size = new System.Drawing.Size(97, 15); + label6.TabIndex = 14; + label6.Text = "Event Frequency"; + // + // chkOmniscient + // + chkOmniscient.AutoSize = true; + chkOmniscient.Location = new System.Drawing.Point(26, 290); + chkOmniscient.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + chkOmniscient.Name = "chkOmniscient"; + chkOmniscient.Size = new System.Drawing.Size(231, 19); + chkOmniscient.TabIndex = 7; + chkOmniscient.Text = "Omniscient View of Explored Systems"; + chkOmniscient.UseVisualStyleBackColor = true; + // + // label4 + // + label4.AutoSize = true; + label4.ForeColor = System.Drawing.Color.CornflowerBlue; + label4.Location = new System.Drawing.Point(13, 237); + label4.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label4.Name = "label4"; + label4.Size = new System.Drawing.Size(66, 15); + label4.TabIndex = 10; + label4.Text = "Fog of War"; + // + // chkAllSystemsExplored + // + chkAllSystemsExplored.AutoSize = true; + chkAllSystemsExplored.Location = new System.Drawing.Point(26, 261); + chkAllSystemsExplored.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + chkAllSystemsExplored.Name = "chkAllSystemsExplored"; + chkAllSystemsExplored.Size = new System.Drawing.Size(140, 19); + chkAllSystemsExplored.TabIndex = 6; + chkAllSystemsExplored.Text = "All Systems Explored"; + chkAllSystemsExplored.UseVisualStyleBackColor = true; + // + // ddlWarpPointLocation + // + ddlWarpPointLocation.DataSource = warpPointPlacementStrategyBindingSource; + ddlWarpPointLocation.DisplayMember = "Name"; + ddlWarpPointLocation.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + ddlWarpPointLocation.FormattingEnabled = true; + ddlWarpPointLocation.Location = new System.Drawing.Point(133, 158); + ddlWarpPointLocation.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + ddlWarpPointLocation.Name = "ddlWarpPointLocation"; + ddlWarpPointLocation.Size = new System.Drawing.Size(177, 23); + ddlWarpPointLocation.TabIndex = 5; + ddlWarpPointLocation.SelectedIndexChanged += ddlWarpPointLocation_SelectedIndexChanged; + // + // warpPointPlacementStrategyBindingSource + // + warpPointPlacementStrategyBindingSource.DataSource = typeof(Setup.WarpPointPlacementStrategies.WarpPointPlacementStrategy); + // + // label3 + // + label3.AutoSize = true; + label3.ForeColor = System.Drawing.Color.CornflowerBlue; + label3.Location = new System.Drawing.Point(10, 162); + label3.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label3.Name = "label3"; + label3.Size = new System.Drawing.Size(88, 15); + label3.TabIndex = 7; + label3.Text = "WP Placement"; + // + // label2 + // + label2.AutoSize = true; + label2.ForeColor = System.Drawing.Color.CornflowerBlue; + label2.Location = new System.Drawing.Point(10, 128); + label2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label2.Name = "label2"; + label2.Size = new System.Drawing.Size(90, 15); + label2.TabIndex = 5; + label2.Text = "System Groups"; + // + // spnStarSystems + // + spnStarSystems.Location = new System.Drawing.Point(133, 93); + spnStarSystems.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + spnStarSystems.Maximum = new decimal(new int[] { 1000, 0, 0, 0 }); + spnStarSystems.Minimum = new decimal(new int[] { 1, 0, 0, 0 }); + spnStarSystems.Name = "spnStarSystems"; + spnStarSystems.Size = new System.Drawing.Size(83, 21); + spnStarSystems.TabIndex = 3; + spnStarSystems.Value = new decimal(new int[] { 30, 0, 0, 0 }); + spnStarSystems.ValueChanged += spnStarSystems_ValueChanged; + // + // label1 + // + label1.AutoSize = true; + label1.ForeColor = System.Drawing.Color.CornflowerBlue; + label1.Location = new System.Drawing.Point(10, 96); + label1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label1.Name = "label1"; + label1.Size = new System.Drawing.Size(78, 15); + label1.TabIndex = 3; + label1.Text = "Star Systems"; + // + // txtGalaxyTypeDescription + // + txtGalaxyTypeDescription.AutoSize = true; + txtGalaxyTypeDescription.Location = new System.Drawing.Point(22, 37); + txtGalaxyTypeDescription.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + txtGalaxyTypeDescription.Name = "txtGalaxyTypeDescription"; + txtGalaxyTypeDescription.Size = new System.Drawing.Size(125, 15); + txtGalaxyTypeDescription.TabIndex = 2; + txtGalaxyTypeDescription.Text = "Choose a galaxy type."; + // + // ddlGalaxyType + // + ddlGalaxyType.DataSource = galaxyTemplateBindingSource; + ddlGalaxyType.DisplayMember = "Name"; + ddlGalaxyType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + ddlGalaxyType.FormattingEnabled = true; + ddlGalaxyType.Location = new System.Drawing.Point(133, 7); + ddlGalaxyType.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + ddlGalaxyType.Name = "ddlGalaxyType"; + ddlGalaxyType.Size = new System.Drawing.Size(177, 23); + ddlGalaxyType.TabIndex = 0; + ddlGalaxyType.SelectedIndexChanged += ddlGalaxyType_SelectedIndexChanged; + // + // galaxyTemplateBindingSource + // + galaxyTemplateBindingSource.AllowNew = false; + galaxyTemplateBindingSource.DataSource = typeof(Modding.Templates.GalaxyTemplate); + // + // lblGalaxyType + // + lblGalaxyType.AutoSize = true; + lblGalaxyType.ForeColor = System.Drawing.Color.CornflowerBlue; + lblGalaxyType.Location = new System.Drawing.Point(10, 12); + lblGalaxyType.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + lblGalaxyType.Name = "lblGalaxyType"; + lblGalaxyType.Size = new System.Drawing.Size(33, 15); + lblGalaxyType.TabIndex = 0; + lblGalaxyType.Text = "Type"; + // + // tabResources + // + tabResources.BackColor = System.Drawing.Color.Black; + tabResources.Controls.Add(chkLimitRemote); + tabResources.Controls.Add(chkLimitStandard); + tabResources.Controls.Add(label29); + tabResources.Controls.Add(label28); + tabResources.Controls.Add(chkRemote); + tabResources.Controls.Add(btnRefreshGraphs); + tabResources.Controls.Add(picMiningGraph); + tabResources.Controls.Add(spnMiningRate); + tabResources.Controls.Add(spnStartValue); + tabResources.Controls.Add(label27); + tabResources.Controls.Add(label26); + tabResources.Controls.Add(picValueGraph); + tabResources.Controls.Add(spnHomeworldValue); + tabResources.Controls.Add(label25); + tabResources.Controls.Add(chkBonusDepletionRemote); + tabResources.Controls.Add(chkBonusDepletionStandard); + tabResources.Controls.Add(label17); + tabResources.Controls.Add(spnDepletionTurnRemote); + tabResources.Controls.Add(spnDepletionTurnStandard); + tabResources.Controls.Add(label24); + tabResources.Controls.Add(spnMaxValuePlanet); + tabResources.Controls.Add(spnMaxSpawnValueAsteroid); + tabResources.Controls.Add(spnMinSpawnValueAsteroid); + tabResources.Controls.Add(spnMinValueAsteroid); + tabResources.Controls.Add(spnMaxSpawnValuePlanet); + tabResources.Controls.Add(spnMinSpawnValuePlanet); + tabResources.Controls.Add(spnMinValuePlanet); + tabResources.Controls.Add(label23); + tabResources.Controls.Add(label22); + tabResources.Controls.Add(label21); + tabResources.Controls.Add(label20); + tabResources.Controls.Add(label19); + tabResources.Controls.Add(label18); + tabResources.Controls.Add(spnDepletionResourceRemote); + tabResources.Controls.Add(spnBonusRemote); + tabResources.Controls.Add(spnRateRemote); + tabResources.Controls.Add(spnDepletionResourceStandard); + tabResources.Controls.Add(spnBonusStandard); + tabResources.Controls.Add(spnRateStandard); + tabResources.Controls.Add(label16); + tabResources.Controls.Add(label15); + tabResources.Controls.Add(label14); + tabResources.Controls.Add(label13); + tabResources.Controls.Add(label12); + tabResources.Controls.Add(btnLoadResourcePreset); + tabResources.Controls.Add(ddlPresets); + tabResources.Controls.Add(label5); + tabResources.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 0); + tabResources.Location = new System.Drawing.Point(4, 29); + tabResources.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + tabResources.Name = "tabResources"; + tabResources.Size = new System.Drawing.Size(637, 628); + tabResources.TabIndex = 7; + tabResources.Text = "Resources"; + // + // chkLimitRemote + // + chkLimitRemote.AutoSize = true; + chkLimitRemote.Location = new System.Drawing.Point(300, 96); + chkLimitRemote.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + chkLimitRemote.Name = "chkLimitRemote"; + chkLimitRemote.Size = new System.Drawing.Size(15, 14); + chkLimitRemote.TabIndex = 62; + chkLimitRemote.UseVisualStyleBackColor = true; + // + // chkLimitStandard + // + chkLimitStandard.AutoSize = true; + chkLimitStandard.Location = new System.Drawing.Point(178, 96); + chkLimitStandard.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + chkLimitStandard.Name = "chkLimitStandard"; + chkLimitStandard.Size = new System.Drawing.Size(15, 14); + chkLimitStandard.TabIndex = 61; + chkLimitStandard.UseVisualStyleBackColor = true; + // + // label29 + // + label29.AutoSize = true; + label29.ForeColor = System.Drawing.Color.CornflowerBlue; + label29.Location = new System.Drawing.Point(9, 95); + label29.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label29.Name = "label29"; + label29.Size = new System.Drawing.Size(114, 15); + label29.TabIndex = 60; + label29.Text = "Limit Rate To Value"; + // + // label28 + // + label28.AutoSize = true; + label28.ForeColor = System.Drawing.Color.CornflowerBlue; + label28.Location = new System.Drawing.Point(426, 387); + label28.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label28.Name = "label28"; + label28.Size = new System.Drawing.Size(142, 15); + label28.TabIndex = 59; + label28.Text = "Graphs display 100 turns"; + // + // chkRemote + // + chkRemote.AutoSize = true; + chkRemote.Location = new System.Drawing.Point(434, 98); + chkRemote.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + chkRemote.Name = "chkRemote"; + chkRemote.Size = new System.Drawing.Size(70, 19); + chkRemote.TabIndex = 58; + chkRemote.Text = "Remote"; + chkRemote.UseVisualStyleBackColor = true; + chkRemote.CheckedChanged += chkRemote_CheckedChanged; + // + // btnRefreshGraphs + // + btnRefreshGraphs.BackColor = System.Drawing.Color.Black; + btnRefreshGraphs.ForeColor = System.Drawing.Color.CornflowerBlue; + btnRefreshGraphs.Location = new System.Drawing.Point(534, 95); + btnRefreshGraphs.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + btnRefreshGraphs.Name = "btnRefreshGraphs"; + btnRefreshGraphs.Size = new System.Drawing.Size(98, 27); + btnRefreshGraphs.TabIndex = 57; + btnRefreshGraphs.Text = "Refresh"; + btnRefreshGraphs.UseVisualStyleBackColor = false; + btnRefreshGraphs.Click += btnRefreshGraphs_Click; + // + // picMiningGraph + // + picMiningGraph.Location = new System.Drawing.Point(429, 257); + picMiningGraph.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + picMiningGraph.Name = "picMiningGraph"; + picMiningGraph.Size = new System.Drawing.Size(203, 122); + picMiningGraph.TabIndex = 56; + picMiningGraph.TabStop = false; + picMiningGraph.Paint += picMiningGraph_Paint; + // + // spnMiningRate + // + spnMiningRate.Increment = new decimal(new int[] { 100, 0, 0, 0 }); + spnMiningRate.Location = new System.Drawing.Point(534, 68); + spnMiningRate.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + spnMiningRate.Maximum = new decimal(new int[] { 10000, 0, 0, 0 }); + spnMiningRate.Name = "spnMiningRate"; + spnMiningRate.Size = new System.Drawing.Size(98, 21); + spnMiningRate.TabIndex = 55; + spnMiningRate.Value = new decimal(new int[] { 1000, 0, 0, 0 }); + spnMiningRate.ValueChanged += spnMiningRate_ValueChanged; + // + // spnStartValue + // + spnStartValue.Location = new System.Drawing.Point(534, 37); + spnStartValue.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + spnStartValue.Maximum = new decimal(new int[] { 10000000, 0, 0, 0 }); + spnStartValue.Name = "spnStartValue"; + spnStartValue.Size = new System.Drawing.Size(98, 21); + spnStartValue.TabIndex = 54; + spnStartValue.Value = new decimal(new int[] { 120, 0, 0, 0 }); + spnStartValue.ValueChanged += spnStartValue_ValueChanged; + // + // label27 + // + label27.AutoSize = true; + label27.ForeColor = System.Drawing.Color.CornflowerBlue; + label27.Location = new System.Drawing.Point(426, 70); + label27.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label27.Name = "label27"; + label27.Size = new System.Drawing.Size(74, 15); + label27.TabIndex = 53; + label27.Text = "Mining Rate"; + // + // label26 + // + label26.AutoSize = true; + label26.ForeColor = System.Drawing.Color.CornflowerBlue; + label26.Location = new System.Drawing.Point(426, 37); + label26.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label26.Name = "label26"; + label26.Size = new System.Drawing.Size(66, 15); + label26.TabIndex = 52; + label26.Text = "Start Value"; + // + // picValueGraph + // + picValueGraph.Location = new System.Drawing.Point(429, 128); + picValueGraph.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + picValueGraph.Name = "picValueGraph"; + picValueGraph.Size = new System.Drawing.Size(203, 122); + picValueGraph.TabIndex = 51; + picValueGraph.TabStop = false; + picValueGraph.Paint += picValueGraph_Paint; + // + // spnHomeworldValue + // + spnHomeworldValue.Location = new System.Drawing.Point(178, 346); + spnHomeworldValue.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + spnHomeworldValue.Maximum = new decimal(new int[] { 10000000, 0, 0, 0 }); + spnHomeworldValue.Name = "spnHomeworldValue"; + spnHomeworldValue.Size = new System.Drawing.Size(111, 21); + spnHomeworldValue.TabIndex = 50; + spnHomeworldValue.ThousandsSeparator = true; + spnHomeworldValue.Value = new decimal(new int[] { 120, 0, 0, 0 }); + // + // label25 + // + label25.AutoSize = true; + label25.ForeColor = System.Drawing.Color.CornflowerBlue; + label25.Location = new System.Drawing.Point(9, 348); + label25.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label25.Name = "label25"; + label25.Size = new System.Drawing.Size(105, 15); + label25.TabIndex = 49; + label25.Text = "Homeworld Value"; + // + // chkBonusDepletionRemote + // + chkBonusDepletionRemote.AutoSize = true; + chkBonusDepletionRemote.Location = new System.Drawing.Point(300, 186); + chkBonusDepletionRemote.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + chkBonusDepletionRemote.Name = "chkBonusDepletionRemote"; + chkBonusDepletionRemote.Size = new System.Drawing.Size(15, 14); + chkBonusDepletionRemote.TabIndex = 48; + chkBonusDepletionRemote.UseVisualStyleBackColor = true; + // + // chkBonusDepletionStandard + // + chkBonusDepletionStandard.AutoSize = true; + chkBonusDepletionStandard.Location = new System.Drawing.Point(178, 186); + chkBonusDepletionStandard.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + chkBonusDepletionStandard.Name = "chkBonusDepletionStandard"; + chkBonusDepletionStandard.Size = new System.Drawing.Size(15, 14); + chkBonusDepletionStandard.TabIndex = 47; + chkBonusDepletionStandard.UseVisualStyleBackColor = true; + // + // label17 + // + label17.AutoSize = true; + label17.ForeColor = System.Drawing.Color.CornflowerBlue; + label17.Location = new System.Drawing.Point(9, 185); + label17.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label17.Name = "label17"; + label17.Size = new System.Drawing.Size(136, 15); + label17.TabIndex = 46; + label17.Text = "Bonus Affects Depletion"; + // + // spnDepletionTurnRemote + // + spnDepletionTurnRemote.Location = new System.Drawing.Point(300, 209); + spnDepletionTurnRemote.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + spnDepletionTurnRemote.Maximum = new decimal(new int[] { 1000000, 0, 0, 0 }); + spnDepletionTurnRemote.Name = "spnDepletionTurnRemote"; + spnDepletionTurnRemote.Size = new System.Drawing.Size(111, 21); + spnDepletionTurnRemote.TabIndex = 45; + spnDepletionTurnRemote.ThousandsSeparator = true; + spnDepletionTurnRemote.Value = new decimal(new int[] { 1, 0, 0, 0 }); + // + // spnDepletionTurnStandard + // + spnDepletionTurnStandard.Location = new System.Drawing.Point(178, 209); + spnDepletionTurnStandard.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + spnDepletionTurnStandard.Maximum = new decimal(new int[] { 1000000, 0, 0, 0 }); + spnDepletionTurnStandard.Name = "spnDepletionTurnStandard"; + spnDepletionTurnStandard.Size = new System.Drawing.Size(111, 21); + spnDepletionTurnStandard.TabIndex = 44; + spnDepletionTurnStandard.ThousandsSeparator = true; + // + // label24 + // + label24.AutoSize = true; + label24.ForeColor = System.Drawing.Color.CornflowerBlue; + label24.Location = new System.Drawing.Point(9, 211); + label24.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label24.Name = "label24"; + label24.Size = new System.Drawing.Size(132, 15); + label24.TabIndex = 43; + label24.Text = "Depletion / Turn Mined"; + // + // spnMaxValuePlanet + // + spnMaxValuePlanet.Location = new System.Drawing.Point(178, 408); + spnMaxValuePlanet.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + spnMaxValuePlanet.Maximum = new decimal(new int[] { 10000000, 0, 0, 0 }); + spnMaxValuePlanet.Name = "spnMaxValuePlanet"; + spnMaxValuePlanet.Size = new System.Drawing.Size(111, 21); + spnMaxValuePlanet.TabIndex = 41; + spnMaxValuePlanet.ThousandsSeparator = true; + spnMaxValuePlanet.Value = new decimal(new int[] { 250, 0, 0, 0 }); + // + // spnMaxSpawnValueAsteroid + // + spnMaxSpawnValueAsteroid.Location = new System.Drawing.Point(300, 377); + spnMaxSpawnValueAsteroid.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + spnMaxSpawnValueAsteroid.Maximum = new decimal(new int[] { 10000000, 0, 0, 0 }); + spnMaxSpawnValueAsteroid.Name = "spnMaxSpawnValueAsteroid"; + spnMaxSpawnValueAsteroid.Size = new System.Drawing.Size(111, 21); + spnMaxSpawnValueAsteroid.TabIndex = 40; + spnMaxSpawnValueAsteroid.ThousandsSeparator = true; + spnMaxSpawnValueAsteroid.Value = new decimal(new int[] { 300, 0, 0, 0 }); + // + // spnMinSpawnValueAsteroid + // + spnMinSpawnValueAsteroid.Location = new System.Drawing.Point(300, 315); + spnMinSpawnValueAsteroid.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + spnMinSpawnValueAsteroid.Maximum = new decimal(new int[] { 10000000, 0, 0, 0 }); + spnMinSpawnValueAsteroid.Name = "spnMinSpawnValueAsteroid"; + spnMinSpawnValueAsteroid.Size = new System.Drawing.Size(111, 21); + spnMinSpawnValueAsteroid.TabIndex = 39; + spnMinSpawnValueAsteroid.ThousandsSeparator = true; + spnMinSpawnValueAsteroid.Value = new decimal(new int[] { 50, 0, 0, 0 }); + // + // spnMinValueAsteroid + // + spnMinValueAsteroid.Location = new System.Drawing.Point(300, 284); + spnMinValueAsteroid.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + spnMinValueAsteroid.Maximum = new decimal(new int[] { 10000000, 0, 0, 0 }); + spnMinValueAsteroid.Name = "spnMinValueAsteroid"; + spnMinValueAsteroid.Size = new System.Drawing.Size(111, 21); + spnMinValueAsteroid.TabIndex = 38; + spnMinValueAsteroid.ThousandsSeparator = true; + // + // spnMaxSpawnValuePlanet + // + spnMaxSpawnValuePlanet.Location = new System.Drawing.Point(178, 377); + spnMaxSpawnValuePlanet.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + spnMaxSpawnValuePlanet.Maximum = new decimal(new int[] { 10000000, 0, 0, 0 }); + spnMaxSpawnValuePlanet.Name = "spnMaxSpawnValuePlanet"; + spnMaxSpawnValuePlanet.Size = new System.Drawing.Size(111, 21); + spnMaxSpawnValuePlanet.TabIndex = 37; + spnMaxSpawnValuePlanet.ThousandsSeparator = true; + spnMaxSpawnValuePlanet.Value = new decimal(new int[] { 150, 0, 0, 0 }); + // + // spnMinSpawnValuePlanet + // + spnMinSpawnValuePlanet.Location = new System.Drawing.Point(178, 315); + spnMinSpawnValuePlanet.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + spnMinSpawnValuePlanet.Maximum = new decimal(new int[] { 10000000, 0, 0, 0 }); + spnMinSpawnValuePlanet.Name = "spnMinSpawnValuePlanet"; + spnMinSpawnValuePlanet.Size = new System.Drawing.Size(111, 21); + spnMinSpawnValuePlanet.TabIndex = 36; + spnMinSpawnValuePlanet.ThousandsSeparator = true; + // + // spnMinValuePlanet + // + spnMinValuePlanet.Location = new System.Drawing.Point(178, 284); + spnMinValuePlanet.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + spnMinValuePlanet.Maximum = new decimal(new int[] { 10000000, 0, 0, 0 }); + spnMinValuePlanet.Name = "spnMinValuePlanet"; + spnMinValuePlanet.Size = new System.Drawing.Size(111, 21); + spnMinValuePlanet.TabIndex = 35; + spnMinValuePlanet.ThousandsSeparator = true; + // + // label23 + // + label23.AutoSize = true; + label23.ForeColor = System.Drawing.Color.CornflowerBlue; + label23.Location = new System.Drawing.Point(296, 257); + label23.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label23.Name = "label23"; + label23.Size = new System.Drawing.Size(57, 15); + label23.TabIndex = 34; + label23.Text = "Asteroids"; + // + // label22 + // + label22.AutoSize = true; + label22.ForeColor = System.Drawing.Color.CornflowerBlue; + label22.Location = new System.Drawing.Point(175, 257); + label22.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label22.Name = "label22"; + label22.Size = new System.Drawing.Size(48, 15); + label22.TabIndex = 33; + label22.Text = "Planets"; + // + // label21 + // + label21.AutoSize = true; + label21.ForeColor = System.Drawing.Color.CornflowerBlue; + label21.Location = new System.Drawing.Point(9, 411); + label21.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label21.Name = "label21"; + label21.Size = new System.Drawing.Size(65, 15); + label21.TabIndex = 32; + label21.Text = "Max Value"; + // + // label20 + // + label20.AutoSize = true; + label20.ForeColor = System.Drawing.Color.CornflowerBlue; + label20.Location = new System.Drawing.Point(9, 284); + label20.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label20.Name = "label20"; + label20.Size = new System.Drawing.Size(62, 15); + label20.TabIndex = 31; + label20.Text = "Min Value"; + // + // label19 + // + label19.AutoSize = true; + label19.ForeColor = System.Drawing.Color.CornflowerBlue; + label19.Location = new System.Drawing.Point(9, 380); + label19.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label19.Name = "label19"; + label19.Size = new System.Drawing.Size(106, 15); + label19.TabIndex = 30; + label19.Text = "Max Spawn Value"; + // + // label18 + // + label18.AutoSize = true; + label18.ForeColor = System.Drawing.Color.CornflowerBlue; + label18.Location = new System.Drawing.Point(9, 317); + label18.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label18.Name = "label18"; + label18.Size = new System.Drawing.Size(103, 15); + label18.TabIndex = 29; + label18.Text = "Min Spawn Value"; + // + // spnDepletionResourceRemote + // + spnDepletionResourceRemote.Increment = new decimal(new int[] { 1, 0, 0, 131072 }); + spnDepletionResourceRemote.Location = new System.Drawing.Point(300, 150); + spnDepletionResourceRemote.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + spnDepletionResourceRemote.Maximum = new decimal(new int[] { 1, 0, 0, 0 }); + spnDepletionResourceRemote.Name = "spnDepletionResourceRemote"; + spnDepletionResourceRemote.Size = new System.Drawing.Size(111, 21); + spnDepletionResourceRemote.TabIndex = 27; + // + // spnBonusRemote + // + spnBonusRemote.Increment = new decimal(new int[] { 1, 0, 0, 131072 }); + spnBonusRemote.Location = new System.Drawing.Point(300, 119); + spnBonusRemote.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + spnBonusRemote.Name = "spnBonusRemote"; + spnBonusRemote.Size = new System.Drawing.Size(111, 21); + spnBonusRemote.TabIndex = 26; + spnBonusRemote.Value = new decimal(new int[] { 1, 0, 0, 0 }); + // + // spnRateRemote + // + spnRateRemote.Location = new System.Drawing.Point(300, 59); + spnRateRemote.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + spnRateRemote.Maximum = new decimal(new int[] { 1000, 0, 0, 0 }); + spnRateRemote.Name = "spnRateRemote"; + spnRateRemote.Size = new System.Drawing.Size(111, 21); + spnRateRemote.TabIndex = 25; + // + // spnDepletionResourceStandard + // + spnDepletionResourceStandard.Increment = new decimal(new int[] { 1, 0, 0, 131072 }); + spnDepletionResourceStandard.Location = new System.Drawing.Point(178, 150); + spnDepletionResourceStandard.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + spnDepletionResourceStandard.Maximum = new decimal(new int[] { 1, 0, 0, 0 }); + spnDepletionResourceStandard.Name = "spnDepletionResourceStandard"; + spnDepletionResourceStandard.Size = new System.Drawing.Size(111, 21); + spnDepletionResourceStandard.TabIndex = 23; + // + // spnBonusStandard + // + spnBonusStandard.Increment = new decimal(new int[] { 1, 0, 0, 131072 }); + spnBonusStandard.Location = new System.Drawing.Point(178, 119); + spnBonusStandard.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + spnBonusStandard.Name = "spnBonusStandard"; + spnBonusStandard.Size = new System.Drawing.Size(111, 21); + spnBonusStandard.TabIndex = 22; + spnBonusStandard.Value = new decimal(new int[] { 1, 0, 0, 0 }); + // + // spnRateStandard + // + spnRateStandard.Location = new System.Drawing.Point(178, 59); + spnRateStandard.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + spnRateStandard.Maximum = new decimal(new int[] { 1000, 0, 0, 0 }); + spnRateStandard.Name = "spnRateStandard"; + spnRateStandard.Size = new System.Drawing.Size(111, 21); + spnRateStandard.TabIndex = 21; + // + // label16 + // + label16.AutoSize = true; + label16.ForeColor = System.Drawing.Color.CornflowerBlue; + label16.Location = new System.Drawing.Point(9, 152); + label16.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label16.Name = "label16"; + label16.Size = new System.Drawing.Size(122, 15); + label16.TabIndex = 19; + label16.Text = "Depletion / Resource"; + // + // label15 + // + label15.AutoSize = true; + label15.ForeColor = System.Drawing.Color.CornflowerBlue; + label15.Location = new System.Drawing.Point(9, 121); + label15.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label15.Name = "label15"; + label15.Size = new System.Drawing.Size(90, 15); + label15.TabIndex = 18; + label15.Text = "Value % Bonus"; + // + // label14 + // + label14.AutoSize = true; + label14.ForeColor = System.Drawing.Color.CornflowerBlue; + label14.Location = new System.Drawing.Point(9, 61); + label14.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label14.Name = "label14"; + label14.Size = new System.Drawing.Size(47, 15); + label14.TabIndex = 17; + label14.Text = "Rate %"; + // + // label13 + // + label13.AutoSize = true; + label13.ForeColor = System.Drawing.Color.CornflowerBlue; + label13.Location = new System.Drawing.Point(296, 37); + label13.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label13.Name = "label13"; + label13.Size = new System.Drawing.Size(92, 15); + label13.TabIndex = 16; + label13.Text = "Remote Mining"; + // + // label12 + // + label12.AutoSize = true; + label12.ForeColor = System.Drawing.Color.CornflowerBlue; + label12.Location = new System.Drawing.Point(175, 37); + label12.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label12.Name = "label12"; + label12.Size = new System.Drawing.Size(98, 15); + label12.TabIndex = 15; + label12.Text = "Standard Mining"; + // + // btnLoadResourcePreset + // + btnLoadResourcePreset.BackColor = System.Drawing.Color.Black; + btnLoadResourcePreset.ForeColor = System.Drawing.Color.CornflowerBlue; + btnLoadResourcePreset.Location = new System.Drawing.Point(364, 2); + btnLoadResourcePreset.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + btnLoadResourcePreset.Name = "btnLoadResourcePreset"; + btnLoadResourcePreset.Size = new System.Drawing.Size(88, 27); + btnLoadResourcePreset.TabIndex = 13; + btnLoadResourcePreset.Text = "Load"; + btnLoadResourcePreset.UseVisualStyleBackColor = false; + btnLoadResourcePreset.Click += btnLoadResourcePreset_Click; + // + // ddlPresets + // + ddlPresets.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + ddlPresets.FormattingEnabled = true; + ddlPresets.Items.AddRange(new object[] { "Standard, Remote Mining Depletes", "Standard, Remote Mining Doesn't Deplete", "Finite" }); + ddlPresets.Location = new System.Drawing.Point(66, 3); + ddlPresets.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + ddlPresets.Name = "ddlPresets"; + ddlPresets.Size = new System.Drawing.Size(290, 23); + ddlPresets.TabIndex = 12; + // + // label5 + // + label5.AutoSize = true; + label5.ForeColor = System.Drawing.Color.CornflowerBlue; + label5.Location = new System.Drawing.Point(4, 7); + label5.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label5.Name = "label5"; + label5.Size = new System.Drawing.Size(48, 15); + label5.TabIndex = 11; + label5.Text = "Presets"; + // + // tabTechnology + // + tabTechnology.BackColor = System.Drawing.Color.Black; + tabTechnology.Controls.Add(ddlTechUniqueness); + tabTechnology.Controls.Add(label63); + tabTechnology.Controls.Add(ddlTechCost); + tabTechnology.Controls.Add(label61); + tabTechnology.Controls.Add(label31); + tabTechnology.Controls.Add(lstTechs); + tabTechnology.Controls.Add(ddlStartTech); + tabTechnology.Controls.Add(label30); + tabTechnology.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 0); + tabTechnology.Location = new System.Drawing.Point(4, 29); + tabTechnology.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + tabTechnology.Name = "tabTechnology"; + tabTechnology.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3); + tabTechnology.Size = new System.Drawing.Size(637, 628); + tabTechnology.TabIndex = 2; + tabTechnology.Text = "Technology"; + // + // ddlTechUniqueness + // + ddlTechUniqueness.DisplayMember = "Name"; + ddlTechUniqueness.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + ddlTechUniqueness.FormattingEnabled = true; + ddlTechUniqueness.Location = new System.Drawing.Point(495, 7); + ddlTechUniqueness.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + ddlTechUniqueness.Name = "ddlTechUniqueness"; + ddlTechUniqueness.Size = new System.Drawing.Size(140, 23); + ddlTechUniqueness.TabIndex = 19; + ddlTechUniqueness.ValueMember = "Value"; + // + // label63 + // + label63.AutoSize = true; + label63.ForeColor = System.Drawing.Color.CornflowerBlue; + label63.Location = new System.Drawing.Point(288, 10); + label63.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label63.Name = "label63"; + label63.Size = new System.Drawing.Size(179, 15); + label63.TabIndex = 18; + label63.Text = "Tech Known By Other Players is"; + // + // ddlTechCost + // + ddlTechCost.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + ddlTechCost.FormattingEnabled = true; + ddlTechCost.Items.AddRange(new object[] { "Low", "Medium", "High" }); + ddlTechCost.Location = new System.Drawing.Point(140, 40); + ddlTechCost.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + ddlTechCost.Name = "ddlTechCost"; + ddlTechCost.Size = new System.Drawing.Size(140, 23); + ddlTechCost.TabIndex = 17; + // + // label61 + // + label61.AutoSize = true; + label61.ForeColor = System.Drawing.Color.CornflowerBlue; + label61.Location = new System.Drawing.Point(4, 44); + label61.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label61.Name = "label61"; + label61.Size = new System.Drawing.Size(97, 15); + label61.TabIndex = 16; + label61.Text = "Technology Cost"; + // + // label31 + // + label31.AutoSize = true; + label31.ForeColor = System.Drawing.Color.CornflowerBlue; + label31.Location = new System.Drawing.Point(4, 97); + label31.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label31.Name = "label31"; + label31.Size = new System.Drawing.Size(133, 15); + label31.TabIndex = 15; + label31.Text = "Available Technologies"; + // + // lstTechs + // + lstTechs.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; + lstTechs.BackColor = System.Drawing.Color.Black; + lstTechs.BorderStyle = System.Windows.Forms.BorderStyle.None; + lstTechs.CheckOnClick = true; + lstTechs.ColumnWidth = 200; + lstTechs.ForeColor = System.Drawing.Color.White; + lstTechs.FormattingEnabled = true; + lstTechs.Location = new System.Drawing.Point(10, 121); + lstTechs.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + lstTechs.MultiColumn = true; + lstTechs.Name = "lstTechs"; + lstTechs.Size = new System.Drawing.Size(618, 480); + lstTechs.TabIndex = 14; + // + // ddlStartTech + // + ddlStartTech.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + ddlStartTech.FormattingEnabled = true; + ddlStartTech.Items.AddRange(new object[] { "Low", "Medium", "High" }); + ddlStartTech.Location = new System.Drawing.Point(140, 7); + ddlStartTech.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + ddlStartTech.Name = "ddlStartTech"; + ddlStartTech.Size = new System.Drawing.Size(140, 23); + ddlStartTech.TabIndex = 13; + // + // label30 + // + label30.AutoSize = true; + label30.ForeColor = System.Drawing.Color.CornflowerBlue; + label30.Location = new System.Drawing.Point(4, 10); + label30.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label30.Name = "label30"; + label30.Size = new System.Drawing.Size(111, 15); + label30.TabIndex = 12; + label30.Text = "Starting Tech Level"; + // + // tabEmpires + // + tabEmpires.BackColor = System.Drawing.Color.Black; + tabEmpires.Controls.Add(lblMaxBonusResearchFromEmpirePoints); + tabEmpires.Controls.Add(spnResearchPerUnspentEmpirePoint); + tabEmpires.Controls.Add(label64); + tabEmpires.Controls.Add(btnEmpireBottom); + tabEmpires.Controls.Add(btnEmpireTop); + tabEmpires.Controls.Add(btnEmpireDown); + tabEmpires.Controls.Add(btnEmpireUp); + tabEmpires.Controls.Add(btnToggleAI); + tabEmpires.Controls.Add(label44); + tabEmpires.Controls.Add(spnMaxDispersion); + tabEmpires.Controls.Add(label43); + tabEmpires.Controls.Add(ddlHomeworldSize); + tabEmpires.Controls.Add(label42); + tabEmpires.Controls.Add(btnSaveEmpire); + tabEmpires.Controls.Add(btnRemoveEmpire); + tabEmpires.Controls.Add(btnEditEmpire); + tabEmpires.Controls.Add(btnLoadEmpire); + tabEmpires.Controls.Add(btnCreateEmpire); + tabEmpires.Controls.Add(gamePanel1); + tabEmpires.Controls.Add(label41); + tabEmpires.Controls.Add(spnResourceStorage); + tabEmpires.Controls.Add(label40); + tabEmpires.Controls.Add(spnMinorEmpires); + tabEmpires.Controls.Add(spnRandomAIs); + tabEmpires.Controls.Add(spnEmpirePoints); + tabEmpires.Controls.Add(ddlScoreDisplay); + tabEmpires.Controls.Add(ddlEmpirePlacement); + tabEmpires.Controls.Add(spnHomeworlds); + tabEmpires.Controls.Add(spnStartResearch); + tabEmpires.Controls.Add(spnStartResources); + tabEmpires.Controls.Add(label39); + tabEmpires.Controls.Add(label38); + tabEmpires.Controls.Add(label37); + tabEmpires.Controls.Add(label36); + tabEmpires.Controls.Add(label35); + tabEmpires.Controls.Add(label34); + tabEmpires.Controls.Add(label33); + tabEmpires.Controls.Add(label32); + tabEmpires.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 0); + tabEmpires.Location = new System.Drawing.Point(4, 29); + tabEmpires.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + tabEmpires.Name = "tabEmpires"; + tabEmpires.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3); + tabEmpires.Size = new System.Drawing.Size(637, 628); + tabEmpires.TabIndex = 3; + tabEmpires.Text = "Empires"; + // + // lblMaxBonusResearchFromEmpirePoints + // + lblMaxBonusResearchFromEmpirePoints.AutoSize = true; + lblMaxBonusResearchFromEmpirePoints.ForeColor = System.Drawing.Color.White; + lblMaxBonusResearchFromEmpirePoints.Location = new System.Drawing.Point(295, 99); + lblMaxBonusResearchFromEmpirePoints.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + lblMaxBonusResearchFromEmpirePoints.Name = "lblMaxBonusResearchFromEmpirePoints"; + lblMaxBonusResearchFromEmpirePoints.Size = new System.Drawing.Size(235, 15); + lblMaxBonusResearchFromEmpirePoints.TabIndex = 50; + lblMaxBonusResearchFromEmpirePoints.Text = "Empires can earn up to 0 bonus research."; + // + // spnResearchPerUnspentEmpirePoint + // + spnResearchPerUnspentEmpirePoint.Location = new System.Drawing.Point(524, 66); + spnResearchPerUnspentEmpirePoint.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + spnResearchPerUnspentEmpirePoint.Maximum = new decimal(new int[] { 10000, 0, 0, 0 }); + spnResearchPerUnspentEmpirePoint.Name = "spnResearchPerUnspentEmpirePoint"; + spnResearchPerUnspentEmpirePoint.Size = new System.Drawing.Size(105, 21); + spnResearchPerUnspentEmpirePoint.TabIndex = 3; + spnResearchPerUnspentEmpirePoint.ThousandsSeparator = true; + spnResearchPerUnspentEmpirePoint.ValueChanged += spnResearchPerUnspentEmpirePoint_ValueChanged; + // + // label64 + // + label64.AutoSize = true; + label64.ForeColor = System.Drawing.Color.CornflowerBlue; + label64.Location = new System.Drawing.Point(294, 68); + label64.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label64.Name = "label64"; + label64.Size = new System.Drawing.Size(187, 15); + label64.TabIndex = 48; + label64.Text = "Bonus Per Unspent Empire Point\r\n"; + // + // btnEmpireBottom + // + btnEmpireBottom.BackColor = System.Drawing.Color.Black; + btnEmpireBottom.ForeColor = System.Drawing.Color.CornflowerBlue; + btnEmpireBottom.Location = new System.Drawing.Point(483, 560); + btnEmpireBottom.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + btnEmpireBottom.Name = "btnEmpireBottom"; + btnEmpireBottom.Size = new System.Drawing.Size(118, 36); + btnEmpireBottom.TabIndex = 47; + btnEmpireBottom.Text = "To Bottom"; + btnEmpireBottom.UseVisualStyleBackColor = false; + btnEmpireBottom.Click += btnEmpireBottom_Click; + // + // btnEmpireTop + // + btnEmpireTop.BackColor = System.Drawing.Color.Black; + btnEmpireTop.ForeColor = System.Drawing.Color.CornflowerBlue; + btnEmpireTop.Location = new System.Drawing.Point(483, 517); + btnEmpireTop.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + btnEmpireTop.Name = "btnEmpireTop"; + btnEmpireTop.Size = new System.Drawing.Size(118, 36); + btnEmpireTop.TabIndex = 46; + btnEmpireTop.Text = "To Top"; + btnEmpireTop.UseVisualStyleBackColor = false; + btnEmpireTop.Click += btnEmpireTop_Click; + // + // btnEmpireDown + // + btnEmpireDown.BackColor = System.Drawing.Color.Black; + btnEmpireDown.ForeColor = System.Drawing.Color.CornflowerBlue; + btnEmpireDown.Location = new System.Drawing.Point(358, 560); + btnEmpireDown.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + btnEmpireDown.Name = "btnEmpireDown"; + btnEmpireDown.Size = new System.Drawing.Size(118, 36); + btnEmpireDown.TabIndex = 45; + btnEmpireDown.Text = "Move Down"; + btnEmpireDown.UseVisualStyleBackColor = false; + btnEmpireDown.Click += btnEmpireDown_Click; + // + // btnEmpireUp + // + btnEmpireUp.BackColor = System.Drawing.Color.Black; + btnEmpireUp.ForeColor = System.Drawing.Color.CornflowerBlue; + btnEmpireUp.Location = new System.Drawing.Point(358, 517); + btnEmpireUp.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + btnEmpireUp.Name = "btnEmpireUp"; + btnEmpireUp.Size = new System.Drawing.Size(118, 36); + btnEmpireUp.TabIndex = 44; + btnEmpireUp.Text = "Move Up"; + btnEmpireUp.UseVisualStyleBackColor = false; + btnEmpireUp.Click += btnEmpireUp_Click; + // + // btnToggleAI + // + btnToggleAI.BackColor = System.Drawing.Color.Black; + btnToggleAI.ForeColor = System.Drawing.Color.CornflowerBlue; + btnToggleAI.Location = new System.Drawing.Point(483, 474); + btnToggleAI.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + btnToggleAI.Name = "btnToggleAI"; + btnToggleAI.Size = new System.Drawing.Size(118, 36); + btnToggleAI.TabIndex = 43; + btnToggleAI.Text = "Toggle AI"; + btnToggleAI.UseVisualStyleBackColor = false; + btnToggleAI.Click += btnToggleAI_Click; + // + // label44 + // + label44.AutoSize = true; + label44.Location = new System.Drawing.Point(295, 196); + label44.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label44.Name = "label44"; + label44.Size = new System.Drawing.Size(173, 15); + label44.TabIndex = 42; + label44.Text = "warps from central homeworld"; + // + // spnMaxDispersion + // + spnMaxDispersion.Location = new System.Drawing.Point(147, 195); + spnMaxDispersion.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + spnMaxDispersion.Maximum = new decimal(new int[] { 10, 0, 0, 0 }); + spnMaxDispersion.Name = "spnMaxDispersion"; + spnMaxDispersion.Size = new System.Drawing.Size(140, 21); + spnMaxDispersion.TabIndex = 7; + spnMaxDispersion.Value = new decimal(new int[] { 1, 0, 0, 0 }); + // + // label43 + // + label43.AutoSize = true; + label43.ForeColor = System.Drawing.Color.CornflowerBlue; + label43.Location = new System.Drawing.Point(10, 197); + label43.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label43.Name = "label43"; + label43.Size = new System.Drawing.Size(93, 15); + label43.TabIndex = 40; + label43.Text = "Max Dispersion"; + // + // ddlHomeworldSize + // + ddlHomeworldSize.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + ddlHomeworldSize.FormattingEnabled = true; + ddlHomeworldSize.Location = new System.Drawing.Point(146, 128); + ddlHomeworldSize.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + ddlHomeworldSize.Name = "ddlHomeworldSize"; + ddlHomeworldSize.Size = new System.Drawing.Size(192, 23); + ddlHomeworldSize.TabIndex = 5; + // + // label42 + // + label42.AutoSize = true; + label42.ForeColor = System.Drawing.Color.CornflowerBlue; + label42.Location = new System.Drawing.Point(9, 132); + label42.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label42.Name = "label42"; + label42.Size = new System.Drawing.Size(98, 15); + label42.TabIndex = 38; + label42.Text = "Homeworld Size"; + // + // btnSaveEmpire + // + btnSaveEmpire.BackColor = System.Drawing.Color.Black; + btnSaveEmpire.ForeColor = System.Drawing.Color.CornflowerBlue; + btnSaveEmpire.Location = new System.Drawing.Point(483, 432); + btnSaveEmpire.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + btnSaveEmpire.Name = "btnSaveEmpire"; + btnSaveEmpire.Size = new System.Drawing.Size(118, 36); + btnSaveEmpire.TabIndex = 37; + btnSaveEmpire.Text = "Save"; + btnSaveEmpire.UseVisualStyleBackColor = false; + btnSaveEmpire.Click += btnSaveEmpire_Click; + // + // btnRemoveEmpire + // + btnRemoveEmpire.BackColor = System.Drawing.Color.Black; + btnRemoveEmpire.ForeColor = System.Drawing.Color.CornflowerBlue; + btnRemoveEmpire.Location = new System.Drawing.Point(358, 474); + btnRemoveEmpire.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + btnRemoveEmpire.Name = "btnRemoveEmpire"; + btnRemoveEmpire.Size = new System.Drawing.Size(118, 36); + btnRemoveEmpire.TabIndex = 36; + btnRemoveEmpire.Text = "Remove"; + btnRemoveEmpire.UseVisualStyleBackColor = false; + btnRemoveEmpire.Click += btnRemoveEmpire_Click; + // + // btnEditEmpire + // + btnEditEmpire.BackColor = System.Drawing.Color.Black; + btnEditEmpire.ForeColor = System.Drawing.Color.CornflowerBlue; + btnEditEmpire.Location = new System.Drawing.Point(483, 389); + btnEditEmpire.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + btnEditEmpire.Name = "btnEditEmpire"; + btnEditEmpire.Size = new System.Drawing.Size(118, 36); + btnEditEmpire.TabIndex = 35; + btnEditEmpire.Text = "Edit"; + btnEditEmpire.UseVisualStyleBackColor = false; + btnEditEmpire.Click += btnEditEmpire_Click; + // + // btnLoadEmpire + // + btnLoadEmpire.BackColor = System.Drawing.Color.Black; + btnLoadEmpire.ForeColor = System.Drawing.Color.CornflowerBlue; + btnLoadEmpire.Location = new System.Drawing.Point(358, 432); + btnLoadEmpire.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + btnLoadEmpire.Name = "btnLoadEmpire"; + btnLoadEmpire.Size = new System.Drawing.Size(118, 36); + btnLoadEmpire.TabIndex = 34; + btnLoadEmpire.Text = "Load"; + btnLoadEmpire.UseVisualStyleBackColor = false; + btnLoadEmpire.Click += btnLoadEmpire_Click; + // + // btnCreateEmpire + // + btnCreateEmpire.BackColor = System.Drawing.Color.Black; + btnCreateEmpire.ForeColor = System.Drawing.Color.CornflowerBlue; + btnCreateEmpire.Location = new System.Drawing.Point(358, 389); + btnCreateEmpire.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + btnCreateEmpire.Name = "btnCreateEmpire"; + btnCreateEmpire.Size = new System.Drawing.Size(118, 36); + btnCreateEmpire.TabIndex = 12; + btnCreateEmpire.Text = "Create"; + btnCreateEmpire.UseVisualStyleBackColor = false; + btnCreateEmpire.Click += btnCreateEmpire_Click; + // + // gamePanel1 + // + gamePanel1.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left; + gamePanel1.BackColor = System.Drawing.Color.Black; + gamePanel1.BorderColor = System.Drawing.Color.CornflowerBlue; + gamePanel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + gamePanel1.Controls.Add(lstEmpires); + gamePanel1.ForeColor = System.Drawing.Color.White; + gamePanel1.Location = new System.Drawing.Point(13, 389); + gamePanel1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + gamePanel1.Name = "gamePanel1"; + gamePanel1.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3); + gamePanel1.Size = new System.Drawing.Size(338, 227); + gamePanel1.TabIndex = 32; + // + // lstEmpires + // + lstEmpires.BackColor = System.Drawing.Color.Black; + lstEmpires.BorderStyle = System.Windows.Forms.BorderStyle.None; + lstEmpires.Dock = System.Windows.Forms.DockStyle.Fill; + lstEmpires.ForeColor = System.Drawing.Color.White; + lstEmpires.Location = new System.Drawing.Point(4, 3); + lstEmpires.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + lstEmpires.Name = "lstEmpires"; + lstEmpires.Size = new System.Drawing.Size(328, 219); + lstEmpires.TabIndex = 0; + lstEmpires.UseCompatibleStateImageBehavior = false; + lstEmpires.View = System.Windows.Forms.View.List; + // + // label41 + // + label41.AutoSize = true; + label41.ForeColor = System.Drawing.Color.CornflowerBlue; + label41.Location = new System.Drawing.Point(14, 365); + label41.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label41.Name = "label41"; + label41.Size = new System.Drawing.Size(90, 15); + label41.TabIndex = 31; + label41.Text = "Player Empires"; + // + // spnResourceStorage + // + spnResourceStorage.Location = new System.Drawing.Point(147, 37); + spnResourceStorage.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + spnResourceStorage.Maximum = new decimal(new int[] { 1000000, 0, 0, 0 }); + spnResourceStorage.Name = "spnResourceStorage"; + spnResourceStorage.Size = new System.Drawing.Size(140, 21); + spnResourceStorage.TabIndex = 1; + spnResourceStorage.Value = new decimal(new int[] { 50000, 0, 0, 0 }); + spnResourceStorage.ValueChanged += spnResourceStorage_ValueChanged; + // + // label40 + // + label40.AutoSize = true; + label40.ForeColor = System.Drawing.Color.CornflowerBlue; + label40.Location = new System.Drawing.Point(7, 39); + label40.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label40.Name = "label40"; + label40.Size = new System.Drawing.Size(106, 15); + label40.TabIndex = 29; + label40.Text = "Resource Storage"; + // + // spnMinorEmpires + // + spnMinorEmpires.Location = new System.Drawing.Point(146, 322); + spnMinorEmpires.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + spnMinorEmpires.Name = "spnMinorEmpires"; + spnMinorEmpires.Size = new System.Drawing.Size(140, 21); + spnMinorEmpires.TabIndex = 11; + // + // spnRandomAIs + // + spnRandomAIs.Location = new System.Drawing.Point(146, 291); + spnRandomAIs.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + spnRandomAIs.Name = "spnRandomAIs"; + spnRandomAIs.Size = new System.Drawing.Size(140, 21); + spnRandomAIs.TabIndex = 10; + // + // spnEmpirePoints + // + spnEmpirePoints.Location = new System.Drawing.Point(146, 260); + spnEmpirePoints.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + spnEmpirePoints.Maximum = new decimal(new int[] { 1000000, 0, 0, 0 }); + spnEmpirePoints.Name = "spnEmpirePoints"; + spnEmpirePoints.Size = new System.Drawing.Size(140, 21); + spnEmpirePoints.TabIndex = 9; + spnEmpirePoints.Value = new decimal(new int[] { 2000, 0, 0, 0 }); + spnEmpirePoints.ValueChanged += spnEmpirePoints_ValueChanged; + // + // ddlScoreDisplay + // + ddlScoreDisplay.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + ddlScoreDisplay.FormattingEnabled = true; + ddlScoreDisplay.Items.AddRange(new object[] { "Own Only (No Rankings)", "Own Only (Ranked)", "Allies Only (No Rankings)", "Allies Only (Ranked)", "All" }); + ddlScoreDisplay.Location = new System.Drawing.Point(146, 226); + ddlScoreDisplay.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + ddlScoreDisplay.Name = "ddlScoreDisplay"; + ddlScoreDisplay.Size = new System.Drawing.Size(193, 23); + ddlScoreDisplay.TabIndex = 8; + // + // ddlEmpirePlacement + // + ddlEmpirePlacement.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + ddlEmpirePlacement.FormattingEnabled = true; + ddlEmpirePlacement.Items.AddRange(new object[] { "Can Start In Same System", "Different Systems", "Equidistant" }); + ddlEmpirePlacement.Location = new System.Drawing.Point(147, 162); + ddlEmpirePlacement.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + ddlEmpirePlacement.Name = "ddlEmpirePlacement"; + ddlEmpirePlacement.Size = new System.Drawing.Size(192, 23); + ddlEmpirePlacement.TabIndex = 6; + // + // spnHomeworlds + // + spnHomeworlds.Location = new System.Drawing.Point(146, 97); + spnHomeworlds.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + spnHomeworlds.Maximum = new decimal(new int[] { 10, 0, 0, 0 }); + spnHomeworlds.Minimum = new decimal(new int[] { 1, 0, 0, 0 }); + spnHomeworlds.Name = "spnHomeworlds"; + spnHomeworlds.Size = new System.Drawing.Size(140, 21); + spnHomeworlds.TabIndex = 4; + spnHomeworlds.Value = new decimal(new int[] { 1, 0, 0, 0 }); + // + // spnStartResearch + // + spnStartResearch.Location = new System.Drawing.Point(147, 66); + spnStartResearch.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + spnStartResearch.Maximum = new decimal(new int[] { 1000000, 0, 0, 0 }); + spnStartResearch.Name = "spnStartResearch"; + spnStartResearch.Size = new System.Drawing.Size(140, 21); + spnStartResearch.TabIndex = 2; + spnStartResearch.Value = new decimal(new int[] { 20000, 0, 0, 0 }); + // + // spnStartResources + // + spnStartResources.Location = new System.Drawing.Point(147, 8); + spnStartResources.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + spnStartResources.Maximum = new decimal(new int[] { 1000000, 0, 0, 0 }); + spnStartResources.Name = "spnStartResources"; + spnStartResources.Size = new System.Drawing.Size(140, 21); + spnStartResources.TabIndex = 0; + spnStartResources.Value = new decimal(new int[] { 20000, 0, 0, 0 }); + // + // label39 + // + label39.AutoSize = true; + label39.ForeColor = System.Drawing.Color.CornflowerBlue; + label39.Location = new System.Drawing.Point(10, 324); + label39.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label39.Name = "label39"; + label39.Size = new System.Drawing.Size(88, 15); + label39.TabIndex = 20; + label39.Text = "Minor Empires"; + // + // label38 + // + label38.AutoSize = true; + label38.ForeColor = System.Drawing.Color.CornflowerBlue; + label38.Location = new System.Drawing.Point(10, 293); + label38.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label38.Name = "label38"; + label38.Size = new System.Drawing.Size(74, 15); + label38.TabIndex = 19; + label38.Text = "Random AIs"; + // + // label37 + // + label37.AutoSize = true; + label37.ForeColor = System.Drawing.Color.CornflowerBlue; + label37.Location = new System.Drawing.Point(10, 260); + label37.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label37.Name = "label37"; + label37.Size = new System.Drawing.Size(84, 15); + label37.TabIndex = 18; + label37.Text = "Empire Points"; + // + // label36 + // + label36.AutoSize = true; + label36.ForeColor = System.Drawing.Color.CornflowerBlue; + label36.Location = new System.Drawing.Point(10, 230); + label36.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label36.Name = "label36"; + label36.Size = new System.Drawing.Size(82, 15); + label36.TabIndex = 17; + label36.Text = "Score Display"; + // + // label35 + // + label35.AutoSize = true; + label35.ForeColor = System.Drawing.Color.CornflowerBlue; + label35.Location = new System.Drawing.Point(10, 165); + label35.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label35.Name = "label35"; + label35.Size = new System.Drawing.Size(66, 15); + label35.TabIndex = 16; + label35.Text = "Placement"; + // + // label34 + // + label34.AutoSize = true; + label34.ForeColor = System.Drawing.Color.CornflowerBlue; + label34.Location = new System.Drawing.Point(9, 99); + label34.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label34.Name = "label34"; + label34.Size = new System.Drawing.Size(77, 15); + label34.TabIndex = 15; + label34.Text = "Homeworlds"; + // + // label33 + // + label33.AutoSize = true; + label33.ForeColor = System.Drawing.Color.CornflowerBlue; + label33.Location = new System.Drawing.Point(7, 68); + label33.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label33.Name = "label33"; + label33.Size = new System.Drawing.Size(105, 15); + label33.TabIndex = 14; + label33.Text = "Starting Research"; + // + // label32 + // + label32.AutoSize = true; + label32.ForeColor = System.Drawing.Color.CornflowerBlue; + label32.Location = new System.Drawing.Point(7, 10); + label32.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label32.Name = "label32"; + label32.Size = new System.Drawing.Size(111, 15); + label32.TabIndex = 13; + label32.Text = "Starting Resources"; + // + // tabVictory + // + tabVictory.BackColor = System.Drawing.Color.Black; + tabVictory.Controls.Add(label51); + tabVictory.Controls.Add(spnVictoryDelay); + tabVictory.Controls.Add(label50); + tabVictory.Controls.Add(label49); + tabVictory.Controls.Add(spnVictoryPeace); + tabVictory.Controls.Add(chkVictoryPeace); + tabVictory.Controls.Add(label48); + tabVictory.Controls.Add(spnVictoryTech); + tabVictory.Controls.Add(chkVictoryTech); + tabVictory.Controls.Add(label47); + tabVictory.Controls.Add(spnVictoryScorePercent); + tabVictory.Controls.Add(chkVictoryScorePercent); + tabVictory.Controls.Add(label46); + tabVictory.Controls.Add(spnVictoryTurns); + tabVictory.Controls.Add(chkVictoryTurns); + tabVictory.Controls.Add(spnVictoryScore); + tabVictory.Controls.Add(chkVictoryScore); + tabVictory.Controls.Add(chkVictoryEliminateMajorEmpires); + tabVictory.Controls.Add(label45); + tabVictory.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); + tabVictory.Location = new System.Drawing.Point(4, 29); + tabVictory.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + tabVictory.Name = "tabVictory"; + tabVictory.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3); + tabVictory.Size = new System.Drawing.Size(637, 628); + tabVictory.TabIndex = 4; + tabVictory.Text = "Victory"; + // + // label51 + // + label51.AutoSize = true; + label51.ForeColor = System.Drawing.Color.CornflowerBlue; + label51.Location = new System.Drawing.Point(430, 260); + label51.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label51.Name = "label51"; + label51.Size = new System.Drawing.Size(34, 15); + label51.TabIndex = 18; + label51.Text = "turns"; + // + // spnVictoryDelay + // + spnVictoryDelay.Increment = new decimal(new int[] { 10, 0, 0, 0 }); + spnVictoryDelay.Location = new System.Drawing.Point(284, 257); + spnVictoryDelay.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + spnVictoryDelay.Maximum = new decimal(new int[] { 1000, 0, 0, 0 }); + spnVictoryDelay.Name = "spnVictoryDelay"; + spnVictoryDelay.Size = new System.Drawing.Size(140, 21); + spnVictoryDelay.TabIndex = 17; + spnVictoryDelay.ThousandsSeparator = true; + // + // label50 + // + label50.AutoSize = true; + label50.ForeColor = System.Drawing.Color.CornflowerBlue; + label50.Location = new System.Drawing.Point(9, 260); + label50.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label50.Name = "label50"; + label50.Size = new System.Drawing.Size(229, 15); + label50.TabIndex = 16; + label50.Text = "Custom victory conditions take effect after"; + // + // label49 + // + label49.AutoSize = true; + label49.Location = new System.Drawing.Point(368, 205); + label49.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label49.Name = "label49"; + label49.Size = new System.Drawing.Size(181, 15); + label49.TabIndex = 15; + label49.Text = "turns (Non-Aggression or better)"; + // + // spnVictoryPeace + // + spnVictoryPeace.Increment = new decimal(new int[] { 10, 0, 0, 0 }); + spnVictoryPeace.Location = new System.Drawing.Point(220, 203); + spnVictoryPeace.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + spnVictoryPeace.Minimum = new decimal(new int[] { 10, 0, 0, 0 }); + spnVictoryPeace.Name = "spnVictoryPeace"; + spnVictoryPeace.Size = new System.Drawing.Size(140, 21); + spnVictoryPeace.TabIndex = 14; + spnVictoryPeace.ThousandsSeparator = true; + spnVictoryPeace.Value = new decimal(new int[] { 10, 0, 0, 0 }); + // + // chkVictoryPeace + // + chkVictoryPeace.AutoSize = true; + chkVictoryPeace.Location = new System.Drawing.Point(12, 204); + chkVictoryPeace.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + chkVictoryPeace.Name = "chkVictoryPeace"; + chkVictoryPeace.Size = new System.Drawing.Size(173, 19); + chkVictoryPeace.TabIndex = 13; + chkVictoryPeace.Text = "Maintain galactic peace for"; + chkVictoryPeace.UseVisualStyleBackColor = true; + // + // label48 + // + label48.AutoSize = true; + label48.Location = new System.Drawing.Point(258, 177); + label48.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label48.Name = "label48"; + label48.Size = new System.Drawing.Size(270, 15); + label48.TabIndex = 12; + label48.Text = "% of all non-racial, non-unique technology levels"; + // + // spnVictoryTech + // + spnVictoryTech.Increment = new decimal(new int[] { 10, 0, 0, 0 }); + spnVictoryTech.Location = new System.Drawing.Point(111, 174); + spnVictoryTech.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + spnVictoryTech.Minimum = new decimal(new int[] { 10, 0, 0, 0 }); + spnVictoryTech.Name = "spnVictoryTech"; + spnVictoryTech.Size = new System.Drawing.Size(140, 21); + spnVictoryTech.TabIndex = 11; + spnVictoryTech.ThousandsSeparator = true; + spnVictoryTech.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // chkVictoryTech + // + chkVictoryTech.AutoSize = true; + chkVictoryTech.Location = new System.Drawing.Point(12, 175); + chkVictoryTech.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + chkVictoryTech.Name = "chkVictoryTech"; + chkVictoryTech.Size = new System.Drawing.Size(79, 19); + chkVictoryTech.TabIndex = 10; + chkVictoryTech.Text = "Research"; + chkVictoryTech.UseVisualStyleBackColor = true; + // + // label47 + // + label47.AutoSize = true; + label47.Location = new System.Drawing.Point(288, 119); + label47.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label47.Name = "label47"; + label47.Size = new System.Drawing.Size(205, 15); + label47.TabIndex = 9; + label47.Text = "% of the second place player's score"; + // + // spnVictoryScorePercent + // + spnVictoryScorePercent.Increment = new decimal(new int[] { 10, 0, 0, 0 }); + spnVictoryScorePercent.Location = new System.Drawing.Point(141, 117); + spnVictoryScorePercent.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + spnVictoryScorePercent.Maximum = new decimal(new int[] { 1000, 0, 0, 0 }); + spnVictoryScorePercent.Minimum = new decimal(new int[] { 150, 0, 0, 0 }); + spnVictoryScorePercent.Name = "spnVictoryScorePercent"; + spnVictoryScorePercent.Size = new System.Drawing.Size(140, 21); + spnVictoryScorePercent.TabIndex = 8; + spnVictoryScorePercent.ThousandsSeparator = true; + spnVictoryScorePercent.Value = new decimal(new int[] { 200, 0, 0, 0 }); + // + // chkVictoryScorePercent + // + chkVictoryScorePercent.AutoSize = true; + chkVictoryScorePercent.Location = new System.Drawing.Point(12, 118); + chkVictoryScorePercent.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + chkVictoryScorePercent.Name = "chkVictoryScorePercent"; + chkVictoryScorePercent.Size = new System.Drawing.Size(105, 19); + chkVictoryScorePercent.TabIndex = 7; + chkVictoryScorePercent.Text = "Reach a score"; + chkVictoryScorePercent.UseVisualStyleBackColor = true; + // + // label46 + // + label46.AutoSize = true; + label46.Location = new System.Drawing.Point(261, 148); + label46.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label46.Name = "label46"; + label46.Size = new System.Drawing.Size(34, 15); + label46.TabIndex = 6; + label46.Text = "turns"; + // + // spnVictoryTurns + // + spnVictoryTurns.Increment = new decimal(new int[] { 10, 0, 0, 0 }); + spnVictoryTurns.Location = new System.Drawing.Point(114, 145); + spnVictoryTurns.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + spnVictoryTurns.Maximum = new decimal(new int[] { 10000, 0, 0, 0 }); + spnVictoryTurns.Name = "spnVictoryTurns"; + spnVictoryTurns.Size = new System.Drawing.Size(140, 21); + spnVictoryTurns.TabIndex = 5; + spnVictoryTurns.ThousandsSeparator = true; + spnVictoryTurns.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // chkVictoryTurns + // + chkVictoryTurns.AutoSize = true; + chkVictoryTurns.Location = new System.Drawing.Point(12, 147); + chkVictoryTurns.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + chkVictoryTurns.Name = "chkVictoryTurns"; + chkVictoryTurns.Size = new System.Drawing.Size(82, 19); + chkVictoryTurns.TabIndex = 4; + chkVictoryTurns.Text = "Survive for"; + chkVictoryTurns.UseVisualStyleBackColor = true; + // + // spnVictoryScore + // + spnVictoryScore.Increment = new decimal(new int[] { 10000, 0, 0, 0 }); + spnVictoryScore.Location = new System.Drawing.Point(156, 88); + spnVictoryScore.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + spnVictoryScore.Maximum = new decimal(new int[] { 1000000000, 0, 0, 0 }); + spnVictoryScore.Minimum = new decimal(new int[] { 10000, 0, 0, 0 }); + spnVictoryScore.Name = "spnVictoryScore"; + spnVictoryScore.Size = new System.Drawing.Size(140, 21); + spnVictoryScore.TabIndex = 3; + spnVictoryScore.ThousandsSeparator = true; + spnVictoryScore.Value = new decimal(new int[] { 5000000, 0, 0, 0 }); + // + // chkVictoryScore + // + chkVictoryScore.AutoSize = true; + chkVictoryScore.Location = new System.Drawing.Point(12, 89); + chkVictoryScore.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + chkVictoryScore.Name = "chkVictoryScore"; + chkVictoryScore.Size = new System.Drawing.Size(118, 19); + chkVictoryScore.TabIndex = 2; + chkVictoryScore.Text = "Reach a score of"; + chkVictoryScore.UseVisualStyleBackColor = true; + // + // chkVictoryEliminateMajorEmpires + // + chkVictoryEliminateMajorEmpires.AutoSize = true; + chkVictoryEliminateMajorEmpires.Location = new System.Drawing.Point(12, 60); + chkVictoryEliminateMajorEmpires.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + chkVictoryEliminateMajorEmpires.Name = "chkVictoryEliminateMajorEmpires"; + chkVictoryEliminateMajorEmpires.Size = new System.Drawing.Size(365, 19); + chkVictoryEliminateMajorEmpires.TabIndex = 1; + chkVictoryEliminateMajorEmpires.Text = "Eliminate all other major empires (minor empires may survive)"; + chkVictoryEliminateMajorEmpires.UseVisualStyleBackColor = true; + // + // label45 + // + label45.ForeColor = System.Drawing.Color.CornflowerBlue; + label45.Location = new System.Drawing.Point(8, 8); + label45.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label45.Name = "label45"; + label45.Size = new System.Drawing.Size(621, 47); + label45.TabIndex = 0; + label45.Text = "The standard victory condition is elimination of all other major and minor empires. Additional optional victory conditions can be selected below."; + // + // tabSettings + // + tabSettings.BackColor = System.Drawing.Color.Black; + tabSettings.Controls.Add(chkAllowAnalysis); + tabSettings.Controls.Add(label60); + tabSettings.Controls.Add(chkColonizeOnlyHWSurface); + tabSettings.Controls.Add(label59); + tabSettings.Controls.Add(chkColonizeOnlyBreathable); + tabSettings.Controls.Add(label58); + tabSettings.Controls.Add(chkUniqueRuins); + tabSettings.Controls.Add(label57); + tabSettings.Controls.Add(chkRandomRuins); + tabSettings.Controls.Add(label56); + tabSettings.Controls.Add(chkAllowIntel); + tabSettings.Controls.Add(label55); + tabSettings.Controls.Add(chkAllowSurrender); + tabSettings.Controls.Add(label54); + tabSettings.Controls.Add(label53); + tabSettings.Controls.Add(label52); + tabSettings.Controls.Add(ddlAllowedTrades); + tabSettings.Controls.Add(chkHumansVsAI); + tabSettings.Controls.Add(txtGalaxyName); + tabSettings.Controls.Add(labelName); + tabSettings.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 0); + tabSettings.Location = new System.Drawing.Point(4, 29); + tabSettings.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + tabSettings.Name = "tabSettings"; + tabSettings.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3); + tabSettings.Size = new System.Drawing.Size(637, 628); + tabSettings.TabIndex = 5; + tabSettings.Text = "Settings"; + // + // chkAllowAnalysis + // + chkAllowAnalysis.AutoSize = true; + chkAllowAnalysis.Checked = true; + chkAllowAnalysis.CheckState = System.Windows.Forms.CheckState.Checked; + chkAllowAnalysis.Location = new System.Drawing.Point(191, 141); + chkAllowAnalysis.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + chkAllowAnalysis.Name = "chkAllowAnalysis"; + chkAllowAnalysis.Size = new System.Drawing.Size(15, 14); + chkAllowAnalysis.TabIndex = 44; + chkAllowAnalysis.UseVisualStyleBackColor = true; + // + // label60 + // + label60.AutoSize = true; + label60.ForeColor = System.Drawing.Color.CornflowerBlue; + label60.Location = new System.Drawing.Point(12, 140); + label60.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label60.Name = "label60"; + label60.Size = new System.Drawing.Size(83, 15); + label60.TabIndex = 43; + label60.Text = "Allow Analysis"; + // + // chkColonizeOnlyHWSurface + // + chkColonizeOnlyHWSurface.AutoSize = true; + chkColonizeOnlyHWSurface.Location = new System.Drawing.Point(191, 234); + chkColonizeOnlyHWSurface.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + chkColonizeOnlyHWSurface.Name = "chkColonizeOnlyHWSurface"; + chkColonizeOnlyHWSurface.Size = new System.Drawing.Size(15, 14); + chkColonizeOnlyHWSurface.TabIndex = 42; + chkColonizeOnlyHWSurface.UseVisualStyleBackColor = true; + // + // label59 + // + label59.AutoSize = true; + label59.ForeColor = System.Drawing.Color.CornflowerBlue; + label59.Location = new System.Drawing.Point(12, 233); + label59.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label59.Name = "label59"; + label59.Size = new System.Drawing.Size(150, 15); + label59.TabIndex = 41; + label59.Text = "Colonize Only HW Surface"; + // + // chkColonizeOnlyBreathable + // + chkColonizeOnlyBreathable.AutoSize = true; + chkColonizeOnlyBreathable.Location = new System.Drawing.Point(191, 211); + chkColonizeOnlyBreathable.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + chkColonizeOnlyBreathable.Name = "chkColonizeOnlyBreathable"; + chkColonizeOnlyBreathable.Size = new System.Drawing.Size(15, 14); + chkColonizeOnlyBreathable.TabIndex = 40; + chkColonizeOnlyBreathable.UseVisualStyleBackColor = true; + // + // label58 + // + label58.AutoSize = true; + label58.ForeColor = System.Drawing.Color.CornflowerBlue; + label58.Location = new System.Drawing.Point(12, 210); + label58.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label58.Name = "label58"; + label58.Size = new System.Drawing.Size(145, 15); + label58.TabIndex = 39; + label58.Text = "Colonize Only Breathable"; + // + // chkUniqueRuins + // + chkUniqueRuins.AutoSize = true; + chkUniqueRuins.Checked = true; + chkUniqueRuins.CheckState = System.Windows.Forms.CheckState.Checked; + chkUniqueRuins.Location = new System.Drawing.Point(191, 187); + chkUniqueRuins.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + chkUniqueRuins.Name = "chkUniqueRuins"; + chkUniqueRuins.Size = new System.Drawing.Size(15, 14); + chkUniqueRuins.TabIndex = 38; + chkUniqueRuins.UseVisualStyleBackColor = true; + // + // label57 + // + label57.AutoSize = true; + label57.ForeColor = System.Drawing.Color.CornflowerBlue; + label57.Location = new System.Drawing.Point(12, 186); + label57.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label57.Name = "label57"; + label57.Size = new System.Drawing.Size(82, 15); + label57.TabIndex = 37; + label57.Text = "Unique Ruins"; + // + // chkRandomRuins + // + chkRandomRuins.AutoSize = true; + chkRandomRuins.Checked = true; + chkRandomRuins.CheckState = System.Windows.Forms.CheckState.Checked; + chkRandomRuins.Location = new System.Drawing.Point(191, 164); + chkRandomRuins.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + chkRandomRuins.Name = "chkRandomRuins"; + chkRandomRuins.Size = new System.Drawing.Size(15, 14); + chkRandomRuins.TabIndex = 36; + chkRandomRuins.UseVisualStyleBackColor = true; + // + // label56 + // + label56.AutoSize = true; + label56.ForeColor = System.Drawing.Color.CornflowerBlue; + label56.Location = new System.Drawing.Point(12, 163); + label56.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label56.Name = "label56"; + label56.Size = new System.Drawing.Size(90, 15); + label56.TabIndex = 35; + label56.Text = "Random Ruins"; + // + // chkAllowIntel + // + chkAllowIntel.AutoSize = true; + chkAllowIntel.Checked = true; + chkAllowIntel.CheckState = System.Windows.Forms.CheckState.Checked; + chkAllowIntel.Location = new System.Drawing.Point(191, 118); + chkAllowIntel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + chkAllowIntel.Name = "chkAllowIntel"; + chkAllowIntel.Size = new System.Drawing.Size(15, 14); + chkAllowIntel.TabIndex = 34; + chkAllowIntel.UseVisualStyleBackColor = true; + // + // label55 + // + label55.AutoSize = true; + label55.ForeColor = System.Drawing.Color.CornflowerBlue; + label55.Location = new System.Drawing.Point(12, 117); + label55.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label55.Name = "label55"; + label55.Size = new System.Drawing.Size(102, 15); + label55.TabIndex = 33; + label55.Text = "Allow Intelligence"; + // + // chkAllowSurrender + // + chkAllowSurrender.AutoSize = true; + chkAllowSurrender.Checked = true; + chkAllowSurrender.CheckState = System.Windows.Forms.CheckState.Checked; + chkAllowSurrender.Location = new System.Drawing.Point(191, 95); + chkAllowSurrender.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + chkAllowSurrender.Name = "chkAllowSurrender"; + chkAllowSurrender.Size = new System.Drawing.Size(15, 14); + chkAllowSurrender.TabIndex = 32; + chkAllowSurrender.UseVisualStyleBackColor = true; + // + // label54 + // + label54.AutoSize = true; + label54.ForeColor = System.Drawing.Color.CornflowerBlue; + label54.Location = new System.Drawing.Point(12, 93); + label54.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label54.Name = "label54"; + label54.Size = new System.Drawing.Size(94, 15); + label54.TabIndex = 31; + label54.Text = "Allow Surrender"; + // + // label53 + // + label53.AutoSize = true; + label53.ForeColor = System.Drawing.Color.CornflowerBlue; + label53.Location = new System.Drawing.Point(9, 65); + label53.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label53.Name = "label53"; + label53.Size = new System.Drawing.Size(91, 15); + label53.TabIndex = 30; + label53.Text = "Allowed Trades"; + // + // label52 + // + label52.AutoSize = true; + label52.ForeColor = System.Drawing.Color.CornflowerBlue; + label52.Location = new System.Drawing.Point(9, 37); + label52.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label52.Name = "label52"; + label52.Size = new System.Drawing.Size(84, 15); + label52.TabIndex = 29; + label52.Text = "Humans vs. AI"; + // + // ddlAllowedTrades + // + ddlAllowedTrades.DisplayMember = "Name"; + ddlAllowedTrades.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + ddlAllowedTrades.FormattingEnabled = true; + ddlAllowedTrades.Location = new System.Drawing.Point(191, 61); + ddlAllowedTrades.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + ddlAllowedTrades.Name = "ddlAllowedTrades"; + ddlAllowedTrades.Size = new System.Drawing.Size(177, 23); + ddlAllowedTrades.TabIndex = 28; + ddlAllowedTrades.ValueMember = "Value"; + // + // chkHumansVsAI + // + chkHumansVsAI.AutoSize = true; + chkHumansVsAI.Location = new System.Drawing.Point(191, 38); + chkHumansVsAI.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + chkHumansVsAI.Name = "chkHumansVsAI"; + chkHumansVsAI.Size = new System.Drawing.Size(15, 14); + chkHumansVsAI.TabIndex = 27; + chkHumansVsAI.UseVisualStyleBackColor = true; + // + // txtGalaxyName + // + txtGalaxyName.Location = new System.Drawing.Point(191, 7); + txtGalaxyName.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + txtGalaxyName.Name = "txtGalaxyName"; + txtGalaxyName.Size = new System.Drawing.Size(177, 21); + txtGalaxyName.TabIndex = 26; + // + // labelName + // + labelName.AutoSize = true; + labelName.ForeColor = System.Drawing.Color.CornflowerBlue; + labelName.Location = new System.Drawing.Point(8, 10); + labelName.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + labelName.Name = "labelName"; + labelName.Size = new System.Drawing.Size(78, 15); + labelName.TabIndex = 25; + labelName.Text = "Game Name"; + // + // btnStart + // + btnStart.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right; + btnStart.BackColor = System.Drawing.Color.Black; + btnStart.ForeColor = System.Drawing.Color.CornflowerBlue; + btnStart.Location = new System.Drawing.Point(558, 668); + btnStart.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + btnStart.Name = "btnStart"; + btnStart.Size = new System.Drawing.Size(88, 27); + btnStart.TabIndex = 0; + btnStart.Text = "Start"; + btnStart.UseVisualStyleBackColor = false; + btnStart.Click += btnStart_Click; + // + // btnCancel + // + btnCancel.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right; + btnCancel.BackColor = System.Drawing.Color.Black; + btnCancel.ForeColor = System.Drawing.Color.CornflowerBlue; + btnCancel.Location = new System.Drawing.Point(463, 668); + btnCancel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + btnCancel.Name = "btnCancel"; + btnCancel.Size = new System.Drawing.Size(88, 27); + btnCancel.TabIndex = 1; + btnCancel.Text = "Cancel"; + btnCancel.UseVisualStyleBackColor = false; + btnCancel.Click += btnCancel_Click; + // + // btnLoadSetup + // + btnLoadSetup.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left; + btnLoadSetup.BackColor = System.Drawing.Color.Black; + btnLoadSetup.ForeColor = System.Drawing.Color.CornflowerBlue; + btnLoadSetup.Location = new System.Drawing.Point(7, 668); + btnLoadSetup.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + btnLoadSetup.Name = "btnLoadSetup"; + btnLoadSetup.Size = new System.Drawing.Size(88, 27); + btnLoadSetup.TabIndex = 2; + btnLoadSetup.Text = "Load Setup"; + btnLoadSetup.UseVisualStyleBackColor = false; + btnLoadSetup.Click += btnLoadSetup_Click; + // + // btnSaveSetup + // + btnSaveSetup.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left; + btnSaveSetup.BackColor = System.Drawing.Color.Black; + btnSaveSetup.ForeColor = System.Drawing.Color.CornflowerBlue; + btnSaveSetup.Location = new System.Drawing.Point(102, 668); + btnSaveSetup.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + btnSaveSetup.Name = "btnSaveSetup"; + btnSaveSetup.Size = new System.Drawing.Size(88, 27); + btnSaveSetup.TabIndex = 3; + btnSaveSetup.Text = "Save Setup"; + btnSaveSetup.UseVisualStyleBackColor = false; + btnSaveSetup.Click += btnSaveSetup_Click; + // + // progressBar + // + progressBar.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; + progressBar.Location = new System.Drawing.Point(196, 675); + progressBar.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + progressBar.Name = "progressBar"; + progressBar.Size = new System.Drawing.Size(260, 16); + progressBar.Style = System.Windows.Forms.ProgressBarStyle.Continuous; + progressBar.TabIndex = 5; + progressBar.Visible = false; + // + // blazorWebView1 + // + blazorWebView1.Location = new System.Drawing.Point(347, 205); + blazorWebView1.Name = "blazorWebView1"; + blazorWebView1.Size = new System.Drawing.Size(275, 104); + blazorWebView1.StartPath = "/"; + blazorWebView1.TabIndex = 33; + blazorWebView1.Text = "blazorWebView1"; + // + // GameSetupForm + // + AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + BackColor = System.Drawing.Color.Black; + ClientSize = new System.Drawing.Size(659, 705); + Controls.Add(progressBar); + Controls.Add(btnSaveSetup); + Controls.Add(btnLoadSetup); + Controls.Add(btnCancel); + Controls.Add(btnStart); + Controls.Add(tabs); + FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; + Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + MaximizeBox = false; + Name = "GameSetupForm"; + ShowInTaskbar = false; + Text = "Game Setup"; + Load += GameSetupForm_Load; + tabs.ResumeLayout(false); + tabGalaxy.ResumeLayout(false); + tabGalaxy.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)spnSeed).EndInit(); + ((System.ComponentModel.ISupportInitialize)spnSystemGroups).EndInit(); + ((System.ComponentModel.ISupportInitialize)spnHeight).EndInit(); + ((System.ComponentModel.ISupportInitialize)spnWidth).EndInit(); + ((System.ComponentModel.ISupportInitialize)warpPointPlacementStrategyBindingSource).EndInit(); + ((System.ComponentModel.ISupportInitialize)spnStarSystems).EndInit(); + ((System.ComponentModel.ISupportInitialize)galaxyTemplateBindingSource).EndInit(); + tabResources.ResumeLayout(false); + tabResources.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)picMiningGraph).EndInit(); + ((System.ComponentModel.ISupportInitialize)spnMiningRate).EndInit(); + ((System.ComponentModel.ISupportInitialize)spnStartValue).EndInit(); + ((System.ComponentModel.ISupportInitialize)picValueGraph).EndInit(); + ((System.ComponentModel.ISupportInitialize)spnHomeworldValue).EndInit(); + ((System.ComponentModel.ISupportInitialize)spnDepletionTurnRemote).EndInit(); + ((System.ComponentModel.ISupportInitialize)spnDepletionTurnStandard).EndInit(); + ((System.ComponentModel.ISupportInitialize)spnMaxValuePlanet).EndInit(); + ((System.ComponentModel.ISupportInitialize)spnMaxSpawnValueAsteroid).EndInit(); + ((System.ComponentModel.ISupportInitialize)spnMinSpawnValueAsteroid).EndInit(); + ((System.ComponentModel.ISupportInitialize)spnMinValueAsteroid).EndInit(); + ((System.ComponentModel.ISupportInitialize)spnMaxSpawnValuePlanet).EndInit(); + ((System.ComponentModel.ISupportInitialize)spnMinSpawnValuePlanet).EndInit(); + ((System.ComponentModel.ISupportInitialize)spnMinValuePlanet).EndInit(); + ((System.ComponentModel.ISupportInitialize)spnDepletionResourceRemote).EndInit(); + ((System.ComponentModel.ISupportInitialize)spnBonusRemote).EndInit(); + ((System.ComponentModel.ISupportInitialize)spnRateRemote).EndInit(); + ((System.ComponentModel.ISupportInitialize)spnDepletionResourceStandard).EndInit(); + ((System.ComponentModel.ISupportInitialize)spnBonusStandard).EndInit(); + ((System.ComponentModel.ISupportInitialize)spnRateStandard).EndInit(); + tabTechnology.ResumeLayout(false); + tabTechnology.PerformLayout(); + tabEmpires.ResumeLayout(false); + tabEmpires.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)spnResearchPerUnspentEmpirePoint).EndInit(); + ((System.ComponentModel.ISupportInitialize)spnMaxDispersion).EndInit(); + gamePanel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)spnResourceStorage).EndInit(); + ((System.ComponentModel.ISupportInitialize)spnMinorEmpires).EndInit(); + ((System.ComponentModel.ISupportInitialize)spnRandomAIs).EndInit(); + ((System.ComponentModel.ISupportInitialize)spnEmpirePoints).EndInit(); + ((System.ComponentModel.ISupportInitialize)spnHomeworlds).EndInit(); + ((System.ComponentModel.ISupportInitialize)spnStartResearch).EndInit(); + ((System.ComponentModel.ISupportInitialize)spnStartResources).EndInit(); + tabVictory.ResumeLayout(false); + tabVictory.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)spnVictoryDelay).EndInit(); + ((System.ComponentModel.ISupportInitialize)spnVictoryPeace).EndInit(); + ((System.ComponentModel.ISupportInitialize)spnVictoryTech).EndInit(); + ((System.ComponentModel.ISupportInitialize)spnVictoryScorePercent).EndInit(); + ((System.ComponentModel.ISupportInitialize)spnVictoryTurns).EndInit(); + ((System.ComponentModel.ISupportInitialize)spnVictoryScore).EndInit(); + tabSettings.ResumeLayout(false); + tabSettings.PerformLayout(); + ResumeLayout(false); + } + + #endregion + + private Controls.GameTabControl tabs; + private System.Windows.Forms.TabPage tabGalaxy; + private Controls.GameButton btnStart; + private Controls.GameButton btnCancel; + private System.Windows.Forms.TabPage tabTechnology; + private System.Windows.Forms.TabPage tabEmpires; + private System.Windows.Forms.TabPage tabVictory; + private System.Windows.Forms.TabPage tabSettings; + private System.Windows.Forms.ComboBox ddlGalaxyType; + private System.Windows.Forms.Label lblGalaxyType; + private System.Windows.Forms.Label txtGalaxyTypeDescription; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.NumericUpDown spnStarSystems; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.ComboBox ddlWarpPointLocation; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.CheckBox chkOmniscient; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.CheckBox chkAllSystemsExplored; + private System.Windows.Forms.ComboBox ddlEventFrequency; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label label9; + private System.Windows.Forms.NumericUpDown spnHeight; + private System.Windows.Forms.Label label8; + private System.Windows.Forms.NumericUpDown spnWidth; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.ComboBox ddlMaximumEventSeverity; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.BindingSource galaxyTemplateBindingSource; + private Controls.GameButton btnLoadSetup; + private Controls.GameButton btnSaveSetup; + private System.Windows.Forms.ProgressBar progressBar; + private System.Windows.Forms.Label txtWarpPointLocation; + private System.Windows.Forms.BindingSource warpPointPlacementStrategyBindingSource; + private System.Windows.Forms.NumericUpDown spnSystemGroups; + private System.Windows.Forms.Label label11; + private System.Windows.Forms.TabPage tabResources; + private Controls.GameButton btnLoadResourcePreset; + private System.Windows.Forms.ComboBox ddlPresets; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.Label label12; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.Label label14; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.Label label16; + private System.Windows.Forms.NumericUpDown spnDepletionResourceStandard; + private System.Windows.Forms.NumericUpDown spnBonusStandard; + private System.Windows.Forms.NumericUpDown spnRateStandard; + private System.Windows.Forms.NumericUpDown spnDepletionResourceRemote; + private System.Windows.Forms.NumericUpDown spnBonusRemote; + private System.Windows.Forms.NumericUpDown spnRateRemote; + private System.Windows.Forms.Label label19; + private System.Windows.Forms.Label label18; + private System.Windows.Forms.Label label21; + private System.Windows.Forms.Label label20; + private System.Windows.Forms.Label label23; + private System.Windows.Forms.Label label22; + private System.Windows.Forms.NumericUpDown spnMaxValuePlanet; + private System.Windows.Forms.NumericUpDown spnMaxSpawnValueAsteroid; + private System.Windows.Forms.NumericUpDown spnMinSpawnValueAsteroid; + private System.Windows.Forms.NumericUpDown spnMinValueAsteroid; + private System.Windows.Forms.NumericUpDown spnMaxSpawnValuePlanet; + private System.Windows.Forms.NumericUpDown spnMinSpawnValuePlanet; + private System.Windows.Forms.NumericUpDown spnMinValuePlanet; + private System.Windows.Forms.CheckBox chkBonusDepletionRemote; + private System.Windows.Forms.CheckBox chkBonusDepletionStandard; + private System.Windows.Forms.Label label17; + private System.Windows.Forms.NumericUpDown spnDepletionTurnRemote; + private System.Windows.Forms.NumericUpDown spnDepletionTurnStandard; + private System.Windows.Forms.Label label24; + private System.Windows.Forms.NumericUpDown spnHomeworldValue; + private System.Windows.Forms.Label label25; + private System.Windows.Forms.PictureBox picValueGraph; + private System.Windows.Forms.NumericUpDown spnMiningRate; + private System.Windows.Forms.NumericUpDown spnStartValue; + private System.Windows.Forms.Label label27; + private System.Windows.Forms.Label label26; + private System.Windows.Forms.PictureBox picMiningGraph; + private Controls.GameButton btnRefreshGraphs; + private System.Windows.Forms.CheckBox chkRemote; + private System.Windows.Forms.Label label28; + private System.Windows.Forms.CheckBox chkLimitRemote; + private System.Windows.Forms.CheckBox chkLimitStandard; + private System.Windows.Forms.Label label29; + private System.Windows.Forms.Label label30; + private System.Windows.Forms.ComboBox ddlStartTech; + private System.Windows.Forms.Label label31; + private System.Windows.Forms.CheckedListBox lstTechs; + private System.Windows.Forms.Label label33; + private System.Windows.Forms.Label label32; + private System.Windows.Forms.Label label36; + private System.Windows.Forms.Label label35; + private System.Windows.Forms.Label label34; + private System.Windows.Forms.Label label37; + private System.Windows.Forms.Label label39; + private System.Windows.Forms.Label label38; + private System.Windows.Forms.ComboBox ddlEmpirePlacement; + private System.Windows.Forms.NumericUpDown spnHomeworlds; + private System.Windows.Forms.NumericUpDown spnStartResearch; + private System.Windows.Forms.NumericUpDown spnStartResources; + private System.Windows.Forms.NumericUpDown spnMinorEmpires; + private System.Windows.Forms.NumericUpDown spnRandomAIs; + private System.Windows.Forms.NumericUpDown spnEmpirePoints; + private System.Windows.Forms.ComboBox ddlScoreDisplay; + private System.Windows.Forms.NumericUpDown spnResourceStorage; + private System.Windows.Forms.Label label40; + private System.Windows.Forms.Label label41; + private Controls.GamePanel gamePanel1; + private System.Windows.Forms.ListView lstEmpires; + private Controls.GameButton btnCreateEmpire; + private Controls.GameButton btnLoadEmpire; + private Controls.GameButton btnEditEmpire; + private Controls.GameButton btnRemoveEmpire; + private Controls.GameButton btnSaveEmpire; + private System.Windows.Forms.ComboBox ddlHomeworldSize; + private System.Windows.Forms.Label label42; + private System.Windows.Forms.Label label44; + private System.Windows.Forms.NumericUpDown spnMaxDispersion; + private System.Windows.Forms.Label label43; + private Controls.GameButton btnToggleAI; + private Controls.GameButton btnEmpireBottom; + private Controls.GameButton btnEmpireTop; + private Controls.GameButton btnEmpireDown; + private Controls.GameButton btnEmpireUp; + private System.Windows.Forms.Label label45; + private System.Windows.Forms.CheckBox chkVictoryEliminateMajorEmpires; + private System.Windows.Forms.Label label46; + private System.Windows.Forms.NumericUpDown spnVictoryTurns; + private System.Windows.Forms.CheckBox chkVictoryTurns; + private System.Windows.Forms.NumericUpDown spnVictoryScore; + private System.Windows.Forms.CheckBox chkVictoryScore; + private System.Windows.Forms.Label label47; + private System.Windows.Forms.NumericUpDown spnVictoryScorePercent; + private System.Windows.Forms.CheckBox chkVictoryScorePercent; + private System.Windows.Forms.Label label48; + private System.Windows.Forms.NumericUpDown spnVictoryTech; + private System.Windows.Forms.CheckBox chkVictoryTech; + private System.Windows.Forms.Label label49; + private System.Windows.Forms.NumericUpDown spnVictoryPeace; + private System.Windows.Forms.CheckBox chkVictoryPeace; + private System.Windows.Forms.Label label50; + private System.Windows.Forms.Label label51; + private System.Windows.Forms.NumericUpDown spnVictoryDelay; + private System.Windows.Forms.TextBox txtGalaxyName; + private System.Windows.Forms.Label labelName; + private System.Windows.Forms.CheckBox chkHumansVsAI; + private System.Windows.Forms.Label label53; + private System.Windows.Forms.Label label52; + private System.Windows.Forms.ComboBox ddlAllowedTrades; + private System.Windows.Forms.CheckBox chkAllowSurrender; + private System.Windows.Forms.Label label54; + private System.Windows.Forms.CheckBox chkAllowIntel; + private System.Windows.Forms.Label label55; + private System.Windows.Forms.CheckBox chkUniqueRuins; + private System.Windows.Forms.Label label57; + private System.Windows.Forms.CheckBox chkRandomRuins; + private System.Windows.Forms.Label label56; + private System.Windows.Forms.CheckBox chkColonizeOnlyBreathable; + private System.Windows.Forms.Label label58; + private System.Windows.Forms.CheckBox chkColonizeOnlyHWSurface; + private System.Windows.Forms.Label label59; + private System.Windows.Forms.CheckBox chkAllowAnalysis; + private System.Windows.Forms.Label label60; + private System.Windows.Forms.ComboBox ddlTechCost; + private System.Windows.Forms.Label label61; + private System.Windows.Forms.Label label62; + private System.Windows.Forms.ComboBox ddlTechUniqueness; + private System.Windows.Forms.Label label63; + private Controls.GameButton btnPreviewMap; + private Controls.GalaxyView galaxyView; + private System.Windows.Forms.NumericUpDown spnResearchPerUnspentEmpirePoint; + private System.Windows.Forms.Label label64; + private System.Windows.Forms.Label lblMaxBonusResearchFromEmpirePoints; + private System.Windows.Forms.Label label65; + private System.Windows.Forms.NumericUpDown spnSeed; + private Controls.GameButton btnGenerateSeed; + private Microsoft.AspNetCore.Components.WebView.WindowsForms.BlazorWebView blazorWebView1; +} \ No newline at end of file diff --git a/FrEee.WinForms/Forms/GameSetupForm.cs b/FrEee.UI.WinForms/Forms/GameSetupForm.cs similarity index 96% rename from FrEee.WinForms/Forms/GameSetupForm.cs rename to FrEee.UI.WinForms/Forms/GameSetupForm.cs index a0fd5876e..c25d7f2cb 100644 --- a/FrEee.WinForms/Forms/GameSetupForm.cs +++ b/FrEee.UI.WinForms/Forms/GameSetupForm.cs @@ -8,7 +8,7 @@ using FrEee.Modding.Templates; using FrEee.Utility; using FrEee.Extensions; -using FrEee.WinForms.Utility.Extensions; +using FrEee.UI.WinForms.Utility.Extensions; using System; using System.Collections.Generic; using System.Data; @@ -20,8 +20,11 @@ using System.Windows.Forms; using FrEee.Objects.GameState; using FrEee.Objects.Civilization.Diplomacy; +using Microsoft.AspNetCore.Components.WebView.WindowsForms; +using Microsoft.Extensions.DependencyInjection; +using FrEee.UI.Blazor; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; public partial class GameSetupForm : GameForm { @@ -88,8 +91,8 @@ public GameSetupForm() ddlTechUniqueness.Items.Add(new { Name = "Very Hard (+2)", Value = 2 }); ddlTechUniqueness.SelectedIndex = 2; // zero, normal cost - try { this.Icon = new Icon(FrEee.WinForms.Properties.Resources.FrEeeIcon); } catch { } - } + try { this.Icon = new Icon(FrEee.UI.WinForms.Properties.Resources.FrEeeIcon); } catch { } + } public bool IsBusy { diff --git a/FrEee.WinForms/Forms/GameSetupForm.resx b/FrEee.UI.WinForms/Forms/GameSetupForm.resx similarity index 92% rename from FrEee.WinForms/Forms/GameSetupForm.resx rename to FrEee.UI.WinForms/Forms/GameSetupForm.resx index 9d26c1a18..2861f656c 100644 --- a/FrEee.WinForms/Forms/GameSetupForm.resx +++ b/FrEee.UI.WinForms/Forms/GameSetupForm.resx @@ -1,17 +1,17 @@  - diff --git a/FrEee.WinForms/Forms/GenericPickerForm.Designer.cs b/FrEee.UI.WinForms/Forms/GenericPickerForm.Designer.cs similarity index 93% rename from FrEee.WinForms/Forms/GenericPickerForm.Designer.cs rename to FrEee.UI.WinForms/Forms/GenericPickerForm.Designer.cs index aa22ae1df..0a676d9d8 100644 --- a/FrEee.WinForms/Forms/GenericPickerForm.Designer.cs +++ b/FrEee.UI.WinForms/Forms/GenericPickerForm.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; partial class GenericPickerForm { @@ -28,8 +28,8 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.btnCancel = new FrEee.WinForms.Controls.GameButton(); - this.btnOk = new FrEee.WinForms.Controls.GameButton(); + this.btnCancel = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnOk = new FrEee.UI.WinForms.Controls.GameButton(); this.lstObjects = new System.Windows.Forms.ListView(); this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.SuspendLayout(); diff --git a/FrEee.WinForms/Forms/GenericPickerForm.cs b/FrEee.UI.WinForms/Forms/GenericPickerForm.cs similarity index 84% rename from FrEee.WinForms/Forms/GenericPickerForm.cs rename to FrEee.UI.WinForms/Forms/GenericPickerForm.cs index db61748e5..63b1f3ea5 100644 --- a/FrEee.WinForms/Forms/GenericPickerForm.cs +++ b/FrEee.UI.WinForms/Forms/GenericPickerForm.cs @@ -1,11 +1,11 @@ using FrEee.Objects.GameState; -using FrEee.WinForms.Utility.Extensions; +using FrEee.UI.WinForms.Utility.Extensions; using System; using System.Collections.Generic; using System.Drawing; using System.Windows.Forms; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; public partial class GenericPickerForm : GameForm { @@ -23,7 +23,7 @@ public GenericPickerForm(IEnumerable objects) } lstObjects.AutoResizeColumns(ColumnHeaderAutoResizeStyle.ColumnContent); - try { this.Icon = new Icon(FrEee.WinForms.Properties.Resources.FrEeeIcon); } catch { } + try { this.Icon = new Icon(FrEee.UI.WinForms.Properties.Resources.FrEeeIcon); } catch { } } public object SelectedObject { get; private set; } diff --git a/FrEee.WinForms/Forms/GenericPickerForm.resx b/FrEee.UI.WinForms/Forms/GenericPickerForm.resx similarity index 100% rename from FrEee.WinForms/Forms/GenericPickerForm.resx rename to FrEee.UI.WinForms/Forms/GenericPickerForm.resx diff --git a/FrEee.WinForms/Forms/HostConsoleForm.Designer.cs b/FrEee.UI.WinForms/Forms/HostConsoleForm.Designer.cs similarity index 95% rename from FrEee.WinForms/Forms/HostConsoleForm.Designer.cs rename to FrEee.UI.WinForms/Forms/HostConsoleForm.Designer.cs index a1fd96166..4f26881cf 100644 --- a/FrEee.WinForms/Forms/HostConsoleForm.Designer.cs +++ b/FrEee.UI.WinForms/Forms/HostConsoleForm.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; partial class HostConsoleForm { @@ -35,11 +35,11 @@ private void InitializeComponent() this.nameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.plrUploadStatusDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.empireStatusBindingSource = new System.Windows.Forms.BindingSource(this.components); - this.btnClose = new FrEee.WinForms.Controls.GameButton(); - this.btnProcess = new FrEee.WinForms.Controls.GameButton(); - this.btnToggleAI = new FrEee.WinForms.Controls.GameButton(); - this.btnPlayerView = new FrEee.WinForms.Controls.GameButton(); - this.btnEdit = new FrEee.WinForms.Controls.GameButton(); + this.btnClose = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnProcess = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnToggleAI = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnPlayerView = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnEdit = new FrEee.UI.WinForms.Controls.GameButton(); this.autoProcess = new System.Windows.Forms.CheckBox(); this.timer = new System.Windows.Forms.Label(); this.autoProcessTimer = new System.Windows.Forms.Timer(this.components); diff --git a/FrEee.WinForms/Forms/HostConsoleForm.cs b/FrEee.UI.WinForms/Forms/HostConsoleForm.cs similarity index 94% rename from FrEee.WinForms/Forms/HostConsoleForm.cs rename to FrEee.UI.WinForms/Forms/HostConsoleForm.cs index 4a52afad4..39340dfa5 100644 --- a/FrEee.WinForms/Forms/HostConsoleForm.cs +++ b/FrEee.UI.WinForms/Forms/HostConsoleForm.cs @@ -3,7 +3,7 @@ using FrEee.Processes; using FrEee.Utility; using FrEee.Serialization; -using FrEee.WinForms.Utility.Extensions; +using FrEee.UI.WinForms.Utility.Extensions; using System; using System.Data; using System.Drawing; @@ -13,7 +13,7 @@ using System.Windows.Forms; using FrEee.Objects.GameState; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; /// /// Form which allows the game host to perform various operations on a game, @@ -25,7 +25,7 @@ public HostConsoleForm() { InitializeComponent(); - try { this.Icon = new Icon(FrEee.WinForms.Properties.Resources.FrEeeIcon); } + try { this.Icon = new Icon(FrEee.UI.WinForms.Properties.Resources.FrEeeIcon); } catch { } Bind(); diff --git a/FrEee.WinForms/Forms/HostConsoleForm.resx b/FrEee.UI.WinForms/Forms/HostConsoleForm.resx similarity index 100% rename from FrEee.WinForms/Forms/HostConsoleForm.resx rename to FrEee.UI.WinForms/Forms/HostConsoleForm.resx diff --git a/FrEee.WinForms/Forms/HullPickerForm.Designer.cs b/FrEee.UI.WinForms/Forms/HullPickerForm.Designer.cs similarity index 95% rename from FrEee.WinForms/Forms/HullPickerForm.Designer.cs rename to FrEee.UI.WinForms/Forms/HullPickerForm.Designer.cs index 904ed3ded..5a22101b8 100644 --- a/FrEee.WinForms/Forms/HullPickerForm.Designer.cs +++ b/FrEee.UI.WinForms/Forms/HullPickerForm.Designer.cs @@ -1,5 +1,5 @@  -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; partial class HullPickerForm { @@ -39,8 +39,8 @@ private void InitializeComponent() this.colOrg = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.colRad = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.colDescription = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.btnCancel = new FrEee.WinForms.Controls.GameButton(); - this.btnOk = new FrEee.WinForms.Controls.GameButton(); + this.btnCancel = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnOk = new FrEee.UI.WinForms.Controls.GameButton(); this.SuspendLayout(); // // ddlVehicleType diff --git a/FrEee.WinForms/Forms/HullPickerForm.cs b/FrEee.UI.WinForms/Forms/HullPickerForm.cs similarity index 92% rename from FrEee.WinForms/Forms/HullPickerForm.cs rename to FrEee.UI.WinForms/Forms/HullPickerForm.cs index 7639f8a34..01567aff3 100644 --- a/FrEee.WinForms/Forms/HullPickerForm.cs +++ b/FrEee.UI.WinForms/Forms/HullPickerForm.cs @@ -1,7 +1,7 @@ using FrEee.Objects.Civilization; using FrEee.Utility; using FrEee.Extensions; -using FrEee.WinForms.Utility.Extensions; +using FrEee.UI.WinForms.Utility.Extensions; using System; using System.Data; using System.Drawing; @@ -10,7 +10,7 @@ using FrEee.Objects.Technology; using FrEee.Objects.Vehicles; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; public partial class HullPickerForm : GameForm { @@ -28,7 +28,7 @@ public HullPickerForm() ddlVehicleType.Items.Add(new { Name = "Weapon Platforms", VehicleType = VehicleTypes.WeaponPlatform }); ddlVehicleType.SelectedItem = ddlVehicleType.Items[0]; - try { base.Icon = new Icon(FrEee.WinForms.Properties.Resources.FrEeeIcon); } catch { } + try { base.Icon = new Icon(FrEee.UI.WinForms.Properties.Resources.FrEeeIcon); } catch { } } /// diff --git a/FrEee.WinForms/Forms/HullPickerForm.resx b/FrEee.UI.WinForms/Forms/HullPickerForm.resx similarity index 100% rename from FrEee.WinForms/Forms/HullPickerForm.resx rename to FrEee.UI.WinForms/Forms/HullPickerForm.resx diff --git a/FrEee.WinForms/Forms/LogForm.Designer.cs b/FrEee.UI.WinForms/Forms/LogForm.Designer.cs similarity index 95% rename from FrEee.WinForms/Forms/LogForm.Designer.cs rename to FrEee.UI.WinForms/Forms/LogForm.Designer.cs index 261d3fdac..81f4abdc4 100644 --- a/FrEee.WinForms/Forms/LogForm.Designer.cs +++ b/FrEee.UI.WinForms/Forms/LogForm.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; partial class LogForm { diff --git a/FrEee.WinForms/Forms/LogForm.cs b/FrEee.UI.WinForms/Forms/LogForm.cs similarity index 92% rename from FrEee.WinForms/Forms/LogForm.cs rename to FrEee.UI.WinForms/Forms/LogForm.cs index 51a9cf823..9662b4256 100644 --- a/FrEee.WinForms/Forms/LogForm.cs +++ b/FrEee.UI.WinForms/Forms/LogForm.cs @@ -4,7 +4,7 @@ using FrEee.Objects.Technology; using FrEee.Modding.Templates; using FrEee.Extensions; -using FrEee.WinForms.Utility.Extensions; +using FrEee.UI.WinForms.Utility.Extensions; using System; using System.Collections.Generic; using System.Data; @@ -15,7 +15,7 @@ using FrEee.Objects.Civilization.Diplomacy.Messages; using FrEee.Objects.GameState; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; public partial class LogForm : GameForm { @@ -30,7 +30,7 @@ public LogForm(MainGameForm mainGameForm, IList log) this.mainGameForm = mainGameForm; messages = log.OrderByDescending(m => m.TurnNumber).ToArray(); - try { this.Icon = new Icon(FrEee.WinForms.Properties.Resources.FrEeeIcon); } catch { } + try { this.Icon = new Icon(FrEee.UI.WinForms.Properties.Resources.FrEeeIcon); } catch { } ShowInTaskbar = !mainGameForm.HasLogBeenShown; } diff --git a/FrEee.WinForms/Forms/LogForm.resx b/FrEee.UI.WinForms/Forms/LogForm.resx similarity index 100% rename from FrEee.WinForms/Forms/LogForm.resx rename to FrEee.UI.WinForms/Forms/LogForm.resx diff --git a/FrEee.UI.WinForms/Forms/MainGameForm.Designer.cs b/FrEee.UI.WinForms/Forms/MainGameForm.Designer.cs new file mode 100644 index 000000000..398252151 --- /dev/null +++ b/FrEee.UI.WinForms/Forms/MainGameForm.Designer.cs @@ -0,0 +1,946 @@ +using FrEee.UI.WinForms.Controls; +using FrEee.UI.WinForms.Controls.Blazor; + +namespace FrEee.UI.WinForms.Forms; + +partial class MainGameForm +{ + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainGameForm)); + Objects.GalaxyViewModes.PresenceMode presenceMode1 = new Objects.GalaxyViewModes.PresenceMode(); + toolTip = new System.Windows.Forms.ToolTip(components); + btnWaypoint = new GameButton(); + btnMovementLog = new GameButton(); + btnDecloak = new GameButton(); + btnCloak = new GameButton(); + btnActivate = new GameButton(); + btnToggleMinister = new GameButton(); + btnRename = new GameButton(); + btnRecycle = new GameButton(); + btnRepeatOrders = new GameButton(); + btnNextIdle = new GameButton(); + btnRepair = new GameButton(); + btnPrevIdle = new GameButton(); + btnResupply = new GameButton(); + btnSentry = new GameButton(); + btnClearOrders = new GameButton(); + btnFleetTransfer = new GameButton(); + btnTransferCargo = new GameButton(); + btnConstructionQueue = new GameButton(); + btnColonize = new GameButton(); + btnEvade = new GameButton(); + btnWarp = new GameButton(); + btnPursue = new GameButton(); + btnMove = new GameButton(); + btnEndTurn = new GameButton(); + btnLog = new GameButton(); + btnQueues = new GameButton(); + btnShips = new GameButton(); + btnEmpires = new GameButton(); + btnPlanets = new GameButton(); + btnDesigns = new GameButton(); + btnMenu = new GameButton(); + progResearch = new GameProgressBar(); + btnCommands = new GameButton(); + pnlLayout = new GamePanel(); + pnlLeft = new System.Windows.Forms.Panel(); + pnlSystemMap = new GamePanel(); + starSystemView = new StarSystemView(); + pnlSearch = new GamePanel(); + searchBox = new SearchBox(); + pnlSystemTabs = new GamePanel(); + pnlTabs = new System.Windows.Forms.FlowLayoutPanel(); + btnNewTab = new GameButton(); + pnlSubCommands = new GamePanel(); + pnlMainCommands = new GamePanel(); + pnlHeader = new GamePanel(); + rqdInventory = new ResourceQuantityDisplay(); + picEmpireFlag = new System.Windows.Forms.PictureBox(); + pnlRight = new System.Windows.Forms.Panel(); + ddlGalaxyViewMode = new System.Windows.Forms.ComboBox(); + pnlGalaxyMap = new GamePanel(); + galaxyView = new GalaxyView(); + pnlDetailReport = new GamePanel(); + pnlLayout.SuspendLayout(); + pnlLeft.SuspendLayout(); + pnlSystemMap.SuspendLayout(); + pnlSearch.SuspendLayout(); + pnlSystemTabs.SuspendLayout(); + pnlTabs.SuspendLayout(); + pnlSubCommands.SuspendLayout(); + pnlMainCommands.SuspendLayout(); + pnlHeader.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)picEmpireFlag).BeginInit(); + pnlRight.SuspendLayout(); + pnlGalaxyMap.SuspendLayout(); + SuspendLayout(); + // + // btnWaypoint + // + btnWaypoint.BackColor = System.Drawing.Color.Black; + btnWaypoint.ForeColor = System.Drawing.Color.CornflowerBlue; + btnWaypoint.Location = new System.Drawing.Point(49, 6); + btnWaypoint.Name = "btnWaypoint"; + btnWaypoint.Size = new System.Drawing.Size(36, 36); + btnWaypoint.TabIndex = 23; + btnWaypoint.TabStop = false; + btnWaypoint.Text = "Way"; + toolTip.SetToolTip(btnWaypoint, "(Ctrl-W) Move to Waypoint"); + btnWaypoint.UseVisualStyleBackColor = false; + // + // btnMovementLog + // + btnMovementLog.BackColor = System.Drawing.Color.Black; + btnMovementLog.ForeColor = System.Drawing.Color.CornflowerBlue; + btnMovementLog.Location = new System.Drawing.Point(427, 48); + btnMovementLog.Name = "btnMovementLog"; + btnMovementLog.Size = new System.Drawing.Size(36, 36); + btnMovementLog.TabIndex = 22; + btnMovementLog.TabStop = false; + btnMovementLog.Text = "ML"; + toolTip.SetToolTip(btnMovementLog, "(Ctrl-L) Movement Log"); + btnMovementLog.UseVisualStyleBackColor = false; + // + // btnDecloak + // + btnDecloak.BackColor = System.Drawing.Color.Black; + btnDecloak.ForeColor = System.Drawing.Color.CornflowerBlue; + btnDecloak.Location = new System.Drawing.Point(301, 49); + btnDecloak.Name = "btnDecloak"; + btnDecloak.Size = new System.Drawing.Size(36, 36); + btnDecloak.TabIndex = 21; + btnDecloak.TabStop = false; + btnDecloak.Text = "Dclk"; + toolTip.SetToolTip(btnDecloak, "(X) Decloak"); + btnDecloak.UseVisualStyleBackColor = false; + // + // btnCloak + // + btnCloak.BackColor = System.Drawing.Color.Black; + btnCloak.ForeColor = System.Drawing.Color.CornflowerBlue; + btnCloak.Location = new System.Drawing.Point(301, 7); + btnCloak.Name = "btnCloak"; + btnCloak.Size = new System.Drawing.Size(36, 36); + btnCloak.TabIndex = 20; + btnCloak.TabStop = false; + btnCloak.Text = "Clk"; + toolTip.SetToolTip(btnCloak, "(Z) Cloak"); + btnCloak.UseVisualStyleBackColor = false; + // + // btnActivate + // + btnActivate.BackColor = System.Drawing.Color.Black; + btnActivate.ForeColor = System.Drawing.Color.CornflowerBlue; + btnActivate.Location = new System.Drawing.Point(343, 7); + btnActivate.Name = "btnActivate"; + btnActivate.Size = new System.Drawing.Size(36, 36); + btnActivate.TabIndex = 19; + btnActivate.TabStop = false; + btnActivate.Text = "Act"; + toolTip.SetToolTip(btnActivate, "(Ctrl-A) Activate Ability"); + btnActivate.UseVisualStyleBackColor = false; + btnActivate.Click += btnActivate_Click; + // + // btnToggleMinister + // + btnToggleMinister.BackColor = System.Drawing.Color.Black; + btnToggleMinister.ForeColor = System.Drawing.Color.CornflowerBlue; + btnToggleMinister.Location = new System.Drawing.Point(385, 49); + btnToggleMinister.Name = "btnToggleMinister"; + btnToggleMinister.Size = new System.Drawing.Size(36, 36); + btnToggleMinister.TabIndex = 18; + btnToggleMinister.TabStop = false; + btnToggleMinister.Text = "Min"; + toolTip.SetToolTip(btnToggleMinister, "(T) Toggle Minister Control"); + btnToggleMinister.UseVisualStyleBackColor = false; + // + // btnRename + // + btnRename.BackColor = System.Drawing.Color.Black; + btnRename.ForeColor = System.Drawing.Color.CornflowerBlue; + btnRename.Location = new System.Drawing.Point(385, 7); + btnRename.Name = "btnRename"; + btnRename.Size = new System.Drawing.Size(36, 36); + btnRename.TabIndex = 17; + btnRename.TabStop = false; + btnRename.Text = "Nam"; + toolTip.SetToolTip(btnRename, "(N) Rename/Notes"); + btnRename.UseVisualStyleBackColor = false; + // + // btnRecycle + // + btnRecycle.BackColor = System.Drawing.Color.Black; + btnRecycle.ForeColor = System.Drawing.Color.CornflowerBlue; + btnRecycle.Location = new System.Drawing.Point(217, 48); + btnRecycle.Name = "btnRecycle"; + btnRecycle.Size = new System.Drawing.Size(36, 36); + btnRecycle.TabIndex = 16; + btnRecycle.TabStop = false; + btnRecycle.Text = "Rcy"; + toolTip.SetToolTip(btnRecycle, "(Ctrl-R) Recycle/Scuttle"); + btnRecycle.UseVisualStyleBackColor = false; + btnRecycle.Click += btnRecycle_Click; + // + // btnRepeatOrders + // + btnRepeatOrders.BackColor = System.Drawing.Color.Black; + btnRepeatOrders.ForeColor = System.Drawing.Color.CornflowerBlue; + btnRepeatOrders.Location = new System.Drawing.Point(49, 48); + btnRepeatOrders.Name = "btnRepeatOrders"; + btnRepeatOrders.Size = new System.Drawing.Size(36, 36); + btnRepeatOrders.TabIndex = 15; + btnRepeatOrders.TabStop = false; + btnRepeatOrders.Text = "Rept"; + toolTip.SetToolTip(btnRepeatOrders, "(P) Repeat Orders"); + btnRepeatOrders.UseVisualStyleBackColor = false; + // + // btnNextIdle + // + btnNextIdle.BackColor = System.Drawing.Color.Black; + btnNextIdle.ForeColor = System.Drawing.Color.CornflowerBlue; + btnNextIdle.Location = new System.Drawing.Point(469, 7); + btnNextIdle.Name = "btnNextIdle"; + btnNextIdle.Size = new System.Drawing.Size(36, 36); + btnNextIdle.TabIndex = 6; + btnNextIdle.TabStop = false; + btnNextIdle.Text = "Next"; + toolTip.SetToolTip(btnNextIdle, "(Tab) Next Idle Space Object"); + btnNextIdle.UseVisualStyleBackColor = false; + btnNextIdle.Click += btnNextIdle_Click; + // + // btnRepair + // + btnRepair.BackColor = System.Drawing.Color.Black; + btnRepair.ForeColor = System.Drawing.Color.CornflowerBlue; + btnRepair.Location = new System.Drawing.Point(175, 49); + btnRepair.Name = "btnRepair"; + btnRepair.Size = new System.Drawing.Size(36, 36); + btnRepair.TabIndex = 14; + btnRepair.TabStop = false; + btnRepair.Text = "Repr"; + toolTip.SetToolTip(btnRepair, "(R) Repair"); + btnRepair.UseVisualStyleBackColor = false; + // + // btnPrevIdle + // + btnPrevIdle.BackColor = System.Drawing.Color.Black; + btnPrevIdle.ForeColor = System.Drawing.Color.CornflowerBlue; + btnPrevIdle.Location = new System.Drawing.Point(427, 7); + btnPrevIdle.Name = "btnPrevIdle"; + btnPrevIdle.Size = new System.Drawing.Size(36, 36); + btnPrevIdle.TabIndex = 5; + btnPrevIdle.TabStop = false; + btnPrevIdle.Text = "Prev"; + toolTip.SetToolTip(btnPrevIdle, "(Shift-Tab) Previous Idle Space Object"); + btnPrevIdle.UseVisualStyleBackColor = false; + btnPrevIdle.Click += btnPrevIdle_Click; + // + // btnResupply + // + btnResupply.BackColor = System.Drawing.Color.Black; + btnResupply.ForeColor = System.Drawing.Color.CornflowerBlue; + btnResupply.Location = new System.Drawing.Point(175, 7); + btnResupply.Name = "btnResupply"; + btnResupply.Size = new System.Drawing.Size(36, 36); + btnResupply.TabIndex = 13; + btnResupply.TabStop = false; + btnResupply.Text = "Sply"; + toolTip.SetToolTip(btnResupply, "(S) Resupply"); + btnResupply.UseVisualStyleBackColor = false; + // + // btnSentry + // + btnSentry.BackColor = System.Drawing.Color.Black; + btnSentry.ForeColor = System.Drawing.Color.CornflowerBlue; + btnSentry.Location = new System.Drawing.Point(133, 49); + btnSentry.Name = "btnSentry"; + btnSentry.Size = new System.Drawing.Size(36, 36); + btnSentry.TabIndex = 12; + btnSentry.TabStop = false; + btnSentry.Text = "Stry"; + toolTip.SetToolTip(btnSentry, "(Y) Sentry"); + btnSentry.UseVisualStyleBackColor = false; + btnSentry.Click += btnSentry_Click; + // + // btnClearOrders + // + btnClearOrders.BackColor = System.Drawing.Color.Black; + btnClearOrders.ForeColor = System.Drawing.Color.CornflowerBlue; + btnClearOrders.Location = new System.Drawing.Point(343, 49); + btnClearOrders.Name = "btnClearOrders"; + btnClearOrders.Size = new System.Drawing.Size(36, 36); + btnClearOrders.TabIndex = 11; + btnClearOrders.TabStop = false; + btnClearOrders.Text = "Clr"; + toolTip.SetToolTip(btnClearOrders, "(Bksp) Clear Orders"); + btnClearOrders.UseVisualStyleBackColor = false; + btnClearOrders.Click += btnClearOrders_Click; + // + // btnFleetTransfer + // + btnFleetTransfer.BackColor = System.Drawing.Color.Black; + btnFleetTransfer.ForeColor = System.Drawing.Color.CornflowerBlue; + btnFleetTransfer.Location = new System.Drawing.Point(259, 49); + btnFleetTransfer.Name = "btnFleetTransfer"; + btnFleetTransfer.Size = new System.Drawing.Size(36, 36); + btnFleetTransfer.TabIndex = 10; + btnFleetTransfer.TabStop = false; + btnFleetTransfer.Text = "Flt"; + toolTip.SetToolTip(btnFleetTransfer, "(F) Fleet Transfer"); + btnFleetTransfer.UseVisualStyleBackColor = false; + btnFleetTransfer.Click += btnFleetTransfer_Click; + // + // btnTransferCargo + // + btnTransferCargo.BackColor = System.Drawing.Color.Black; + btnTransferCargo.ForeColor = System.Drawing.Color.CornflowerBlue; + btnTransferCargo.Location = new System.Drawing.Point(259, 7); + btnTransferCargo.Name = "btnTransferCargo"; + btnTransferCargo.Size = new System.Drawing.Size(36, 36); + btnTransferCargo.TabIndex = 9; + btnTransferCargo.TabStop = false; + btnTransferCargo.Text = "TC"; + toolTip.SetToolTip(btnTransferCargo, "(T) Transfer Cargo"); + btnTransferCargo.UseVisualStyleBackColor = false; + btnTransferCargo.Click += btnTransferCargo_Click; + // + // btnConstructionQueue + // + btnConstructionQueue.BackColor = System.Drawing.Color.Black; + btnConstructionQueue.ForeColor = System.Drawing.Color.CornflowerBlue; + btnConstructionQueue.Location = new System.Drawing.Point(217, 7); + btnConstructionQueue.Name = "btnConstructionQueue"; + btnConstructionQueue.Size = new System.Drawing.Size(36, 36); + btnConstructionQueue.TabIndex = 8; + btnConstructionQueue.TabStop = false; + btnConstructionQueue.Text = "CQ"; + toolTip.SetToolTip(btnConstructionQueue, "(Q) Construction Queue"); + btnConstructionQueue.UseVisualStyleBackColor = false; + btnConstructionQueue.Click += btnConstructionQueue_Click; + // + // btnColonize + // + btnColonize.BackColor = System.Drawing.Color.Black; + btnColonize.ForeColor = System.Drawing.Color.CornflowerBlue; + btnColonize.Location = new System.Drawing.Point(133, 7); + btnColonize.Name = "btnColonize"; + btnColonize.Size = new System.Drawing.Size(36, 36); + btnColonize.TabIndex = 7; + btnColonize.TabStop = false; + btnColonize.Text = "Col"; + toolTip.SetToolTip(btnColonize, "(C) Colonize"); + btnColonize.UseVisualStyleBackColor = false; + btnColonize.Click += btnColonize_Click; + // + // btnEvade + // + btnEvade.BackColor = System.Drawing.Color.Black; + btnEvade.ForeColor = System.Drawing.Color.CornflowerBlue; + btnEvade.Location = new System.Drawing.Point(91, 47); + btnEvade.Name = "btnEvade"; + btnEvade.Size = new System.Drawing.Size(36, 36); + btnEvade.TabIndex = 6; + btnEvade.TabStop = false; + btnEvade.Text = "Ev"; + toolTip.SetToolTip(btnEvade, "(E) Evade"); + btnEvade.UseVisualStyleBackColor = false; + btnEvade.Click += btnEvade_Click; + // + // btnWarp + // + btnWarp.BackColor = System.Drawing.Color.Black; + btnWarp.ForeColor = System.Drawing.Color.CornflowerBlue; + btnWarp.Location = new System.Drawing.Point(7, 48); + btnWarp.Name = "btnWarp"; + btnWarp.Size = new System.Drawing.Size(36, 36); + btnWarp.TabIndex = 5; + btnWarp.TabStop = false; + btnWarp.Text = "Wp"; + toolTip.SetToolTip(btnWarp, "(W) Warp"); + btnWarp.UseVisualStyleBackColor = false; + btnWarp.Click += btnWarp_Click; + // + // btnPursue + // + btnPursue.BackColor = System.Drawing.Color.Black; + btnPursue.ForeColor = System.Drawing.Color.CornflowerBlue; + btnPursue.Location = new System.Drawing.Point(91, 6); + btnPursue.Name = "btnPursue"; + btnPursue.Size = new System.Drawing.Size(36, 36); + btnPursue.TabIndex = 4; + btnPursue.TabStop = false; + btnPursue.Text = "Pur"; + toolTip.SetToolTip(btnPursue, "(A) Attack / Pursue"); + btnPursue.UseVisualStyleBackColor = false; + btnPursue.Click += btnPursue_Click; + // + // btnMove + // + btnMove.BackColor = System.Drawing.Color.Black; + btnMove.ForeColor = System.Drawing.Color.CornflowerBlue; + btnMove.Location = new System.Drawing.Point(7, 6); + btnMove.Name = "btnMove"; + btnMove.Size = new System.Drawing.Size(36, 36); + btnMove.TabIndex = 2; + btnMove.TabStop = false; + btnMove.Text = "Mov"; + toolTip.SetToolTip(btnMove, "(M) Move"); + btnMove.UseVisualStyleBackColor = false; + btnMove.Click += btnMove_Click; + // + // btnEndTurn + // + btnEndTurn.BackColor = System.Drawing.Color.Black; + btnEndTurn.ForeColor = System.Drawing.Color.CornflowerBlue; + btnEndTurn.Location = new System.Drawing.Point(296, 6); + btnEndTurn.Name = "btnEndTurn"; + btnEndTurn.Size = new System.Drawing.Size(36, 36); + btnEndTurn.TabIndex = 7; + btnEndTurn.TabStop = false; + toolTip.SetToolTip(btnEndTurn, "(F12) Save Commands"); + btnEndTurn.UseVisualStyleBackColor = false; + btnEndTurn.Click += btnEndTurn_Click; + // + // btnLog + // + btnLog.BackColor = System.Drawing.Color.Black; + btnLog.ForeColor = System.Drawing.Color.CornflowerBlue; + btnLog.Location = new System.Drawing.Point(256, 6); + btnLog.Name = "btnLog"; + btnLog.Size = new System.Drawing.Size(36, 36); + btnLog.TabIndex = 6; + btnLog.TabStop = false; + toolTip.SetToolTip(btnLog, "(F10 / Shift-L) Log"); + btnLog.UseVisualStyleBackColor = false; + btnLog.Click += btnLog_Click; + // + // btnQueues + // + btnQueues.BackColor = System.Drawing.Color.Black; + btnQueues.ForeColor = System.Drawing.Color.CornflowerBlue; + btnQueues.Location = new System.Drawing.Point(214, 6); + btnQueues.Name = "btnQueues"; + btnQueues.Size = new System.Drawing.Size(36, 36); + btnQueues.TabIndex = 5; + btnQueues.TabStop = false; + toolTip.SetToolTip(btnQueues, "(F7 / Shift-Q) Construction Queues"); + btnQueues.UseVisualStyleBackColor = false; + btnQueues.Click += btnQueues_Click; + // + // btnShips + // + btnShips.BackColor = System.Drawing.Color.Black; + btnShips.ForeColor = System.Drawing.Color.CornflowerBlue; + btnShips.Location = new System.Drawing.Point(172, 6); + btnShips.Name = "btnShips"; + btnShips.Size = new System.Drawing.Size(36, 36); + btnShips.TabIndex = 4; + btnShips.TabStop = false; + toolTip.SetToolTip(btnShips, "(F6 / Shift-S) Ships"); + btnShips.UseVisualStyleBackColor = false; + btnShips.Click += btnShips_Click; + // + // btnEmpires + // + btnEmpires.BackColor = System.Drawing.Color.Black; + btnEmpires.ForeColor = System.Drawing.Color.CornflowerBlue; + btnEmpires.Location = new System.Drawing.Point(130, 6); + btnEmpires.Name = "btnEmpires"; + btnEmpires.Size = new System.Drawing.Size(36, 36); + btnEmpires.TabIndex = 3; + btnEmpires.TabStop = false; + toolTip.SetToolTip(btnEmpires, "(F9 / Shift-E) Empires"); + btnEmpires.UseVisualStyleBackColor = false; + btnEmpires.Click += btnEmpires_Click; + // + // btnPlanets + // + btnPlanets.BackColor = System.Drawing.Color.Black; + btnPlanets.ForeColor = System.Drawing.Color.CornflowerBlue; + btnPlanets.Location = new System.Drawing.Point(88, 6); + btnPlanets.Name = "btnPlanets"; + btnPlanets.Size = new System.Drawing.Size(36, 36); + btnPlanets.TabIndex = 0; + btnPlanets.TabStop = false; + toolTip.SetToolTip(btnPlanets, "(F4 / F5 / Shift-P / Shift-C) Planets/Colonies"); + btnPlanets.UseVisualStyleBackColor = false; + btnPlanets.Click += btnPlanets_Click; + // + // btnDesigns + // + btnDesigns.BackColor = System.Drawing.Color.Black; + btnDesigns.ForeColor = System.Drawing.Color.CornflowerBlue; + btnDesigns.Location = new System.Drawing.Point(47, 6); + btnDesigns.Name = "btnDesigns"; + btnDesigns.Size = new System.Drawing.Size(36, 36); + btnDesigns.TabIndex = 2; + btnDesigns.TabStop = false; + toolTip.SetToolTip(btnDesigns, "(F3 / Shift-D) Designs"); + btnDesigns.UseVisualStyleBackColor = false; + btnDesigns.Click += btnDesigns_Click; + // + // btnMenu + // + btnMenu.BackColor = System.Drawing.Color.Black; + btnMenu.ForeColor = System.Drawing.Color.CornflowerBlue; + btnMenu.Location = new System.Drawing.Point(5, 6); + btnMenu.Name = "btnMenu"; + btnMenu.Size = new System.Drawing.Size(36, 36); + btnMenu.TabIndex = 1; + btnMenu.TabStop = false; + toolTip.SetToolTip(btnMenu, "(F2) Menu"); + btnMenu.UseVisualStyleBackColor = false; + btnMenu.Click += btnMenu_Click; + // + // progResearch + // + progResearch.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; + progResearch.BackColor = System.Drawing.Color.Black; + progResearch.BarColor = System.Drawing.Color.Magenta; + progResearch.ForeColor = System.Drawing.Color.White; + progResearch.IncrementalProgress = 0L; + progResearch.LeftText = "Ice Planet Colonization"; + progResearch.Location = new System.Drawing.Point(3, -3); + progResearch.Margin = new System.Windows.Forms.Padding(0); + progResearch.Maximum = 500000L; + progResearch.Name = "progResearch"; + progResearch.Padding = new System.Windows.Forms.Padding(5); + progResearch.ProgressDisplayType = Blazor.Views.ProgressDisplayType.Numeric; + progResearch.RightText = "0.2 years"; + progResearch.Size = new System.Drawing.Size(411, 38); + progResearch.TabIndex = 11; + toolTip.SetToolTip(progResearch, "(F8 / Shift-R) Research"); + progResearch.Value = 350000L; + progResearch.Click += progResearch_Click; + // + // btnCommands + // + btnCommands.BackColor = System.Drawing.Color.Black; + btnCommands.ForeColor = System.Drawing.Color.CornflowerBlue; + btnCommands.Location = new System.Drawing.Point(469, 47); + btnCommands.Name = "btnCommands"; + btnCommands.Size = new System.Drawing.Size(36, 36); + btnCommands.TabIndex = 24; + btnCommands.TabStop = false; + btnCommands.Text = "Cmd"; + toolTip.SetToolTip(btnCommands, "View Commands"); + btnCommands.UseVisualStyleBackColor = false; + btnCommands.Click += btnCommands_Click; + // + // pnlLayout + // + pnlLayout.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; + pnlLayout.BackColor = System.Drawing.Color.Black; + pnlLayout.BorderColor = System.Drawing.Color.CornflowerBlue; + pnlLayout.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + pnlLayout.Controls.Add(pnlLeft); + pnlLayout.Controls.Add(pnlRight); + pnlLayout.ForeColor = System.Drawing.Color.White; + pnlLayout.Location = new System.Drawing.Point(0, 0); + pnlLayout.Margin = new System.Windows.Forms.Padding(0); + pnlLayout.Name = "pnlLayout"; + pnlLayout.Padding = new System.Windows.Forms.Padding(3); + pnlLayout.Size = new System.Drawing.Size(1270, 779); + pnlLayout.TabIndex = 8; + // + // pnlLeft + // + pnlLeft.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; + pnlLeft.Controls.Add(pnlSystemMap); + pnlLeft.Controls.Add(pnlSearch); + pnlLeft.Controls.Add(pnlSystemTabs); + pnlLeft.Controls.Add(pnlSubCommands); + pnlLeft.Controls.Add(pnlMainCommands); + pnlLeft.Controls.Add(pnlHeader); + pnlLeft.Location = new System.Drawing.Point(1, 0); + pnlLeft.Margin = new System.Windows.Forms.Padding(1, 1, 0, 1); + pnlLeft.Name = "pnlLeft"; + pnlLeft.Size = new System.Drawing.Size(857, 777); + pnlLeft.TabIndex = 6; + // + // pnlSystemMap + // + pnlSystemMap.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; + pnlSystemMap.BackColor = System.Drawing.Color.Black; + pnlSystemMap.BorderColor = System.Drawing.Color.RoyalBlue; + pnlSystemMap.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + pnlSystemMap.Controls.Add(starSystemView); + pnlSystemMap.ForeColor = System.Drawing.Color.White; + pnlSystemMap.Location = new System.Drawing.Point(145, 134); + pnlSystemMap.Margin = new System.Windows.Forms.Padding(0); + pnlSystemMap.Name = "pnlSystemMap"; + pnlSystemMap.Padding = new System.Windows.Forms.Padding(3); + pnlSystemMap.Size = new System.Drawing.Size(712, 642); + pnlSystemMap.TabIndex = 9; + // + // starSystemView + // + starSystemView.BackColor = System.Drawing.Color.Black; + starSystemView.Dock = System.Windows.Forms.DockStyle.Fill; + starSystemView.DrawText = true; + starSystemView.Location = new System.Drawing.Point(3, 3); + starSystemView.Name = "starSystemView"; + starSystemView.SelectedSector = null; + starSystemView.SelectedSpaceObject = null; + starSystemView.Size = new System.Drawing.Size(704, 634); + starSystemView.StarSystem = null; + starSystemView.TabIndex = 0; + starSystemView.SectorClicked += starSystemView_SectorClicked; + starSystemView.SectorSelected += starSystemView_SectorSelected; + // + // pnlSearch + // + pnlSearch.BackColor = System.Drawing.Color.Black; + pnlSearch.BorderColor = System.Drawing.Color.RoyalBlue; + pnlSearch.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + pnlSearch.Controls.Add(searchBox); + pnlSearch.ForeColor = System.Drawing.Color.White; + pnlSearch.Location = new System.Drawing.Point(-2, 85); + pnlSearch.Margin = new System.Windows.Forms.Padding(2); + pnlSearch.Name = "pnlSearch"; + pnlSearch.Padding = new System.Windows.Forms.Padding(3); + pnlSearch.Size = new System.Drawing.Size(342, 49); + pnlSearch.TabIndex = 8; + // + // searchBox + // + searchBox.BackColor = System.Drawing.Color.Black; + searchBox.ForeColor = System.Drawing.Color.White; + searchBox.Location = new System.Drawing.Point(12, 8); + searchBox.Margin = new System.Windows.Forms.Padding(6); + searchBox.Name = "searchBox"; + searchBox.ObjectsToSearch = null; + searchBox.ResultsPopupHeight = 128; + searchBox.Size = new System.Drawing.Size(320, 21); + searchBox.StarSystem = null; + searchBox.TabIndex = 0; + searchBox.TabStop = false; + searchBox.ObjectSelected += searchBox_ObjectSelected; + // + // pnlSystemTabs + // + pnlSystemTabs.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left; + pnlSystemTabs.BackColor = System.Drawing.Color.Black; + pnlSystemTabs.BorderColor = System.Drawing.Color.RoyalBlue; + pnlSystemTabs.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + pnlSystemTabs.Controls.Add(pnlTabs); + pnlSystemTabs.ForeColor = System.Drawing.Color.White; + pnlSystemTabs.Location = new System.Drawing.Point(0, 134); + pnlSystemTabs.Margin = new System.Windows.Forms.Padding(0); + pnlSystemTabs.Name = "pnlSystemTabs"; + pnlSystemTabs.Padding = new System.Windows.Forms.Padding(3); + pnlSystemTabs.Size = new System.Drawing.Size(145, 642); + pnlSystemTabs.TabIndex = 7; + // + // pnlTabs + // + pnlTabs.Controls.Add(btnNewTab); + pnlTabs.Dock = System.Windows.Forms.DockStyle.Fill; + pnlTabs.FlowDirection = System.Windows.Forms.FlowDirection.TopDown; + pnlTabs.Location = new System.Drawing.Point(3, 3); + pnlTabs.Name = "pnlTabs"; + pnlTabs.Size = new System.Drawing.Size(137, 634); + pnlTabs.TabIndex = 0; + pnlTabs.DoubleClick += btnNewTab_Click; + // + // btnNewTab + // + btnNewTab.BackColor = System.Drawing.Color.Black; + btnNewTab.ForeColor = System.Drawing.Color.CornflowerBlue; + btnNewTab.Location = new System.Drawing.Point(3, 3); + btnNewTab.Name = "btnNewTab"; + btnNewTab.Size = new System.Drawing.Size(128, 23); + btnNewTab.TabIndex = 0; + btnNewTab.TabStop = false; + btnNewTab.Text = "(New Tab)"; + btnNewTab.UseVisualStyleBackColor = false; + btnNewTab.Click += btnNewTab_Click; + // + // pnlSubCommands + // + pnlSubCommands.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; + pnlSubCommands.BackColor = System.Drawing.Color.Black; + pnlSubCommands.BorderColor = System.Drawing.Color.RoyalBlue; + pnlSubCommands.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + pnlSubCommands.Controls.Add(btnCommands); + pnlSubCommands.Controls.Add(btnWaypoint); + pnlSubCommands.Controls.Add(btnMovementLog); + pnlSubCommands.Controls.Add(btnDecloak); + pnlSubCommands.Controls.Add(btnCloak); + pnlSubCommands.Controls.Add(btnActivate); + pnlSubCommands.Controls.Add(btnToggleMinister); + pnlSubCommands.Controls.Add(btnRename); + pnlSubCommands.Controls.Add(btnRecycle); + pnlSubCommands.Controls.Add(btnRepeatOrders); + pnlSubCommands.Controls.Add(btnNextIdle); + pnlSubCommands.Controls.Add(btnRepair); + pnlSubCommands.Controls.Add(btnPrevIdle); + pnlSubCommands.Controls.Add(btnResupply); + pnlSubCommands.Controls.Add(btnSentry); + pnlSubCommands.Controls.Add(btnClearOrders); + pnlSubCommands.Controls.Add(btnFleetTransfer); + pnlSubCommands.Controls.Add(btnTransferCargo); + pnlSubCommands.Controls.Add(btnConstructionQueue); + pnlSubCommands.Controls.Add(btnColonize); + pnlSubCommands.Controls.Add(btnEvade); + pnlSubCommands.Controls.Add(btnWarp); + pnlSubCommands.Controls.Add(btnPursue); + pnlSubCommands.Controls.Add(btnMove); + pnlSubCommands.ForeColor = System.Drawing.Color.White; + pnlSubCommands.Location = new System.Drawing.Point(340, 37); + pnlSubCommands.Margin = new System.Windows.Forms.Padding(0); + pnlSubCommands.Name = "pnlSubCommands"; + pnlSubCommands.Padding = new System.Windows.Forms.Padding(4); + pnlSubCommands.Size = new System.Drawing.Size(517, 97); + pnlSubCommands.TabIndex = 6; + // + // pnlMainCommands + // + pnlMainCommands.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + pnlMainCommands.BackColor = System.Drawing.Color.Black; + pnlMainCommands.BorderColor = System.Drawing.Color.RoyalBlue; + pnlMainCommands.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + pnlMainCommands.Controls.Add(btnEndTurn); + pnlMainCommands.Controls.Add(btnLog); + pnlMainCommands.Controls.Add(btnQueues); + pnlMainCommands.Controls.Add(btnShips); + pnlMainCommands.Controls.Add(btnEmpires); + pnlMainCommands.Controls.Add(btnPlanets); + pnlMainCommands.Controls.Add(btnDesigns); + pnlMainCommands.Controls.Add(btnMenu); + pnlMainCommands.ForeColor = System.Drawing.Color.White; + pnlMainCommands.Location = new System.Drawing.Point(-2, 37); + pnlMainCommands.Margin = new System.Windows.Forms.Padding(0); + pnlMainCommands.Name = "pnlMainCommands"; + pnlMainCommands.Padding = new System.Windows.Forms.Padding(6); + pnlMainCommands.Size = new System.Drawing.Size(342, 50); + pnlMainCommands.TabIndex = 3; + // + // pnlHeader + // + pnlHeader.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; + pnlHeader.BackColor = System.Drawing.Color.Black; + pnlHeader.BorderColor = System.Drawing.Color.RoyalBlue; + pnlHeader.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + pnlHeader.Controls.Add(rqdInventory); + pnlHeader.Controls.Add(picEmpireFlag); + pnlHeader.ForeColor = System.Drawing.Color.White; + pnlHeader.Location = new System.Drawing.Point(-2, 0); + pnlHeader.Margin = new System.Windows.Forms.Padding(2); + pnlHeader.Name = "pnlHeader"; + pnlHeader.Padding = new System.Windows.Forms.Padding(3); + pnlHeader.Size = new System.Drawing.Size(859, 37); + pnlHeader.TabIndex = 5; + // + // rqdInventory + // + rqdInventory.BackColor = System.Drawing.Color.Black; + rqdInventory.ForeColor = System.Drawing.Color.White; + rqdInventory.Location = new System.Drawing.Point(49, 3); + rqdInventory.Margin = new System.Windows.Forms.Padding(0); + rqdInventory.Name = "rqdInventory"; + rqdInventory.ResourcesToShow = new FrEee.Utility.Resource[] +{ + (FrEee.Utility.Resource)resources.GetObject("rqdInventory.ResourcesToShow"), + (FrEee.Utility.Resource)resources.GetObject("rqdInventory.ResourcesToShow1"), + (FrEee.Utility.Resource)resources.GetObject("rqdInventory.ResourcesToShow2") +}; + rqdInventory.Size = new System.Drawing.Size(798, 24); + rqdInventory.TabIndex = 1; + rqdInventory.Text = "resourceQuantityDisplay1"; + // + // picEmpireFlag + // + picEmpireFlag.Location = new System.Drawing.Point(4, 5); + picEmpireFlag.Margin = new System.Windows.Forms.Padding(4); + picEmpireFlag.Name = "picEmpireFlag"; + picEmpireFlag.Size = new System.Drawing.Size(38, 21); + picEmpireFlag.TabIndex = 0; + picEmpireFlag.TabStop = false; + // + // pnlRight + // + pnlRight.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right; + pnlRight.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + pnlRight.Controls.Add(ddlGalaxyViewMode); + pnlRight.Controls.Add(pnlGalaxyMap); + pnlRight.Controls.Add(pnlDetailReport); + pnlRight.Controls.Add(progResearch); + pnlRight.Location = new System.Drawing.Point(853, 2); + pnlRight.Margin = new System.Windows.Forms.Padding(0, 1, 1, 1); + pnlRight.Name = "pnlRight"; + pnlRight.Size = new System.Drawing.Size(414, 775); + pnlRight.TabIndex = 4; + // + // ddlGalaxyViewMode + // + ddlGalaxyViewMode.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; + ddlGalaxyViewMode.DisplayMember = "Name"; + ddlGalaxyViewMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + ddlGalaxyViewMode.FormattingEnabled = true; + ddlGalaxyViewMode.Location = new System.Drawing.Point(3, 495); + ddlGalaxyViewMode.Margin = new System.Windows.Forms.Padding(0); + ddlGalaxyViewMode.Name = "ddlGalaxyViewMode"; + ddlGalaxyViewMode.Size = new System.Drawing.Size(411, 23); + ddlGalaxyViewMode.TabIndex = 1; + ddlGalaxyViewMode.SelectedIndexChanged += ddlGalaxyViewMode_SelectedIndexChanged; + // + // pnlGalaxyMap + // + pnlGalaxyMap.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; + pnlGalaxyMap.BackColor = System.Drawing.Color.Black; + pnlGalaxyMap.BorderColor = System.Drawing.Color.RoyalBlue; + pnlGalaxyMap.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + pnlGalaxyMap.Controls.Add(galaxyView); + pnlGalaxyMap.ForeColor = System.Drawing.Color.White; + pnlGalaxyMap.Location = new System.Drawing.Point(4, 518); + pnlGalaxyMap.Margin = new System.Windows.Forms.Padding(0); + pnlGalaxyMap.Name = "pnlGalaxyMap"; + pnlGalaxyMap.Padding = new System.Windows.Forms.Padding(3); + pnlGalaxyMap.Size = new System.Drawing.Size(411, 257); + pnlGalaxyMap.TabIndex = 14; + // + // galaxyView + // + galaxyView.BackColor = System.Drawing.Color.Black; + galaxyView.Dock = System.Windows.Forms.DockStyle.Fill; + galaxyView.Location = new System.Drawing.Point(3, 3); + //galaxyView.Mode = presenceMode1; + galaxyView.Name = "galaxyView"; + galaxyView.SelectedStarSystem = null; + galaxyView.Size = new System.Drawing.Size(403, 249); + galaxyView.TabIndex = 0; + galaxyView.Text = "galaxyView1"; + galaxyView.StarSystemClicked += galaxyView_StarSystemClicked; + galaxyView.StarSystemSelected += galaxyView_StarSystemSelected; + // + // pnlDetailReport + // + pnlDetailReport.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; + pnlDetailReport.BackColor = System.Drawing.Color.Black; + pnlDetailReport.BorderColor = System.Drawing.Color.RoyalBlue; + pnlDetailReport.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + pnlDetailReport.ForeColor = System.Drawing.Color.White; + pnlDetailReport.Location = new System.Drawing.Point(4, 35); + pnlDetailReport.Margin = new System.Windows.Forms.Padding(0); + pnlDetailReport.Name = "pnlDetailReport"; + pnlDetailReport.Padding = new System.Windows.Forms.Padding(3); + pnlDetailReport.Size = new System.Drawing.Size(412, 460); + pnlDetailReport.TabIndex = 12; + // + // MainGameForm + // + AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; + BackColor = System.Drawing.Color.Black; + ClientSize = new System.Drawing.Size(1270, 779); + Controls.Add(pnlLayout); + DoubleBuffered = true; + Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); + KeyPreview = true; + Margin = new System.Windows.Forms.Padding(4); + MinimumSize = new System.Drawing.Size(900, 700); + Name = "MainGameForm"; + FormClosing += GameForm_FormClosing; + FormClosed += GameForm_FormClosed; + Load += GameForm_Load; + KeyDown += GameForm_KeyDown; + KeyUp += GameForm_KeyUp; + MouseDown += GameForm_MouseDown; + pnlLayout.ResumeLayout(false); + pnlLeft.ResumeLayout(false); + pnlSystemMap.ResumeLayout(false); + pnlSearch.ResumeLayout(false); + pnlSystemTabs.ResumeLayout(false); + pnlTabs.ResumeLayout(false); + pnlSubCommands.ResumeLayout(false); + pnlMainCommands.ResumeLayout(false); + pnlHeader.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)picEmpireFlag).EndInit(); + pnlRight.ResumeLayout(false); + pnlGalaxyMap.ResumeLayout(false); + ResumeLayout(false); + } + + #endregion + + private System.Windows.Forms.ToolTip toolTip; + private GamePanel pnlLayout; + private System.Windows.Forms.Panel pnlRight; + private GamePanel pnlGalaxyMap; + private GalaxyView galaxyView; + private GamePanel pnlDetailReport; + private GameProgressBar progResearch; + private System.Windows.Forms.Panel pnlLeft; + private GamePanel pnlSystemMap; + private StarSystemView starSystemView; + private GamePanel pnlSearch; + private SearchBox searchBox; + private GamePanel pnlSystemTabs; + private System.Windows.Forms.FlowLayoutPanel pnlTabs; + private GameButton btnNewTab; + private GamePanel pnlSubCommands; + private GameButton btnSentry; + private GameButton btnClearOrders; + private GameButton btnFleetTransfer; + private GameButton btnTransferCargo; + private GameButton btnConstructionQueue; + private GameButton btnColonize; + private GameButton btnEvade; + private GameButton btnWarp; + private GameButton btnPursue; + private GameButton btnMove; + private GamePanel pnlMainCommands; + private GameButton btnEndTurn; + private GameButton btnLog; + private GameButton btnQueues; + private GameButton btnShips; + private GameButton btnEmpires; + private GameButton btnPlanets; + private GameButton btnDesigns; + private GameButton btnMenu; + private GamePanel pnlHeader; + private System.Windows.Forms.PictureBox picEmpireFlag; + private GameButton btnNextIdle; + private GameButton btnPrevIdle; + private GameButton btnRepeatOrders; + private GameButton btnRepair; + private GameButton btnResupply; + private GameButton btnRecycle; + private GameButton btnRename; + private GameButton btnToggleMinister; + private GameButton btnActivate; + private GameButton btnCloak; + private GameButton btnDecloak; + private GameButton btnMovementLog; + private GameButton btnWaypoint; + private System.Windows.Forms.ComboBox ddlGalaxyViewMode; + private GameButton btnCommands; + private ResourceQuantityDisplay rqdInventory; +} + diff --git a/FrEee.WinForms/Forms/MainGameForm.cs b/FrEee.UI.WinForms/Forms/MainGameForm.cs similarity index 94% rename from FrEee.WinForms/Forms/MainGameForm.cs rename to FrEee.UI.WinForms/Forms/MainGameForm.cs index 9030f4c23..31fef8b70 100644 --- a/FrEee.WinForms/Forms/MainGameForm.cs +++ b/FrEee.UI.WinForms/Forms/MainGameForm.cs @@ -6,12 +6,12 @@ using FrEee.Processes; using FrEee.Utility; using FrEee.Extensions; -using FrEee.WinForms.Controls; -using FrEee.WinForms.Interfaces; -using FrEee.WinForms.Objects; -using FrEee.WinForms.Objects.GalaxyViewModes; -using FrEee.WinForms.Utility; -using FrEee.WinForms.Utility.Extensions; +using FrEee.UI.WinForms.Controls; +using FrEee.UI.WinForms.Interfaces; +using FrEee.UI.WinForms.Objects; +using FrEee.UI.WinForms.Objects.GalaxyViewModes; +using FrEee.UI.WinForms.Utility; +using FrEee.UI.WinForms.Utility.Extensions; using System; using System.Collections.Generic; using System.Drawing; @@ -26,8 +26,9 @@ using FrEee.Objects.Civilization.Orders; using FrEee.Objects.GameState; using FrEee.Objects.Civilization.CargoStorage; +using FrEee.UI.Blazor.Views.GalaxyMapModes; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; public partial class MainGameForm : GameForm { @@ -44,7 +45,7 @@ public MainGameForm(bool hostView, bool quitOnClose) QuitOnClose = quitOnClose; SetMouseDownHandler(this, GameForm_MouseDown); RemoveMouseDownHandler(searchBox, GameForm_MouseDown); - foreach (var mode in GalaxyViewModes.All) + foreach (var mode in GalaxyMapModeLibrary.All) ddlGalaxyViewMode.Items.Add(mode); ddlGalaxyViewMode.SelectedIndex = 0; Instance = this; @@ -657,7 +658,8 @@ private void ctl_Click(object sender, EventArgs e) private void ddlGalaxyViewMode_SelectedIndexChanged(object sender, EventArgs e) { - galaxyView.Mode = ddlGalaxyViewMode.SelectedItem as IGalaxyViewMode; + // TODO: switch galaxy *map* mode + galaxyView.Mode = (IGalaxyMapMode)ddlGalaxyViewMode.SelectedItem; } private MusicMood FindMusicMood() @@ -1016,7 +1018,7 @@ private void GameForm_KeyUp(object sender, KeyEventArgs e) private void GameForm_Load(object sender, EventArgs e) { - try { this.Icon = new Icon(FrEee.WinForms.Properties.Resources.FrEeeIcon); } + try { this.Icon = new Icon(FrEee.UI.WinForms.Properties.Resources.FrEeeIcon); } catch { } this.Enabled = false; @@ -1321,19 +1323,9 @@ private void SetUpGui() private void SetUpResourceDisplay() { - var income = Empire.Current.NetIncomeLessConstruction; - resMin.Amount = Galaxy.Current.CurrentEmpire.StoredResources[Resource.Minerals]; - resMin.Change = income[Resource.Minerals]; - resOrg.Amount = Galaxy.Current.CurrentEmpire.StoredResources[Resource.Organics]; - resOrg.Change = income[Resource.Organics]; - resRad.Amount = Galaxy.Current.CurrentEmpire.StoredResources[Resource.Radioactives]; - resRad.Change = income[Resource.Radioactives]; - resRes.Amount = income[Resource.Research]; - if (Empire.Current.BonusResearch != 0) - resRes.Change = Empire.Current.BonusResearch; - else - resRes.Change = null; - resInt.Amount = income[Resource.Intelligence]; + rqdInventory.ResourcesToShow = [Resource.Minerals, Resource.Organics, Resource.Radioactives, Resource.Research, Resource.Intelligence]; + rqdInventory.Amounts = Empire.Current.StoredResources; + rqdInventory.Changes = Empire.Current.NetIncomeLessConstruction; } private void SetWaypoint(int waypointNumber, bool redirect) diff --git a/FrEee.UI.WinForms/Forms/MainGameForm.resx b/FrEee.UI.WinForms/Forms/MainGameForm.resx new file mode 100644 index 000000000..41ad6eeaf --- /dev/null +++ b/FrEee.UI.WinForms/Forms/MainGameForm.resx @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAADBGckVlZS5Db3JlLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tl + eVRva2VuPW51bGwMAwAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5l + dXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAABZGckVlZS5VdGlsaXR5LlJl + c291cmNlCAAAABk8QXB0aXR1ZGU+a19fQmFja2luZ0ZpZWxkFjxDb2xvcj5rX19CYWNraW5nRmllbGQs + PEN1bHR1cmVNb2RpZmllclByb3BlcnR5TmFtZT5rX19CYWNraW5nRmllbGQZPEhhc1ZhbHVlPmtfX0Jh + Y2tpbmdGaWVsZBk8SXNHbG9iYWw+a19fQmFja2luZ0ZpZWxkGDxJc0xvY2FsPmtfX0JhY2tpbmdGaWVs + ZBU8TmFtZT5rX19CYWNraW5nRmllbGQcPFBpY3R1cmVOYW1lPmtfX0JhY2tpbmdGaWVsZAQEAQAAAAEB + I0ZyRWVlLk9iamVjdHMuQ2l2aWxpemF0aW9uLkFwdGl0dWRlAgAAABRTeXN0ZW0uRHJhd2luZy5Db2xv + cgMAAAABAQECAAAACQQAAAAF+////xRTeXN0ZW0uRHJhd2luZy5Db2xvcgQAAAAEbmFtZQV2YWx1ZQpr + bm93bkNvbG9yBXN0YXRlAQAAAAkHBwMAAAAK/4CA/wAAAAAAAAIABgYAAAAKUHJvZHVjdGlvbgEBAAYH + AAAACE1pbmVyYWxzBggAAAAJUmVzb3VyY2UxBQQAAAAjRnJFZWUuT2JqZWN0cy5DaXZpbGl6YXRpb24u + QXB0aXR1ZGUJAAAAHDxBYmlsaXR5TmFtZT5rX19CYWNraW5nRmllbGQVPENvc3Q+a19fQmFja2luZ0Zp + ZWxkHDxEZXNjcmlwdGlvbj5rX19CYWNraW5nRmllbGQZPEhpZ2hDb3N0PmtfX0JhY2tpbmdGaWVsZBg8 + TG93Q29zdD5rX19CYWNraW5nRmllbGQbPE1heFBlcmNlbnQ+a19fQmFja2luZ0ZpZWxkGzxNaW5QZXJj + ZW50PmtfX0JhY2tpbmdGaWVsZBU8TmFtZT5rX19CYWNraW5nRmllbGQaPFRocmVzaG9sZD5rX19CYWNr + aW5nRmllbGQBAAEAAAAAAQAICAgICAgCAAAABgkAAAAlUmVzb3VyY2UgR2VuIE1vZGlmaWVyIFJhY2Ug + LSBNaW5lcmFscwAAAAAGCgAAACFBZmZlY3RzIG1pbmVyYWxzIHJlc291cmNlIGluY29tZS4AAAAAAAAA + AAAAAAAAAAAABgsAAAAPTWluaW5nIEFwdGl0dWRlAAAAAAs= + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAADBGckVlZS5Db3JlLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tl + eVRva2VuPW51bGwMAwAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5l + dXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAABZGckVlZS5VdGlsaXR5LlJl + c291cmNlCAAAABk8QXB0aXR1ZGU+a19fQmFja2luZ0ZpZWxkFjxDb2xvcj5rX19CYWNraW5nRmllbGQs + PEN1bHR1cmVNb2RpZmllclByb3BlcnR5TmFtZT5rX19CYWNraW5nRmllbGQZPEhhc1ZhbHVlPmtfX0Jh + Y2tpbmdGaWVsZBk8SXNHbG9iYWw+a19fQmFja2luZ0ZpZWxkGDxJc0xvY2FsPmtfX0JhY2tpbmdGaWVs + ZBU8TmFtZT5rX19CYWNraW5nRmllbGQcPFBpY3R1cmVOYW1lPmtfX0JhY2tpbmdGaWVsZAQEAQAAAAEB + I0ZyRWVlLk9iamVjdHMuQ2l2aWxpemF0aW9uLkFwdGl0dWRlAgAAABRTeXN0ZW0uRHJhd2luZy5Db2xv + cgMAAAABAQECAAAACQQAAAAF+////xRTeXN0ZW0uRHJhd2luZy5Db2xvcgQAAAAEbmFtZQV2YWx1ZQpr + bm93bkNvbG9yBXN0YXRlAQAAAAkHBwMAAAAKAMAA/wAAAAAAAAIABgYAAAAKUHJvZHVjdGlvbgEBAAYH + AAAACE9yZ2FuaWNzBggAAAAJUmVzb3VyY2UyBQQAAAAjRnJFZWUuT2JqZWN0cy5DaXZpbGl6YXRpb24u + QXB0aXR1ZGUJAAAAHDxBYmlsaXR5TmFtZT5rX19CYWNraW5nRmllbGQVPENvc3Q+a19fQmFja2luZ0Zp + ZWxkHDxEZXNjcmlwdGlvbj5rX19CYWNraW5nRmllbGQZPEhpZ2hDb3N0PmtfX0JhY2tpbmdGaWVsZBg8 + TG93Q29zdD5rX19CYWNraW5nRmllbGQbPE1heFBlcmNlbnQ+a19fQmFja2luZ0ZpZWxkGzxNaW5QZXJj + ZW50PmtfX0JhY2tpbmdGaWVsZBU8TmFtZT5rX19CYWNraW5nRmllbGQaPFRocmVzaG9sZD5rX19CYWNr + aW5nRmllbGQBAAEAAAAAAQAICAgICAgCAAAABgkAAAAlUmVzb3VyY2UgR2VuIE1vZGlmaWVyIFJhY2Ug + LSBPcmdhbmljcwAAAAAGCgAAACFBZmZlY3RzIG9yZ2FuaWNzIHJlc291cmNlIGluY29tZS4AAAAAAAAA + AAAAAAAAAAAABgsAAAAQRmFybWluZyBBcHRpdHVkZQAAAAAL + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAADBGckVlZS5Db3JlLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tl + eVRva2VuPW51bGwMAwAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5l + dXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAABZGckVlZS5VdGlsaXR5LlJl + c291cmNlCAAAABk8QXB0aXR1ZGU+a19fQmFja2luZ0ZpZWxkFjxDb2xvcj5rX19CYWNraW5nRmllbGQs + PEN1bHR1cmVNb2RpZmllclByb3BlcnR5TmFtZT5rX19CYWNraW5nRmllbGQZPEhhc1ZhbHVlPmtfX0Jh + Y2tpbmdGaWVsZBk8SXNHbG9iYWw+a19fQmFja2luZ0ZpZWxkGDxJc0xvY2FsPmtfX0JhY2tpbmdGaWVs + ZBU8TmFtZT5rX19CYWNraW5nRmllbGQcPFBpY3R1cmVOYW1lPmtfX0JhY2tpbmdGaWVsZAQEAQAAAAEB + I0ZyRWVlLk9iamVjdHMuQ2l2aWxpemF0aW9uLkFwdGl0dWRlAgAAABRTeXN0ZW0uRHJhd2luZy5Db2xv + cgMAAAABAQECAAAACQQAAAAF+////xRTeXN0ZW0uRHJhd2luZy5Db2xvcgQAAAAEbmFtZQV2YWx1ZQpr + bm93bkNvbG9yBXN0YXRlAQAAAAkHBwMAAAAKAADA/wAAAAAAAAIABgYAAAAKUHJvZHVjdGlvbgEBAAYH + AAAADFJhZGlvYWN0aXZlcwYIAAAACVJlc291cmNlMwUEAAAAI0ZyRWVlLk9iamVjdHMuQ2l2aWxpemF0 + aW9uLkFwdGl0dWRlCQAAABw8QWJpbGl0eU5hbWU+a19fQmFja2luZ0ZpZWxkFTxDb3N0PmtfX0JhY2tp + bmdGaWVsZBw8RGVzY3JpcHRpb24+a19fQmFja2luZ0ZpZWxkGTxIaWdoQ29zdD5rX19CYWNraW5nRmll + bGQYPExvd0Nvc3Q+a19fQmFja2luZ0ZpZWxkGzxNYXhQZXJjZW50PmtfX0JhY2tpbmdGaWVsZBs8TWlu + UGVyY2VudD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkGjxUaHJlc2hvbGQ+a19f + QmFja2luZ0ZpZWxkAQABAAAAAAEACAgICAgIAgAAAAYJAAAAKVJlc291cmNlIEdlbiBNb2RpZmllciBS + YWNlIC0gUmFkaW9hY3RpdmVzAAAAAAYKAAAAJUFmZmVjdHMgcmFkaW9hY3RpdmVzIHJlc291cmNlIGlu + Y29tZS4AAAAAAAAAAAAAAAAAAAAABgsAAAARUmVmaW5pbmcgQXB0aXR1ZGUAAAAACw== + + + \ No newline at end of file diff --git a/FrEee.WinForms/Forms/MainMenuForm.Designer.cs b/FrEee.UI.WinForms/Forms/MainMenuForm.Designer.cs similarity index 94% rename from FrEee.WinForms/Forms/MainMenuForm.Designer.cs rename to FrEee.UI.WinForms/Forms/MainMenuForm.Designer.cs index 1d084af17..8b437e663 100644 --- a/FrEee.WinForms/Forms/MainMenuForm.Designer.cs +++ b/FrEee.UI.WinForms/Forms/MainMenuForm.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; partial class MainMenuForm { @@ -32,15 +32,15 @@ private void InitializeComponent() this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.tblButtonPanel = new System.Windows.Forms.TableLayoutPanel(); - this.btnQuit = new FrEee.WinForms.Controls.GameButton(); - this.btnScenario = new FrEee.WinForms.Controls.GameButton(); - this.btnNew = new FrEee.WinForms.Controls.GameButton(); - this.btnCredits = new FrEee.WinForms.Controls.GameButton(); - this.btnMods = new FrEee.WinForms.Controls.GameButton(); - this.btnQuickStart = new FrEee.WinForms.Controls.GameButton(); - this.btnLoad = new FrEee.WinForms.Controls.GameButton(); - this.btnResume = new FrEee.WinForms.Controls.GameButton(); - this.btnOptions = new FrEee.WinForms.Controls.GameButton(); + this.btnQuit = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnScenario = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnNew = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnCredits = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnMods = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnQuickStart = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnLoad = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnResume = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnOptions = new FrEee.UI.WinForms.Controls.GameButton(); this.tableLayoutPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.tblButtonPanel.SuspendLayout(); diff --git a/FrEee.WinForms/Forms/MainMenuForm.cs b/FrEee.UI.WinForms/Forms/MainMenuForm.cs similarity index 93% rename from FrEee.WinForms/Forms/MainMenuForm.cs rename to FrEee.UI.WinForms/Forms/MainMenuForm.cs index 56e1f1ef0..96387a6a2 100644 --- a/FrEee.WinForms/Forms/MainMenuForm.cs +++ b/FrEee.UI.WinForms/Forms/MainMenuForm.cs @@ -3,9 +3,9 @@ using FrEee.Modding; using FrEee.Utility; using FrEee.Extensions; -using FrEee.WinForms.Objects; -using FrEee.WinForms.Utility; -using FrEee.WinForms.Utility.Extensions; +using FrEee.UI.WinForms.Objects; +using FrEee.UI.WinForms.Utility; +using FrEee.UI.WinForms.Utility.Extensions; using System; using System.Collections.Generic; using System.Data; @@ -18,7 +18,7 @@ using System.Windows.Forms; using FrEee.Objects.GameState; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; public partial class MainMenuForm : GameForm { @@ -33,7 +33,7 @@ private MainMenuForm() { InitializeComponent(); pictureBox1.Image = Properties.Resources.Splash; - try { this.Icon = new Icon(FrEee.WinForms.Properties.Resources.FrEeeIcon); } + try { this.Icon = new Icon(FrEee.UI.WinForms.Properties.Resources.FrEeeIcon); } catch { } } diff --git a/FrEee.WinForms/Forms/MainMenuForm.resx b/FrEee.UI.WinForms/Forms/MainMenuForm.resx similarity index 100% rename from FrEee.WinForms/Forms/MainMenuForm.resx rename to FrEee.UI.WinForms/Forms/MainMenuForm.resx diff --git a/FrEee.WinForms/Forms/MinistersForm.Designer.cs b/FrEee.UI.WinForms/Forms/MinistersForm.Designer.cs similarity index 92% rename from FrEee.WinForms/Forms/MinistersForm.Designer.cs rename to FrEee.UI.WinForms/Forms/MinistersForm.Designer.cs index 4fbeaf03c..2d024aaff 100644 --- a/FrEee.WinForms/Forms/MinistersForm.Designer.cs +++ b/FrEee.UI.WinForms/Forms/MinistersForm.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; partial class MinistersForm { @@ -28,10 +28,10 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.btnClose = new FrEee.WinForms.Controls.GameButton(); + this.btnClose = new FrEee.UI.WinForms.Controls.GameButton(); this.lstMinisters = new System.Windows.Forms.CheckedListBox(); - this.btnDisableAll = new FrEee.WinForms.Controls.GameButton(); - this.btnEnableAll = new FrEee.WinForms.Controls.GameButton(); + this.btnDisableAll = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnEnableAll = new FrEee.UI.WinForms.Controls.GameButton(); this.SuspendLayout(); // // btnClose diff --git a/FrEee.WinForms/Forms/MinistersForm.cs b/FrEee.UI.WinForms/Forms/MinistersForm.cs similarity index 91% rename from FrEee.WinForms/Forms/MinistersForm.cs rename to FrEee.UI.WinForms/Forms/MinistersForm.cs index c67c935ed..e421ac9bf 100644 --- a/FrEee.WinForms/Forms/MinistersForm.cs +++ b/FrEee.UI.WinForms/Forms/MinistersForm.cs @@ -7,14 +7,14 @@ using System.Drawing; using System.Linq; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; public partial class MinistersForm : GameForm { public MinistersForm() { InitializeComponent(); - try { base.Icon = new Icon(FrEee.WinForms.Properties.Resources.FrEeeIcon); } + try { base.Icon = new Icon(FrEee.UI.WinForms.Properties.Resources.FrEeeIcon); } catch { } } diff --git a/FrEee.WinForms/Forms/MinistersForm.resx b/FrEee.UI.WinForms/Forms/MinistersForm.resx similarity index 100% rename from FrEee.WinForms/Forms/MinistersForm.resx rename to FrEee.UI.WinForms/Forms/MinistersForm.resx diff --git a/FrEee.WinForms/Forms/ModErrorsForm.Designer.cs b/FrEee.UI.WinForms/Forms/ModErrorsForm.Designer.cs similarity index 94% rename from FrEee.WinForms/Forms/ModErrorsForm.Designer.cs rename to FrEee.UI.WinForms/Forms/ModErrorsForm.Designer.cs index 60b811bb6..fcaa95147 100644 --- a/FrEee.WinForms/Forms/ModErrorsForm.Designer.cs +++ b/FrEee.UI.WinForms/Forms/ModErrorsForm.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; partial class ModErrorsForm { @@ -28,19 +28,19 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.gamePanel1 = new FrEee.WinForms.Controls.GamePanel(); + this.gamePanel1 = new FrEee.UI.WinForms.Controls.GamePanel(); this.lstFiles = new System.Windows.Forms.ListView(); this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.gamePanel2 = new FrEee.WinForms.Controls.GamePanel(); + this.gamePanel2 = new FrEee.UI.WinForms.Controls.GamePanel(); this.lstErrors = new System.Windows.Forms.ListView(); this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.pnlDetails = new FrEee.WinForms.Controls.GamePanel(); + this.pnlDetails = new FrEee.UI.WinForms.Controls.GamePanel(); this.lblField = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); this.lblRecord = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); - this.btnOK = new FrEee.WinForms.Controls.GameButton(); - this.btnCancel = new FrEee.WinForms.Controls.GameButton(); + this.btnOK = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnCancel = new FrEee.UI.WinForms.Controls.GameButton(); this.lblNoErrors = new System.Windows.Forms.Label(); this.lblMessage = new System.Windows.Forms.Label(); this.gamePanel1.SuspendLayout(); diff --git a/FrEee.WinForms/Forms/ModErrorsForm.cs b/FrEee.UI.WinForms/Forms/ModErrorsForm.cs similarity index 88% rename from FrEee.WinForms/Forms/ModErrorsForm.cs rename to FrEee.UI.WinForms/Forms/ModErrorsForm.cs index 95690483a..77b913cc2 100644 --- a/FrEee.WinForms/Forms/ModErrorsForm.cs +++ b/FrEee.UI.WinForms/Forms/ModErrorsForm.cs @@ -1,14 +1,14 @@ using FrEee.Modding; using FrEee.Extensions; -using FrEee.WinForms.Interfaces; -using FrEee.WinForms.Utility.Extensions; +using FrEee.UI.WinForms.Interfaces; +using FrEee.UI.WinForms.Utility.Extensions; using System; using System.Collections.Generic; using System.Drawing; using System.Linq; using System.Windows.Forms; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; /// /// Displays errors when loading a mod. @@ -19,7 +19,7 @@ public ModErrorsForm() { InitializeComponent(); Bind(Mod.Errors); - try { this.Icon = new Icon(FrEee.WinForms.Properties.Resources.FrEeeIcon); } + try { this.Icon = new Icon(FrEee.UI.WinForms.Properties.Resources.FrEeeIcon); } catch { } } diff --git a/FrEee.WinForms/Forms/ModErrorsForm.resx b/FrEee.UI.WinForms/Forms/ModErrorsForm.resx similarity index 100% rename from FrEee.WinForms/Forms/ModErrorsForm.resx rename to FrEee.UI.WinForms/Forms/ModErrorsForm.resx diff --git a/FrEee.WinForms/Forms/ModPickerForm.Designer.cs b/FrEee.UI.WinForms/Forms/ModPickerForm.Designer.cs similarity index 95% rename from FrEee.WinForms/Forms/ModPickerForm.Designer.cs rename to FrEee.UI.WinForms/Forms/ModPickerForm.Designer.cs index 6f42d21df..523400b2f 100644 --- a/FrEee.WinForms/Forms/ModPickerForm.Designer.cs +++ b/FrEee.UI.WinForms/Forms/ModPickerForm.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; partial class ModPickerForm { @@ -28,7 +28,7 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.gamePanel1 = new FrEee.WinForms.Controls.GamePanel(); + this.gamePanel1 = new FrEee.UI.WinForms.Controls.GamePanel(); this.lstMods = new System.Windows.Forms.ListView(); this.txtName = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); @@ -41,11 +41,11 @@ private void InitializeComponent() this.txtEmail = new System.Windows.Forms.Label(); this.txtWebsite = new System.Windows.Forms.Label(); this.txtDescription = new System.Windows.Forms.Label(); - this.btnLoad = new FrEee.WinForms.Controls.GameButton(); - this.btnCancel = new FrEee.WinForms.Controls.GameButton(); + this.btnLoad = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnCancel = new FrEee.UI.WinForms.Controls.GameButton(); this.txtFolder = new System.Windows.Forms.Label(); this.label7 = new System.Windows.Forms.Label(); - this.btnEdit = new FrEee.WinForms.Controls.GameButton(); + this.btnEdit = new FrEee.UI.WinForms.Controls.GameButton(); this.gamePanel1.SuspendLayout(); this.SuspendLayout(); // diff --git a/FrEee.WinForms/Forms/ModPickerForm.cs b/FrEee.UI.WinForms/Forms/ModPickerForm.cs similarity index 91% rename from FrEee.WinForms/Forms/ModPickerForm.cs rename to FrEee.UI.WinForms/Forms/ModPickerForm.cs index da44beb91..fb931f113 100644 --- a/FrEee.WinForms/Forms/ModPickerForm.cs +++ b/FrEee.UI.WinForms/Forms/ModPickerForm.cs @@ -2,7 +2,7 @@ using FrEee.Modding.Loaders; using FrEee.Utility; using FrEee.Extensions; -using FrEee.WinForms.Utility.Extensions; +using FrEee.UI.WinForms.Utility.Extensions; using System; using System.Collections.Generic; using System.Diagnostics; @@ -13,7 +13,7 @@ using System.Threading; using System.Windows.Forms; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; public partial class ModPickerForm : GameForm { @@ -49,7 +49,7 @@ public ModPickerForm() lstMods.AddItemWithImage(null, info.Name, info, img); } - try { this.Icon = new Icon(FrEee.WinForms.Properties.Resources.FrEeeIcon); } catch { } + try { this.Icon = new Icon(FrEee.UI.WinForms.Properties.Resources.FrEeeIcon); } catch { } } public string ModPath { get; private set; } diff --git a/FrEee.WinForms/Forms/ModPickerForm.resx b/FrEee.UI.WinForms/Forms/ModPickerForm.resx similarity index 100% rename from FrEee.WinForms/Forms/ModPickerForm.resx rename to FrEee.UI.WinForms/Forms/ModPickerForm.resx diff --git a/FrEee.WinForms/Forms/MountPickerForm.Designer.cs b/FrEee.UI.WinForms/Forms/MountPickerForm.Designer.cs similarity index 95% rename from FrEee.WinForms/Forms/MountPickerForm.Designer.cs rename to FrEee.UI.WinForms/Forms/MountPickerForm.Designer.cs index 584416f07..7f2949c0f 100644 --- a/FrEee.WinForms/Forms/MountPickerForm.Designer.cs +++ b/FrEee.UI.WinForms/Forms/MountPickerForm.Designer.cs @@ -1,5 +1,5 @@  -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; partial class MountPickerForm { @@ -35,8 +35,8 @@ private void InitializeComponent() this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.mountBindingSource = new System.Windows.Forms.BindingSource(this.components); - this.btnOk = new FrEee.WinForms.Controls.GameButton(); - this.btnCancel = new FrEee.WinForms.Controls.GameButton(); + this.btnOk = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnCancel = new FrEee.UI.WinForms.Controls.GameButton(); ((System.ComponentModel.ISupportInitialize)(this.gridMounts)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.mountBindingSource)).BeginInit(); this.SuspendLayout(); diff --git a/FrEee.WinForms/Forms/MountPickerForm.cs b/FrEee.UI.WinForms/Forms/MountPickerForm.cs similarity index 88% rename from FrEee.WinForms/Forms/MountPickerForm.cs rename to FrEee.UI.WinForms/Forms/MountPickerForm.cs index cc1d69381..fae971a92 100644 --- a/FrEee.WinForms/Forms/MountPickerForm.cs +++ b/FrEee.UI.WinForms/Forms/MountPickerForm.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Windows.Forms; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; public partial class MountPickerForm : GameForm { @@ -17,7 +17,7 @@ public MountPickerForm(IHull hull) this.hull = hull; Bind(); - try { this.Icon = new Icon(FrEee.WinForms.Properties.Resources.FrEeeIcon); } catch { } + try { this.Icon = new Icon(FrEee.UI.WinForms.Properties.Resources.FrEeeIcon); } catch { } } /// diff --git a/FrEee.WinForms/Forms/MountPickerForm.resx b/FrEee.UI.WinForms/Forms/MountPickerForm.resx similarity index 100% rename from FrEee.WinForms/Forms/MountPickerForm.resx rename to FrEee.UI.WinForms/Forms/MountPickerForm.resx diff --git a/FrEee.UI.WinForms/Forms/OptionsForm.cs b/FrEee.UI.WinForms/Forms/OptionsForm.cs new file mode 100644 index 000000000..937043472 --- /dev/null +++ b/FrEee.UI.WinForms/Forms/OptionsForm.cs @@ -0,0 +1,549 @@ +using FrEee.Objects.Civilization; +using FrEee.UI.WinForms.Objects; +using FrEee.UI.WinForms.Utility.Extensions; +using System; +using System.IO; +using System.Reflection; +using System.Windows.Forms; + +namespace FrEee.UI.WinForms.Forms; + +public partial class OptionsForm : GameForm +{ + public OptionsForm() + { + InitializeComponent(); + } + + private Controls.GameButton btnCancel; + private Controls.GameButton btnSave; + private Controls.GameButton btnSE4; + private GroupBox groupBox1; + private Label label1; + private Label label2; + private Label label7; + private TrackBar sldEffects; + private TrackBar sldMaster; + private GroupBox grpPlayerInfo; + private Label label9; + private Label label8; + private Label label6; + private Label label5; + private Label label4; + private Label label3; + private TextBox txtNotes; + private TextBox txtDiscord; + private TextBox txtIrc; + private TextBox txtEmail; + private TextBox txtPbw; + private TextBox txtName; + private TextBox txtWebsite; + private Label label10; + private GroupBox groupBox2; + private CheckBox chkQuitToMainMenu; + private Button btnBlazorTest; + private TrackBar sldMusic; + + private void btnCancel_Click(object sender, EventArgs e) + { + Close(); + } + + private void btnSave_Click(object sender, EventArgs e) + { + ClientSettings.Instance.MasterVolume = sldMaster.Value; + ClientSettings.Instance.MusicVolume = sldMusic.Value; + ClientSettings.Instance.EffectsVolume = sldEffects.Value; + if (ClientSettings.Instance.PlayerInfo == null) + ClientSettings.Instance.PlayerInfo = new PlayerInfo(); + ClientSettings.Instance.PlayerInfo.Name = txtName.Text; + ClientSettings.Instance.PlayerInfo.Pbw = txtPbw.Text; + ClientSettings.Instance.PlayerInfo.Email = txtEmail.Text; + ClientSettings.Instance.PlayerInfo.Irc = txtIrc.Text; + ClientSettings.Instance.PlayerInfo.Discord = txtDiscord.Text; + ClientSettings.Instance.PlayerInfo.Notes = txtNotes.Text; + ClientSettings.Instance.PlayerInfo.Website = txtWebsite.Text; + ClientSettings.Instance.QuitToMainMenu = chkQuitToMainMenu.Checked; + ClientSettings.Save(); + Music.setVolume(ClientSettings.Instance.MasterVolume * ClientSettings.Instance.MusicVolume * 1.0e-4f); + Music.StartNewTrack(); + Close(); + } + + private void btnSE4_Click(object sender, EventArgs e) + { + // find SE4 folder + FolderBrowserDialog fbd = new FolderBrowserDialog(); + fbd.Description = "Locate SE4 root folder"; + DialogResult result = fbd.ShowDialog(); + if (result == DialogResult.Cancel) + { + return; + } + string se4root = fbd.SelectedPath; + + DirectoryInfo dir = null; + string output = Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), "Pictures"); + // create the output pictures folder if it doesn't exist + if (!Directory.Exists(output)) + { + Directory.CreateDirectory(output); + } + + // === MOST OF THE ART IS HERE === + string[] folders = { "Planets", "Components", "Facilities", "Systems" }; + foreach (string f in folders) + { + dir = new DirectoryInfo(se4root + "/Pictures/" + f); + if (dir.Exists) + { + output = Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), "Pictures/" + f); + if (!Directory.Exists(output)) + { + Directory.CreateDirectory(output); + } + + FileInfo[] files = dir.GetFiles(); + foreach (FileInfo file in files) + { + string temppath = Path.Combine(output, file.Name); + string conflict = temppath.Replace(".BMP", ".png").Replace(".bmp", ".png"); + //if (File.Exists(conflict)) + //{ + // File.Delete(conflict); + //} + file.CopyTo(temppath, true); + } + } + } + + // === RACES AND THEIR SHIPSETS === + output = Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), "Pictures/Races"); + dir = new DirectoryInfo(se4root + "/Pictures/Races"); + foreach (DirectoryInfo subdir in dir.GetDirectories()) + { + string subOutput = Path.Combine(output, subdir.Name); + if (!Directory.Exists(subOutput)) + { + Directory.CreateDirectory(subOutput); + } + FileInfo[] files = (new DirectoryInfo(se4root + "/Pictures/Races/" + subdir.Name)).GetFiles(); + foreach (FileInfo file in files) + { + string temppath = Path.Combine(subOutput, file.Name); + file.CopyTo(temppath, true); + } + } + + /* // TEMPORARILY DISABLED: we need to classify all the tracks to put them in the right sub folder + // === MUSIC === + foreach (string f in folders) { + dir = new DirectoryInfo(se4root + "/Music/"); + if (dir.Exists) { + output = Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), "Music"); + if (!Directory.Exists(output)) { + Directory.CreateDirectory(output); + } + + FileInfo[] files = dir.GetFiles(); + foreach (FileInfo file in files) { + string temppath = Path.Combine(output, file.Name); + file.CopyTo(temppath, true); + } + } + } + */ + } + + private void InitializeComponent() + { + sldMaster = new TrackBar(); + label7 = new Label(); + groupBox1 = new GroupBox(); + label2 = new Label(); + sldEffects = new TrackBar(); + label1 = new Label(); + sldMusic = new TrackBar(); + btnCancel = new Controls.GameButton(); + btnSave = new Controls.GameButton(); + btnSE4 = new Controls.GameButton(); + grpPlayerInfo = new GroupBox(); + txtWebsite = new TextBox(); + label10 = new Label(); + txtNotes = new TextBox(); + txtDiscord = new TextBox(); + txtIrc = new TextBox(); + txtEmail = new TextBox(); + txtPbw = new TextBox(); + txtName = new TextBox(); + label9 = new Label(); + label8 = new Label(); + label6 = new Label(); + label5 = new Label(); + label4 = new Label(); + label3 = new Label(); + groupBox2 = new GroupBox(); + chkQuitToMainMenu = new CheckBox(); + btnBlazorTest = new Button(); + ((System.ComponentModel.ISupportInitialize)sldMaster).BeginInit(); + groupBox1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)sldEffects).BeginInit(); + ((System.ComponentModel.ISupportInitialize)sldMusic).BeginInit(); + grpPlayerInfo.SuspendLayout(); + groupBox2.SuspendLayout(); + SuspendLayout(); + // + // sldMaster + // + sldMaster.LargeChange = 10; + sldMaster.Location = new System.Drawing.Point(140, 19); + sldMaster.Maximum = 100; + sldMaster.Name = "sldMaster"; + sldMaster.Size = new System.Drawing.Size(213, 45); + sldMaster.TabIndex = 0; + sldMaster.TickFrequency = 10; + // + // label7 + // + label7.AutoSize = true; + label7.ForeColor = System.Drawing.Color.CornflowerBlue; + label7.Location = new System.Drawing.Point(6, 19); + label7.Margin = new Padding(3); + label7.Name = "label7"; + label7.Size = new System.Drawing.Size(43, 15); + label7.TabIndex = 17; + label7.Text = "Master"; + // + // groupBox1 + // + groupBox1.Controls.Add(label2); + groupBox1.Controls.Add(sldEffects); + groupBox1.Controls.Add(label1); + groupBox1.Controls.Add(sldMusic); + groupBox1.Controls.Add(label7); + groupBox1.Controls.Add(sldMaster); + groupBox1.ForeColor = System.Drawing.Color.CornflowerBlue; + groupBox1.Location = new System.Drawing.Point(12, 319); + groupBox1.Name = "groupBox1"; + groupBox1.Size = new System.Drawing.Size(359, 176); + groupBox1.TabIndex = 2; + groupBox1.TabStop = false; + groupBox1.Text = "Volume"; + // + // label2 + // + label2.AutoSize = true; + label2.ForeColor = System.Drawing.Color.CornflowerBlue; + label2.Location = new System.Drawing.Point(6, 121); + label2.Margin = new Padding(3); + label2.Name = "label2"; + label2.Size = new System.Drawing.Size(42, 15); + label2.TabIndex = 21; + label2.Text = "Effects"; + // + // sldEffects + // + sldEffects.Enabled = false; + sldEffects.LargeChange = 10; + sldEffects.Location = new System.Drawing.Point(140, 121); + sldEffects.Maximum = 100; + sldEffects.Name = "sldEffects"; + sldEffects.Size = new System.Drawing.Size(213, 45); + sldEffects.TabIndex = 2; + sldEffects.TickFrequency = 10; + // + // label1 + // + label1.AutoSize = true; + label1.ForeColor = System.Drawing.Color.CornflowerBlue; + label1.Location = new System.Drawing.Point(6, 70); + label1.Margin = new Padding(3); + label1.Name = "label1"; + label1.Size = new System.Drawing.Size(39, 15); + label1.TabIndex = 19; + label1.Text = "Music"; + // + // sldMusic + // + sldMusic.LargeChange = 10; + sldMusic.Location = new System.Drawing.Point(140, 70); + sldMusic.Maximum = 100; + sldMusic.Name = "sldMusic"; + sldMusic.Size = new System.Drawing.Size(213, 45); + sldMusic.TabIndex = 1; + sldMusic.TickFrequency = 10; + // + // btnCancel + // + btnCancel.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + btnCancel.BackColor = System.Drawing.Color.Black; + btnCancel.ForeColor = System.Drawing.Color.CornflowerBlue; + btnCancel.Location = new System.Drawing.Point(295, 585); + btnCancel.Name = "btnCancel"; + btnCancel.Size = new System.Drawing.Size(75, 23); + btnCancel.TabIndex = 5; + btnCancel.Text = "Cancel"; + btnCancel.UseVisualStyleBackColor = false; + btnCancel.Click += btnCancel_Click; + // + // btnSave + // + btnSave.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + btnSave.BackColor = System.Drawing.Color.Black; + btnSave.ForeColor = System.Drawing.Color.CornflowerBlue; + btnSave.Location = new System.Drawing.Point(214, 585); + btnSave.Name = "btnSave"; + btnSave.Size = new System.Drawing.Size(75, 23); + btnSave.TabIndex = 4; + btnSave.Text = "Save"; + btnSave.UseVisualStyleBackColor = false; + btnSave.Click += btnSave_Click; + // + // btnSE4 + // + btnSE4.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; + btnSE4.BackColor = System.Drawing.Color.Black; + btnSE4.ForeColor = System.Drawing.Color.CornflowerBlue; + btnSE4.Location = new System.Drawing.Point(12, 578); + btnSE4.Name = "btnSE4"; + btnSE4.Size = new System.Drawing.Size(104, 30); + btnSE4.TabIndex = 3; + btnSE4.Text = "Copy SE4 Assets"; + btnSE4.UseVisualStyleBackColor = false; + btnSE4.Click += btnSE4_Click; + // + // grpPlayerInfo + // + grpPlayerInfo.Controls.Add(btnBlazorTest); + grpPlayerInfo.Controls.Add(txtWebsite); + grpPlayerInfo.Controls.Add(label10); + grpPlayerInfo.Controls.Add(txtNotes); + grpPlayerInfo.Controls.Add(txtDiscord); + grpPlayerInfo.Controls.Add(txtIrc); + grpPlayerInfo.Controls.Add(txtEmail); + grpPlayerInfo.Controls.Add(txtPbw); + grpPlayerInfo.Controls.Add(txtName); + grpPlayerInfo.Controls.Add(label9); + grpPlayerInfo.Controls.Add(label8); + grpPlayerInfo.Controls.Add(label6); + grpPlayerInfo.Controls.Add(label5); + grpPlayerInfo.Controls.Add(label4); + grpPlayerInfo.Controls.Add(label3); + grpPlayerInfo.ForeColor = System.Drawing.Color.CornflowerBlue; + grpPlayerInfo.Location = new System.Drawing.Point(12, 12); + grpPlayerInfo.Name = "grpPlayerInfo"; + grpPlayerInfo.Size = new System.Drawing.Size(359, 301); + grpPlayerInfo.TabIndex = 1; + grpPlayerInfo.TabStop = false; + grpPlayerInfo.Text = "Player Info"; + // + // txtWebsite + // + txtWebsite.Location = new System.Drawing.Point(57, 146); + txtWebsite.Name = "txtWebsite"; + txtWebsite.Size = new System.Drawing.Size(190, 23); + txtWebsite.TabIndex = 5; + // + // label10 + // + label10.AutoSize = true; + label10.ForeColor = System.Drawing.Color.CornflowerBlue; + label10.Location = new System.Drawing.Point(7, 149); + label10.Margin = new Padding(3); + label10.Name = "label10"; + label10.Size = new System.Drawing.Size(49, 15); + label10.TabIndex = 30; + label10.Text = "Website"; + // + // txtNotes + // + txtNotes.Location = new System.Drawing.Point(57, 174); + txtNotes.Multiline = true; + txtNotes.Name = "txtNotes"; + txtNotes.Size = new System.Drawing.Size(296, 98); + txtNotes.TabIndex = 6; + // + // txtDiscord + // + txtDiscord.Location = new System.Drawing.Point(57, 120); + txtDiscord.Name = "txtDiscord"; + txtDiscord.Size = new System.Drawing.Size(190, 23); + txtDiscord.TabIndex = 4; + // + // txtIrc + // + txtIrc.Location = new System.Drawing.Point(57, 94); + txtIrc.Name = "txtIrc"; + txtIrc.Size = new System.Drawing.Size(190, 23); + txtIrc.TabIndex = 3; + // + // txtEmail + // + txtEmail.Location = new System.Drawing.Point(57, 68); + txtEmail.Name = "txtEmail"; + txtEmail.Size = new System.Drawing.Size(190, 23); + txtEmail.TabIndex = 2; + // + // txtPbw + // + txtPbw.Location = new System.Drawing.Point(57, 42); + txtPbw.Name = "txtPbw"; + txtPbw.Size = new System.Drawing.Size(190, 23); + txtPbw.TabIndex = 1; + // + // txtName + // + txtName.Location = new System.Drawing.Point(57, 16); + txtName.Name = "txtName"; + txtName.Size = new System.Drawing.Size(190, 23); + txtName.TabIndex = 0; + // + // label9 + // + label9.AutoSize = true; + label9.ForeColor = System.Drawing.Color.CornflowerBlue; + label9.Location = new System.Drawing.Point(7, 174); + label9.Margin = new Padding(3); + label9.Name = "label9"; + label9.Size = new System.Drawing.Size(38, 15); + label9.TabIndex = 23; + label9.Text = "Notes"; + // + // label8 + // + label8.AutoSize = true; + label8.ForeColor = System.Drawing.Color.CornflowerBlue; + label8.Location = new System.Drawing.Point(6, 123); + label8.Margin = new Padding(3); + label8.Name = "label8"; + label8.Size = new System.Drawing.Size(47, 15); + label8.TabIndex = 22; + label8.Text = "Discord"; + // + // label6 + // + label6.AutoSize = true; + label6.ForeColor = System.Drawing.Color.CornflowerBlue; + label6.Location = new System.Drawing.Point(7, 97); + label6.Margin = new Padding(3); + label6.Name = "label6"; + label6.Size = new System.Drawing.Size(25, 15); + label6.TabIndex = 21; + label6.Text = "IRC"; + // + // label5 + // + label5.AutoSize = true; + label5.ForeColor = System.Drawing.Color.CornflowerBlue; + label5.Location = new System.Drawing.Point(6, 71); + label5.Margin = new Padding(3); + label5.Name = "label5"; + label5.Size = new System.Drawing.Size(36, 15); + label5.TabIndex = 20; + label5.Text = "Email"; + // + // label4 + // + label4.AutoSize = true; + label4.ForeColor = System.Drawing.Color.CornflowerBlue; + label4.Location = new System.Drawing.Point(7, 45); + label4.Margin = new Padding(3); + label4.Name = "label4"; + label4.Size = new System.Drawing.Size(32, 15); + label4.TabIndex = 19; + label4.Text = "PBW"; + // + // label3 + // + label3.AutoSize = true; + label3.ForeColor = System.Drawing.Color.CornflowerBlue; + label3.Location = new System.Drawing.Point(7, 19); + label3.Margin = new Padding(3); + label3.Name = "label3"; + label3.Size = new System.Drawing.Size(39, 15); + label3.TabIndex = 18; + label3.Text = "Name"; + // + // groupBox2 + // + groupBox2.Controls.Add(chkQuitToMainMenu); + groupBox2.ForeColor = System.Drawing.Color.CornflowerBlue; + groupBox2.Location = new System.Drawing.Point(12, 501); + groupBox2.Name = "groupBox2"; + groupBox2.Size = new System.Drawing.Size(359, 57); + groupBox2.TabIndex = 22; + groupBox2.TabStop = false; + groupBox2.Text = "UI"; + groupBox2.Enter += groupBox2_Enter; + // + // chkQuitToMainMenu + // + chkQuitToMainMenu.AutoSize = true; + chkQuitToMainMenu.Location = new System.Drawing.Point(15, 24); + chkQuitToMainMenu.Name = "chkQuitToMainMenu"; + chkQuitToMainMenu.Size = new System.Drawing.Size(127, 19); + chkQuitToMainMenu.TabIndex = 0; + chkQuitToMainMenu.Text = "Quit to Main Menu"; + chkQuitToMainMenu.UseVisualStyleBackColor = true; + // + // btnBlazorTest + // + btnBlazorTest.Location = new System.Drawing.Point(268, 67); + btnBlazorTest.Name = "btnBlazorTest"; + btnBlazorTest.Size = new System.Drawing.Size(75, 23); + btnBlazorTest.TabIndex = 31; + btnBlazorTest.Text = "blazor test"; + btnBlazorTest.UseVisualStyleBackColor = true; + btnBlazorTest.Click += btnBlazorTest_Click; + // + // OptionsForm + // + BackColor = System.Drawing.Color.Black; + ClientSize = new System.Drawing.Size(382, 620); + Controls.Add(groupBox2); + Controls.Add(grpPlayerInfo); + Controls.Add(btnSE4); + Controls.Add(btnCancel); + Controls.Add(btnSave); + Controls.Add(groupBox1); + MaximizeBox = false; + Name = "OptionsForm"; + Text = "Options"; + Load += OptionsForm_Load; + ((System.ComponentModel.ISupportInitialize)sldMaster).EndInit(); + groupBox1.ResumeLayout(false); + groupBox1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)sldEffects).EndInit(); + ((System.ComponentModel.ISupportInitialize)sldMusic).EndInit(); + grpPlayerInfo.ResumeLayout(false); + grpPlayerInfo.PerformLayout(); + groupBox2.ResumeLayout(false); + groupBox2.PerformLayout(); + ResumeLayout(false); + } + + private void OptionsForm_Load(object sender, EventArgs e) + { + txtName.Text = ClientSettings.Instance.PlayerInfo.Name; + txtPbw.Text = ClientSettings.Instance.PlayerInfo.Pbw; + txtEmail.Text = ClientSettings.Instance.PlayerInfo.Email; + txtIrc.Text = ClientSettings.Instance.PlayerInfo.Irc; + txtDiscord.Text = ClientSettings.Instance.PlayerInfo.Discord; + txtNotes.Text = ClientSettings.Instance.PlayerInfo.Notes; + txtWebsite.Text = ClientSettings.Instance.PlayerInfo.Website; + sldMaster.Value = Math.Max(0, Math.Min(100, ClientSettings.Instance.MasterVolume)); + sldMusic.Value = Math.Max(0, Math.Min(100, ClientSettings.Instance.MusicVolume)); + sldEffects.Value = Math.Max(0, Math.Min(100, ClientSettings.Instance.EffectsVolume)); + chkQuitToMainMenu.Checked = ClientSettings.Instance.QuitToMainMenu; + } + + private void groupBox2_Enter(object sender, EventArgs e) + { + + } + + private void btnBlazorTest_Click(object sender, EventArgs e) + { + this.ShowChildForm(new BlazorTestForm()); + } +} diff --git a/FrEee.UI.WinForms/Forms/OptionsForm.resx b/FrEee.UI.WinForms/Forms/OptionsForm.resx new file mode 100644 index 000000000..b92c16350 --- /dev/null +++ b/FrEee.UI.WinForms/Forms/OptionsForm.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/FrEee.WinForms/Forms/PlanetListForm.Designer.cs b/FrEee.UI.WinForms/Forms/PlanetListForm.Designer.cs similarity index 94% rename from FrEee.WinForms/Forms/PlanetListForm.Designer.cs rename to FrEee.UI.WinForms/Forms/PlanetListForm.Designer.cs index fd3e6794d..e519c2fbb 100644 --- a/FrEee.WinForms/Forms/PlanetListForm.Designer.cs +++ b/FrEee.UI.WinForms/Forms/PlanetListForm.Designer.cs @@ -1,8 +1,9 @@ using FrEee.Objects.Space; using FrEee.Utility; using FrEee.Serialization; -using FrEee.WinForms.Controls; +using FrEee.UI.WinForms.Controls; +using FrEee.UI.WinForms.Controls.Blazor; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; partial class PlanetListForm { @@ -33,20 +34,20 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - FrEee.WinForms.Objects.GalaxyViewModes.PresenceMode presenceMode1 = new FrEee.WinForms.Objects.GalaxyViewModes.PresenceMode(); + FrEee.UI.WinForms.Objects.GalaxyViewModes.PresenceMode presenceMode1 = new FrEee.UI.WinForms.Objects.GalaxyViewModes.PresenceMode(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.galaxyView = new FrEee.WinForms.Controls.GalaxyView(); - this.pnlHeader = new FrEee.WinForms.Controls.GamePanel(); + this.galaxyView = new FrEee.UI.WinForms.Controls.GalaxyView(); + this.pnlHeader = new FrEee.UI.WinForms.Controls.GamePanel(); this.txtPopulation = new System.Windows.Forms.Label(); - this.resStorageRad = new FrEee.WinForms.Controls.ResourceDisplay(); - this.resStorageOrg = new FrEee.WinForms.Controls.ResourceDisplay(); - this.resStorageMin = new FrEee.WinForms.Controls.ResourceDisplay(); + this.resStorageRad = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); + this.resStorageOrg = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); + this.resStorageMin = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); this.label16 = new System.Windows.Forms.Label(); - this.resInt = new FrEee.WinForms.Controls.ResourceDisplay(); - this.resRes = new FrEee.WinForms.Controls.ResourceDisplay(); - this.resRad = new FrEee.WinForms.Controls.ResourceDisplay(); - this.resOrg = new FrEee.WinForms.Controls.ResourceDisplay(); - this.resMin = new FrEee.WinForms.Controls.ResourceDisplay(); + this.resInt = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); + this.resRes = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); + this.resRad = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); + this.resOrg = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); + this.resMin = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); this.label15 = new System.Windows.Forms.Label(); this.label13 = new System.Windows.Forms.Label(); this.txtUs = new System.Windows.Forms.Label(); @@ -75,7 +76,7 @@ private void InitializeComponent() this.label3 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); - this.grid = new FrEee.WinForms.Controls.GameGridView(); + this.grid = new FrEee.UI.WinForms.Controls.GameGridView(); this.contextMenu = new System.Windows.Forms.ContextMenuStrip(this.components); this.colonizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.tableLayoutPanel1.SuspendLayout(); @@ -110,7 +111,7 @@ private void InitializeComponent() this.galaxyView.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.galaxyView.Dock = System.Windows.Forms.DockStyle.Left; this.galaxyView.Location = new System.Drawing.Point(403, 3); - this.galaxyView.Mode = presenceMode1; + //this.galaxyView.Mode = presenceMode1; this.galaxyView.Name = "galaxyView"; this.galaxyView.SelectedStarSystem = null; this.galaxyView.Size = new System.Drawing.Size(226, 194); diff --git a/FrEee.WinForms/Forms/PlanetListForm.cs b/FrEee.UI.WinForms/Forms/PlanetListForm.cs similarity index 95% rename from FrEee.WinForms/Forms/PlanetListForm.cs rename to FrEee.UI.WinForms/Forms/PlanetListForm.cs index 7a2363c42..98d52db95 100644 --- a/FrEee.WinForms/Forms/PlanetListForm.cs +++ b/FrEee.UI.WinForms/Forms/PlanetListForm.cs @@ -4,8 +4,8 @@ using FrEee.Objects.Vehicles; using FrEee.Utility; using FrEee.Extensions; -using FrEee.WinForms.DataGridView; -using FrEee.WinForms.Objects; +using FrEee.UI.WinForms.DataGridView; +using FrEee.UI.WinForms.Objects; using System; using System.Collections.Generic; using System.Drawing; @@ -16,14 +16,14 @@ using FrEee.Objects.GameState; using FrEee.Objects.Civilization.CargoStorage; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; public partial class PlanetListForm : GameForm { public PlanetListForm() { InitializeComponent(); - try { this.Icon = new Icon(FrEee.WinForms.Properties.Resources.FrEeeIcon); } + try { this.Icon = new Icon(FrEee.UI.WinForms.Properties.Resources.FrEeeIcon); } catch { } grid.AppendMenuItems = contextMenu.Items.Cast().ToArray(); contextMenu.Items.Clear(); diff --git a/FrEee.WinForms/Forms/PlanetListForm.resx b/FrEee.UI.WinForms/Forms/PlanetListForm.resx similarity index 100% rename from FrEee.WinForms/Forms/PlanetListForm.resx rename to FrEee.UI.WinForms/Forms/PlanetListForm.resx diff --git a/FrEee.WinForms/Forms/RecycleForm.Designer.cs b/FrEee.UI.WinForms/Forms/RecycleForm.Designer.cs similarity index 92% rename from FrEee.WinForms/Forms/RecycleForm.Designer.cs rename to FrEee.UI.WinForms/Forms/RecycleForm.Designer.cs index cc61c5a6f..71d65f6cd 100644 --- a/FrEee.WinForms/Forms/RecycleForm.Designer.cs +++ b/FrEee.UI.WinForms/Forms/RecycleForm.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; partial class RecycleForm { @@ -30,13 +30,13 @@ private void InitializeComponent() { this.treeVehicles = new System.Windows.Forms.TreeView(); this.label1 = new System.Windows.Forms.Label(); - this.btnScrap = new FrEee.WinForms.Controls.GameButton(); - this.btnMothball = new FrEee.WinForms.Controls.GameButton(); - this.btnUnmothball = new FrEee.WinForms.Controls.GameButton(); - this.btnRefit = new FrEee.WinForms.Controls.GameButton(); - this.btnAnalyze = new FrEee.WinForms.Controls.GameButton(); - this.btnOK = new FrEee.WinForms.Controls.GameButton(); - this.btnCancel = new FrEee.WinForms.Controls.GameButton(); + this.btnScrap = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnMothball = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnUnmothball = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnRefit = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnAnalyze = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnOK = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnCancel = new FrEee.UI.WinForms.Controls.GameButton(); this.SuspendLayout(); // // treeVehicles diff --git a/FrEee.WinForms/Forms/RecycleForm.cs b/FrEee.UI.WinForms/Forms/RecycleForm.cs similarity index 95% rename from FrEee.WinForms/Forms/RecycleForm.cs rename to FrEee.UI.WinForms/Forms/RecycleForm.cs index 3c80f5c59..35d557587 100644 --- a/FrEee.WinForms/Forms/RecycleForm.cs +++ b/FrEee.UI.WinForms/Forms/RecycleForm.cs @@ -4,7 +4,7 @@ using FrEee.Objects.Technology; using FrEee.Objects.Vehicles; using FrEee.Extensions; -using FrEee.WinForms.Utility.Extensions; +using FrEee.UI.WinForms.Utility.Extensions; using System; using System.Collections.Generic; using System.Data; @@ -15,7 +15,7 @@ using FrEee.Objects.Civilization.CargoStorage; using FrEee.Objects.Civilization.Orders.RecycleBehaviors; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; /// /// Form where the player can choose recycling actions such as scrapping and mothballing. @@ -24,7 +24,7 @@ public partial class RecycleForm : GameForm { public RecycleForm(Sector sector) { - try { this.Icon = new Icon(FrEee.WinForms.Properties.Resources.FrEeeIcon); } + try { this.Icon = new Icon(FrEee.UI.WinForms.Properties.Resources.FrEeeIcon); } catch { } InitializeComponent(); diff --git a/FrEee.WinForms/Forms/RecycleForm.resx b/FrEee.UI.WinForms/Forms/RecycleForm.resx similarity index 100% rename from FrEee.WinForms/Forms/RecycleForm.resx rename to FrEee.UI.WinForms/Forms/RecycleForm.resx diff --git a/FrEee.WinForms/Forms/ResearchForm.Designer.cs b/FrEee.UI.WinForms/Forms/ResearchForm.Designer.cs similarity index 93% rename from FrEee.WinForms/Forms/ResearchForm.Designer.cs rename to FrEee.UI.WinForms/Forms/ResearchForm.Designer.cs index ae82d9121..90bf877cd 100644 --- a/FrEee.WinForms/Forms/ResearchForm.Designer.cs +++ b/FrEee.UI.WinForms/Forms/ResearchForm.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; partial class ResearchForm { @@ -34,8 +34,8 @@ private void InitializeComponent() this.colName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colLevel = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colNextLevelCost = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colProgress = new FrEee.WinForms.DataGridView.DataGridViewProgressColumn(); - this.colSpending = new FrEee.WinForms.DataGridView.DataGridViewProgressColumn(); + this.colProgress = new FrEee.UI.WinForms.DataGridView.DataGridViewProgressColumn(); + this.colSpending = new FrEee.UI.WinForms.DataGridView.DataGridViewProgressColumn(); this.technologyBindingSource = new System.Windows.Forms.BindingSource(this.components); this.ddlGroup = new System.Windows.Forms.ComboBox(); this.lblPoints = new System.Windows.Forms.Label(); @@ -43,24 +43,24 @@ private void InitializeComponent() this.lblSpending = new System.Windows.Forms.Label(); this.sldSpending = new System.Windows.Forms.TrackBar(); this.lblResults = new System.Windows.Forms.Label(); - this.btnDown = new FrEee.WinForms.Controls.GameButton(); - this.btnBottom = new FrEee.WinForms.Controls.GameButton(); - this.btnUp = new FrEee.WinForms.Controls.GameButton(); - this.btnTop = new FrEee.WinForms.Controls.GameButton(); - this.gamePanel2 = new FrEee.WinForms.Controls.GamePanel(); + this.btnDown = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnBottom = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnUp = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnTop = new FrEee.UI.WinForms.Controls.GameButton(); + this.gamePanel2 = new FrEee.UI.WinForms.Controls.GamePanel(); this.lstQueue = new System.Windows.Forms.ListBox(); - this.btnAddToQueue = new FrEee.WinForms.Controls.GameButton(); - this.gamePanel1 = new FrEee.WinForms.Controls.GamePanel(); + this.btnAddToQueue = new FrEee.UI.WinForms.Controls.GameButton(); + this.gamePanel1 = new FrEee.UI.WinForms.Controls.GamePanel(); this.lstResults = new System.Windows.Forms.ListView(); - this.dataGridViewProgressColumn1 = new FrEee.WinForms.DataGridView.DataGridViewProgressColumn(); - this.btnCancel = new FrEee.WinForms.Controls.GameButton(); - this.resRes = new FrEee.WinForms.Controls.ResourceDisplay(); + this.dataGridViewProgressColumn1 = new FrEee.UI.WinForms.DataGridView.DataGridViewProgressColumn(); + this.btnCancel = new FrEee.UI.WinForms.Controls.GameButton(); + this.resRes = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.btnClear = new FrEee.WinForms.Controls.GameButton(); - this.btnDelete = new FrEee.WinForms.Controls.GameButton(); + this.btnClear = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnDelete = new FrEee.UI.WinForms.Controls.GameButton(); this.txtTechDiscription = new System.Windows.Forms.Label(); - this.btnTree = new FrEee.WinForms.Controls.GameButton(); - this.btnSave = new FrEee.WinForms.Controls.GameButton(); + this.btnTree = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnSave = new FrEee.UI.WinForms.Controls.GameButton(); ((System.ComponentModel.ISupportInitialize)(this.gridTechs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.technologyBindingSource)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.sldSpending)).BeginInit(); @@ -141,7 +141,7 @@ private void InitializeComponent() this.colProgress.HeaderText = "Progress"; this.colProgress.MinimumWidth = 100; this.colProgress.Name = "colProgress"; - this.colProgress.ProgressDisplayMode = FrEee.WinForms.DataGridView.ProgressDisplayMode.Eta; + this.colProgress.ProgressDisplayMode = FrEee.UI.WinForms.DataGridView.ProgressDisplayMode.Eta; this.colProgress.ReadOnly = true; this.colProgress.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; // @@ -152,7 +152,7 @@ private void InitializeComponent() this.colSpending.HeaderText = "Spending"; this.colSpending.MinimumWidth = 100; this.colSpending.Name = "colSpending"; - this.colSpending.ProgressDisplayMode = FrEee.WinForms.DataGridView.ProgressDisplayMode.Percentage; + this.colSpending.ProgressDisplayMode = FrEee.UI.WinForms.DataGridView.ProgressDisplayMode.Percentage; this.colSpending.ReadOnly = true; this.colSpending.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; // @@ -581,7 +581,7 @@ private void InitializeComponent() private Controls.GameButton btnUp; private Controls.GameButton btnTop; private Controls.GameButton btnCancel; - private Controls.ResourceDisplay resRes; + private FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay resRes; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; private Controls.GameButton btnClear; private Controls.GameButton btnDelete; diff --git a/FrEee.WinForms/Forms/ResearchForm.cs b/FrEee.UI.WinForms/Forms/ResearchForm.cs similarity index 95% rename from FrEee.WinForms/Forms/ResearchForm.cs rename to FrEee.UI.WinForms/Forms/ResearchForm.cs index fa46c3eda..fc9289f2c 100644 --- a/FrEee.WinForms/Forms/ResearchForm.cs +++ b/FrEee.UI.WinForms/Forms/ResearchForm.cs @@ -4,7 +4,7 @@ using FrEee.Modding; using FrEee.Utility; using FrEee.Extensions; -using FrEee.WinForms.Utility.Extensions; +using FrEee.UI.WinForms.Utility.Extensions; using System; using System.Collections.Generic; using System.ComponentModel; @@ -14,7 +14,7 @@ using System.Windows.Forms; using FrEee.Objects.GameState; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; public partial class ResearchForm : GameForm { @@ -46,7 +46,7 @@ public ResearchForm() // bind queue BindQueue(); - try { this.Icon = new Icon(FrEee.WinForms.Properties.Resources.FrEeeIcon); } + try { this.Icon = new Icon(FrEee.UI.WinForms.Properties.Resources.FrEeeIcon); } catch { } } diff --git a/FrEee.WinForms/Forms/ResearchForm.resx b/FrEee.UI.WinForms/Forms/ResearchForm.resx similarity index 100% rename from FrEee.WinForms/Forms/ResearchForm.resx rename to FrEee.UI.WinForms/Forms/ResearchForm.resx diff --git a/FrEee.WinForms/Forms/ScoresForm.Designer.cs b/FrEee.UI.WinForms/Forms/ScoresForm.Designer.cs similarity index 91% rename from FrEee.WinForms/Forms/ScoresForm.Designer.cs rename to FrEee.UI.WinForms/Forms/ScoresForm.Designer.cs index 39e1de814..ec3cf732a 100644 --- a/FrEee.WinForms/Forms/ScoresForm.Designer.cs +++ b/FrEee.UI.WinForms/Forms/ScoresForm.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; partial class ScoresForm { @@ -28,8 +28,8 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.graph = new FrEee.WinForms.Controls.LineGraph(); - this.grid = new FrEee.WinForms.Controls.GameGridView(); + this.graph = new FrEee.UI.WinForms.Controls.LineGraph(); + this.grid = new FrEee.UI.WinForms.Controls.GameGridView(); this.SuspendLayout(); // // graph diff --git a/FrEee.WinForms/Forms/ScoresForm.cs b/FrEee.UI.WinForms/Forms/ScoresForm.cs similarity index 91% rename from FrEee.WinForms/Forms/ScoresForm.cs rename to FrEee.UI.WinForms/Forms/ScoresForm.cs index da5ad1d14..99c4098e7 100644 --- a/FrEee.WinForms/Forms/ScoresForm.cs +++ b/FrEee.UI.WinForms/Forms/ScoresForm.cs @@ -1,12 +1,12 @@ using FrEee.Extensions; -using FrEee.WinForms.DataGridView; +using FrEee.UI.WinForms.DataGridView; using System; using System.Collections.Generic; using System.Drawing; using System.Windows.Forms; using FrEee.Objects.GameState; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; public partial class ScoresForm : GameForm { diff --git a/FrEee.WinForms/Forms/ScoresForm.resx b/FrEee.UI.WinForms/Forms/ScoresForm.resx similarity index 100% rename from FrEee.WinForms/Forms/ScoresForm.resx rename to FrEee.UI.WinForms/Forms/ScoresForm.resx diff --git a/FrEee.WinForms/Forms/SearchBoxResultsForm.Designer.cs b/FrEee.UI.WinForms/Forms/SearchBoxResultsForm.Designer.cs similarity index 94% rename from FrEee.WinForms/Forms/SearchBoxResultsForm.Designer.cs rename to FrEee.UI.WinForms/Forms/SearchBoxResultsForm.Designer.cs index 4533d0c87..5b5e903f5 100644 --- a/FrEee.WinForms/Forms/SearchBoxResultsForm.Designer.cs +++ b/FrEee.UI.WinForms/Forms/SearchBoxResultsForm.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; partial class SearchBoxResultsForm { @@ -28,7 +28,7 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.gamePanel1 = new FrEee.WinForms.Controls.GamePanel(); + this.gamePanel1 = new FrEee.UI.WinForms.Controls.GamePanel(); this.listView = new System.Windows.Forms.ListView(); gamePanel1.Controls.Add(listView); this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); diff --git a/FrEee.WinForms/Forms/SearchBoxResultsForm.cs b/FrEee.UI.WinForms/Forms/SearchBoxResultsForm.cs similarity index 83% rename from FrEee.WinForms/Forms/SearchBoxResultsForm.cs rename to FrEee.UI.WinForms/Forms/SearchBoxResultsForm.cs index 40d6583aa..e53609d1b 100644 --- a/FrEee.WinForms/Forms/SearchBoxResultsForm.cs +++ b/FrEee.UI.WinForms/Forms/SearchBoxResultsForm.cs @@ -1,12 +1,12 @@ using FrEee.Objects.Space; -using FrEee.WinForms.Utility.Extensions; +using FrEee.UI.WinForms.Utility.Extensions; using System; using System.Collections.Generic; using System.Drawing; using System.Linq; using System.Windows.Forms; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; public partial class SearchBoxResultsForm : GameForm { @@ -14,7 +14,7 @@ public SearchBoxResultsForm() { InitializeComponent(); - try { this.Icon = new Icon(FrEee.WinForms.Properties.Resources.FrEeeIcon); } catch { } + try { this.Icon = new Icon(FrEee.UI.WinForms.Properties.Resources.FrEeeIcon); } catch { } } public IEnumerable Results diff --git a/FrEee.WinForms/Forms/SearchBoxResultsForm.resx b/FrEee.UI.WinForms/Forms/SearchBoxResultsForm.resx similarity index 100% rename from FrEee.WinForms/Forms/SearchBoxResultsForm.resx rename to FrEee.UI.WinForms/Forms/SearchBoxResultsForm.resx diff --git a/FrEee.WinForms/Forms/ShipListForm.Designer.cs b/FrEee.UI.WinForms/Forms/ShipListForm.Designer.cs similarity index 93% rename from FrEee.WinForms/Forms/ShipListForm.Designer.cs rename to FrEee.UI.WinForms/Forms/ShipListForm.Designer.cs index 0c46c0147..c2fc9aa17 100644 --- a/FrEee.WinForms/Forms/ShipListForm.Designer.cs +++ b/FrEee.UI.WinForms/Forms/ShipListForm.Designer.cs @@ -1,8 +1,9 @@ using FrEee.Objects.Space; using FrEee.Utility; using FrEee.Serialization; -using FrEee.WinForms.Controls; +using FrEee.UI.WinForms.Controls; +using FrEee.UI.WinForms.Controls.Blazor; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; partial class ShipListForm { @@ -32,18 +33,18 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - FrEee.WinForms.Objects.GalaxyViewModes.PresenceMode presenceMode1 = new FrEee.WinForms.Objects.GalaxyViewModes.PresenceMode(); + FrEee.UI.WinForms.Objects.GalaxyViewModes.PresenceMode presenceMode1 = new FrEee.UI.WinForms.Objects.GalaxyViewModes.PresenceMode(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.galaxyView = new FrEee.WinForms.Controls.GalaxyView(); - this.pnlHeader = new FrEee.WinForms.Controls.GamePanel(); + this.galaxyView = new FrEee.UI.WinForms.Controls.GalaxyView(); + this.pnlHeader = new FrEee.UI.WinForms.Controls.GamePanel(); this.txtAlienShips = new System.Windows.Forms.Label(); this.label9 = new System.Windows.Forms.Label(); this.txtAllyShips = new System.Windows.Forms.Label(); this.label7 = new System.Windows.Forms.Label(); this.txtFleets = new System.Windows.Forms.Label(); - this.resMaintenanceRad = new FrEee.WinForms.Controls.ResourceDisplay(); - this.resMaintenanceOrg = new FrEee.WinForms.Controls.ResourceDisplay(); - this.resMaintenanaceMin = new FrEee.WinForms.Controls.ResourceDisplay(); + this.resMaintenanceRad = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); + this.resMaintenanceOrg = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); + this.resMaintenanaceMin = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); this.label16 = new System.Windows.Forms.Label(); this.txtShipsOutsideFleets = new System.Windows.Forms.Label(); this.label12 = new System.Windows.Forms.Label(); @@ -56,7 +57,7 @@ private void InitializeComponent() this.label4 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); - this.grid = new FrEee.WinForms.Controls.GameGridView(); + this.grid = new FrEee.UI.WinForms.Controls.GameGridView(); this.tableLayoutPanel1.SuspendLayout(); this.pnlHeader.SuspendLayout(); this.SuspendLayout(); @@ -87,7 +88,7 @@ private void InitializeComponent() this.galaxyView.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.galaxyView.Dock = System.Windows.Forms.DockStyle.Left; this.galaxyView.Location = new System.Drawing.Point(253, 3); - this.galaxyView.Mode = presenceMode1; + //this.galaxyView.Mode = presenceMode1; this.galaxyView.Name = "galaxyView"; this.galaxyView.SelectedStarSystem = null; this.galaxyView.Size = new System.Drawing.Size(226, 194); diff --git a/FrEee.WinForms/Forms/ShipListForm.cs b/FrEee.UI.WinForms/Forms/ShipListForm.cs similarity index 92% rename from FrEee.WinForms/Forms/ShipListForm.cs rename to FrEee.UI.WinForms/Forms/ShipListForm.cs index bee4c8a74..d427835ab 100644 --- a/FrEee.WinForms/Forms/ShipListForm.cs +++ b/FrEee.UI.WinForms/Forms/ShipListForm.cs @@ -4,8 +4,8 @@ using FrEee.Objects.Vehicles; using FrEee.Utility; using FrEee.Extensions; -using FrEee.WinForms.DataGridView; -using FrEee.WinForms.Objects; +using FrEee.UI.WinForms.DataGridView; +using FrEee.UI.WinForms.Objects; using System; using System.Collections.Generic; using System.Drawing; @@ -15,14 +15,14 @@ using System.Windows.Forms; using FrEee.Objects.GameState; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; public partial class ShipListForm : GameForm { public ShipListForm() { InitializeComponent(); - try { this.Icon = new Icon(FrEee.WinForms.Properties.Resources.FrEeeIcon); } catch { } + try { this.Icon = new Icon(FrEee.UI.WinForms.Properties.Resources.FrEeeIcon); } catch { } } private IEnumerable sobjs; diff --git a/FrEee.WinForms/Forms/ShipListForm.resx b/FrEee.UI.WinForms/Forms/ShipListForm.resx similarity index 100% rename from FrEee.WinForms/Forms/ShipListForm.resx rename to FrEee.UI.WinForms/Forms/ShipListForm.resx diff --git a/FrEee.WinForms/Forms/SpaceObjectPickerForm.Designer.cs b/FrEee.UI.WinForms/Forms/SpaceObjectPickerForm.Designer.cs similarity index 94% rename from FrEee.WinForms/Forms/SpaceObjectPickerForm.Designer.cs rename to FrEee.UI.WinForms/Forms/SpaceObjectPickerForm.Designer.cs index db24b989b..ee85727fa 100644 --- a/FrEee.WinForms/Forms/SpaceObjectPickerForm.Designer.cs +++ b/FrEee.UI.WinForms/Forms/SpaceObjectPickerForm.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; partial class SpaceObjectPickerForm { @@ -28,8 +28,8 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.btnCancel = new FrEee.WinForms.Controls.GameButton(); - this.btnOk = new FrEee.WinForms.Controls.GameButton(); + this.btnCancel = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnOk = new FrEee.UI.WinForms.Controls.GameButton(); this.lstSpaceObjects = new System.Windows.Forms.ListView(); this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.SuspendLayout(); diff --git a/FrEee.WinForms/Forms/SpaceObjectPickerForm.cs b/FrEee.UI.WinForms/Forms/SpaceObjectPickerForm.cs similarity index 84% rename from FrEee.WinForms/Forms/SpaceObjectPickerForm.cs rename to FrEee.UI.WinForms/Forms/SpaceObjectPickerForm.cs index 494fd57ad..18c95f5c5 100644 --- a/FrEee.WinForms/Forms/SpaceObjectPickerForm.cs +++ b/FrEee.UI.WinForms/Forms/SpaceObjectPickerForm.cs @@ -1,11 +1,11 @@ using FrEee.Objects.Space; -using FrEee.WinForms.Utility.Extensions; +using FrEee.UI.WinForms.Utility.Extensions; using System; using System.Collections.Generic; using System.Drawing; using System.Windows.Forms; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; public partial class SpaceObjectPickerForm : GameForm { @@ -18,7 +18,7 @@ public SpaceObjectPickerForm(IEnumerable objects) lstSpaceObjects.AddItemWithImage(null, sobj.Name, sobj, sobj.Icon); lstSpaceObjects.AutoResizeColumns(ColumnHeaderAutoResizeStyle.ColumnContent); - try { this.Icon = new Icon(FrEee.WinForms.Properties.Resources.FrEeeIcon); } catch { } + try { this.Icon = new Icon(FrEee.UI.WinForms.Properties.Resources.FrEeeIcon); } catch { } } public ISpaceObject SelectedSpaceObject { get; private set; } diff --git a/FrEee.WinForms/Forms/SpaceObjectPickerForm.resx b/FrEee.UI.WinForms/Forms/SpaceObjectPickerForm.resx similarity index 100% rename from FrEee.WinForms/Forms/SpaceObjectPickerForm.resx rename to FrEee.UI.WinForms/Forms/SpaceObjectPickerForm.resx diff --git a/FrEee.WinForms/Forms/StatusForm.Designer.cs b/FrEee.UI.WinForms/Forms/StatusForm.Designer.cs similarity index 89% rename from FrEee.WinForms/Forms/StatusForm.Designer.cs rename to FrEee.UI.WinForms/Forms/StatusForm.Designer.cs index 941849f2b..ae3066c7b 100644 --- a/FrEee.WinForms/Forms/StatusForm.Designer.cs +++ b/FrEee.UI.WinForms/Forms/StatusForm.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; partial class StatusForm { @@ -29,7 +29,7 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - this.progressBar = new FrEee.WinForms.Controls.GameProgressBar(); + this.progressBar = new FrEee.UI.WinForms.Controls.Blazor.GameProgressBar(); this.timer1 = new System.Windows.Forms.Timer(this.components); this.SuspendLayout(); // @@ -37,7 +37,6 @@ private void InitializeComponent() // this.progressBar.BackColor = System.Drawing.Color.Black; this.progressBar.BarColor = System.Drawing.Color.Blue; - this.progressBar.BorderColor = System.Drawing.Color.Empty; this.progressBar.Dock = System.Windows.Forms.DockStyle.Fill; this.progressBar.ForeColor = System.Drawing.Color.White; this.progressBar.IncrementalProgress = 0; @@ -81,6 +80,6 @@ private void InitializeComponent() #endregion - private Controls.GameProgressBar progressBar; + private FrEee.UI.WinForms.Controls.Blazor.GameProgressBar progressBar; private System.Windows.Forms.Timer timer1; } \ No newline at end of file diff --git a/FrEee.WinForms/Forms/StatusForm.cs b/FrEee.UI.WinForms/Forms/StatusForm.cs similarity index 93% rename from FrEee.WinForms/Forms/StatusForm.cs rename to FrEee.UI.WinForms/Forms/StatusForm.cs index a005346e7..155125c4d 100644 --- a/FrEee.WinForms/Forms/StatusForm.cs +++ b/FrEee.UI.WinForms/Forms/StatusForm.cs @@ -4,7 +4,7 @@ using System.Threading; using System.Windows.Forms; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; public partial class StatusForm : GameForm { diff --git a/FrEee.WinForms/Forms/StatusForm.resx b/FrEee.UI.WinForms/Forms/StatusForm.resx similarity index 100% rename from FrEee.WinForms/Forms/StatusForm.resx rename to FrEee.UI.WinForms/Forms/StatusForm.resx diff --git a/FrEee.UI.WinForms/Forms/TechTreeForm.Designer.cs b/FrEee.UI.WinForms/Forms/TechTreeForm.Designer.cs new file mode 100644 index 000000000..109b6041d --- /dev/null +++ b/FrEee.UI.WinForms/Forms/TechTreeForm.Designer.cs @@ -0,0 +1,267 @@ +namespace FrEee.UI.WinForms.Forms; + +partial class TechTreeForm +{ + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + gamePanel2 = new Controls.GamePanel(); + lstUnlocks = new System.Windows.Forms.ListView(); + columnHeader2 = new System.Windows.Forms.ColumnHeader(); + gamePanel1 = new Controls.GamePanel(); + lstRequired = new System.Windows.Forms.ListView(); + columnHeader1 = new System.Windows.Forms.ColumnHeader(); + ddlItems = new System.Windows.Forms.ComboBox(); + lblPrereqs = new System.Windows.Forms.Label(); + lblDetailsHeader = new System.Windows.Forms.Label(); + lblUnlocks = new System.Windows.Forms.Label(); + ddlType = new System.Windows.Forms.ComboBox(); + pnlDetails = new Controls.GamePanel(); + btlReset = new Controls.GameButton(); + tableLayoutPanel1.SuspendLayout(); + gamePanel2.SuspendLayout(); + gamePanel1.SuspendLayout(); + SuspendLayout(); + // + // tableLayoutPanel1 + // + tableLayoutPanel1.ColumnCount = 3; + tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 233F)); + tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 233F)); + tableLayoutPanel1.Controls.Add(gamePanel2, 2, 2); + tableLayoutPanel1.Controls.Add(gamePanel1, 0, 2); + tableLayoutPanel1.Controls.Add(ddlItems, 1, 0); + tableLayoutPanel1.Controls.Add(lblPrereqs, 0, 1); + tableLayoutPanel1.Controls.Add(lblDetailsHeader, 1, 1); + tableLayoutPanel1.Controls.Add(lblUnlocks, 2, 1); + tableLayoutPanel1.Controls.Add(ddlType, 0, 0); + tableLayoutPanel1.Controls.Add(pnlDetails, 1, 2); + tableLayoutPanel1.Controls.Add(btlReset, 2, 0); + tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); + tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + tableLayoutPanel1.Name = "tableLayoutPanel1"; + tableLayoutPanel1.RowCount = 3; + tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 37F)); + tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 23F)); + tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + tableLayoutPanel1.Size = new System.Drawing.Size(1112, 732); + tableLayoutPanel1.TabIndex = 0; + // + // gamePanel2 + // + gamePanel2.BackColor = System.Drawing.Color.Black; + gamePanel2.BorderColor = System.Drawing.Color.CornflowerBlue; + gamePanel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + gamePanel2.Controls.Add(lstUnlocks); + gamePanel2.Dock = System.Windows.Forms.DockStyle.Fill; + gamePanel2.ForeColor = System.Drawing.Color.White; + gamePanel2.Location = new System.Drawing.Point(883, 63); + gamePanel2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + gamePanel2.Name = "gamePanel2"; + gamePanel2.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3); + gamePanel2.Size = new System.Drawing.Size(225, 666); + gamePanel2.TabIndex = 8; + // + // lstUnlocks + // + lstUnlocks.BackColor = System.Drawing.Color.Black; + lstUnlocks.BorderStyle = System.Windows.Forms.BorderStyle.None; + lstUnlocks.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { columnHeader2 }); + lstUnlocks.Dock = System.Windows.Forms.DockStyle.Fill; + lstUnlocks.ForeColor = System.Drawing.Color.White; + lstUnlocks.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; + lstUnlocks.Location = new System.Drawing.Point(4, 3); + lstUnlocks.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + lstUnlocks.Name = "lstUnlocks"; + lstUnlocks.Size = new System.Drawing.Size(215, 658); + lstUnlocks.TabIndex = 3; + lstUnlocks.UseCompatibleStateImageBehavior = false; + lstUnlocks.View = System.Windows.Forms.View.Details; + lstUnlocks.MouseDoubleClick += lstUnlocks_MouseDoubleClick; + // + // columnHeader2 + // + columnHeader2.Width = 186; + // + // gamePanel1 + // + gamePanel1.BackColor = System.Drawing.Color.Black; + gamePanel1.BorderColor = System.Drawing.Color.CornflowerBlue; + gamePanel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + gamePanel1.Controls.Add(lstRequired); + gamePanel1.Dock = System.Windows.Forms.DockStyle.Fill; + gamePanel1.ForeColor = System.Drawing.Color.White; + gamePanel1.Location = new System.Drawing.Point(4, 63); + gamePanel1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + gamePanel1.Name = "gamePanel1"; + gamePanel1.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3); + gamePanel1.Size = new System.Drawing.Size(225, 666); + gamePanel1.TabIndex = 7; + // + // lstRequired + // + lstRequired.BackColor = System.Drawing.Color.Black; + lstRequired.BorderStyle = System.Windows.Forms.BorderStyle.None; + lstRequired.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { columnHeader1 }); + lstRequired.Dock = System.Windows.Forms.DockStyle.Fill; + lstRequired.ForeColor = System.Drawing.Color.White; + lstRequired.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; + lstRequired.Location = new System.Drawing.Point(4, 3); + lstRequired.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + lstRequired.Name = "lstRequired"; + lstRequired.Size = new System.Drawing.Size(215, 658); + lstRequired.TabIndex = 2; + lstRequired.UseCompatibleStateImageBehavior = false; + lstRequired.View = System.Windows.Forms.View.Details; + lstRequired.MouseDoubleClick += lstRequired_MouseDoubleClick; + // + // columnHeader1 + // + columnHeader1.Width = 186; + // + // ddlItems + // + ddlItems.Dock = System.Windows.Forms.DockStyle.Fill; + ddlItems.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + ddlItems.FormattingEnabled = true; + ddlItems.Location = new System.Drawing.Point(237, 3); + ddlItems.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + ddlItems.Name = "ddlItems"; + ddlItems.Size = new System.Drawing.Size(638, 23); + ddlItems.TabIndex = 4; + ddlItems.SelectedIndexChanged += ddlItems_SelectedIndexChanged; + // + // lblPrereqs + // + lblPrereqs.AutoSize = true; + lblPrereqs.ForeColor = System.Drawing.Color.CornflowerBlue; + lblPrereqs.Location = new System.Drawing.Point(4, 37); + lblPrereqs.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + lblPrereqs.Name = "lblPrereqs"; + lblPrereqs.Size = new System.Drawing.Size(74, 15); + lblPrereqs.TabIndex = 0; + lblPrereqs.Text = "Prerequisites"; + // + // lblDetailsHeader + // + lblDetailsHeader.AutoSize = true; + lblDetailsHeader.ForeColor = System.Drawing.Color.CornflowerBlue; + lblDetailsHeader.Location = new System.Drawing.Point(237, 37); + lblDetailsHeader.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + lblDetailsHeader.Name = "lblDetailsHeader"; + lblDetailsHeader.Size = new System.Drawing.Size(42, 15); + lblDetailsHeader.TabIndex = 1; + lblDetailsHeader.Text = "Details"; + // + // lblUnlocks + // + lblUnlocks.AutoSize = true; + lblUnlocks.ForeColor = System.Drawing.Color.CornflowerBlue; + lblUnlocks.Location = new System.Drawing.Point(883, 37); + lblUnlocks.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + lblUnlocks.Name = "lblUnlocks"; + lblUnlocks.Size = new System.Drawing.Size(49, 15); + lblUnlocks.TabIndex = 2; + lblUnlocks.Text = "Unlocks"; + // + // ddlType + // + ddlType.DisplayMember = "Name"; + ddlType.Dock = System.Windows.Forms.DockStyle.Fill; + ddlType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + ddlType.FormattingEnabled = true; + ddlType.Location = new System.Drawing.Point(4, 3); + ddlType.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + ddlType.Name = "ddlType"; + ddlType.Size = new System.Drawing.Size(225, 23); + ddlType.TabIndex = 3; + ddlType.SelectedIndexChanged += ddlType_SelectedIndexChanged; + // + // pnlDetails + // + pnlDetails.BackColor = System.Drawing.Color.Black; + pnlDetails.BorderColor = System.Drawing.Color.CornflowerBlue; + pnlDetails.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + pnlDetails.Dock = System.Windows.Forms.DockStyle.Fill; + pnlDetails.ForeColor = System.Drawing.Color.White; + pnlDetails.Location = new System.Drawing.Point(237, 63); + pnlDetails.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + pnlDetails.Name = "pnlDetails"; + pnlDetails.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3); + pnlDetails.Size = new System.Drawing.Size(638, 666); + pnlDetails.TabIndex = 6; + // + // btlReset + // + btlReset.BackColor = System.Drawing.Color.Black; + btlReset.Dock = System.Windows.Forms.DockStyle.Fill; + btlReset.ForeColor = System.Drawing.Color.CornflowerBlue; + btlReset.Location = new System.Drawing.Point(883, 3); + btlReset.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + btlReset.Name = "btlReset"; + btlReset.Size = new System.Drawing.Size(225, 31); + btlReset.TabIndex = 9; + btlReset.Text = "Reset"; + btlReset.UseVisualStyleBackColor = false; + btlReset.Click += btlReset_Click; + // + // TechTreeForm + // + AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + BackColor = System.Drawing.Color.Black; + ClientSize = new System.Drawing.Size(1112, 732); + Controls.Add(tableLayoutPanel1); + Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + Name = "TechTreeForm"; + Text = "Tech Tree"; + tableLayoutPanel1.ResumeLayout(false); + tableLayoutPanel1.PerformLayout(); + gamePanel2.ResumeLayout(false); + gamePanel1.ResumeLayout(false); + ResumeLayout(false); + } + + #endregion + + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; + private System.Windows.Forms.Label lblPrereqs; + private System.Windows.Forms.Label lblDetailsHeader; + private System.Windows.Forms.Label lblUnlocks; + private System.Windows.Forms.ComboBox ddlType; + private System.Windows.Forms.ComboBox ddlItems; + private Controls.GamePanel pnlDetails; + private Controls.GamePanel gamePanel1; + private System.Windows.Forms.ListView lstRequired; + private Controls.GamePanel gamePanel2; + private System.Windows.Forms.ColumnHeader columnHeader1; + private System.Windows.Forms.ListView lstUnlocks; + private System.Windows.Forms.ColumnHeader columnHeader2; + private Controls.GameButton btlReset; +} \ No newline at end of file diff --git a/FrEee.WinForms/Forms/TechTreeForm.cs b/FrEee.UI.WinForms/Forms/TechTreeForm.cs similarity index 94% rename from FrEee.WinForms/Forms/TechTreeForm.cs rename to FrEee.UI.WinForms/Forms/TechTreeForm.cs index 82b42c33f..9e937bbf7 100644 --- a/FrEee.WinForms/Forms/TechTreeForm.cs +++ b/FrEee.UI.WinForms/Forms/TechTreeForm.cs @@ -3,9 +3,9 @@ using FrEee.Modding; using FrEee.Modding.Templates; using FrEee.Extensions; -using FrEee.WinForms.Controls; -using FrEee.WinForms.Interfaces; -using FrEee.WinForms.Utility.Extensions; +using FrEee.UI.WinForms.Controls; +using FrEee.UI.WinForms.Interfaces; +using FrEee.UI.WinForms.Utility.Extensions; using System; using System.Collections.Generic; using System.Data; @@ -14,7 +14,7 @@ using System.Windows.Forms; using FrEee.Objects.GameState; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; public partial class TechTreeForm : GameForm, IBindable { @@ -25,7 +25,7 @@ public TechTreeForm() BindItems(); Bind(); - try { this.Icon = new Icon(FrEee.WinForms.Properties.Resources.FrEeeIcon); } + try { this.Icon = new Icon(FrEee.UI.WinForms.Properties.Resources.FrEeeIcon); } catch { } } diff --git a/FrEee.WinForms/Forms/TechTreeForm.resx b/FrEee.UI.WinForms/Forms/TechTreeForm.resx similarity index 91% rename from FrEee.WinForms/Forms/TechTreeForm.resx rename to FrEee.UI.WinForms/Forms/TechTreeForm.resx index 29dcb1b3a..b92c16350 100644 --- a/FrEee.WinForms/Forms/TechTreeForm.resx +++ b/FrEee.UI.WinForms/Forms/TechTreeForm.resx @@ -1,17 +1,17 @@  - diff --git a/FrEee.WinForms/Forms/VehicleDesignForm.Designer.cs b/FrEee.UI.WinForms/Forms/VehicleDesignForm.Designer.cs similarity index 92% rename from FrEee.WinForms/Forms/VehicleDesignForm.Designer.cs rename to FrEee.UI.WinForms/Forms/VehicleDesignForm.Designer.cs index 849463096..103eaf445 100644 --- a/FrEee.WinForms/Forms/VehicleDesignForm.Designer.cs +++ b/FrEee.UI.WinForms/Forms/VehicleDesignForm.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; partial class VehicleDesignForm { @@ -42,10 +42,10 @@ private void InitializeComponent() this.label8 = new System.Windows.Forms.Label(); this.chkOnlyLatest = new System.Windows.Forms.CheckBox(); this.chkFilterByMount = new System.Windows.Forms.CheckBox(); - this.btnWeaponsReport = new FrEee.WinForms.Controls.GameButton(); - this.btnCancel = new FrEee.WinForms.Controls.GameButton(); - this.btnSave = new FrEee.WinForms.Controls.GameButton(); - this.pnlStats = new FrEee.WinForms.Controls.GamePanel(); + this.btnWeaponsReport = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnCancel = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnSave = new FrEee.UI.WinForms.Controls.GameButton(); + this.pnlStats = new FrEee.UI.WinForms.Controls.GamePanel(); this.txtEngines = new System.Windows.Forms.Label(); this.label14 = new System.Windows.Forms.Label(); this.txtEvasion = new System.Windows.Forms.Label(); @@ -65,32 +65,32 @@ private void InitializeComponent() this.label13 = new System.Windows.Forms.Label(); this.label12 = new System.Windows.Forms.Label(); this.txtSpaceFree = new System.Windows.Forms.Label(); - this.resCostRad = new FrEee.WinForms.Controls.ResourceDisplay(); - this.resCostOrg = new FrEee.WinForms.Controls.ResourceDisplay(); - this.resCostMin = new FrEee.WinForms.Controls.ResourceDisplay(); + this.resCostRad = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); + this.resCostOrg = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); + this.resCostMin = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); this.label10 = new System.Windows.Forms.Label(); this.label9 = new System.Windows.Forms.Label(); - this.gamePanel4 = new FrEee.WinForms.Controls.GamePanel(); + this.gamePanel4 = new FrEee.UI.WinForms.Controls.GamePanel(); this.txtDetailDescription = new System.Windows.Forms.Label(); - this.resDetailRad = new FrEee.WinForms.Controls.ResourceDisplay(); - this.resDetailOrg = new FrEee.WinForms.Controls.ResourceDisplay(); - this.resDetailMin = new FrEee.WinForms.Controls.ResourceDisplay(); + this.resDetailRad = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); + this.resDetailOrg = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); + this.resDetailMin = new FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay(); this.txtDetailSize = new System.Windows.Forms.Label(); this.txtDetailName = new System.Windows.Forms.Label(); - this.picDetailIcon = new FrEee.WinForms.Controls.GamePictureBox(); - this.gamePanel3 = new FrEee.WinForms.Controls.GamePanel(); + this.picDetailIcon = new FrEee.UI.WinForms.Controls.Blazor.GamePictureBox(); + this.gamePanel3 = new FrEee.UI.WinForms.Controls.GamePanel(); this.lstWarnings = new System.Windows.Forms.ListBox(); - this.gamePanel2 = new FrEee.WinForms.Controls.GamePanel(); + this.gamePanel2 = new FrEee.UI.WinForms.Controls.GamePanel(); this.lstComponentsInstalled = new System.Windows.Forms.ListView(); - this.gamePanel1 = new FrEee.WinForms.Controls.GamePanel(); + this.gamePanel1 = new FrEee.UI.WinForms.Controls.GamePanel(); this.lstComponentsAvailable = new System.Windows.Forms.ListView(); - this.btnHull = new FrEee.WinForms.Controls.GameButton(); + this.btnHull = new FrEee.UI.WinForms.Controls.GameButton(); this.txtIteration = new System.Windows.Forms.Label(); - this.picPortrait = new FrEee.WinForms.Controls.GamePictureBox(); - this.btnMountInfo = new FrEee.WinForms.Controls.GameButton(); + this.picPortrait = new FrEee.UI.WinForms.Controls.Blazor.GamePictureBox(); + this.btnMountInfo = new FrEee.UI.WinForms.Controls.GameButton(); this.ddlMount = new System.Windows.Forms.ComboBox(); - this.btnHelp = new FrEee.WinForms.Controls.GameButton(); - this.btnMount = new FrEee.WinForms.Controls.GameButton(); + this.btnHelp = new FrEee.UI.WinForms.Controls.GameButton(); + this.btnMount = new FrEee.UI.WinForms.Controls.GameButton(); this.pnlStats.SuspendLayout(); this.gamePanel4.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.picDetailIcon)).BeginInit(); @@ -891,18 +891,18 @@ private void InitializeComponent() private System.Windows.Forms.Label label7; private Controls.GamePanel gamePanel4; private System.Windows.Forms.Label label8; - private Controls.GamePictureBox picDetailIcon; + private FrEee.UI.WinForms.Controls.Blazor.GamePictureBox picDetailIcon; private System.Windows.Forms.Label txtDetailName; private System.Windows.Forms.Label txtDetailSize; - private Controls.ResourceDisplay resDetailRad; - private Controls.ResourceDisplay resDetailOrg; - private Controls.ResourceDisplay resDetailMin; + private FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay resDetailRad; + private FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay resDetailOrg; + private FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay resDetailMin; private System.Windows.Forms.Label txtDetailDescription; private System.Windows.Forms.CheckBox chkOnlyLatest; private Controls.GamePanel pnlStats; - private Controls.ResourceDisplay resCostRad; - private Controls.ResourceDisplay resCostOrg; - private Controls.ResourceDisplay resCostMin; + private FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay resCostRad; + private FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay resCostOrg; + private FrEee.UI.WinForms.Controls.Blazor.ResourceDisplay resCostMin; private System.Windows.Forms.Label label10; private System.Windows.Forms.Label label9; private System.Windows.Forms.Label label13; @@ -927,7 +927,7 @@ private void InitializeComponent() private Controls.GameButton btnWeaponsReport; private System.Windows.Forms.CheckBox chkFilterByMount; private System.Windows.Forms.Label txtIteration; - private Controls.GamePictureBox picPortrait; + private FrEee.UI.WinForms.Controls.Blazor.GamePictureBox picPortrait; private Controls.GameButton btnMountInfo; private System.Windows.Forms.ComboBox ddlMount; private Controls.GameButton btnHelp; diff --git a/FrEee.WinForms/Forms/VehicleDesignForm.cs b/FrEee.UI.WinForms/Forms/VehicleDesignForm.cs similarity index 94% rename from FrEee.WinForms/Forms/VehicleDesignForm.cs rename to FrEee.UI.WinForms/Forms/VehicleDesignForm.cs index e7ab8fb9d..20e3ea197 100644 --- a/FrEee.WinForms/Forms/VehicleDesignForm.cs +++ b/FrEee.UI.WinForms/Forms/VehicleDesignForm.cs @@ -4,8 +4,8 @@ using FrEee.Modding.Templates; using FrEee.Utility; using FrEee.Extensions; -using FrEee.WinForms.Controls; -using FrEee.WinForms.Utility.Extensions; +using FrEee.UI.WinForms.Controls; +using FrEee.UI.WinForms.Utility.Extensions; using System; using System.Collections.Generic; using System.Data; @@ -15,7 +15,7 @@ using FrEee.Objects.Vehicles; using FrEee.Objects.GameState; -namespace FrEee.WinForms.Forms; +namespace FrEee.UI.WinForms.Forms; public partial class VehicleDesignForm : GameForm { @@ -24,7 +24,7 @@ public VehicleDesignForm() InitializeComponent(); ShowComponentDetails(null); - try { this.Icon = new Icon(FrEee.WinForms.Properties.Resources.FrEeeIcon); } + try { this.Icon = new Icon(FrEee.UI.WinForms.Properties.Resources.FrEeeIcon); } catch { } } @@ -34,7 +34,7 @@ public VehicleDesignForm(IHull hull) ShowComponentDetails(null); Design = FrEee.Objects.Vehicles.Design.Create(hull); - try { this.Icon = new Icon(FrEee.WinForms.Properties.Resources.FrEeeIcon); } + try { this.Icon = new Icon(FrEee.UI.WinForms.Properties.Resources.FrEeeIcon); } catch { } } @@ -44,7 +44,7 @@ public VehicleDesignForm(IDesign design) ShowComponentDetails(null); Design = design; - try { this.Icon = new Icon(FrEee.WinForms.Properties.Resources.FrEeeIcon); } + try { this.Icon = new Icon(FrEee.UI.WinForms.Properties.Resources.FrEeeIcon); } catch { } } diff --git a/FrEee.WinForms/Forms/VehicleDesignForm.resx b/FrEee.UI.WinForms/Forms/VehicleDesignForm.resx similarity index 100% rename from FrEee.WinForms/Forms/VehicleDesignForm.resx rename to FrEee.UI.WinForms/Forms/VehicleDesignForm.resx diff --git a/FrEee.WinForms/FrEee.WinForms.csproj b/FrEee.UI.WinForms/FrEee.UI.WinForms.csproj similarity index 64% rename from FrEee.WinForms/FrEee.WinForms.csproj rename to FrEee.UI.WinForms/FrEee.UI.WinForms.csproj index c43069ba4..dd4522c0f 100644 --- a/FrEee.WinForms/FrEee.WinForms.csproj +++ b/FrEee.UI.WinForms/FrEee.UI.WinForms.csproj @@ -1,51 +1,68 @@ - - - WinExe - net8.0-windows7.0 - true - Windows Forms GUI for FrEee - FrEee.WinForms.Program - - - - - - - - - - - - - - - True - True - Resources.resx - - - True - True - Settings.settings - - - - - ResXFileCodeGenerator - Resources.Designer.cs - - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - - - - - false - true - - + + + WinExe + net8.0-windows7.0 + true + Windows Forms GUI for FrEee + FrEee.UI.WinForms.Program + + + + + + + + + + + + + + + + + Component + + + True + True + Resources.resx + + + True + True + Settings.settings + + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + + + + + false + true + + diff --git a/FrEee.WinForms/FrEee.ico b/FrEee.UI.WinForms/FrEee.ico similarity index 100% rename from FrEee.WinForms/FrEee.ico rename to FrEee.UI.WinForms/FrEee.ico diff --git a/FrEee.WinForms/GamePropertyGrid.Designer.cs b/FrEee.UI.WinForms/GamePropertyGrid.Designer.cs similarity index 91% rename from FrEee.WinForms/GamePropertyGrid.Designer.cs rename to FrEee.UI.WinForms/GamePropertyGrid.Designer.cs index a4e0b184b..97b37283d 100644 --- a/FrEee.WinForms/GamePropertyGrid.Designer.cs +++ b/FrEee.UI.WinForms/GamePropertyGrid.Designer.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms; +namespace FrEee.UI.WinForms; partial class GamePropertyGrid { @@ -28,7 +28,7 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.table = new FrEee.WinForms.Controls.GameTableLayoutPanel(); + this.table = new FrEee.UI.WinForms.Controls.GameTableLayoutPanel(); this.SuspendLayout(); // // table diff --git a/FrEee.WinForms/GamePropertyGrid.cs b/FrEee.UI.WinForms/GamePropertyGrid.cs similarity index 94% rename from FrEee.WinForms/GamePropertyGrid.cs rename to FrEee.UI.WinForms/GamePropertyGrid.cs index 0351d92df..33ae16aa0 100644 --- a/FrEee.WinForms/GamePropertyGrid.cs +++ b/FrEee.UI.WinForms/GamePropertyGrid.cs @@ -1,8 +1,8 @@ using FrEee.Modding; using FrEee.Serialization; using FrEee.Extensions; -using FrEee.WinForms.Controls; -using FrEee.WinForms.Interfaces; +using FrEee.UI.WinForms.Controls; +using FrEee.UI.WinForms.Interfaces; using System; using System.Collections; using System.Collections.Generic; @@ -11,7 +11,7 @@ using System.Windows.Forms; using FrEee.Objects.GameState; -namespace FrEee.WinForms; +namespace FrEee.UI.WinForms; /// /// Displays a grid of properties for an object. diff --git a/FrEee.WinForms/GamePropertyGrid.resx b/FrEee.UI.WinForms/GamePropertyGrid.resx similarity index 100% rename from FrEee.WinForms/GamePropertyGrid.resx rename to FrEee.UI.WinForms/GamePropertyGrid.resx diff --git a/FrEee.WinForms/Interfaces/IBindable.cs b/FrEee.UI.WinForms/Interfaces/IBindable.cs similarity index 88% rename from FrEee.WinForms/Interfaces/IBindable.cs rename to FrEee.UI.WinForms/Interfaces/IBindable.cs index a98b4d0b1..6849c2e30 100644 --- a/FrEee.WinForms/Interfaces/IBindable.cs +++ b/FrEee.UI.WinForms/Interfaces/IBindable.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.Interfaces; +namespace FrEee.UI.WinForms.Interfaces; /// /// Something which can be bound to data. diff --git a/FrEee.WinForms/Objects/ClientSettings.cs b/FrEee.UI.WinForms/Objects/ClientSettings.cs similarity index 97% rename from FrEee.WinForms/Objects/ClientSettings.cs rename to FrEee.UI.WinForms/Objects/ClientSettings.cs index 48b7c15a3..1d8f0d0da 100644 --- a/FrEee.WinForms/Objects/ClientSettings.cs +++ b/FrEee.UI.WinForms/Objects/ClientSettings.cs @@ -1,14 +1,14 @@ using FrEee.Objects.Civilization; using FrEee.Utility; using FrEee.Serialization; using FrEee.Extensions; -using FrEee.WinForms.DataGridView; +using FrEee.UI.WinForms.DataGridView; using System; using System.Collections.Generic; using System.Drawing; using System.IO; using System.Windows.Forms; -namespace FrEee.WinForms.Objects; +namespace FrEee.UI.WinForms.Objects; /// /// Client settings that don't need to be persisted to the server. diff --git a/FrEee.WinForms/Objects/GalaxyViewModes/ArgbMode.cs b/FrEee.UI.WinForms/Objects/GalaxyViewModes/ArgbMode.cs similarity index 87% rename from FrEee.WinForms/Objects/GalaxyViewModes/ArgbMode.cs rename to FrEee.UI.WinForms/Objects/GalaxyViewModes/ArgbMode.cs index a852e92bc..82646e2f6 100644 --- a/FrEee.WinForms/Objects/GalaxyViewModes/ArgbMode.cs +++ b/FrEee.UI.WinForms/Objects/GalaxyViewModes/ArgbMode.cs @@ -1,9 +1,9 @@ using FrEee.Objects.Space; -using FrEee.WinForms.Utility.Extensions; +using FrEee.UI.WinForms.Utility.Extensions; using System.Drawing; using System.Linq; -namespace FrEee.WinForms.Objects.GalaxyViewModes; +namespace FrEee.UI.WinForms.Objects.GalaxyViewModes; /// /// A galaxy view mode that uses ARGB values to indicate up to four data values at once. diff --git a/FrEee.WinForms/Objects/GalaxyViewModes/ColoniesMode.cs b/FrEee.UI.WinForms/Objects/GalaxyViewModes/ColoniesMode.cs similarity index 95% rename from FrEee.WinForms/Objects/GalaxyViewModes/ColoniesMode.cs rename to FrEee.UI.WinForms/Objects/GalaxyViewModes/ColoniesMode.cs index 90dfc0187..8509558a0 100644 --- a/FrEee.WinForms/Objects/GalaxyViewModes/ColoniesMode.cs +++ b/FrEee.UI.WinForms/Objects/GalaxyViewModes/ColoniesMode.cs @@ -7,7 +7,7 @@ using System.Linq; using FrEee.Objects.GameState; -namespace FrEee.WinForms.Objects.GalaxyViewModes; +namespace FrEee.UI.WinForms.Objects.GalaxyViewModes; /// /// Displays the relative concentrations of friendly, allied, neutral, and enemy colonies (by max breathable facility slots) using pie charts. diff --git a/FrEee.WinForms/Objects/GalaxyViewModes/ConstructionMode.cs b/FrEee.UI.WinForms/Objects/GalaxyViewModes/ConstructionMode.cs similarity index 92% rename from FrEee.WinForms/Objects/GalaxyViewModes/ConstructionMode.cs rename to FrEee.UI.WinForms/Objects/GalaxyViewModes/ConstructionMode.cs index e3245d30b..71c0a8d7d 100644 --- a/FrEee.WinForms/Objects/GalaxyViewModes/ConstructionMode.cs +++ b/FrEee.UI.WinForms/Objects/GalaxyViewModes/ConstructionMode.cs @@ -7,7 +7,7 @@ using FrEee.Objects.Civilization.Construction; using FrEee.Objects.GameState; -namespace FrEee.WinForms.Objects.GalaxyViewModes; +namespace FrEee.UI.WinForms.Objects.GalaxyViewModes; /// /// Displays construction queues by build rate in each resource. diff --git a/FrEee.WinForms/Objects/GalaxyViewModes/ForcesMode.cs b/FrEee.UI.WinForms/Objects/GalaxyViewModes/ForcesMode.cs similarity index 95% rename from FrEee.WinForms/Objects/GalaxyViewModes/ForcesMode.cs rename to FrEee.UI.WinForms/Objects/GalaxyViewModes/ForcesMode.cs index c7900bb59..e74f6e5b5 100644 --- a/FrEee.WinForms/Objects/GalaxyViewModes/ForcesMode.cs +++ b/FrEee.UI.WinForms/Objects/GalaxyViewModes/ForcesMode.cs @@ -7,7 +7,7 @@ using System.Drawing; using System.Linq; -namespace FrEee.WinForms.Objects.GalaxyViewModes; +namespace FrEee.UI.WinForms.Objects.GalaxyViewModes; /// /// Displays the relative concentrations of friendly, allied, neutral, and enemy forces (by tonnage) using pie charts. diff --git a/FrEee.WinForms/Objects/GalaxyViewModes/GalaxyViewModes.cs b/FrEee.UI.WinForms/Objects/GalaxyViewModes/GalaxyViewModes.cs similarity index 85% rename from FrEee.WinForms/Objects/GalaxyViewModes/GalaxyViewModes.cs rename to FrEee.UI.WinForms/Objects/GalaxyViewModes/GalaxyViewModes.cs index 3e6bd5caf..019aecc76 100644 --- a/FrEee.WinForms/Objects/GalaxyViewModes/GalaxyViewModes.cs +++ b/FrEee.UI.WinForms/Objects/GalaxyViewModes/GalaxyViewModes.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace FrEee.WinForms.Objects.GalaxyViewModes; +namespace FrEee.UI.WinForms.Objects.GalaxyViewModes; public static class GalaxyViewModes { diff --git a/FrEee.WinForms/Objects/GalaxyViewModes/IGalaxyViewMode.cs b/FrEee.UI.WinForms/Objects/GalaxyViewModes/IGalaxyViewMode.cs similarity index 89% rename from FrEee.WinForms/Objects/GalaxyViewModes/IGalaxyViewMode.cs rename to FrEee.UI.WinForms/Objects/GalaxyViewModes/IGalaxyViewMode.cs index b6745ab8a..25f722e3b 100644 --- a/FrEee.WinForms/Objects/GalaxyViewModes/IGalaxyViewMode.cs +++ b/FrEee.UI.WinForms/Objects/GalaxyViewModes/IGalaxyViewMode.cs @@ -2,7 +2,7 @@ using FrEee.Objects.Space; using System.Drawing; -namespace FrEee.WinForms.Objects.GalaxyViewModes; +namespace FrEee.UI.WinForms.Objects.GalaxyViewModes; /// /// A display mode for a galaxy map. diff --git a/FrEee.WinForms/Objects/GalaxyViewModes/PieMode.cs b/FrEee.UI.WinForms/Objects/GalaxyViewModes/PieMode.cs similarity index 90% rename from FrEee.WinForms/Objects/GalaxyViewModes/PieMode.cs rename to FrEee.UI.WinForms/Objects/GalaxyViewModes/PieMode.cs index 9cc5e6844..e0b7b4ec8 100644 --- a/FrEee.WinForms/Objects/GalaxyViewModes/PieMode.cs +++ b/FrEee.UI.WinForms/Objects/GalaxyViewModes/PieMode.cs @@ -1,11 +1,11 @@ using FrEee.Objects.Space; -using FrEee.WinForms.Utility.Extensions; +using FrEee.UI.WinForms.Utility.Extensions; using System; using System.Collections.Generic; using System.Drawing; using System.Linq; -namespace FrEee.WinForms.Objects.GalaxyViewModes; +namespace FrEee.UI.WinForms.Objects.GalaxyViewModes; /// /// A galaxy view mode that uses a pie chart. diff --git a/FrEee.WinForms/Objects/GalaxyViewModes/PresenceMode.cs b/FrEee.UI.WinForms/Objects/GalaxyViewModes/PresenceMode.cs similarity index 91% rename from FrEee.WinForms/Objects/GalaxyViewModes/PresenceMode.cs rename to FrEee.UI.WinForms/Objects/GalaxyViewModes/PresenceMode.cs index 26b0a2ea5..02aeafa8b 100644 --- a/FrEee.WinForms/Objects/GalaxyViewModes/PresenceMode.cs +++ b/FrEee.UI.WinForms/Objects/GalaxyViewModes/PresenceMode.cs @@ -5,7 +5,7 @@ using System.Drawing; using System.Linq; -namespace FrEee.WinForms.Objects.GalaxyViewModes; +namespace FrEee.UI.WinForms.Objects.GalaxyViewModes; /// /// Displays the presence of empires in star systems using pies with equal slices of each present empire's color, similar to SE3. diff --git a/FrEee.WinForms/Objects/GalaxyViewModes/RepairMode.cs b/FrEee.UI.WinForms/Objects/GalaxyViewModes/RepairMode.cs similarity index 89% rename from FrEee.WinForms/Objects/GalaxyViewModes/RepairMode.cs rename to FrEee.UI.WinForms/Objects/GalaxyViewModes/RepairMode.cs index 4ebfec3c3..4a6cba80a 100644 --- a/FrEee.WinForms/Objects/GalaxyViewModes/RepairMode.cs +++ b/FrEee.UI.WinForms/Objects/GalaxyViewModes/RepairMode.cs @@ -5,7 +5,7 @@ using System.Linq; using FrEee.Objects.GameState; -namespace FrEee.WinForms.Objects.GalaxyViewModes; +namespace FrEee.UI.WinForms.Objects.GalaxyViewModes; /// /// Displays repair rates in each resource. diff --git a/FrEee.WinForms/Objects/GalaxyViewModes/ResearchIntelMode.cs b/FrEee.UI.WinForms/Objects/GalaxyViewModes/ResearchIntelMode.cs similarity index 91% rename from FrEee.WinForms/Objects/GalaxyViewModes/ResearchIntelMode.cs rename to FrEee.UI.WinForms/Objects/GalaxyViewModes/ResearchIntelMode.cs index cd3ee676a..84f888b57 100644 --- a/FrEee.WinForms/Objects/GalaxyViewModes/ResearchIntelMode.cs +++ b/FrEee.UI.WinForms/Objects/GalaxyViewModes/ResearchIntelMode.cs @@ -6,7 +6,7 @@ using System.Linq; using FrEee.Objects.GameState; -namespace FrEee.WinForms.Objects.GalaxyViewModes; +namespace FrEee.UI.WinForms.Objects.GalaxyViewModes; /// /// Displays research/intel. diff --git a/FrEee.WinForms/Objects/GalaxyViewModes/ResourcesMode.cs b/FrEee.UI.WinForms/Objects/GalaxyViewModes/ResourcesMode.cs similarity index 92% rename from FrEee.WinForms/Objects/GalaxyViewModes/ResourcesMode.cs rename to FrEee.UI.WinForms/Objects/GalaxyViewModes/ResourcesMode.cs index 66c801aca..885a84330 100644 --- a/FrEee.WinForms/Objects/GalaxyViewModes/ResourcesMode.cs +++ b/FrEee.UI.WinForms/Objects/GalaxyViewModes/ResourcesMode.cs @@ -6,7 +6,7 @@ using System.Linq; using FrEee.Objects.GameState; -namespace FrEee.WinForms.Objects.GalaxyViewModes; +namespace FrEee.UI.WinForms.Objects.GalaxyViewModes; /// /// Displays min/org/rad income. diff --git a/FrEee.WinForms/Objects/GalaxyViewModes/SpaceYardMode.cs b/FrEee.UI.WinForms/Objects/GalaxyViewModes/SpaceYardMode.cs similarity index 92% rename from FrEee.WinForms/Objects/GalaxyViewModes/SpaceYardMode.cs rename to FrEee.UI.WinForms/Objects/GalaxyViewModes/SpaceYardMode.cs index cad794606..9bd5e736a 100644 --- a/FrEee.WinForms/Objects/GalaxyViewModes/SpaceYardMode.cs +++ b/FrEee.UI.WinForms/Objects/GalaxyViewModes/SpaceYardMode.cs @@ -7,7 +7,7 @@ using FrEee.Objects.Civilization.Construction; using FrEee.Objects.GameState; -namespace FrEee.WinForms.Objects.GalaxyViewModes; +namespace FrEee.UI.WinForms.Objects.GalaxyViewModes; /// /// Displays space yards by build rate in each resource. diff --git a/FrEee.WinForms/Objects/GalaxyViewModes/UtilityMode.cs b/FrEee.UI.WinForms/Objects/GalaxyViewModes/UtilityMode.cs similarity index 94% rename from FrEee.WinForms/Objects/GalaxyViewModes/UtilityMode.cs rename to FrEee.UI.WinForms/Objects/GalaxyViewModes/UtilityMode.cs index 127109b04..317c5db5b 100644 --- a/FrEee.WinForms/Objects/GalaxyViewModes/UtilityMode.cs +++ b/FrEee.UI.WinForms/Objects/GalaxyViewModes/UtilityMode.cs @@ -4,7 +4,7 @@ using System.Drawing; using System.Linq; -namespace FrEee.WinForms.Objects.GalaxyViewModes; +namespace FrEee.UI.WinForms.Objects.GalaxyViewModes; /// /// Displays resupply depots in blue and systems lacking space ports (but also containing non-merchants population) in red. diff --git a/FrEee.WinForms/Objects/GalaxyViewModes/WarpPointsMode.cs b/FrEee.UI.WinForms/Objects/GalaxyViewModes/WarpPointsMode.cs similarity index 91% rename from FrEee.WinForms/Objects/GalaxyViewModes/WarpPointsMode.cs rename to FrEee.UI.WinForms/Objects/GalaxyViewModes/WarpPointsMode.cs index 0a388deba..963c6468c 100644 --- a/FrEee.WinForms/Objects/GalaxyViewModes/WarpPointsMode.cs +++ b/FrEee.UI.WinForms/Objects/GalaxyViewModes/WarpPointsMode.cs @@ -4,7 +4,7 @@ using System.Drawing; using System.Linq; -namespace FrEee.WinForms.Objects.GalaxyViewModes; +namespace FrEee.UI.WinForms.Objects.GalaxyViewModes; /// /// Displays the relative prevalence of explored and unexplored warp points (explored = blue, unexplored = red). diff --git a/FrEee.WinForms/Objects/Music.cs b/FrEee.UI.WinForms/Objects/Music.cs similarity index 95% rename from FrEee.WinForms/Objects/Music.cs rename to FrEee.UI.WinForms/Objects/Music.cs index b549b82fb..6d21c4cc6 100644 --- a/FrEee.WinForms/Objects/Music.cs +++ b/FrEee.UI.WinForms/Objects/Music.cs @@ -7,7 +7,7 @@ using System.IO; using System.Linq; -namespace FrEee.WinForms.Objects; +namespace FrEee.UI.WinForms.Objects; /// /// Music support for the game. diff --git a/FrEee.WinForms/Program.cs b/FrEee.UI.WinForms/Program.cs similarity index 93% rename from FrEee.WinForms/Program.cs rename to FrEee.UI.WinForms/Program.cs index 4554f0d2b..3a7edf3b6 100644 --- a/FrEee.WinForms/Program.cs +++ b/FrEee.UI.WinForms/Program.cs @@ -3,12 +3,9 @@ using FrEee.Processes; using FrEee.Utility; using FrEee.Extensions; -using FrEee.WinForms.Forms; -using FrEee.WinForms.Utility; -using FrEee.WinForms.Utility.Extensions; -using Microsoft.AppCenter; -using Microsoft.AppCenter.Analytics; -using Microsoft.AppCenter.Crashes; +using FrEee.UI.WinForms.Forms; +using FrEee.UI.WinForms.Utility; +using FrEee.UI.WinForms.Utility.Extensions; using System; using System.Collections.Generic; using System.IO; @@ -19,7 +16,7 @@ using System.Windows.Forms; using FrEee.Objects.GameState; -namespace FrEee.WinForms; +namespace FrEee.UI.WinForms; internal static class Program { @@ -60,10 +57,6 @@ private static int DisplaySyntax() [STAThread] private static int Main(string[] args) { - // enable Microsoft App Center integration - AppCenter.Start("f433569d-4dcf-416c-9c6e-e6c11f284cd5", - typeof(Analytics), typeof(Crashes)); - // log exceptions online Application.ThreadException += (sender, e) => { diff --git a/FrEee.WinForms/Properties/DataSources/FrEee.Game.Interfaces.IHull.datasource b/FrEee.UI.WinForms/Properties/DataSources/FrEee.Game.Interfaces.IHull.datasource similarity index 100% rename from FrEee.WinForms/Properties/DataSources/FrEee.Game.Interfaces.IHull.datasource rename to FrEee.UI.WinForms/Properties/DataSources/FrEee.Game.Interfaces.IHull.datasource diff --git a/FrEee.WinForms/Properties/DataSources/FrEee.Game.Objects.Civilization.ConstructionQueue.datasource b/FrEee.UI.WinForms/Properties/DataSources/FrEee.Game.Objects.Civilization.ConstructionQueue.datasource similarity index 100% rename from FrEee.WinForms/Properties/DataSources/FrEee.Game.Objects.Civilization.ConstructionQueue.datasource rename to FrEee.UI.WinForms/Properties/DataSources/FrEee.Game.Objects.Civilization.ConstructionQueue.datasource diff --git a/FrEee.WinForms/Properties/DataSources/FrEee.Game.Objects.Civilization.Culture.datasource b/FrEee.UI.WinForms/Properties/DataSources/FrEee.Game.Objects.Civilization.Culture.datasource similarity index 100% rename from FrEee.WinForms/Properties/DataSources/FrEee.Game.Objects.Civilization.Culture.datasource rename to FrEee.UI.WinForms/Properties/DataSources/FrEee.Game.Objects.Civilization.Culture.datasource diff --git a/FrEee.WinForms/Properties/DataSources/FrEee.Game.Objects.Civilization.Empire.datasource b/FrEee.UI.WinForms/Properties/DataSources/FrEee.Game.Objects.Civilization.Empire.datasource similarity index 100% rename from FrEee.WinForms/Properties/DataSources/FrEee.Game.Objects.Civilization.Empire.datasource rename to FrEee.UI.WinForms/Properties/DataSources/FrEee.Game.Objects.Civilization.Empire.datasource diff --git a/FrEee.WinForms/Properties/DataSources/FrEee.Game.Objects.Civilization.EmpireStatus.datasource b/FrEee.UI.WinForms/Properties/DataSources/FrEee.Game.Objects.Civilization.EmpireStatus.datasource similarity index 100% rename from FrEee.WinForms/Properties/DataSources/FrEee.Game.Objects.Civilization.EmpireStatus.datasource rename to FrEee.UI.WinForms/Properties/DataSources/FrEee.Game.Objects.Civilization.EmpireStatus.datasource diff --git a/FrEee.WinForms/Properties/DataSources/FrEee.Game.Objects.Technology.Mount.datasource b/FrEee.UI.WinForms/Properties/DataSources/FrEee.Game.Objects.Technology.Mount.datasource similarity index 100% rename from FrEee.WinForms/Properties/DataSources/FrEee.Game.Objects.Technology.Mount.datasource rename to FrEee.UI.WinForms/Properties/DataSources/FrEee.Game.Objects.Technology.Mount.datasource diff --git a/FrEee.WinForms/Properties/DataSources/FrEee.Game.Objects.Technology.Technology.datasource b/FrEee.UI.WinForms/Properties/DataSources/FrEee.Game.Objects.Technology.Technology.datasource similarity index 100% rename from FrEee.WinForms/Properties/DataSources/FrEee.Game.Objects.Technology.Technology.datasource rename to FrEee.UI.WinForms/Properties/DataSources/FrEee.Game.Objects.Technology.Technology.datasource diff --git a/FrEee.WinForms/Properties/DataSources/FrEee.Game.Setup.WarpPointPlacementStrategies.WarpPointPlacementStrategy.datasource b/FrEee.UI.WinForms/Properties/DataSources/FrEee.Game.Setup.WarpPointPlacementStrategies.WarpPointPlacementStrategy.datasource similarity index 100% rename from FrEee.WinForms/Properties/DataSources/FrEee.Game.Setup.WarpPointPlacementStrategies.WarpPointPlacementStrategy.datasource rename to FrEee.UI.WinForms/Properties/DataSources/FrEee.Game.Setup.WarpPointPlacementStrategies.WarpPointPlacementStrategy.datasource diff --git a/FrEee.WinForms/Properties/DataSources/FrEee.Modding.StellarObjectSize.datasource b/FrEee.UI.WinForms/Properties/DataSources/FrEee.Modding.StellarObjectSize.datasource similarity index 100% rename from FrEee.WinForms/Properties/DataSources/FrEee.Modding.StellarObjectSize.datasource rename to FrEee.UI.WinForms/Properties/DataSources/FrEee.Modding.StellarObjectSize.datasource diff --git a/FrEee.WinForms/Properties/DataSources/FrEee.Modding.Templates.GalaxyTemplate.datasource b/FrEee.UI.WinForms/Properties/DataSources/FrEee.Modding.Templates.GalaxyTemplate.datasource similarity index 100% rename from FrEee.WinForms/Properties/DataSources/FrEee.Modding.Templates.GalaxyTemplate.datasource rename to FrEee.UI.WinForms/Properties/DataSources/FrEee.Modding.Templates.GalaxyTemplate.datasource diff --git a/FrEee.WinForms/Properties/Resources.Designer.cs b/FrEee.UI.WinForms/Properties/Resources.Designer.cs similarity index 94% rename from FrEee.WinForms/Properties/Resources.Designer.cs rename to FrEee.UI.WinForms/Properties/Resources.Designer.cs index 10fd90383..4b0d1de38 100644 --- a/FrEee.WinForms/Properties/Resources.Designer.cs +++ b/FrEee.UI.WinForms/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace FrEee.WinForms.Properties; +namespace FrEee.UI.WinForms.Properties { using System; @@ -39,7 +39,7 @@ internal Resources() { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("FrEee.WinForms.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("FrEee.UI.WinForms.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; @@ -108,3 +108,4 @@ internal static System.Drawing.Bitmap Splash { } } } +} diff --git a/FrEee.WinForms/Properties/Resources.resx b/FrEee.UI.WinForms/Properties/Resources.resx similarity index 100% rename from FrEee.WinForms/Properties/Resources.resx rename to FrEee.UI.WinForms/Properties/Resources.resx diff --git a/FrEee.WinForms/Properties/Settings.Designer.cs b/FrEee.UI.WinForms/Properties/Settings.Designer.cs similarity index 91% rename from FrEee.WinForms/Properties/Settings.Designer.cs rename to FrEee.UI.WinForms/Properties/Settings.Designer.cs index 18ba7c2b8..52bc65d05 100644 --- a/FrEee.WinForms/Properties/Settings.Designer.cs +++ b/FrEee.UI.WinForms/Properties/Settings.Designer.cs @@ -8,11 +8,11 @@ // //------------------------------------------------------------------------------ -namespace FrEee.WinForms.Properties; +namespace FrEee.UI.WinForms.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.3.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.9.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -23,3 +23,4 @@ public static Settings Default { } } } +} diff --git a/FrEee.WinForms/Properties/Settings.settings b/FrEee.UI.WinForms/Properties/Settings.settings similarity index 100% rename from FrEee.WinForms/Properties/Settings.settings rename to FrEee.UI.WinForms/Properties/Settings.settings diff --git a/FrEee.WinForms/Resources/check_ethernet_checked.bmp b/FrEee.UI.WinForms/Resources/check_ethernet_checked.bmp similarity index 100% rename from FrEee.WinForms/Resources/check_ethernet_checked.bmp rename to FrEee.UI.WinForms/Resources/check_ethernet_checked.bmp diff --git a/FrEee.WinForms/Resources/check_ethernet_clear.bmp b/FrEee.UI.WinForms/Resources/check_ethernet_clear.bmp similarity index 100% rename from FrEee.WinForms/Resources/check_ethernet_clear.bmp rename to FrEee.UI.WinForms/Resources/check_ethernet_clear.bmp diff --git a/FrEee.WinForms/Utility/Extensions/GuiExtensions.cs b/FrEee.UI.WinForms/Utility/Extensions/GuiExtensions.cs similarity index 90% rename from FrEee.WinForms/Utility/Extensions/GuiExtensions.cs rename to FrEee.UI.WinForms/Utility/Extensions/GuiExtensions.cs index aee10ede0..62b4b4c1d 100644 --- a/FrEee.WinForms/Utility/Extensions/GuiExtensions.cs +++ b/FrEee.UI.WinForms/Utility/Extensions/GuiExtensions.cs @@ -1,12 +1,14 @@ using FrEee.Utility; -using FrEee.WinForms.Forms; +using FrEee.UI.WinForms.Forms; using System; using System.Collections.Generic; using System.Drawing; using System.Linq; using System.Windows.Forms; +using Microsoft.AspNetCore.Components.WebView.WindowsForms; +using Microsoft.Extensions.DependencyInjection; -namespace FrEee.WinForms.Utility.Extensions; +namespace FrEee.UI.WinForms.Utility.Extensions; /// /// Extension methods for GUIs. @@ -247,16 +249,21 @@ public static void Initialize(this TreeView tv, int imageSize) /// Shows a form as a dialog in the center of its parent form with a wait cursor while the form loads. /// /// - public static DialogResult ShowChildForm(this Form parent, Form form) + public static DialogResult ShowChildForm(this Form parent, TForm form) + where TForm : Form { parent.BeginInvoke(new Action(() => parent.Cursor = Cursors.WaitCursor)); + + // TODO: why is this inconsistent? if (form.StartPosition != FormStartPosition.CenterScreen) form.StartPosition = FormStartPosition.CenterParent; + form.KeyPreview = true; form.KeyDown += escapeKeyHandler; form.KeyDown += childForm_KeyDown_forDebugConsole; var result = form.ShowDialog(); parent.BeginInvoke(new Action(() => parent.Cursor = Cursors.Default)); + return result; } @@ -293,4 +300,15 @@ private static void escapeKeyHandler(object sender, KeyEventArgs e) form.Close(); } } + + /// + /// Initializes the services required to run a Blazor web view. + /// + /// The Blazor web view. + public static void InitializeServices(this BlazorWebView blazorView) + { + var services = new ServiceCollection(); + services.AddWindowsFormsBlazorWebView(); + blazorView.Services = services.BuildServiceProvider(); + } } \ No newline at end of file diff --git a/FrEee.WinForms/Utility/Gui.cs b/FrEee.UI.WinForms/Utility/Gui.cs similarity index 88% rename from FrEee.WinForms/Utility/Gui.cs rename to FrEee.UI.WinForms/Utility/Gui.cs index ceefe92b9..02f48b784 100644 --- a/FrEee.WinForms/Utility/Gui.cs +++ b/FrEee.UI.WinForms/Utility/Gui.cs @@ -1,8 +1,8 @@ using System.Windows.Forms; -using FrEee.WinForms.Forms; -using FrEee.WinForms.Objects; +using FrEee.UI.WinForms.Forms; +using FrEee.UI.WinForms.Objects; -namespace FrEee.WinForms.Utility; +namespace FrEee.UI.WinForms.Utility; /// /// Non-extension utility methods for manipulating the GUI. diff --git a/FrEee.WinForms/app.config b/FrEee.UI.WinForms/app.config similarity index 100% rename from FrEee.WinForms/app.config rename to FrEee.UI.WinForms/app.config diff --git a/FrEee.UI.WinForms/index.html b/FrEee.UI.WinForms/index.html new file mode 100644 index 000000000..d4da2001a --- /dev/null +++ b/FrEee.UI.WinForms/index.html @@ -0,0 +1,25 @@ + + + + + + WinFormsBlazor + + + + + + +
Loading...
+ +
+ An unhandled error has occurred. + Reload + 🗙 +
+ + + + + + \ No newline at end of file diff --git a/FrEee.WinForms/post-build.bat b/FrEee.UI.WinForms/post-build.bat similarity index 95% rename from FrEee.WinForms/post-build.bat rename to FrEee.UI.WinForms/post-build.bat index 2c9bdb467..50225b2a2 100644 --- a/FrEee.WinForms/post-build.bat +++ b/FrEee.UI.WinForms/post-build.bat @@ -11,6 +11,4 @@ echo %%G ren "%%~fG" "%%~nxG.temp" findstr /V "../../../bin/Debug/FrEee.Core.dll" "%%G.temp" > "%%~fG" del "%%G.temp" -) - - +) \ No newline at end of file diff --git a/FrEee.WinForms/post-build.sh b/FrEee.UI.WinForms/post-build.sh similarity index 93% rename from FrEee.WinForms/post-build.sh rename to FrEee.UI.WinForms/post-build.sh index 3e7a89aa2..2223e8e5b 100755 --- a/FrEee.WinForms/post-build.sh +++ b/FrEee.UI.WinForms/post-build.sh @@ -1,5 +1,5 @@ # execute with -# ./post-build.sh" Debug /home/teo/games/se4_free/src/freee/FrEee.WinForms/ +# ./post-build.sh" Debug /home/teo/games/se4_free/src/freee/FrEee.UI.WinForms/ # echo 1=$1 2=$2 3=$3 4=$4 # probably outdated! diff --git a/FrEee.WinForms/xbuild.sh b/FrEee.UI.WinForms/xbuild.sh similarity index 100% rename from FrEee.WinForms/xbuild.sh rename to FrEee.UI.WinForms/xbuild.sh diff --git a/FrEee.WinForms/Controls/GamePictureBox.cs b/FrEee.WinForms/Controls/GamePictureBox.cs deleted file mode 100644 index 64554eaef..000000000 --- a/FrEee.WinForms/Controls/GamePictureBox.cs +++ /dev/null @@ -1,31 +0,0 @@ -using FrEee.WinForms.Utility.Extensions; -using System.Drawing; -using System.Windows.Forms; - -namespace FrEee.WinForms.Controls; - -public partial class GamePictureBox : PictureBox -{ - public GamePictureBox() - { - InitializeComponent(); - SizeMode = PictureBoxSizeMode.Zoom; - } - - /// - /// Shows a full-size version of the picture in its own window. - /// - /// The title for the form. - public void ShowFullSize(string text) - { - if (Image != null) - { - var pic = new PictureBox(); - pic.Image = Image; - pic.Size = Image.Size; - pic.BackColor = Color.Black; - pic.SizeMode = PictureBoxSizeMode.Zoom; - this.FindForm().ShowChildForm(pic.CreatePopupForm()); - } - } -} \ No newline at end of file diff --git a/FrEee.WinForms/Controls/GameProgressBar.cs b/FrEee.WinForms/Controls/GameProgressBar.cs deleted file mode 100644 index 751ba5496..000000000 --- a/FrEee.WinForms/Controls/GameProgressBar.cs +++ /dev/null @@ -1,175 +0,0 @@ -using FrEee.Utility; -using FrEee.Extensions; -using System; -using System.Drawing; -using System.Windows.Forms; - -namespace FrEee.WinForms.Controls; - -public partial class GameProgressBar : UserControl -{ - public GameProgressBar() - { - InitializeComponent(); - this.SizeChanged += GameProgressBar_SizeChanged; - Padding = new Padding(5, 5, 5, 5); - } - - public Color BarColor - { - get { return barColor; } - set - { - barColor = value; - Invalidate(); - } - } - - /// - /// Color of the border for BorderStyle.FixedSingle mode. - /// - public Color BorderColor - { - get { return borderColor; } - set - { - borderColor = value; - Invalidate(); - } - } - - public long IncrementalProgress - { - get { return incrementalProgress; } - set - { - incrementalProgress = value; - Invalidate(); - } - } - - public string LeftText { get { return leftText; } set { leftText = value; Invalidate(); } } - - public long Maximum - { - get { return maximum; } - set - { - maximum = value; - Invalidate(); - } - } - - public Progress Progress - { - get - { - return new Progress(Value, Maximum, IncrementalProgress); - } - set - { - Value = value.Value; - Maximum = value.Maximum; - IncrementalProgress = value.IncrementalProgressBeforeDelay; - } - } - - public ProgressDisplayType ProgressDisplayType - { - get { return displayType; } - set - { - displayType = value; - Invalidate(); - } - } - - public string RightText { get { return rightText; } set { rightText = value; Invalidate(); } } - - public long Value - { - get { return value; } - set - { - this.value = value; - Invalidate(); - } - } - - private Color barColor = Color.Blue; - - private Color borderColor; - - private ProgressDisplayType displayType = ProgressDisplayType.Percentage; - - private long incrementalProgress = 0; - - private string leftText, rightText; - - private long maximum = 100; - - private long value = 0; - - protected override void OnPaint(PaintEventArgs e) - { - string centerText; - switch (ProgressDisplayType) - { - case ProgressDisplayType.None: - centerText = ""; - break; - - case ProgressDisplayType.Percentage: - centerText = Math.Round(((double)Value / (double)Maximum * 100)) + "%"; - break; - - case ProgressDisplayType.Numeric: - centerText = Value.ToUnitString(true) + " / " + Maximum.ToUnitString(true); - break; - - case ProgressDisplayType.Both: - centerText = Math.Round(((double)Value / (double)Maximum * 100)) + "% (" + Value.ToUnitString(true) + " / " + Maximum.ToUnitString(true) + ")"; - break; - - default: - centerText = ""; - break; - } - base.OnPaint(e); - e.Graphics.Clear(BackColor); - if (Maximum != 0) - { - e.Graphics.FillRectangle(new SolidBrush(BarColor), 0, 0, Value * Width / Maximum, Height); - e.Graphics.FillRectangle(new SolidBrush(Color.FromArgb(128, BarColor)), Value * Width / Maximum, 0, IncrementalProgress * Width / Maximum, Height); - } - if (BorderStyle == BorderStyle.FixedSingle) - ControlPaint.DrawBorder(e.Graphics, ClientRectangle, BorderColor, ButtonBorderStyle.Solid); - Brush brush; - if (BarColor.R + BarColor.G + BarColor.B > 128 * 3 && BackColor.R + BackColor.G + BackColor.B > 128 * 3) - brush = new SolidBrush(Color.Black); - else - brush = new SolidBrush(Color.White); - var rect = new Rectangle(0, 0, Width, Height); - rect.X += Padding.Left; - rect.Y += Padding.Top; - rect.Width -= Padding.Left + Padding.Right; - rect.Height -= Padding.Top + Padding.Bottom; - e.Graphics.DrawString(LeftText, Font, brush, rect, new StringFormat { Alignment = StringAlignment.Near, LineAlignment = StringAlignment.Center }); - e.Graphics.DrawString(RightText, Font, brush, rect, new StringFormat { Alignment = StringAlignment.Far, LineAlignment = StringAlignment.Center }); - e.Graphics.DrawString(centerText, Font, brush, rect, new StringFormat { Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center }); - } - - private void GameProgressBar_SizeChanged(object sender, EventArgs e) - { - Invalidate(); - } -} - -[Flags] -public enum ProgressDisplayType -{ - None = 0, - Percentage = 1, - Numeric = 2, - Both = 3, -} \ No newline at end of file diff --git a/FrEee.WinForms/Controls/ResourceDisplay.Designer.cs b/FrEee.WinForms/Controls/ResourceDisplay.Designer.cs deleted file mode 100644 index c4e5e6311..000000000 --- a/FrEee.WinForms/Controls/ResourceDisplay.Designer.cs +++ /dev/null @@ -1,50 +0,0 @@ -namespace FrEee.WinForms.Controls; - -partial class ResourceDisplay -{ - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.SuspendLayout(); - // - // ResourceDisplay - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.Black; - this.ForeColor = System.Drawing.Color.White; - this.Margin = new System.Windows.Forms.Padding(0); - this.Name = "ResourceDisplay"; - this.Size = new System.Drawing.Size(128, 20); - this.Paint += new System.Windows.Forms.PaintEventHandler(this.ResourceDisplay_Paint); - this.ResumeLayout(false); - - } - - #endregion - - -} diff --git a/FrEee.WinForms/Controls/ResourceDisplay.cs b/FrEee.WinForms/Controls/ResourceDisplay.cs deleted file mode 100644 index 6142f3f4a..000000000 --- a/FrEee.WinForms/Controls/ResourceDisplay.cs +++ /dev/null @@ -1,101 +0,0 @@ -using FrEee.Utility; -using FrEee.Extensions; -using System; -using System.ComponentModel; -using System.Drawing; -using System.Windows.Forms; - -namespace FrEee.WinForms.Controls; - -public partial class ResourceDisplay : UserControl -{ - public ResourceDisplay() - { - InitializeComponent(); - } - - public int Amount { get { return amount; } set { amount = value; Invalidate(); } } - public int? Change { get { return change; } set { change = value; Invalidate(); } } - - [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] - public Resource Resource - { - get { return resource; } - set - { - resource = value; - Invalidate(); - } - } - - public Color ResourceColor - { - get - { - return Resource == null ? Color.White : Resource.Color; - } - } - - public Image ResourceIcon - { - get - { - try - { - return Resource == null ? null : Resource.Icon; - } - catch (NullReferenceException) - { - // HACK - stupid forms designer thinks it's null and not null at the same time, WTF?! - var icon = new Bitmap(1, 1); - var color = Color.Gray; - if (Resource != null) - color = ResourceColor; - var g = Graphics.FromImage(icon); - g.Clear(color); - return icon; - } - } - } - - public string ResourceName - { - get { return Resource == null ? null : Resource.Name; } - set { Resource = Resource.Find(value); } - } - - private int amount; - - private int? change; - - private Resource resource; - - private void ResourceDisplay_Paint(object sender, PaintEventArgs e) - { - var g = e.Graphics; - var rpos = Width; - if (ResourceIcon != null) - { - // draw resource icon on the right - g.DrawImage(ResourceIcon, Width - Height, 0, Height, Height); - rpos -= Height + 5; - } - - // draw text right aligned in the remaining space - var text = Amount.ToUnitString(); - if (Change != null) - { - text += " ("; - if (Change.Value >= 0) - text += "+"; - text += Change.Value.ToUnitString(); - text += ")"; - } - var brush = new SolidBrush(ResourceColor); - var rect = new Rectangle(0, 0, rpos, Height); - var sf = new StringFormat(); - sf.Alignment = StringAlignment.Far; - sf.LineAlignment = StringAlignment.Center; - g.DrawString(text, Font, brush, rect, sf); - } -} \ No newline at end of file diff --git a/FrEee.WinForms/Controls/ResourceQuantityDisplay.Designer.cs b/FrEee.WinForms/Controls/ResourceQuantityDisplay.Designer.cs deleted file mode 100644 index 9fed0ffbe..000000000 --- a/FrEee.WinForms/Controls/ResourceQuantityDisplay.Designer.cs +++ /dev/null @@ -1,102 +0,0 @@ -namespace FrEee.WinForms.Controls; - -partial class ResourceQuantityDisplay -{ - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.min = new FrEee.WinForms.Controls.ResourceDisplay(); - this.org = new FrEee.WinForms.Controls.ResourceDisplay(); - this.rad = new FrEee.WinForms.Controls.ResourceDisplay(); - this.SuspendLayout(); - // - // min - // - this.min.Amount = 0; - this.min.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left))); - this.min.BackColor = System.Drawing.Color.Black; - this.min.Change = null; - this.min.ForeColor = System.Drawing.Color.White; - this.min.Location = new System.Drawing.Point(0, 0); - this.min.Margin = new System.Windows.Forms.Padding(0); - this.min.Name = "min"; - this.min.ResourceName = "Minerals"; - this.min.Size = new System.Drawing.Size(128, 26); - this.min.TabIndex = 0; - // - // org - // - this.org.Amount = 0; - this.org.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left))); - this.org.BackColor = System.Drawing.Color.Black; - this.org.Change = null; - this.org.ForeColor = System.Drawing.Color.White; - this.org.Location = new System.Drawing.Point(128, 0); - this.org.Margin = new System.Windows.Forms.Padding(0); - this.org.Name = "org"; - this.org.ResourceName = "Organics"; - this.org.Size = new System.Drawing.Size(128, 26); - this.org.TabIndex = 1; - // - // rad - // - this.rad.Amount = 0; - this.rad.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left))); - this.rad.BackColor = System.Drawing.Color.Black; - this.rad.Change = null; - this.rad.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); - this.rad.ForeColor = System.Drawing.Color.White; - this.rad.Location = new System.Drawing.Point(256, 0); - this.rad.Margin = new System.Windows.Forms.Padding(0); - this.rad.Name = "rad"; - this.rad.ResourceName = "Radioactives"; - this.rad.Size = new System.Drawing.Size(131, 26); - this.rad.TabIndex = 2; - // - // ResourceQuantityDisplay - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.Black; - this.Controls.Add(this.rad); - this.Controls.Add(this.org); - this.Controls.Add(this.min); - this.ForeColor = System.Drawing.Color.White; - this.Name = "ResourceQuantityDisplay"; - this.Size = new System.Drawing.Size(387, 26); - this.ResumeLayout(false); - - } - - #endregion - - private ResourceDisplay min; - private ResourceDisplay org; - private ResourceDisplay rad; -} diff --git a/FrEee.WinForms/Controls/ResourceQuantityDisplay.cs b/FrEee.WinForms/Controls/ResourceQuantityDisplay.cs deleted file mode 100644 index 2260c747d..000000000 --- a/FrEee.WinForms/Controls/ResourceQuantityDisplay.cs +++ /dev/null @@ -1,46 +0,0 @@ -using FrEee.Utility; -using FrEee.WinForms.Interfaces; -using System.Windows.Forms; - -namespace FrEee.WinForms.Controls; - -public partial class ResourceQuantityDisplay : UserControl, IBindable -{ - public ResourceQuantityDisplay() - { - InitializeComponent(); - } - - public ResourceQuantity ResourceQuantity - { - get { return q; } - set - { - q = value; - Bind(); - } - } - - private ResourceQuantity q; - - public void Bind(ResourceQuantity data) - { - ResourceQuantity = data; - } - - public void Bind() - { - if (ResourceQuantity == null) - { - min.Amount = 0; - org.Amount = 0; - rad.Amount = 0; - } - else - { - min.Amount = ResourceQuantity[Resource.Minerals]; - org.Amount = ResourceQuantity[Resource.Organics]; - rad.Amount = ResourceQuantity[Resource.Radioactives]; - } - } -} \ No newline at end of file diff --git a/FrEee.WinForms/Forms/GameSetupForm.Designer.cs b/FrEee.WinForms/Forms/GameSetupForm.Designer.cs deleted file mode 100644 index deaf523b1..000000000 --- a/FrEee.WinForms/Forms/GameSetupForm.Designer.cs +++ /dev/null @@ -1,2864 +0,0 @@ -namespace FrEee.WinForms.Forms; - -partial class GameSetupForm -{ - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.components = new System.ComponentModel.Container(); - FrEee.WinForms.Objects.GalaxyViewModes.PresenceMode presenceMode1 = new FrEee.WinForms.Objects.GalaxyViewModes.PresenceMode(); - this.tabs = new FrEee.WinForms.Controls.GameTabControl(); - this.tabGalaxy = new System.Windows.Forms.TabPage(); - this.label65 = new System.Windows.Forms.Label(); - this.spnSeed = new System.Windows.Forms.NumericUpDown(); - this.btnPreviewMap = new FrEee.WinForms.Controls.GameButton(); - this.galaxyView = new FrEee.WinForms.Controls.GalaxyView(); - this.label62 = new System.Windows.Forms.Label(); - this.label11 = new System.Windows.Forms.Label(); - this.spnSystemGroups = new System.Windows.Forms.NumericUpDown(); - this.txtWarpPointLocation = new System.Windows.Forms.Label(); - this.ddlMaximumEventSeverity = new System.Windows.Forms.ComboBox(); - this.label10 = new System.Windows.Forms.Label(); - this.label9 = new System.Windows.Forms.Label(); - this.spnHeight = new System.Windows.Forms.NumericUpDown(); - this.label8 = new System.Windows.Forms.Label(); - this.spnWidth = new System.Windows.Forms.NumericUpDown(); - this.label7 = new System.Windows.Forms.Label(); - this.ddlEventFrequency = new System.Windows.Forms.ComboBox(); - this.label6 = new System.Windows.Forms.Label(); - this.chkOmniscient = new System.Windows.Forms.CheckBox(); - this.label4 = new System.Windows.Forms.Label(); - this.chkAllSystemsExplored = new System.Windows.Forms.CheckBox(); - this.ddlWarpPointLocation = new System.Windows.Forms.ComboBox(); - this.warpPointPlacementStrategyBindingSource = new System.Windows.Forms.BindingSource(this.components); - this.label3 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.spnStarSystems = new System.Windows.Forms.NumericUpDown(); - this.label1 = new System.Windows.Forms.Label(); - this.txtGalaxyTypeDescription = new System.Windows.Forms.Label(); - this.ddlGalaxyType = new System.Windows.Forms.ComboBox(); - this.galaxyTemplateBindingSource = new System.Windows.Forms.BindingSource(this.components); - this.lblGalaxyType = new System.Windows.Forms.Label(); - this.tabResources = new System.Windows.Forms.TabPage(); - this.chkLimitRemote = new System.Windows.Forms.CheckBox(); - this.chkLimitStandard = new System.Windows.Forms.CheckBox(); - this.label29 = new System.Windows.Forms.Label(); - this.label28 = new System.Windows.Forms.Label(); - this.chkRemote = new System.Windows.Forms.CheckBox(); - this.btnRefreshGraphs = new FrEee.WinForms.Controls.GameButton(); - this.picMiningGraph = new System.Windows.Forms.PictureBox(); - this.spnMiningRate = new System.Windows.Forms.NumericUpDown(); - this.spnStartValue = new System.Windows.Forms.NumericUpDown(); - this.label27 = new System.Windows.Forms.Label(); - this.label26 = new System.Windows.Forms.Label(); - this.picValueGraph = new System.Windows.Forms.PictureBox(); - this.spnHomeworldValue = new System.Windows.Forms.NumericUpDown(); - this.label25 = new System.Windows.Forms.Label(); - this.chkBonusDepletionRemote = new System.Windows.Forms.CheckBox(); - this.chkBonusDepletionStandard = new System.Windows.Forms.CheckBox(); - this.label17 = new System.Windows.Forms.Label(); - this.spnDepletionTurnRemote = new System.Windows.Forms.NumericUpDown(); - this.spnDepletionTurnStandard = new System.Windows.Forms.NumericUpDown(); - this.label24 = new System.Windows.Forms.Label(); - this.spnMaxValuePlanet = new System.Windows.Forms.NumericUpDown(); - this.spnMaxSpawnValueAsteroid = new System.Windows.Forms.NumericUpDown(); - this.spnMinSpawnValueAsteroid = new System.Windows.Forms.NumericUpDown(); - this.spnMinValueAsteroid = new System.Windows.Forms.NumericUpDown(); - this.spnMaxSpawnValuePlanet = new System.Windows.Forms.NumericUpDown(); - this.spnMinSpawnValuePlanet = new System.Windows.Forms.NumericUpDown(); - this.spnMinValuePlanet = new System.Windows.Forms.NumericUpDown(); - this.label23 = new System.Windows.Forms.Label(); - this.label22 = new System.Windows.Forms.Label(); - this.label21 = new System.Windows.Forms.Label(); - this.label20 = new System.Windows.Forms.Label(); - this.label19 = new System.Windows.Forms.Label(); - this.label18 = new System.Windows.Forms.Label(); - this.spnDepletionResourceRemote = new System.Windows.Forms.NumericUpDown(); - this.spnBonusRemote = new System.Windows.Forms.NumericUpDown(); - this.spnRateRemote = new System.Windows.Forms.NumericUpDown(); - this.spnDepletionResourceStandard = new System.Windows.Forms.NumericUpDown(); - this.spnBonusStandard = new System.Windows.Forms.NumericUpDown(); - this.spnRateStandard = new System.Windows.Forms.NumericUpDown(); - this.label16 = new System.Windows.Forms.Label(); - this.label15 = new System.Windows.Forms.Label(); - this.label14 = new System.Windows.Forms.Label(); - this.label13 = new System.Windows.Forms.Label(); - this.label12 = new System.Windows.Forms.Label(); - this.btnLoadResourcePreset = new FrEee.WinForms.Controls.GameButton(); - this.ddlPresets = new System.Windows.Forms.ComboBox(); - this.label5 = new System.Windows.Forms.Label(); - this.tabTechnology = new System.Windows.Forms.TabPage(); - this.ddlTechUniqueness = new System.Windows.Forms.ComboBox(); - this.label63 = new System.Windows.Forms.Label(); - this.ddlTechCost = new System.Windows.Forms.ComboBox(); - this.label61 = new System.Windows.Forms.Label(); - this.label31 = new System.Windows.Forms.Label(); - this.lstTechs = new System.Windows.Forms.CheckedListBox(); - this.ddlStartTech = new System.Windows.Forms.ComboBox(); - this.label30 = new System.Windows.Forms.Label(); - this.tabEmpires = new System.Windows.Forms.TabPage(); - this.lblMaxBonusResearchFromEmpirePoints = new System.Windows.Forms.Label(); - this.spnResearchPerUnspentEmpirePoint = new System.Windows.Forms.NumericUpDown(); - this.label64 = new System.Windows.Forms.Label(); - this.btnEmpireBottom = new FrEee.WinForms.Controls.GameButton(); - this.btnEmpireTop = new FrEee.WinForms.Controls.GameButton(); - this.btnEmpireDown = new FrEee.WinForms.Controls.GameButton(); - this.btnEmpireUp = new FrEee.WinForms.Controls.GameButton(); - this.btnToggleAI = new FrEee.WinForms.Controls.GameButton(); - this.label44 = new System.Windows.Forms.Label(); - this.spnMaxDispersion = new System.Windows.Forms.NumericUpDown(); - this.label43 = new System.Windows.Forms.Label(); - this.ddlHomeworldSize = new System.Windows.Forms.ComboBox(); - this.label42 = new System.Windows.Forms.Label(); - this.btnSaveEmpire = new FrEee.WinForms.Controls.GameButton(); - this.btnRemoveEmpire = new FrEee.WinForms.Controls.GameButton(); - this.btnEditEmpire = new FrEee.WinForms.Controls.GameButton(); - this.btnLoadEmpire = new FrEee.WinForms.Controls.GameButton(); - this.btnCreateEmpire = new FrEee.WinForms.Controls.GameButton(); - this.gamePanel1 = new FrEee.WinForms.Controls.GamePanel(); - this.lstEmpires = new System.Windows.Forms.ListView(); - this.label41 = new System.Windows.Forms.Label(); - this.spnResourceStorage = new System.Windows.Forms.NumericUpDown(); - this.label40 = new System.Windows.Forms.Label(); - this.spnMinorEmpires = new System.Windows.Forms.NumericUpDown(); - this.spnRandomAIs = new System.Windows.Forms.NumericUpDown(); - this.spnEmpirePoints = new System.Windows.Forms.NumericUpDown(); - this.ddlScoreDisplay = new System.Windows.Forms.ComboBox(); - this.ddlEmpirePlacement = new System.Windows.Forms.ComboBox(); - this.spnHomeworlds = new System.Windows.Forms.NumericUpDown(); - this.spnStartResearch = new System.Windows.Forms.NumericUpDown(); - this.spnStartResources = new System.Windows.Forms.NumericUpDown(); - this.label39 = new System.Windows.Forms.Label(); - this.label38 = new System.Windows.Forms.Label(); - this.label37 = new System.Windows.Forms.Label(); - this.label36 = new System.Windows.Forms.Label(); - this.label35 = new System.Windows.Forms.Label(); - this.label34 = new System.Windows.Forms.Label(); - this.label33 = new System.Windows.Forms.Label(); - this.label32 = new System.Windows.Forms.Label(); - this.tabVictory = new System.Windows.Forms.TabPage(); - this.label51 = new System.Windows.Forms.Label(); - this.spnVictoryDelay = new System.Windows.Forms.NumericUpDown(); - this.label50 = new System.Windows.Forms.Label(); - this.label49 = new System.Windows.Forms.Label(); - this.spnVictoryPeace = new System.Windows.Forms.NumericUpDown(); - this.chkVictoryPeace = new System.Windows.Forms.CheckBox(); - this.label48 = new System.Windows.Forms.Label(); - this.spnVictoryTech = new System.Windows.Forms.NumericUpDown(); - this.chkVictoryTech = new System.Windows.Forms.CheckBox(); - this.label47 = new System.Windows.Forms.Label(); - this.spnVictoryScorePercent = new System.Windows.Forms.NumericUpDown(); - this.chkVictoryScorePercent = new System.Windows.Forms.CheckBox(); - this.label46 = new System.Windows.Forms.Label(); - this.spnVictoryTurns = new System.Windows.Forms.NumericUpDown(); - this.chkVictoryTurns = new System.Windows.Forms.CheckBox(); - this.spnVictoryScore = new System.Windows.Forms.NumericUpDown(); - this.chkVictoryScore = new System.Windows.Forms.CheckBox(); - this.chkVictoryEliminateMajorEmpires = new System.Windows.Forms.CheckBox(); - this.label45 = new System.Windows.Forms.Label(); - this.tabSettings = new System.Windows.Forms.TabPage(); - this.chkAllowAnalysis = new System.Windows.Forms.CheckBox(); - this.label60 = new System.Windows.Forms.Label(); - this.chkColonizeOnlyHWSurface = new System.Windows.Forms.CheckBox(); - this.label59 = new System.Windows.Forms.Label(); - this.chkColonizeOnlyBreathable = new System.Windows.Forms.CheckBox(); - this.label58 = new System.Windows.Forms.Label(); - this.chkUniqueRuins = new System.Windows.Forms.CheckBox(); - this.label57 = new System.Windows.Forms.Label(); - this.chkRandomRuins = new System.Windows.Forms.CheckBox(); - this.label56 = new System.Windows.Forms.Label(); - this.chkAllowIntel = new System.Windows.Forms.CheckBox(); - this.label55 = new System.Windows.Forms.Label(); - this.chkAllowSurrender = new System.Windows.Forms.CheckBox(); - this.label54 = new System.Windows.Forms.Label(); - this.label53 = new System.Windows.Forms.Label(); - this.label52 = new System.Windows.Forms.Label(); - this.ddlAllowedTrades = new System.Windows.Forms.ComboBox(); - this.chkHumansVsAI = new System.Windows.Forms.CheckBox(); - this.txtGalaxyName = new System.Windows.Forms.TextBox(); - this.labelName = new System.Windows.Forms.Label(); - this.btnStart = new FrEee.WinForms.Controls.GameButton(); - this.btnCancel = new FrEee.WinForms.Controls.GameButton(); - this.btnLoadSetup = new FrEee.WinForms.Controls.GameButton(); - this.btnSaveSetup = new FrEee.WinForms.Controls.GameButton(); - this.progressBar = new System.Windows.Forms.ProgressBar(); - this.btnGenerateSeed = new FrEee.WinForms.Controls.GameButton(); - this.tabs.SuspendLayout(); - this.tabGalaxy.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.spnSeed)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnSystemGroups)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnHeight)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnWidth)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.warpPointPlacementStrategyBindingSource)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnStarSystems)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.galaxyTemplateBindingSource)).BeginInit(); - this.tabResources.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.picMiningGraph)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnMiningRate)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnStartValue)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.picValueGraph)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnHomeworldValue)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnDepletionTurnRemote)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnDepletionTurnStandard)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnMaxValuePlanet)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnMaxSpawnValueAsteroid)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnMinSpawnValueAsteroid)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnMinValueAsteroid)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnMaxSpawnValuePlanet)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnMinSpawnValuePlanet)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnMinValuePlanet)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnDepletionResourceRemote)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnBonusRemote)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnRateRemote)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnDepletionResourceStandard)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnBonusStandard)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnRateStandard)).BeginInit(); - this.tabTechnology.SuspendLayout(); - this.tabEmpires.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.spnResearchPerUnspentEmpirePoint)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnMaxDispersion)).BeginInit(); - this.gamePanel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.spnResourceStorage)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnMinorEmpires)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnRandomAIs)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnEmpirePoints)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnHomeworlds)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnStartResearch)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnStartResources)).BeginInit(); - this.tabVictory.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.spnVictoryDelay)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnVictoryPeace)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnVictoryTech)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnVictoryScorePercent)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnVictoryTurns)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnVictoryScore)).BeginInit(); - this.tabSettings.SuspendLayout(); - this.SuspendLayout(); - // - // tabs - // - this.tabs.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.tabs.Controls.Add(this.tabGalaxy); - this.tabs.Controls.Add(this.tabResources); - this.tabs.Controls.Add(this.tabTechnology); - this.tabs.Controls.Add(this.tabEmpires); - this.tabs.Controls.Add(this.tabVictory); - this.tabs.Controls.Add(this.tabSettings); - this.tabs.DrawMode = System.Windows.Forms.TabDrawMode.OwnerDrawFixed; - this.tabs.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.tabs.Location = new System.Drawing.Point(0, 0); - this.tabs.Name = "tabs"; - this.tabs.SelectedIndex = 0; - this.tabs.SelectedTabBackColor = System.Drawing.Color.CornflowerBlue; - this.tabs.SelectedTabForeColor = System.Drawing.Color.Black; - this.tabs.Size = new System.Drawing.Size(553, 573); - this.tabs.TabBackColor = System.Drawing.Color.Black; - this.tabs.TabBorderColor = System.Drawing.Color.CornflowerBlue; - this.tabs.TabForeColor = System.Drawing.Color.CornflowerBlue; - this.tabs.TabIndex = 0; - // - // tabGalaxy - // - this.tabGalaxy.BackColor = System.Drawing.Color.Black; - this.tabGalaxy.Controls.Add(this.btnGenerateSeed); - this.tabGalaxy.Controls.Add(this.label65); - this.tabGalaxy.Controls.Add(this.spnSeed); - this.tabGalaxy.Controls.Add(this.btnPreviewMap); - this.tabGalaxy.Controls.Add(this.galaxyView); - this.tabGalaxy.Controls.Add(this.label62); - this.tabGalaxy.Controls.Add(this.label11); - this.tabGalaxy.Controls.Add(this.spnSystemGroups); - this.tabGalaxy.Controls.Add(this.txtWarpPointLocation); - this.tabGalaxy.Controls.Add(this.ddlMaximumEventSeverity); - this.tabGalaxy.Controls.Add(this.label10); - this.tabGalaxy.Controls.Add(this.label9); - this.tabGalaxy.Controls.Add(this.spnHeight); - this.tabGalaxy.Controls.Add(this.label8); - this.tabGalaxy.Controls.Add(this.spnWidth); - this.tabGalaxy.Controls.Add(this.label7); - this.tabGalaxy.Controls.Add(this.ddlEventFrequency); - this.tabGalaxy.Controls.Add(this.label6); - this.tabGalaxy.Controls.Add(this.chkOmniscient); - this.tabGalaxy.Controls.Add(this.label4); - this.tabGalaxy.Controls.Add(this.chkAllSystemsExplored); - this.tabGalaxy.Controls.Add(this.ddlWarpPointLocation); - this.tabGalaxy.Controls.Add(this.label3); - this.tabGalaxy.Controls.Add(this.label2); - this.tabGalaxy.Controls.Add(this.spnStarSystems); - this.tabGalaxy.Controls.Add(this.label1); - this.tabGalaxy.Controls.Add(this.txtGalaxyTypeDescription); - this.tabGalaxy.Controls.Add(this.ddlGalaxyType); - this.tabGalaxy.Controls.Add(this.lblGalaxyType); - this.tabGalaxy.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.tabGalaxy.Location = new System.Drawing.Point(4, 29); - this.tabGalaxy.Name = "tabGalaxy"; - this.tabGalaxy.Padding = new System.Windows.Forms.Padding(3); - this.tabGalaxy.Size = new System.Drawing.Size(545, 540); - this.tabGalaxy.TabIndex = 0; - this.tabGalaxy.Text = "Galaxy"; - // - // label65 - // - this.label65.AutoSize = true; - this.label65.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label65.Location = new System.Drawing.Point(272, 9); - this.label65.Margin = new System.Windows.Forms.Padding(3); - this.label65.Name = "label65"; - this.label65.Size = new System.Drawing.Size(36, 15); - this.label65.TabIndex = 31; - this.label65.Text = "Seed"; - // - // spnSeed - // - this.spnSeed.Location = new System.Drawing.Point(314, 7); - this.spnSeed.Maximum = new decimal(new int[] { - 2147483647, - 0, - 0, - 0}); - this.spnSeed.Minimum = new decimal(new int[] { - -2147483648, - 0, - 0, - -2147483648}); - this.spnSeed.Name = "spnSeed"; - this.spnSeed.Size = new System.Drawing.Size(116, 21); - this.spnSeed.TabIndex = 30; - // - // btnPreviewMap - // - this.btnPreviewMap.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnPreviewMap.BackColor = System.Drawing.Color.Black; - this.btnPreviewMap.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnPreviewMap.Location = new System.Drawing.Point(442, 137); - this.btnPreviewMap.Name = "btnPreviewMap"; - this.btnPreviewMap.Size = new System.Drawing.Size(97, 23); - this.btnPreviewMap.TabIndex = 10; - this.btnPreviewMap.Text = "Preview Map"; - this.btnPreviewMap.UseVisualStyleBackColor = false; - this.btnPreviewMap.Click += new System.EventHandler(this.btnPreviewMap_Click); - // - // galaxyView - // - this.galaxyView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.galaxyView.BackColor = System.Drawing.Color.Black; - this.galaxyView.Location = new System.Drawing.Point(14, 330); - this.galaxyView.Mode = presenceMode1; - this.galaxyView.Name = "galaxyView"; - this.galaxyView.SelectedStarSystem = null; - this.galaxyView.Size = new System.Drawing.Size(525, 204); - this.galaxyView.TabIndex = 29; - this.galaxyView.Text = "galaxyView2"; - // - // label62 - // - this.label62.AutoSize = true; - this.label62.Location = new System.Drawing.Point(272, 279); - this.label62.Name = "label62"; - this.label62.Size = new System.Drawing.Size(158, 15); - this.label62.TabIndex = 28; - this.label62.Text = "Per mille per player per turn"; - // - // label11 - // - this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(191, 111); - this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(287, 15); - this.label11.TabIndex = 27; - this.label11.Text = "Fewer groups means more warp point connections."; - // - // spnSystemGroups - // - this.spnSystemGroups.Location = new System.Drawing.Point(114, 109); - this.spnSystemGroups.Minimum = new decimal(new int[] { - 1, - 0, - 0, - 0}); - this.spnSystemGroups.Name = "spnSystemGroups"; - this.spnSystemGroups.Size = new System.Drawing.Size(71, 21); - this.spnSystemGroups.TabIndex = 4; - this.spnSystemGroups.Value = new decimal(new int[] { - 1, - 0, - 0, - 0}); - this.spnSystemGroups.ValueChanged += new System.EventHandler(this.spnSystemGroups_ValueChanged); - // - // txtWarpPointLocation - // - this.txtWarpPointLocation.Location = new System.Drawing.Point(19, 163); - this.txtWarpPointLocation.Margin = new System.Windows.Forms.Padding(3); - this.txtWarpPointLocation.MaximumSize = new System.Drawing.Size(467, 36); - this.txtWarpPointLocation.Name = "txtWarpPointLocation"; - this.txtWarpPointLocation.Size = new System.Drawing.Size(467, 36); - this.txtWarpPointLocation.TabIndex = 25; - this.txtWarpPointLocation.Text = "Choose a warp point placement option."; - // - // ddlMaximumEventSeverity - // - this.ddlMaximumEventSeverity.DisplayMember = "Value"; - this.ddlMaximumEventSeverity.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.ddlMaximumEventSeverity.Enabled = false; - this.ddlMaximumEventSeverity.FormattingEnabled = true; - this.ddlMaximumEventSeverity.Location = new System.Drawing.Point(114, 305); - this.ddlMaximumEventSeverity.Name = "ddlMaximumEventSeverity"; - this.ddlMaximumEventSeverity.Size = new System.Drawing.Size(152, 23); - this.ddlMaximumEventSeverity.TabIndex = 9; - // - // label10 - // - this.label10.AutoSize = true; - this.label10.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label10.Location = new System.Drawing.Point(11, 308); - this.label10.Margin = new System.Windows.Forms.Padding(3); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(82, 15); - this.label10.TabIndex = 21; - this.label10.Text = "Event Severity"; - // - // label9 - // - this.label9.AutoSize = true; - this.label9.ForeColor = System.Drawing.Color.White; - this.label9.Location = new System.Drawing.Point(241, 56); - this.label9.Margin = new System.Windows.Forms.Padding(3); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(63, 15); - this.label9.TabIndex = 20; - this.label9.Text = "light-years"; - // - // spnHeight - // - this.spnHeight.Location = new System.Drawing.Point(187, 54); - this.spnHeight.Minimum = new decimal(new int[] { - 1, - 0, - 0, - 0}); - this.spnHeight.Name = "spnHeight"; - this.spnHeight.Size = new System.Drawing.Size(48, 21); - this.spnHeight.TabIndex = 2; - this.spnHeight.Value = new decimal(new int[] { - 30, - 0, - 0, - 0}); - this.spnHeight.ValueChanged += new System.EventHandler(this.spnHeight_ValueChanged); - // - // label8 - // - this.label8.AutoSize = true; - this.label8.ForeColor = System.Drawing.Color.White; - this.label8.Location = new System.Drawing.Point(168, 56); - this.label8.Margin = new System.Windows.Forms.Padding(3); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(13, 15); - this.label8.TabIndex = 18; - this.label8.Text = "x"; - // - // spnWidth - // - this.spnWidth.Location = new System.Drawing.Point(114, 54); - this.spnWidth.Minimum = new decimal(new int[] { - 1, - 0, - 0, - 0}); - this.spnWidth.Name = "spnWidth"; - this.spnWidth.Size = new System.Drawing.Size(48, 21); - this.spnWidth.TabIndex = 1; - this.spnWidth.Value = new decimal(new int[] { - 40, - 0, - 0, - 0}); - this.spnWidth.ValueChanged += new System.EventHandler(this.spnWidth_ValueChanged); - // - // label7 - // - this.label7.AutoSize = true; - this.label7.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label7.Location = new System.Drawing.Point(11, 56); - this.label7.Margin = new System.Windows.Forms.Padding(3); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(73, 15); - this.label7.TabIndex = 16; - this.label7.Text = "Dimensions"; - // - // ddlEventFrequency - // - this.ddlEventFrequency.DisplayMember = "Name"; - this.ddlEventFrequency.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.ddlEventFrequency.Enabled = false; - this.ddlEventFrequency.FormattingEnabled = true; - this.ddlEventFrequency.Location = new System.Drawing.Point(114, 276); - this.ddlEventFrequency.Name = "ddlEventFrequency"; - this.ddlEventFrequency.Size = new System.Drawing.Size(152, 23); - this.ddlEventFrequency.TabIndex = 8; - this.ddlEventFrequency.ValueMember = "Value"; - // - // label6 - // - this.label6.AutoSize = true; - this.label6.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label6.Location = new System.Drawing.Point(11, 279); - this.label6.Margin = new System.Windows.Forms.Padding(3); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(97, 15); - this.label6.TabIndex = 14; - this.label6.Text = "Event Frequency"; - // - // chkOmniscient - // - this.chkOmniscient.AutoSize = true; - this.chkOmniscient.Location = new System.Drawing.Point(22, 251); - this.chkOmniscient.Name = "chkOmniscient"; - this.chkOmniscient.Size = new System.Drawing.Size(231, 19); - this.chkOmniscient.TabIndex = 7; - this.chkOmniscient.Text = "Omniscient View of Explored Systems"; - this.chkOmniscient.UseVisualStyleBackColor = true; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label4.Location = new System.Drawing.Point(11, 205); - this.label4.Margin = new System.Windows.Forms.Padding(3); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(66, 15); - this.label4.TabIndex = 10; - this.label4.Text = "Fog of War"; - // - // chkAllSystemsExplored - // - this.chkAllSystemsExplored.AutoSize = true; - this.chkAllSystemsExplored.Location = new System.Drawing.Point(22, 226); - this.chkAllSystemsExplored.Name = "chkAllSystemsExplored"; - this.chkAllSystemsExplored.Size = new System.Drawing.Size(140, 19); - this.chkAllSystemsExplored.TabIndex = 6; - this.chkAllSystemsExplored.Text = "All Systems Explored"; - this.chkAllSystemsExplored.UseVisualStyleBackColor = true; - // - // ddlWarpPointLocation - // - this.ddlWarpPointLocation.DataSource = this.warpPointPlacementStrategyBindingSource; - this.ddlWarpPointLocation.DisplayMember = "Name"; - this.ddlWarpPointLocation.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.ddlWarpPointLocation.FormattingEnabled = true; - this.ddlWarpPointLocation.Location = new System.Drawing.Point(114, 137); - this.ddlWarpPointLocation.Name = "ddlWarpPointLocation"; - this.ddlWarpPointLocation.Size = new System.Drawing.Size(152, 23); - this.ddlWarpPointLocation.TabIndex = 5; - this.ddlWarpPointLocation.SelectedIndexChanged += new System.EventHandler(this.ddlWarpPointLocation_SelectedIndexChanged); - // - // warpPointPlacementStrategyBindingSource - // - this.warpPointPlacementStrategyBindingSource.DataSource = typeof(FrEee.Setup.WarpPointPlacementStrategies.WarpPointPlacementStrategy); - // - // label3 - // - this.label3.AutoSize = true; - this.label3.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label3.Location = new System.Drawing.Point(9, 140); - this.label3.Margin = new System.Windows.Forms.Padding(3); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(88, 15); - this.label3.TabIndex = 7; - this.label3.Text = "WP Placement"; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label2.Location = new System.Drawing.Point(9, 111); - this.label2.Margin = new System.Windows.Forms.Padding(3); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(90, 15); - this.label2.TabIndex = 5; - this.label2.Text = "System Groups"; - // - // spnStarSystems - // - this.spnStarSystems.Location = new System.Drawing.Point(114, 81); - this.spnStarSystems.Maximum = new decimal(new int[] { - 1000, - 0, - 0, - 0}); - this.spnStarSystems.Minimum = new decimal(new int[] { - 1, - 0, - 0, - 0}); - this.spnStarSystems.Name = "spnStarSystems"; - this.spnStarSystems.Size = new System.Drawing.Size(71, 21); - this.spnStarSystems.TabIndex = 3; - this.spnStarSystems.Value = new decimal(new int[] { - 30, - 0, - 0, - 0}); - this.spnStarSystems.ValueChanged += new System.EventHandler(this.spnStarSystems_ValueChanged); - // - // label1 - // - this.label1.AutoSize = true; - this.label1.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label1.Location = new System.Drawing.Point(9, 83); - this.label1.Margin = new System.Windows.Forms.Padding(3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(78, 15); - this.label1.TabIndex = 3; - this.label1.Text = "Star Systems"; - // - // txtGalaxyTypeDescription - // - this.txtGalaxyTypeDescription.AutoSize = true; - this.txtGalaxyTypeDescription.Location = new System.Drawing.Point(19, 32); - this.txtGalaxyTypeDescription.Name = "txtGalaxyTypeDescription"; - this.txtGalaxyTypeDescription.Size = new System.Drawing.Size(125, 15); - this.txtGalaxyTypeDescription.TabIndex = 2; - this.txtGalaxyTypeDescription.Text = "Choose a galaxy type."; - // - // ddlGalaxyType - // - this.ddlGalaxyType.DataSource = this.galaxyTemplateBindingSource; - this.ddlGalaxyType.DisplayMember = "Name"; - this.ddlGalaxyType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.ddlGalaxyType.FormattingEnabled = true; - this.ddlGalaxyType.Location = new System.Drawing.Point(114, 6); - this.ddlGalaxyType.Name = "ddlGalaxyType"; - this.ddlGalaxyType.Size = new System.Drawing.Size(152, 23); - this.ddlGalaxyType.TabIndex = 0; - this.ddlGalaxyType.SelectedIndexChanged += new System.EventHandler(this.ddlGalaxyType_SelectedIndexChanged); - // - // galaxyTemplateBindingSource - // - this.galaxyTemplateBindingSource.AllowNew = false; - this.galaxyTemplateBindingSource.DataSource = typeof(FrEee.Modding.Templates.GalaxyTemplate); - // - // lblGalaxyType - // - this.lblGalaxyType.AutoSize = true; - this.lblGalaxyType.ForeColor = System.Drawing.Color.CornflowerBlue; - this.lblGalaxyType.Location = new System.Drawing.Point(9, 10); - this.lblGalaxyType.Margin = new System.Windows.Forms.Padding(3); - this.lblGalaxyType.Name = "lblGalaxyType"; - this.lblGalaxyType.Size = new System.Drawing.Size(33, 15); - this.lblGalaxyType.TabIndex = 0; - this.lblGalaxyType.Text = "Type"; - // - // tabResources - // - this.tabResources.BackColor = System.Drawing.Color.Black; - this.tabResources.Controls.Add(this.chkLimitRemote); - this.tabResources.Controls.Add(this.chkLimitStandard); - this.tabResources.Controls.Add(this.label29); - this.tabResources.Controls.Add(this.label28); - this.tabResources.Controls.Add(this.chkRemote); - this.tabResources.Controls.Add(this.btnRefreshGraphs); - this.tabResources.Controls.Add(this.picMiningGraph); - this.tabResources.Controls.Add(this.spnMiningRate); - this.tabResources.Controls.Add(this.spnStartValue); - this.tabResources.Controls.Add(this.label27); - this.tabResources.Controls.Add(this.label26); - this.tabResources.Controls.Add(this.picValueGraph); - this.tabResources.Controls.Add(this.spnHomeworldValue); - this.tabResources.Controls.Add(this.label25); - this.tabResources.Controls.Add(this.chkBonusDepletionRemote); - this.tabResources.Controls.Add(this.chkBonusDepletionStandard); - this.tabResources.Controls.Add(this.label17); - this.tabResources.Controls.Add(this.spnDepletionTurnRemote); - this.tabResources.Controls.Add(this.spnDepletionTurnStandard); - this.tabResources.Controls.Add(this.label24); - this.tabResources.Controls.Add(this.spnMaxValuePlanet); - this.tabResources.Controls.Add(this.spnMaxSpawnValueAsteroid); - this.tabResources.Controls.Add(this.spnMinSpawnValueAsteroid); - this.tabResources.Controls.Add(this.spnMinValueAsteroid); - this.tabResources.Controls.Add(this.spnMaxSpawnValuePlanet); - this.tabResources.Controls.Add(this.spnMinSpawnValuePlanet); - this.tabResources.Controls.Add(this.spnMinValuePlanet); - this.tabResources.Controls.Add(this.label23); - this.tabResources.Controls.Add(this.label22); - this.tabResources.Controls.Add(this.label21); - this.tabResources.Controls.Add(this.label20); - this.tabResources.Controls.Add(this.label19); - this.tabResources.Controls.Add(this.label18); - this.tabResources.Controls.Add(this.spnDepletionResourceRemote); - this.tabResources.Controls.Add(this.spnBonusRemote); - this.tabResources.Controls.Add(this.spnRateRemote); - this.tabResources.Controls.Add(this.spnDepletionResourceStandard); - this.tabResources.Controls.Add(this.spnBonusStandard); - this.tabResources.Controls.Add(this.spnRateStandard); - this.tabResources.Controls.Add(this.label16); - this.tabResources.Controls.Add(this.label15); - this.tabResources.Controls.Add(this.label14); - this.tabResources.Controls.Add(this.label13); - this.tabResources.Controls.Add(this.label12); - this.tabResources.Controls.Add(this.btnLoadResourcePreset); - this.tabResources.Controls.Add(this.ddlPresets); - this.tabResources.Controls.Add(this.label5); - this.tabResources.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.tabResources.Location = new System.Drawing.Point(4, 29); - this.tabResources.Name = "tabResources"; - this.tabResources.Size = new System.Drawing.Size(545, 540); - this.tabResources.TabIndex = 7; - this.tabResources.Text = "Resources"; - // - // chkLimitRemote - // - this.chkLimitRemote.AutoSize = true; - this.chkLimitRemote.Location = new System.Drawing.Point(257, 83); - this.chkLimitRemote.Name = "chkLimitRemote"; - this.chkLimitRemote.Size = new System.Drawing.Size(15, 14); - this.chkLimitRemote.TabIndex = 62; - this.chkLimitRemote.UseVisualStyleBackColor = true; - // - // chkLimitStandard - // - this.chkLimitStandard.AutoSize = true; - this.chkLimitStandard.Location = new System.Drawing.Point(153, 83); - this.chkLimitStandard.Name = "chkLimitStandard"; - this.chkLimitStandard.Size = new System.Drawing.Size(15, 14); - this.chkLimitStandard.TabIndex = 61; - this.chkLimitStandard.UseVisualStyleBackColor = true; - // - // label29 - // - this.label29.AutoSize = true; - this.label29.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label29.Location = new System.Drawing.Point(8, 82); - this.label29.Margin = new System.Windows.Forms.Padding(3); - this.label29.Name = "label29"; - this.label29.Size = new System.Drawing.Size(114, 15); - this.label29.TabIndex = 60; - this.label29.Text = "Limit Rate To Value"; - // - // label28 - // - this.label28.AutoSize = true; - this.label28.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label28.Location = new System.Drawing.Point(365, 335); - this.label28.Margin = new System.Windows.Forms.Padding(3); - this.label28.Name = "label28"; - this.label28.Size = new System.Drawing.Size(142, 15); - this.label28.TabIndex = 59; - this.label28.Text = "Graphs display 100 turns"; - // - // chkRemote - // - this.chkRemote.AutoSize = true; - this.chkRemote.Location = new System.Drawing.Point(372, 85); - this.chkRemote.Name = "chkRemote"; - this.chkRemote.Size = new System.Drawing.Size(70, 19); - this.chkRemote.TabIndex = 58; - this.chkRemote.Text = "Remote"; - this.chkRemote.UseVisualStyleBackColor = true; - this.chkRemote.CheckedChanged += new System.EventHandler(this.chkRemote_CheckedChanged); - // - // btnRefreshGraphs - // - this.btnRefreshGraphs.BackColor = System.Drawing.Color.Black; - this.btnRefreshGraphs.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnRefreshGraphs.Location = new System.Drawing.Point(458, 82); - this.btnRefreshGraphs.Name = "btnRefreshGraphs"; - this.btnRefreshGraphs.Size = new System.Drawing.Size(84, 23); - this.btnRefreshGraphs.TabIndex = 57; - this.btnRefreshGraphs.Text = "Refresh"; - this.btnRefreshGraphs.UseVisualStyleBackColor = false; - this.btnRefreshGraphs.Click += new System.EventHandler(this.btnRefreshGraphs_Click); - // - // picMiningGraph - // - this.picMiningGraph.Location = new System.Drawing.Point(368, 223); - this.picMiningGraph.Name = "picMiningGraph"; - this.picMiningGraph.Size = new System.Drawing.Size(174, 106); - this.picMiningGraph.TabIndex = 56; - this.picMiningGraph.TabStop = false; - this.picMiningGraph.Paint += new System.Windows.Forms.PaintEventHandler(this.picMiningGraph_Paint); - // - // spnMiningRate - // - this.spnMiningRate.Increment = new decimal(new int[] { - 100, - 0, - 0, - 0}); - this.spnMiningRate.Location = new System.Drawing.Point(458, 59); - this.spnMiningRate.Maximum = new decimal(new int[] { - 10000, - 0, - 0, - 0}); - this.spnMiningRate.Name = "spnMiningRate"; - this.spnMiningRate.Size = new System.Drawing.Size(84, 21); - this.spnMiningRate.TabIndex = 55; - this.spnMiningRate.Value = new decimal(new int[] { - 1000, - 0, - 0, - 0}); - this.spnMiningRate.ValueChanged += new System.EventHandler(this.spnMiningRate_ValueChanged); - // - // spnStartValue - // - this.spnStartValue.Location = new System.Drawing.Point(458, 32); - this.spnStartValue.Maximum = new decimal(new int[] { - 10000000, - 0, - 0, - 0}); - this.spnStartValue.Name = "spnStartValue"; - this.spnStartValue.Size = new System.Drawing.Size(84, 21); - this.spnStartValue.TabIndex = 54; - this.spnStartValue.Value = new decimal(new int[] { - 120, - 0, - 0, - 0}); - this.spnStartValue.ValueChanged += new System.EventHandler(this.spnStartValue_ValueChanged); - // - // label27 - // - this.label27.AutoSize = true; - this.label27.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label27.Location = new System.Drawing.Point(365, 61); - this.label27.Margin = new System.Windows.Forms.Padding(3); - this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(74, 15); - this.label27.TabIndex = 53; - this.label27.Text = "Mining Rate"; - // - // label26 - // - this.label26.AutoSize = true; - this.label26.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label26.Location = new System.Drawing.Point(365, 32); - this.label26.Margin = new System.Windows.Forms.Padding(3); - this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(66, 15); - this.label26.TabIndex = 52; - this.label26.Text = "Start Value"; - // - // picValueGraph - // - this.picValueGraph.Location = new System.Drawing.Point(368, 111); - this.picValueGraph.Name = "picValueGraph"; - this.picValueGraph.Size = new System.Drawing.Size(174, 106); - this.picValueGraph.TabIndex = 51; - this.picValueGraph.TabStop = false; - this.picValueGraph.Paint += new System.Windows.Forms.PaintEventHandler(this.picValueGraph_Paint); - // - // spnHomeworldValue - // - this.spnHomeworldValue.Location = new System.Drawing.Point(153, 300); - this.spnHomeworldValue.Maximum = new decimal(new int[] { - 10000000, - 0, - 0, - 0}); - this.spnHomeworldValue.Name = "spnHomeworldValue"; - this.spnHomeworldValue.Size = new System.Drawing.Size(95, 21); - this.spnHomeworldValue.TabIndex = 50; - this.spnHomeworldValue.ThousandsSeparator = true; - this.spnHomeworldValue.Value = new decimal(new int[] { - 120, - 0, - 0, - 0}); - // - // label25 - // - this.label25.AutoSize = true; - this.label25.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label25.Location = new System.Drawing.Point(8, 302); - this.label25.Margin = new System.Windows.Forms.Padding(3); - this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(105, 15); - this.label25.TabIndex = 49; - this.label25.Text = "Homeworld Value"; - // - // chkBonusDepletionRemote - // - this.chkBonusDepletionRemote.AutoSize = true; - this.chkBonusDepletionRemote.Location = new System.Drawing.Point(257, 161); - this.chkBonusDepletionRemote.Name = "chkBonusDepletionRemote"; - this.chkBonusDepletionRemote.Size = new System.Drawing.Size(15, 14); - this.chkBonusDepletionRemote.TabIndex = 48; - this.chkBonusDepletionRemote.UseVisualStyleBackColor = true; - // - // chkBonusDepletionStandard - // - this.chkBonusDepletionStandard.AutoSize = true; - this.chkBonusDepletionStandard.Location = new System.Drawing.Point(153, 161); - this.chkBonusDepletionStandard.Name = "chkBonusDepletionStandard"; - this.chkBonusDepletionStandard.Size = new System.Drawing.Size(15, 14); - this.chkBonusDepletionStandard.TabIndex = 47; - this.chkBonusDepletionStandard.UseVisualStyleBackColor = true; - // - // label17 - // - this.label17.AutoSize = true; - this.label17.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label17.Location = new System.Drawing.Point(8, 160); - this.label17.Margin = new System.Windows.Forms.Padding(3); - this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(136, 15); - this.label17.TabIndex = 46; - this.label17.Text = "Bonus Affects Depletion"; - // - // spnDepletionTurnRemote - // - this.spnDepletionTurnRemote.Location = new System.Drawing.Point(257, 181); - this.spnDepletionTurnRemote.Maximum = new decimal(new int[] { - 1000000, - 0, - 0, - 0}); - this.spnDepletionTurnRemote.Name = "spnDepletionTurnRemote"; - this.spnDepletionTurnRemote.Size = new System.Drawing.Size(95, 21); - this.spnDepletionTurnRemote.TabIndex = 45; - this.spnDepletionTurnRemote.ThousandsSeparator = true; - this.spnDepletionTurnRemote.Value = new decimal(new int[] { - 1, - 0, - 0, - 0}); - // - // spnDepletionTurnStandard - // - this.spnDepletionTurnStandard.Location = new System.Drawing.Point(153, 181); - this.spnDepletionTurnStandard.Maximum = new decimal(new int[] { - 1000000, - 0, - 0, - 0}); - this.spnDepletionTurnStandard.Name = "spnDepletionTurnStandard"; - this.spnDepletionTurnStandard.Size = new System.Drawing.Size(95, 21); - this.spnDepletionTurnStandard.TabIndex = 44; - this.spnDepletionTurnStandard.ThousandsSeparator = true; - // - // label24 - // - this.label24.AutoSize = true; - this.label24.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label24.Location = new System.Drawing.Point(8, 183); - this.label24.Margin = new System.Windows.Forms.Padding(3); - this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(132, 15); - this.label24.TabIndex = 43; - this.label24.Text = "Depletion / Turn Mined"; - // - // spnMaxValuePlanet - // - this.spnMaxValuePlanet.Location = new System.Drawing.Point(153, 354); - this.spnMaxValuePlanet.Maximum = new decimal(new int[] { - 10000000, - 0, - 0, - 0}); - this.spnMaxValuePlanet.Name = "spnMaxValuePlanet"; - this.spnMaxValuePlanet.Size = new System.Drawing.Size(95, 21); - this.spnMaxValuePlanet.TabIndex = 41; - this.spnMaxValuePlanet.ThousandsSeparator = true; - this.spnMaxValuePlanet.Value = new decimal(new int[] { - 250, - 0, - 0, - 0}); - // - // spnMaxSpawnValueAsteroid - // - this.spnMaxSpawnValueAsteroid.Location = new System.Drawing.Point(257, 327); - this.spnMaxSpawnValueAsteroid.Maximum = new decimal(new int[] { - 10000000, - 0, - 0, - 0}); - this.spnMaxSpawnValueAsteroid.Name = "spnMaxSpawnValueAsteroid"; - this.spnMaxSpawnValueAsteroid.Size = new System.Drawing.Size(95, 21); - this.spnMaxSpawnValueAsteroid.TabIndex = 40; - this.spnMaxSpawnValueAsteroid.ThousandsSeparator = true; - this.spnMaxSpawnValueAsteroid.Value = new decimal(new int[] { - 300, - 0, - 0, - 0}); - // - // spnMinSpawnValueAsteroid - // - this.spnMinSpawnValueAsteroid.Location = new System.Drawing.Point(257, 273); - this.spnMinSpawnValueAsteroid.Maximum = new decimal(new int[] { - 10000000, - 0, - 0, - 0}); - this.spnMinSpawnValueAsteroid.Name = "spnMinSpawnValueAsteroid"; - this.spnMinSpawnValueAsteroid.Size = new System.Drawing.Size(95, 21); - this.spnMinSpawnValueAsteroid.TabIndex = 39; - this.spnMinSpawnValueAsteroid.ThousandsSeparator = true; - this.spnMinSpawnValueAsteroid.Value = new decimal(new int[] { - 50, - 0, - 0, - 0}); - // - // spnMinValueAsteroid - // - this.spnMinValueAsteroid.Location = new System.Drawing.Point(257, 246); - this.spnMinValueAsteroid.Maximum = new decimal(new int[] { - 10000000, - 0, - 0, - 0}); - this.spnMinValueAsteroid.Name = "spnMinValueAsteroid"; - this.spnMinValueAsteroid.Size = new System.Drawing.Size(95, 21); - this.spnMinValueAsteroid.TabIndex = 38; - this.spnMinValueAsteroid.ThousandsSeparator = true; - // - // spnMaxSpawnValuePlanet - // - this.spnMaxSpawnValuePlanet.Location = new System.Drawing.Point(153, 327); - this.spnMaxSpawnValuePlanet.Maximum = new decimal(new int[] { - 10000000, - 0, - 0, - 0}); - this.spnMaxSpawnValuePlanet.Name = "spnMaxSpawnValuePlanet"; - this.spnMaxSpawnValuePlanet.Size = new System.Drawing.Size(95, 21); - this.spnMaxSpawnValuePlanet.TabIndex = 37; - this.spnMaxSpawnValuePlanet.ThousandsSeparator = true; - this.spnMaxSpawnValuePlanet.Value = new decimal(new int[] { - 150, - 0, - 0, - 0}); - // - // spnMinSpawnValuePlanet - // - this.spnMinSpawnValuePlanet.Location = new System.Drawing.Point(153, 273); - this.spnMinSpawnValuePlanet.Maximum = new decimal(new int[] { - 10000000, - 0, - 0, - 0}); - this.spnMinSpawnValuePlanet.Name = "spnMinSpawnValuePlanet"; - this.spnMinSpawnValuePlanet.Size = new System.Drawing.Size(95, 21); - this.spnMinSpawnValuePlanet.TabIndex = 36; - this.spnMinSpawnValuePlanet.ThousandsSeparator = true; - // - // spnMinValuePlanet - // - this.spnMinValuePlanet.Location = new System.Drawing.Point(153, 246); - this.spnMinValuePlanet.Maximum = new decimal(new int[] { - 10000000, - 0, - 0, - 0}); - this.spnMinValuePlanet.Name = "spnMinValuePlanet"; - this.spnMinValuePlanet.Size = new System.Drawing.Size(95, 21); - this.spnMinValuePlanet.TabIndex = 35; - this.spnMinValuePlanet.ThousandsSeparator = true; - // - // label23 - // - this.label23.AutoSize = true; - this.label23.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label23.Location = new System.Drawing.Point(254, 223); - this.label23.Margin = new System.Windows.Forms.Padding(3); - this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(57, 15); - this.label23.TabIndex = 34; - this.label23.Text = "Asteroids"; - // - // label22 - // - this.label22.AutoSize = true; - this.label22.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label22.Location = new System.Drawing.Point(150, 223); - this.label22.Margin = new System.Windows.Forms.Padding(3); - this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(48, 15); - this.label22.TabIndex = 33; - this.label22.Text = "Planets"; - // - // label21 - // - this.label21.AutoSize = true; - this.label21.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label21.Location = new System.Drawing.Point(8, 356); - this.label21.Margin = new System.Windows.Forms.Padding(3); - this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(65, 15); - this.label21.TabIndex = 32; - this.label21.Text = "Max Value"; - // - // label20 - // - this.label20.AutoSize = true; - this.label20.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label20.Location = new System.Drawing.Point(8, 246); - this.label20.Margin = new System.Windows.Forms.Padding(3); - this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(62, 15); - this.label20.TabIndex = 31; - this.label20.Text = "Min Value"; - // - // label19 - // - this.label19.AutoSize = true; - this.label19.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label19.Location = new System.Drawing.Point(8, 329); - this.label19.Margin = new System.Windows.Forms.Padding(3); - this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(106, 15); - this.label19.TabIndex = 30; - this.label19.Text = "Max Spawn Value"; - // - // label18 - // - this.label18.AutoSize = true; - this.label18.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label18.Location = new System.Drawing.Point(8, 275); - this.label18.Margin = new System.Windows.Forms.Padding(3); - this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(103, 15); - this.label18.TabIndex = 29; - this.label18.Text = "Min Spawn Value"; - // - // spnDepletionResourceRemote - // - this.spnDepletionResourceRemote.Increment = new decimal(new int[] { - 1, - 0, - 0, - 131072}); - this.spnDepletionResourceRemote.Location = new System.Drawing.Point(257, 130); - this.spnDepletionResourceRemote.Maximum = new decimal(new int[] { - 1, - 0, - 0, - 0}); - this.spnDepletionResourceRemote.Name = "spnDepletionResourceRemote"; - this.spnDepletionResourceRemote.Size = new System.Drawing.Size(95, 21); - this.spnDepletionResourceRemote.TabIndex = 27; - // - // spnBonusRemote - // - this.spnBonusRemote.Increment = new decimal(new int[] { - 1, - 0, - 0, - 131072}); - this.spnBonusRemote.Location = new System.Drawing.Point(257, 103); - this.spnBonusRemote.Name = "spnBonusRemote"; - this.spnBonusRemote.Size = new System.Drawing.Size(95, 21); - this.spnBonusRemote.TabIndex = 26; - this.spnBonusRemote.Value = new decimal(new int[] { - 1, - 0, - 0, - 0}); - // - // spnRateRemote - // - this.spnRateRemote.Location = new System.Drawing.Point(257, 51); - this.spnRateRemote.Maximum = new decimal(new int[] { - 1000, - 0, - 0, - 0}); - this.spnRateRemote.Name = "spnRateRemote"; - this.spnRateRemote.Size = new System.Drawing.Size(95, 21); - this.spnRateRemote.TabIndex = 25; - // - // spnDepletionResourceStandard - // - this.spnDepletionResourceStandard.Increment = new decimal(new int[] { - 1, - 0, - 0, - 131072}); - this.spnDepletionResourceStandard.Location = new System.Drawing.Point(153, 130); - this.spnDepletionResourceStandard.Maximum = new decimal(new int[] { - 1, - 0, - 0, - 0}); - this.spnDepletionResourceStandard.Name = "spnDepletionResourceStandard"; - this.spnDepletionResourceStandard.Size = new System.Drawing.Size(95, 21); - this.spnDepletionResourceStandard.TabIndex = 23; - // - // spnBonusStandard - // - this.spnBonusStandard.Increment = new decimal(new int[] { - 1, - 0, - 0, - 131072}); - this.spnBonusStandard.Location = new System.Drawing.Point(153, 103); - this.spnBonusStandard.Name = "spnBonusStandard"; - this.spnBonusStandard.Size = new System.Drawing.Size(95, 21); - this.spnBonusStandard.TabIndex = 22; - this.spnBonusStandard.Value = new decimal(new int[] { - 1, - 0, - 0, - 0}); - // - // spnRateStandard - // - this.spnRateStandard.Location = new System.Drawing.Point(153, 51); - this.spnRateStandard.Maximum = new decimal(new int[] { - 1000, - 0, - 0, - 0}); - this.spnRateStandard.Name = "spnRateStandard"; - this.spnRateStandard.Size = new System.Drawing.Size(95, 21); - this.spnRateStandard.TabIndex = 21; - // - // label16 - // - this.label16.AutoSize = true; - this.label16.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label16.Location = new System.Drawing.Point(8, 132); - this.label16.Margin = new System.Windows.Forms.Padding(3); - this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(122, 15); - this.label16.TabIndex = 19; - this.label16.Text = "Depletion / Resource"; - // - // label15 - // - this.label15.AutoSize = true; - this.label15.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label15.Location = new System.Drawing.Point(8, 105); - this.label15.Margin = new System.Windows.Forms.Padding(3); - this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(90, 15); - this.label15.TabIndex = 18; - this.label15.Text = "Value % Bonus"; - // - // label14 - // - this.label14.AutoSize = true; - this.label14.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label14.Location = new System.Drawing.Point(8, 53); - this.label14.Margin = new System.Windows.Forms.Padding(3); - this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(47, 15); - this.label14.TabIndex = 17; - this.label14.Text = "Rate %"; - // - // label13 - // - this.label13.AutoSize = true; - this.label13.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label13.Location = new System.Drawing.Point(254, 32); - this.label13.Margin = new System.Windows.Forms.Padding(3); - this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(92, 15); - this.label13.TabIndex = 16; - this.label13.Text = "Remote Mining"; - // - // label12 - // - this.label12.AutoSize = true; - this.label12.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label12.Location = new System.Drawing.Point(150, 32); - this.label12.Margin = new System.Windows.Forms.Padding(3); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(98, 15); - this.label12.TabIndex = 15; - this.label12.Text = "Standard Mining"; - // - // btnLoadResourcePreset - // - this.btnLoadResourcePreset.BackColor = System.Drawing.Color.Black; - this.btnLoadResourcePreset.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnLoadResourcePreset.Location = new System.Drawing.Point(312, 2); - this.btnLoadResourcePreset.Name = "btnLoadResourcePreset"; - this.btnLoadResourcePreset.Size = new System.Drawing.Size(75, 23); - this.btnLoadResourcePreset.TabIndex = 13; - this.btnLoadResourcePreset.Text = "Load"; - this.btnLoadResourcePreset.UseVisualStyleBackColor = false; - this.btnLoadResourcePreset.Click += new System.EventHandler(this.btnLoadResourcePreset_Click); - // - // ddlPresets - // - this.ddlPresets.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.ddlPresets.FormattingEnabled = true; - this.ddlPresets.Items.AddRange(new object[] { - "Standard, Remote Mining Depletes", - "Standard, Remote Mining Doesn\'t Deplete", - "Finite"}); - this.ddlPresets.Location = new System.Drawing.Point(57, 3); - this.ddlPresets.Name = "ddlPresets"; - this.ddlPresets.Size = new System.Drawing.Size(249, 23); - this.ddlPresets.TabIndex = 12; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label5.Location = new System.Drawing.Point(3, 6); - this.label5.Margin = new System.Windows.Forms.Padding(3); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(48, 15); - this.label5.TabIndex = 11; - this.label5.Text = "Presets"; - // - // tabTechnology - // - this.tabTechnology.BackColor = System.Drawing.Color.Black; - this.tabTechnology.Controls.Add(this.ddlTechUniqueness); - this.tabTechnology.Controls.Add(this.label63); - this.tabTechnology.Controls.Add(this.ddlTechCost); - this.tabTechnology.Controls.Add(this.label61); - this.tabTechnology.Controls.Add(this.label31); - this.tabTechnology.Controls.Add(this.lstTechs); - this.tabTechnology.Controls.Add(this.ddlStartTech); - this.tabTechnology.Controls.Add(this.label30); - this.tabTechnology.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.tabTechnology.Location = new System.Drawing.Point(4, 29); - this.tabTechnology.Name = "tabTechnology"; - this.tabTechnology.Padding = new System.Windows.Forms.Padding(3); - this.tabTechnology.Size = new System.Drawing.Size(545, 540); - this.tabTechnology.TabIndex = 2; - this.tabTechnology.Text = "Technology"; - // - // ddlTechUniqueness - // - this.ddlTechUniqueness.DisplayMember = "Name"; - this.ddlTechUniqueness.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.ddlTechUniqueness.FormattingEnabled = true; - this.ddlTechUniqueness.Location = new System.Drawing.Point(424, 6); - this.ddlTechUniqueness.Name = "ddlTechUniqueness"; - this.ddlTechUniqueness.Size = new System.Drawing.Size(121, 23); - this.ddlTechUniqueness.TabIndex = 19; - this.ddlTechUniqueness.ValueMember = "Value"; - // - // label63 - // - this.label63.AutoSize = true; - this.label63.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label63.Location = new System.Drawing.Point(247, 9); - this.label63.Margin = new System.Windows.Forms.Padding(3); - this.label63.Name = "label63"; - this.label63.Size = new System.Drawing.Size(179, 15); - this.label63.TabIndex = 18; - this.label63.Text = "Tech Known By Other Players is"; - // - // ddlTechCost - // - this.ddlTechCost.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.ddlTechCost.FormattingEnabled = true; - this.ddlTechCost.Items.AddRange(new object[] { - "Low", - "Medium", - "High"}); - this.ddlTechCost.Location = new System.Drawing.Point(120, 35); - this.ddlTechCost.Name = "ddlTechCost"; - this.ddlTechCost.Size = new System.Drawing.Size(121, 23); - this.ddlTechCost.TabIndex = 17; - // - // label61 - // - this.label61.AutoSize = true; - this.label61.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label61.Location = new System.Drawing.Point(3, 38); - this.label61.Margin = new System.Windows.Forms.Padding(3); - this.label61.Name = "label61"; - this.label61.Size = new System.Drawing.Size(97, 15); - this.label61.TabIndex = 16; - this.label61.Text = "Technology Cost"; - // - // label31 - // - this.label31.AutoSize = true; - this.label31.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label31.Location = new System.Drawing.Point(3, 84); - this.label31.Margin = new System.Windows.Forms.Padding(3); - this.label31.Name = "label31"; - this.label31.Size = new System.Drawing.Size(133, 15); - this.label31.TabIndex = 15; - this.label31.Text = "Available Technologies"; - // - // lstTechs - // - this.lstTechs.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.lstTechs.BackColor = System.Drawing.Color.Black; - this.lstTechs.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.lstTechs.CheckOnClick = true; - this.lstTechs.ColumnWidth = 200; - this.lstTechs.ForeColor = System.Drawing.Color.White; - this.lstTechs.FormattingEnabled = true; - this.lstTechs.Location = new System.Drawing.Point(9, 105); - this.lstTechs.MultiColumn = true; - this.lstTechs.Name = "lstTechs"; - this.lstTechs.Size = new System.Drawing.Size(530, 416); - this.lstTechs.TabIndex = 14; - // - // ddlStartTech - // - this.ddlStartTech.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.ddlStartTech.FormattingEnabled = true; - this.ddlStartTech.Items.AddRange(new object[] { - "Low", - "Medium", - "High"}); - this.ddlStartTech.Location = new System.Drawing.Point(120, 6); - this.ddlStartTech.Name = "ddlStartTech"; - this.ddlStartTech.Size = new System.Drawing.Size(121, 23); - this.ddlStartTech.TabIndex = 13; - // - // label30 - // - this.label30.AutoSize = true; - this.label30.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label30.Location = new System.Drawing.Point(3, 9); - this.label30.Margin = new System.Windows.Forms.Padding(3); - this.label30.Name = "label30"; - this.label30.Size = new System.Drawing.Size(111, 15); - this.label30.TabIndex = 12; - this.label30.Text = "Starting Tech Level"; - // - // tabEmpires - // - this.tabEmpires.BackColor = System.Drawing.Color.Black; - this.tabEmpires.Controls.Add(this.lblMaxBonusResearchFromEmpirePoints); - this.tabEmpires.Controls.Add(this.spnResearchPerUnspentEmpirePoint); - this.tabEmpires.Controls.Add(this.label64); - this.tabEmpires.Controls.Add(this.btnEmpireBottom); - this.tabEmpires.Controls.Add(this.btnEmpireTop); - this.tabEmpires.Controls.Add(this.btnEmpireDown); - this.tabEmpires.Controls.Add(this.btnEmpireUp); - this.tabEmpires.Controls.Add(this.btnToggleAI); - this.tabEmpires.Controls.Add(this.label44); - this.tabEmpires.Controls.Add(this.spnMaxDispersion); - this.tabEmpires.Controls.Add(this.label43); - this.tabEmpires.Controls.Add(this.ddlHomeworldSize); - this.tabEmpires.Controls.Add(this.label42); - this.tabEmpires.Controls.Add(this.btnSaveEmpire); - this.tabEmpires.Controls.Add(this.btnRemoveEmpire); - this.tabEmpires.Controls.Add(this.btnEditEmpire); - this.tabEmpires.Controls.Add(this.btnLoadEmpire); - this.tabEmpires.Controls.Add(this.btnCreateEmpire); - this.tabEmpires.Controls.Add(this.gamePanel1); - this.tabEmpires.Controls.Add(this.label41); - this.tabEmpires.Controls.Add(this.spnResourceStorage); - this.tabEmpires.Controls.Add(this.label40); - this.tabEmpires.Controls.Add(this.spnMinorEmpires); - this.tabEmpires.Controls.Add(this.spnRandomAIs); - this.tabEmpires.Controls.Add(this.spnEmpirePoints); - this.tabEmpires.Controls.Add(this.ddlScoreDisplay); - this.tabEmpires.Controls.Add(this.ddlEmpirePlacement); - this.tabEmpires.Controls.Add(this.spnHomeworlds); - this.tabEmpires.Controls.Add(this.spnStartResearch); - this.tabEmpires.Controls.Add(this.spnStartResources); - this.tabEmpires.Controls.Add(this.label39); - this.tabEmpires.Controls.Add(this.label38); - this.tabEmpires.Controls.Add(this.label37); - this.tabEmpires.Controls.Add(this.label36); - this.tabEmpires.Controls.Add(this.label35); - this.tabEmpires.Controls.Add(this.label34); - this.tabEmpires.Controls.Add(this.label33); - this.tabEmpires.Controls.Add(this.label32); - this.tabEmpires.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.tabEmpires.Location = new System.Drawing.Point(4, 29); - this.tabEmpires.Name = "tabEmpires"; - this.tabEmpires.Padding = new System.Windows.Forms.Padding(3); - this.tabEmpires.Size = new System.Drawing.Size(545, 540); - this.tabEmpires.TabIndex = 3; - this.tabEmpires.Text = "Empires"; - // - // lblMaxBonusResearchFromEmpirePoints - // - this.lblMaxBonusResearchFromEmpirePoints.AutoSize = true; - this.lblMaxBonusResearchFromEmpirePoints.ForeColor = System.Drawing.Color.White; - this.lblMaxBonusResearchFromEmpirePoints.Location = new System.Drawing.Point(253, 86); - this.lblMaxBonusResearchFromEmpirePoints.Margin = new System.Windows.Forms.Padding(3); - this.lblMaxBonusResearchFromEmpirePoints.Name = "lblMaxBonusResearchFromEmpirePoints"; - this.lblMaxBonusResearchFromEmpirePoints.Size = new System.Drawing.Size(235, 15); - this.lblMaxBonusResearchFromEmpirePoints.TabIndex = 50; - this.lblMaxBonusResearchFromEmpirePoints.Text = "Empires can earn up to 0 bonus research."; - // - // spnResearchPerUnspentEmpirePoint - // - this.spnResearchPerUnspentEmpirePoint.Location = new System.Drawing.Point(449, 57); - this.spnResearchPerUnspentEmpirePoint.Maximum = new decimal(new int[] { - 10000, - 0, - 0, - 0}); - this.spnResearchPerUnspentEmpirePoint.Name = "spnResearchPerUnspentEmpirePoint"; - this.spnResearchPerUnspentEmpirePoint.Size = new System.Drawing.Size(90, 21); - this.spnResearchPerUnspentEmpirePoint.TabIndex = 3; - this.spnResearchPerUnspentEmpirePoint.ThousandsSeparator = true; - this.spnResearchPerUnspentEmpirePoint.ValueChanged += new System.EventHandler(this.spnResearchPerUnspentEmpirePoint_ValueChanged); - // - // label64 - // - this.label64.AutoSize = true; - this.label64.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label64.Location = new System.Drawing.Point(252, 59); - this.label64.Margin = new System.Windows.Forms.Padding(3); - this.label64.Name = "label64"; - this.label64.Size = new System.Drawing.Size(187, 15); - this.label64.TabIndex = 48; - this.label64.Text = "Bonus Per Unspent Empire Point\r\n"; - // - // btnEmpireBottom - // - this.btnEmpireBottom.BackColor = System.Drawing.Color.Black; - this.btnEmpireBottom.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnEmpireBottom.Location = new System.Drawing.Point(414, 485); - this.btnEmpireBottom.Name = "btnEmpireBottom"; - this.btnEmpireBottom.Size = new System.Drawing.Size(101, 31); - this.btnEmpireBottom.TabIndex = 47; - this.btnEmpireBottom.Text = "To Bottom"; - this.btnEmpireBottom.UseVisualStyleBackColor = false; - this.btnEmpireBottom.Click += new System.EventHandler(this.btnEmpireBottom_Click); - // - // btnEmpireTop - // - this.btnEmpireTop.BackColor = System.Drawing.Color.Black; - this.btnEmpireTop.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnEmpireTop.Location = new System.Drawing.Point(414, 448); - this.btnEmpireTop.Name = "btnEmpireTop"; - this.btnEmpireTop.Size = new System.Drawing.Size(101, 31); - this.btnEmpireTop.TabIndex = 46; - this.btnEmpireTop.Text = "To Top"; - this.btnEmpireTop.UseVisualStyleBackColor = false; - this.btnEmpireTop.Click += new System.EventHandler(this.btnEmpireTop_Click); - // - // btnEmpireDown - // - this.btnEmpireDown.BackColor = System.Drawing.Color.Black; - this.btnEmpireDown.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnEmpireDown.Location = new System.Drawing.Point(307, 485); - this.btnEmpireDown.Name = "btnEmpireDown"; - this.btnEmpireDown.Size = new System.Drawing.Size(101, 31); - this.btnEmpireDown.TabIndex = 45; - this.btnEmpireDown.Text = "Move Down"; - this.btnEmpireDown.UseVisualStyleBackColor = false; - this.btnEmpireDown.Click += new System.EventHandler(this.btnEmpireDown_Click); - // - // btnEmpireUp - // - this.btnEmpireUp.BackColor = System.Drawing.Color.Black; - this.btnEmpireUp.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnEmpireUp.Location = new System.Drawing.Point(307, 448); - this.btnEmpireUp.Name = "btnEmpireUp"; - this.btnEmpireUp.Size = new System.Drawing.Size(101, 31); - this.btnEmpireUp.TabIndex = 44; - this.btnEmpireUp.Text = "Move Up"; - this.btnEmpireUp.UseVisualStyleBackColor = false; - this.btnEmpireUp.Click += new System.EventHandler(this.btnEmpireUp_Click); - // - // btnToggleAI - // - this.btnToggleAI.BackColor = System.Drawing.Color.Black; - this.btnToggleAI.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnToggleAI.Location = new System.Drawing.Point(414, 411); - this.btnToggleAI.Name = "btnToggleAI"; - this.btnToggleAI.Size = new System.Drawing.Size(101, 31); - this.btnToggleAI.TabIndex = 43; - this.btnToggleAI.Text = "Toggle AI"; - this.btnToggleAI.UseVisualStyleBackColor = false; - this.btnToggleAI.Click += new System.EventHandler(this.btnToggleAI_Click); - // - // label44 - // - this.label44.AutoSize = true; - this.label44.Location = new System.Drawing.Point(253, 170); - this.label44.Name = "label44"; - this.label44.Size = new System.Drawing.Size(173, 15); - this.label44.TabIndex = 42; - this.label44.Text = "warps from central homeworld"; - // - // spnMaxDispersion - // - this.spnMaxDispersion.Location = new System.Drawing.Point(126, 169); - this.spnMaxDispersion.Maximum = new decimal(new int[] { - 10, - 0, - 0, - 0}); - this.spnMaxDispersion.Name = "spnMaxDispersion"; - this.spnMaxDispersion.Size = new System.Drawing.Size(120, 21); - this.spnMaxDispersion.TabIndex = 7; - this.spnMaxDispersion.Value = new decimal(new int[] { - 1, - 0, - 0, - 0}); - // - // label43 - // - this.label43.AutoSize = true; - this.label43.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label43.Location = new System.Drawing.Point(9, 171); - this.label43.Margin = new System.Windows.Forms.Padding(3); - this.label43.Name = "label43"; - this.label43.Size = new System.Drawing.Size(93, 15); - this.label43.TabIndex = 40; - this.label43.Text = "Max Dispersion"; - // - // ddlHomeworldSize - // - this.ddlHomeworldSize.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.ddlHomeworldSize.FormattingEnabled = true; - this.ddlHomeworldSize.Location = new System.Drawing.Point(125, 111); - this.ddlHomeworldSize.Name = "ddlHomeworldSize"; - this.ddlHomeworldSize.Size = new System.Drawing.Size(165, 23); - this.ddlHomeworldSize.TabIndex = 5; - // - // label42 - // - this.label42.AutoSize = true; - this.label42.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label42.Location = new System.Drawing.Point(8, 114); - this.label42.Margin = new System.Windows.Forms.Padding(3); - this.label42.Name = "label42"; - this.label42.Size = new System.Drawing.Size(98, 15); - this.label42.TabIndex = 38; - this.label42.Text = "Homeworld Size"; - // - // btnSaveEmpire - // - this.btnSaveEmpire.BackColor = System.Drawing.Color.Black; - this.btnSaveEmpire.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnSaveEmpire.Location = new System.Drawing.Point(414, 374); - this.btnSaveEmpire.Name = "btnSaveEmpire"; - this.btnSaveEmpire.Size = new System.Drawing.Size(101, 31); - this.btnSaveEmpire.TabIndex = 37; - this.btnSaveEmpire.Text = "Save"; - this.btnSaveEmpire.UseVisualStyleBackColor = false; - this.btnSaveEmpire.Click += new System.EventHandler(this.btnSaveEmpire_Click); - // - // btnRemoveEmpire - // - this.btnRemoveEmpire.BackColor = System.Drawing.Color.Black; - this.btnRemoveEmpire.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnRemoveEmpire.Location = new System.Drawing.Point(307, 411); - this.btnRemoveEmpire.Name = "btnRemoveEmpire"; - this.btnRemoveEmpire.Size = new System.Drawing.Size(101, 31); - this.btnRemoveEmpire.TabIndex = 36; - this.btnRemoveEmpire.Text = "Remove"; - this.btnRemoveEmpire.UseVisualStyleBackColor = false; - this.btnRemoveEmpire.Click += new System.EventHandler(this.btnRemoveEmpire_Click); - // - // btnEditEmpire - // - this.btnEditEmpire.BackColor = System.Drawing.Color.Black; - this.btnEditEmpire.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnEditEmpire.Location = new System.Drawing.Point(414, 337); - this.btnEditEmpire.Name = "btnEditEmpire"; - this.btnEditEmpire.Size = new System.Drawing.Size(101, 31); - this.btnEditEmpire.TabIndex = 35; - this.btnEditEmpire.Text = "Edit"; - this.btnEditEmpire.UseVisualStyleBackColor = false; - this.btnEditEmpire.Click += new System.EventHandler(this.btnEditEmpire_Click); - // - // btnLoadEmpire - // - this.btnLoadEmpire.BackColor = System.Drawing.Color.Black; - this.btnLoadEmpire.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnLoadEmpire.Location = new System.Drawing.Point(307, 374); - this.btnLoadEmpire.Name = "btnLoadEmpire"; - this.btnLoadEmpire.Size = new System.Drawing.Size(101, 31); - this.btnLoadEmpire.TabIndex = 34; - this.btnLoadEmpire.Text = "Load"; - this.btnLoadEmpire.UseVisualStyleBackColor = false; - this.btnLoadEmpire.Click += new System.EventHandler(this.btnLoadEmpire_Click); - // - // btnCreateEmpire - // - this.btnCreateEmpire.BackColor = System.Drawing.Color.Black; - this.btnCreateEmpire.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnCreateEmpire.Location = new System.Drawing.Point(307, 337); - this.btnCreateEmpire.Name = "btnCreateEmpire"; - this.btnCreateEmpire.Size = new System.Drawing.Size(101, 31); - this.btnCreateEmpire.TabIndex = 12; - this.btnCreateEmpire.Text = "Create"; - this.btnCreateEmpire.UseVisualStyleBackColor = false; - this.btnCreateEmpire.Click += new System.EventHandler(this.btnCreateEmpire_Click); - // - // gamePanel1 - // - this.gamePanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left))); - this.gamePanel1.BackColor = System.Drawing.Color.Black; - this.gamePanel1.BorderColor = System.Drawing.Color.CornflowerBlue; - this.gamePanel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.gamePanel1.Controls.Add(this.lstEmpires); - this.gamePanel1.ForeColor = System.Drawing.Color.White; - this.gamePanel1.Location = new System.Drawing.Point(11, 337); - this.gamePanel1.Name = "gamePanel1"; - this.gamePanel1.Padding = new System.Windows.Forms.Padding(3); - this.gamePanel1.Size = new System.Drawing.Size(290, 197); - this.gamePanel1.TabIndex = 32; - // - // lstEmpires - // - this.lstEmpires.BackColor = System.Drawing.Color.Black; - this.lstEmpires.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.lstEmpires.Dock = System.Windows.Forms.DockStyle.Fill; - this.lstEmpires.ForeColor = System.Drawing.Color.White; - this.lstEmpires.Location = new System.Drawing.Point(3, 3); - this.lstEmpires.Name = "lstEmpires"; - this.lstEmpires.Size = new System.Drawing.Size(282, 189); - this.lstEmpires.TabIndex = 0; - this.lstEmpires.UseCompatibleStateImageBehavior = false; - this.lstEmpires.View = System.Windows.Forms.View.List; - // - // label41 - // - this.label41.AutoSize = true; - this.label41.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label41.Location = new System.Drawing.Point(12, 316); - this.label41.Margin = new System.Windows.Forms.Padding(3); - this.label41.Name = "label41"; - this.label41.Size = new System.Drawing.Size(90, 15); - this.label41.TabIndex = 31; - this.label41.Text = "Player Empires"; - // - // spnResourceStorage - // - this.spnResourceStorage.Location = new System.Drawing.Point(126, 32); - this.spnResourceStorage.Maximum = new decimal(new int[] { - 1000000, - 0, - 0, - 0}); - this.spnResourceStorage.Name = "spnResourceStorage"; - this.spnResourceStorage.Size = new System.Drawing.Size(120, 21); - this.spnResourceStorage.TabIndex = 1; - this.spnResourceStorage.Value = new decimal(new int[] { - 50000, - 0, - 0, - 0}); - this.spnResourceStorage.ValueChanged += new System.EventHandler(this.spnResourceStorage_ValueChanged); - // - // label40 - // - this.label40.AutoSize = true; - this.label40.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label40.Location = new System.Drawing.Point(6, 34); - this.label40.Margin = new System.Windows.Forms.Padding(3); - this.label40.Name = "label40"; - this.label40.Size = new System.Drawing.Size(106, 15); - this.label40.TabIndex = 29; - this.label40.Text = "Resource Storage"; - // - // spnMinorEmpires - // - this.spnMinorEmpires.Location = new System.Drawing.Point(125, 279); - this.spnMinorEmpires.Name = "spnMinorEmpires"; - this.spnMinorEmpires.Size = new System.Drawing.Size(120, 21); - this.spnMinorEmpires.TabIndex = 11; - // - // spnRandomAIs - // - this.spnRandomAIs.Location = new System.Drawing.Point(125, 252); - this.spnRandomAIs.Name = "spnRandomAIs"; - this.spnRandomAIs.Size = new System.Drawing.Size(120, 21); - this.spnRandomAIs.TabIndex = 10; - // - // spnEmpirePoints - // - this.spnEmpirePoints.Location = new System.Drawing.Point(125, 225); - this.spnEmpirePoints.Maximum = new decimal(new int[] { - 1000000, - 0, - 0, - 0}); - this.spnEmpirePoints.Name = "spnEmpirePoints"; - this.spnEmpirePoints.Size = new System.Drawing.Size(120, 21); - this.spnEmpirePoints.TabIndex = 9; - this.spnEmpirePoints.Value = new decimal(new int[] { - 2000, - 0, - 0, - 0}); - this.spnEmpirePoints.ValueChanged += new System.EventHandler(this.spnEmpirePoints_ValueChanged); - // - // ddlScoreDisplay - // - this.ddlScoreDisplay.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.ddlScoreDisplay.FormattingEnabled = true; - this.ddlScoreDisplay.Items.AddRange(new object[] { - "Own Only (No Rankings)", - "Own Only (Ranked)", - "Allies Only (No Rankings)", - "Allies Only (Ranked)", - "All"}); - this.ddlScoreDisplay.Location = new System.Drawing.Point(125, 196); - this.ddlScoreDisplay.Name = "ddlScoreDisplay"; - this.ddlScoreDisplay.Size = new System.Drawing.Size(166, 23); - this.ddlScoreDisplay.TabIndex = 8; - // - // ddlEmpirePlacement - // - this.ddlEmpirePlacement.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.ddlEmpirePlacement.FormattingEnabled = true; - this.ddlEmpirePlacement.Items.AddRange(new object[] { - "Can Start In Same System", - "Different Systems", - "Equidistant"}); - this.ddlEmpirePlacement.Location = new System.Drawing.Point(126, 140); - this.ddlEmpirePlacement.Name = "ddlEmpirePlacement"; - this.ddlEmpirePlacement.Size = new System.Drawing.Size(165, 23); - this.ddlEmpirePlacement.TabIndex = 6; - // - // spnHomeworlds - // - this.spnHomeworlds.Location = new System.Drawing.Point(125, 84); - this.spnHomeworlds.Maximum = new decimal(new int[] { - 10, - 0, - 0, - 0}); - this.spnHomeworlds.Minimum = new decimal(new int[] { - 1, - 0, - 0, - 0}); - this.spnHomeworlds.Name = "spnHomeworlds"; - this.spnHomeworlds.Size = new System.Drawing.Size(120, 21); - this.spnHomeworlds.TabIndex = 4; - this.spnHomeworlds.Value = new decimal(new int[] { - 1, - 0, - 0, - 0}); - // - // spnStartResearch - // - this.spnStartResearch.Location = new System.Drawing.Point(126, 57); - this.spnStartResearch.Maximum = new decimal(new int[] { - 1000000, - 0, - 0, - 0}); - this.spnStartResearch.Name = "spnStartResearch"; - this.spnStartResearch.Size = new System.Drawing.Size(120, 21); - this.spnStartResearch.TabIndex = 2; - this.spnStartResearch.Value = new decimal(new int[] { - 20000, - 0, - 0, - 0}); - // - // spnStartResources - // - this.spnStartResources.Location = new System.Drawing.Point(126, 7); - this.spnStartResources.Maximum = new decimal(new int[] { - 1000000, - 0, - 0, - 0}); - this.spnStartResources.Name = "spnStartResources"; - this.spnStartResources.Size = new System.Drawing.Size(120, 21); - this.spnStartResources.TabIndex = 0; - this.spnStartResources.Value = new decimal(new int[] { - 20000, - 0, - 0, - 0}); - // - // label39 - // - this.label39.AutoSize = true; - this.label39.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label39.Location = new System.Drawing.Point(9, 281); - this.label39.Margin = new System.Windows.Forms.Padding(3); - this.label39.Name = "label39"; - this.label39.Size = new System.Drawing.Size(88, 15); - this.label39.TabIndex = 20; - this.label39.Text = "Minor Empires"; - // - // label38 - // - this.label38.AutoSize = true; - this.label38.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label38.Location = new System.Drawing.Point(9, 254); - this.label38.Margin = new System.Windows.Forms.Padding(3); - this.label38.Name = "label38"; - this.label38.Size = new System.Drawing.Size(74, 15); - this.label38.TabIndex = 19; - this.label38.Text = "Random AIs"; - // - // label37 - // - this.label37.AutoSize = true; - this.label37.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label37.Location = new System.Drawing.Point(9, 225); - this.label37.Margin = new System.Windows.Forms.Padding(3); - this.label37.Name = "label37"; - this.label37.Size = new System.Drawing.Size(84, 15); - this.label37.TabIndex = 18; - this.label37.Text = "Empire Points"; - // - // label36 - // - this.label36.AutoSize = true; - this.label36.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label36.Location = new System.Drawing.Point(9, 199); - this.label36.Margin = new System.Windows.Forms.Padding(3); - this.label36.Name = "label36"; - this.label36.Size = new System.Drawing.Size(82, 15); - this.label36.TabIndex = 17; - this.label36.Text = "Score Display"; - // - // label35 - // - this.label35.AutoSize = true; - this.label35.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label35.Location = new System.Drawing.Point(9, 143); - this.label35.Margin = new System.Windows.Forms.Padding(3); - this.label35.Name = "label35"; - this.label35.Size = new System.Drawing.Size(66, 15); - this.label35.TabIndex = 16; - this.label35.Text = "Placement"; - // - // label34 - // - this.label34.AutoSize = true; - this.label34.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label34.Location = new System.Drawing.Point(8, 86); - this.label34.Margin = new System.Windows.Forms.Padding(3); - this.label34.Name = "label34"; - this.label34.Size = new System.Drawing.Size(77, 15); - this.label34.TabIndex = 15; - this.label34.Text = "Homeworlds"; - // - // label33 - // - this.label33.AutoSize = true; - this.label33.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label33.Location = new System.Drawing.Point(6, 59); - this.label33.Margin = new System.Windows.Forms.Padding(3); - this.label33.Name = "label33"; - this.label33.Size = new System.Drawing.Size(105, 15); - this.label33.TabIndex = 14; - this.label33.Text = "Starting Research"; - // - // label32 - // - this.label32.AutoSize = true; - this.label32.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label32.Location = new System.Drawing.Point(6, 9); - this.label32.Margin = new System.Windows.Forms.Padding(3); - this.label32.Name = "label32"; - this.label32.Size = new System.Drawing.Size(111, 15); - this.label32.TabIndex = 13; - this.label32.Text = "Starting Resources"; - // - // tabVictory - // - this.tabVictory.BackColor = System.Drawing.Color.Black; - this.tabVictory.Controls.Add(this.label51); - this.tabVictory.Controls.Add(this.spnVictoryDelay); - this.tabVictory.Controls.Add(this.label50); - this.tabVictory.Controls.Add(this.label49); - this.tabVictory.Controls.Add(this.spnVictoryPeace); - this.tabVictory.Controls.Add(this.chkVictoryPeace); - this.tabVictory.Controls.Add(this.label48); - this.tabVictory.Controls.Add(this.spnVictoryTech); - this.tabVictory.Controls.Add(this.chkVictoryTech); - this.tabVictory.Controls.Add(this.label47); - this.tabVictory.Controls.Add(this.spnVictoryScorePercent); - this.tabVictory.Controls.Add(this.chkVictoryScorePercent); - this.tabVictory.Controls.Add(this.label46); - this.tabVictory.Controls.Add(this.spnVictoryTurns); - this.tabVictory.Controls.Add(this.chkVictoryTurns); - this.tabVictory.Controls.Add(this.spnVictoryScore); - this.tabVictory.Controls.Add(this.chkVictoryScore); - this.tabVictory.Controls.Add(this.chkVictoryEliminateMajorEmpires); - this.tabVictory.Controls.Add(this.label45); - this.tabVictory.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); - this.tabVictory.Location = new System.Drawing.Point(4, 29); - this.tabVictory.Name = "tabVictory"; - this.tabVictory.Padding = new System.Windows.Forms.Padding(3); - this.tabVictory.Size = new System.Drawing.Size(545, 540); - this.tabVictory.TabIndex = 4; - this.tabVictory.Text = "Victory"; - // - // label51 - // - this.label51.AutoSize = true; - this.label51.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label51.Location = new System.Drawing.Point(369, 225); - this.label51.Name = "label51"; - this.label51.Size = new System.Drawing.Size(34, 15); - this.label51.TabIndex = 18; - this.label51.Text = "turns"; - // - // spnVictoryDelay - // - this.spnVictoryDelay.Increment = new decimal(new int[] { - 10, - 0, - 0, - 0}); - this.spnVictoryDelay.Location = new System.Drawing.Point(243, 223); - this.spnVictoryDelay.Maximum = new decimal(new int[] { - 1000, - 0, - 0, - 0}); - this.spnVictoryDelay.Name = "spnVictoryDelay"; - this.spnVictoryDelay.Size = new System.Drawing.Size(120, 21); - this.spnVictoryDelay.TabIndex = 17; - this.spnVictoryDelay.ThousandsSeparator = true; - // - // label50 - // - this.label50.AutoSize = true; - this.label50.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label50.Location = new System.Drawing.Point(8, 225); - this.label50.Name = "label50"; - this.label50.Size = new System.Drawing.Size(229, 15); - this.label50.TabIndex = 16; - this.label50.Text = "Custom victory conditions take effect after"; - // - // label49 - // - this.label49.AutoSize = true; - this.label49.Location = new System.Drawing.Point(315, 178); - this.label49.Name = "label49"; - this.label49.Size = new System.Drawing.Size(181, 15); - this.label49.TabIndex = 15; - this.label49.Text = "turns (Non-Aggression or better)"; - // - // spnVictoryPeace - // - this.spnVictoryPeace.Increment = new decimal(new int[] { - 10, - 0, - 0, - 0}); - this.spnVictoryPeace.Location = new System.Drawing.Point(189, 176); - this.spnVictoryPeace.Minimum = new decimal(new int[] { - 10, - 0, - 0, - 0}); - this.spnVictoryPeace.Name = "spnVictoryPeace"; - this.spnVictoryPeace.Size = new System.Drawing.Size(120, 21); - this.spnVictoryPeace.TabIndex = 14; - this.spnVictoryPeace.ThousandsSeparator = true; - this.spnVictoryPeace.Value = new decimal(new int[] { - 10, - 0, - 0, - 0}); - // - // chkVictoryPeace - // - this.chkVictoryPeace.AutoSize = true; - this.chkVictoryPeace.Location = new System.Drawing.Point(10, 177); - this.chkVictoryPeace.Name = "chkVictoryPeace"; - this.chkVictoryPeace.Size = new System.Drawing.Size(173, 19); - this.chkVictoryPeace.TabIndex = 13; - this.chkVictoryPeace.Text = "Maintain galactic peace for"; - this.chkVictoryPeace.UseVisualStyleBackColor = true; - // - // label48 - // - this.label48.AutoSize = true; - this.label48.Location = new System.Drawing.Point(221, 153); - this.label48.Name = "label48"; - this.label48.Size = new System.Drawing.Size(270, 15); - this.label48.TabIndex = 12; - this.label48.Text = "% of all non-racial, non-unique technology levels"; - // - // spnVictoryTech - // - this.spnVictoryTech.Increment = new decimal(new int[] { - 10, - 0, - 0, - 0}); - this.spnVictoryTech.Location = new System.Drawing.Point(95, 151); - this.spnVictoryTech.Minimum = new decimal(new int[] { - 10, - 0, - 0, - 0}); - this.spnVictoryTech.Name = "spnVictoryTech"; - this.spnVictoryTech.Size = new System.Drawing.Size(120, 21); - this.spnVictoryTech.TabIndex = 11; - this.spnVictoryTech.ThousandsSeparator = true; - this.spnVictoryTech.Value = new decimal(new int[] { - 100, - 0, - 0, - 0}); - // - // chkVictoryTech - // - this.chkVictoryTech.AutoSize = true; - this.chkVictoryTech.Location = new System.Drawing.Point(10, 152); - this.chkVictoryTech.Name = "chkVictoryTech"; - this.chkVictoryTech.Size = new System.Drawing.Size(79, 19); - this.chkVictoryTech.TabIndex = 10; - this.chkVictoryTech.Text = "Research"; - this.chkVictoryTech.UseVisualStyleBackColor = true; - // - // label47 - // - this.label47.AutoSize = true; - this.label47.Location = new System.Drawing.Point(247, 103); - this.label47.Name = "label47"; - this.label47.Size = new System.Drawing.Size(205, 15); - this.label47.TabIndex = 9; - this.label47.Text = "% of the second place player\'s score"; - // - // spnVictoryScorePercent - // - this.spnVictoryScorePercent.Increment = new decimal(new int[] { - 10, - 0, - 0, - 0}); - this.spnVictoryScorePercent.Location = new System.Drawing.Point(121, 101); - this.spnVictoryScorePercent.Maximum = new decimal(new int[] { - 1000, - 0, - 0, - 0}); - this.spnVictoryScorePercent.Minimum = new decimal(new int[] { - 150, - 0, - 0, - 0}); - this.spnVictoryScorePercent.Name = "spnVictoryScorePercent"; - this.spnVictoryScorePercent.Size = new System.Drawing.Size(120, 21); - this.spnVictoryScorePercent.TabIndex = 8; - this.spnVictoryScorePercent.ThousandsSeparator = true; - this.spnVictoryScorePercent.Value = new decimal(new int[] { - 200, - 0, - 0, - 0}); - // - // chkVictoryScorePercent - // - this.chkVictoryScorePercent.AutoSize = true; - this.chkVictoryScorePercent.Location = new System.Drawing.Point(10, 102); - this.chkVictoryScorePercent.Name = "chkVictoryScorePercent"; - this.chkVictoryScorePercent.Size = new System.Drawing.Size(105, 19); - this.chkVictoryScorePercent.TabIndex = 7; - this.chkVictoryScorePercent.Text = "Reach a score"; - this.chkVictoryScorePercent.UseVisualStyleBackColor = true; - // - // label46 - // - this.label46.AutoSize = true; - this.label46.Location = new System.Drawing.Point(224, 128); - this.label46.Name = "label46"; - this.label46.Size = new System.Drawing.Size(34, 15); - this.label46.TabIndex = 6; - this.label46.Text = "turns"; - // - // spnVictoryTurns - // - this.spnVictoryTurns.Increment = new decimal(new int[] { - 10, - 0, - 0, - 0}); - this.spnVictoryTurns.Location = new System.Drawing.Point(98, 126); - this.spnVictoryTurns.Maximum = new decimal(new int[] { - 10000, - 0, - 0, - 0}); - this.spnVictoryTurns.Name = "spnVictoryTurns"; - this.spnVictoryTurns.Size = new System.Drawing.Size(120, 21); - this.spnVictoryTurns.TabIndex = 5; - this.spnVictoryTurns.ThousandsSeparator = true; - this.spnVictoryTurns.Value = new decimal(new int[] { - 100, - 0, - 0, - 0}); - // - // chkVictoryTurns - // - this.chkVictoryTurns.AutoSize = true; - this.chkVictoryTurns.Location = new System.Drawing.Point(10, 127); - this.chkVictoryTurns.Name = "chkVictoryTurns"; - this.chkVictoryTurns.Size = new System.Drawing.Size(82, 19); - this.chkVictoryTurns.TabIndex = 4; - this.chkVictoryTurns.Text = "Survive for"; - this.chkVictoryTurns.UseVisualStyleBackColor = true; - // - // spnVictoryScore - // - this.spnVictoryScore.Increment = new decimal(new int[] { - 10000, - 0, - 0, - 0}); - this.spnVictoryScore.Location = new System.Drawing.Point(134, 76); - this.spnVictoryScore.Maximum = new decimal(new int[] { - 1000000000, - 0, - 0, - 0}); - this.spnVictoryScore.Minimum = new decimal(new int[] { - 10000, - 0, - 0, - 0}); - this.spnVictoryScore.Name = "spnVictoryScore"; - this.spnVictoryScore.Size = new System.Drawing.Size(120, 21); - this.spnVictoryScore.TabIndex = 3; - this.spnVictoryScore.ThousandsSeparator = true; - this.spnVictoryScore.Value = new decimal(new int[] { - 5000000, - 0, - 0, - 0}); - // - // chkVictoryScore - // - this.chkVictoryScore.AutoSize = true; - this.chkVictoryScore.Location = new System.Drawing.Point(10, 77); - this.chkVictoryScore.Name = "chkVictoryScore"; - this.chkVictoryScore.Size = new System.Drawing.Size(118, 19); - this.chkVictoryScore.TabIndex = 2; - this.chkVictoryScore.Text = "Reach a score of"; - this.chkVictoryScore.UseVisualStyleBackColor = true; - // - // chkVictoryEliminateMajorEmpires - // - this.chkVictoryEliminateMajorEmpires.AutoSize = true; - this.chkVictoryEliminateMajorEmpires.Location = new System.Drawing.Point(10, 52); - this.chkVictoryEliminateMajorEmpires.Name = "chkVictoryEliminateMajorEmpires"; - this.chkVictoryEliminateMajorEmpires.Size = new System.Drawing.Size(365, 19); - this.chkVictoryEliminateMajorEmpires.TabIndex = 1; - this.chkVictoryEliminateMajorEmpires.Text = "Eliminate all other major empires (minor empires may survive)"; - this.chkVictoryEliminateMajorEmpires.UseVisualStyleBackColor = true; - // - // label45 - // - this.label45.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label45.Location = new System.Drawing.Point(7, 7); - this.label45.Name = "label45"; - this.label45.Size = new System.Drawing.Size(532, 41); - this.label45.TabIndex = 0; - this.label45.Text = "The standard victory condition is elimination of all other major and minor empire" + - "s. Additional optional victory conditions can be selected below."; - // - // tabSettings - // - this.tabSettings.BackColor = System.Drawing.Color.Black; - this.tabSettings.Controls.Add(this.chkAllowAnalysis); - this.tabSettings.Controls.Add(this.label60); - this.tabSettings.Controls.Add(this.chkColonizeOnlyHWSurface); - this.tabSettings.Controls.Add(this.label59); - this.tabSettings.Controls.Add(this.chkColonizeOnlyBreathable); - this.tabSettings.Controls.Add(this.label58); - this.tabSettings.Controls.Add(this.chkUniqueRuins); - this.tabSettings.Controls.Add(this.label57); - this.tabSettings.Controls.Add(this.chkRandomRuins); - this.tabSettings.Controls.Add(this.label56); - this.tabSettings.Controls.Add(this.chkAllowIntel); - this.tabSettings.Controls.Add(this.label55); - this.tabSettings.Controls.Add(this.chkAllowSurrender); - this.tabSettings.Controls.Add(this.label54); - this.tabSettings.Controls.Add(this.label53); - this.tabSettings.Controls.Add(this.label52); - this.tabSettings.Controls.Add(this.ddlAllowedTrades); - this.tabSettings.Controls.Add(this.chkHumansVsAI); - this.tabSettings.Controls.Add(this.txtGalaxyName); - this.tabSettings.Controls.Add(this.labelName); - this.tabSettings.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.tabSettings.Location = new System.Drawing.Point(4, 29); - this.tabSettings.Name = "tabSettings"; - this.tabSettings.Padding = new System.Windows.Forms.Padding(3); - this.tabSettings.Size = new System.Drawing.Size(545, 540); - this.tabSettings.TabIndex = 5; - this.tabSettings.Text = "Settings"; - // - // chkAllowAnalysis - // - this.chkAllowAnalysis.AutoSize = true; - this.chkAllowAnalysis.Checked = true; - this.chkAllowAnalysis.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkAllowAnalysis.Location = new System.Drawing.Point(164, 122); - this.chkAllowAnalysis.Name = "chkAllowAnalysis"; - this.chkAllowAnalysis.Size = new System.Drawing.Size(15, 14); - this.chkAllowAnalysis.TabIndex = 44; - this.chkAllowAnalysis.UseVisualStyleBackColor = true; - // - // label60 - // - this.label60.AutoSize = true; - this.label60.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label60.Location = new System.Drawing.Point(10, 121); - this.label60.Margin = new System.Windows.Forms.Padding(3); - this.label60.Name = "label60"; - this.label60.Size = new System.Drawing.Size(83, 15); - this.label60.TabIndex = 43; - this.label60.Text = "Allow Analysis"; - // - // chkColonizeOnlyHWSurface - // - this.chkColonizeOnlyHWSurface.AutoSize = true; - this.chkColonizeOnlyHWSurface.Location = new System.Drawing.Point(164, 203); - this.chkColonizeOnlyHWSurface.Name = "chkColonizeOnlyHWSurface"; - this.chkColonizeOnlyHWSurface.Size = new System.Drawing.Size(15, 14); - this.chkColonizeOnlyHWSurface.TabIndex = 42; - this.chkColonizeOnlyHWSurface.UseVisualStyleBackColor = true; - // - // label59 - // - this.label59.AutoSize = true; - this.label59.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label59.Location = new System.Drawing.Point(10, 202); - this.label59.Margin = new System.Windows.Forms.Padding(3); - this.label59.Name = "label59"; - this.label59.Size = new System.Drawing.Size(150, 15); - this.label59.TabIndex = 41; - this.label59.Text = "Colonize Only HW Surface"; - // - // chkColonizeOnlyBreathable - // - this.chkColonizeOnlyBreathable.AutoSize = true; - this.chkColonizeOnlyBreathable.Location = new System.Drawing.Point(164, 183); - this.chkColonizeOnlyBreathable.Name = "chkColonizeOnlyBreathable"; - this.chkColonizeOnlyBreathable.Size = new System.Drawing.Size(15, 14); - this.chkColonizeOnlyBreathable.TabIndex = 40; - this.chkColonizeOnlyBreathable.UseVisualStyleBackColor = true; - // - // label58 - // - this.label58.AutoSize = true; - this.label58.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label58.Location = new System.Drawing.Point(10, 182); - this.label58.Margin = new System.Windows.Forms.Padding(3); - this.label58.Name = "label58"; - this.label58.Size = new System.Drawing.Size(145, 15); - this.label58.TabIndex = 39; - this.label58.Text = "Colonize Only Breathable"; - // - // chkUniqueRuins - // - this.chkUniqueRuins.AutoSize = true; - this.chkUniqueRuins.Checked = true; - this.chkUniqueRuins.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkUniqueRuins.Location = new System.Drawing.Point(164, 162); - this.chkUniqueRuins.Name = "chkUniqueRuins"; - this.chkUniqueRuins.Size = new System.Drawing.Size(15, 14); - this.chkUniqueRuins.TabIndex = 38; - this.chkUniqueRuins.UseVisualStyleBackColor = true; - // - // label57 - // - this.label57.AutoSize = true; - this.label57.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label57.Location = new System.Drawing.Point(10, 161); - this.label57.Margin = new System.Windows.Forms.Padding(3); - this.label57.Name = "label57"; - this.label57.Size = new System.Drawing.Size(82, 15); - this.label57.TabIndex = 37; - this.label57.Text = "Unique Ruins"; - // - // chkRandomRuins - // - this.chkRandomRuins.AutoSize = true; - this.chkRandomRuins.Checked = true; - this.chkRandomRuins.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkRandomRuins.Location = new System.Drawing.Point(164, 142); - this.chkRandomRuins.Name = "chkRandomRuins"; - this.chkRandomRuins.Size = new System.Drawing.Size(15, 14); - this.chkRandomRuins.TabIndex = 36; - this.chkRandomRuins.UseVisualStyleBackColor = true; - // - // label56 - // - this.label56.AutoSize = true; - this.label56.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label56.Location = new System.Drawing.Point(10, 141); - this.label56.Margin = new System.Windows.Forms.Padding(3); - this.label56.Name = "label56"; - this.label56.Size = new System.Drawing.Size(90, 15); - this.label56.TabIndex = 35; - this.label56.Text = "Random Ruins"; - // - // chkAllowIntel - // - this.chkAllowIntel.AutoSize = true; - this.chkAllowIntel.Checked = true; - this.chkAllowIntel.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkAllowIntel.Location = new System.Drawing.Point(164, 102); - this.chkAllowIntel.Name = "chkAllowIntel"; - this.chkAllowIntel.Size = new System.Drawing.Size(15, 14); - this.chkAllowIntel.TabIndex = 34; - this.chkAllowIntel.UseVisualStyleBackColor = true; - // - // label55 - // - this.label55.AutoSize = true; - this.label55.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label55.Location = new System.Drawing.Point(10, 101); - this.label55.Margin = new System.Windows.Forms.Padding(3); - this.label55.Name = "label55"; - this.label55.Size = new System.Drawing.Size(102, 15); - this.label55.TabIndex = 33; - this.label55.Text = "Allow Intelligence"; - // - // chkAllowSurrender - // - this.chkAllowSurrender.AutoSize = true; - this.chkAllowSurrender.Checked = true; - this.chkAllowSurrender.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkAllowSurrender.Location = new System.Drawing.Point(164, 82); - this.chkAllowSurrender.Name = "chkAllowSurrender"; - this.chkAllowSurrender.Size = new System.Drawing.Size(15, 14); - this.chkAllowSurrender.TabIndex = 32; - this.chkAllowSurrender.UseVisualStyleBackColor = true; - // - // label54 - // - this.label54.AutoSize = true; - this.label54.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label54.Location = new System.Drawing.Point(10, 81); - this.label54.Margin = new System.Windows.Forms.Padding(3); - this.label54.Name = "label54"; - this.label54.Size = new System.Drawing.Size(94, 15); - this.label54.TabIndex = 31; - this.label54.Text = "Allow Surrender"; - // - // label53 - // - this.label53.AutoSize = true; - this.label53.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label53.Location = new System.Drawing.Point(8, 56); - this.label53.Margin = new System.Windows.Forms.Padding(3); - this.label53.Name = "label53"; - this.label53.Size = new System.Drawing.Size(91, 15); - this.label53.TabIndex = 30; - this.label53.Text = "Allowed Trades"; - // - // label52 - // - this.label52.AutoSize = true; - this.label52.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label52.Location = new System.Drawing.Point(8, 32); - this.label52.Margin = new System.Windows.Forms.Padding(3); - this.label52.Name = "label52"; - this.label52.Size = new System.Drawing.Size(84, 15); - this.label52.TabIndex = 29; - this.label52.Text = "Humans vs. AI"; - // - // ddlAllowedTrades - // - this.ddlAllowedTrades.DisplayMember = "Name"; - this.ddlAllowedTrades.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.ddlAllowedTrades.FormattingEnabled = true; - this.ddlAllowedTrades.Location = new System.Drawing.Point(164, 53); - this.ddlAllowedTrades.Name = "ddlAllowedTrades"; - this.ddlAllowedTrades.Size = new System.Drawing.Size(152, 23); - this.ddlAllowedTrades.TabIndex = 28; - this.ddlAllowedTrades.ValueMember = "Value"; - // - // chkHumansVsAI - // - this.chkHumansVsAI.AutoSize = true; - this.chkHumansVsAI.Location = new System.Drawing.Point(164, 33); - this.chkHumansVsAI.Name = "chkHumansVsAI"; - this.chkHumansVsAI.Size = new System.Drawing.Size(15, 14); - this.chkHumansVsAI.TabIndex = 27; - this.chkHumansVsAI.UseVisualStyleBackColor = true; - // - // txtGalaxyName - // - this.txtGalaxyName.Location = new System.Drawing.Point(164, 6); - this.txtGalaxyName.Name = "txtGalaxyName"; - this.txtGalaxyName.Size = new System.Drawing.Size(152, 21); - this.txtGalaxyName.TabIndex = 26; - // - // labelName - // - this.labelName.AutoSize = true; - this.labelName.ForeColor = System.Drawing.Color.CornflowerBlue; - this.labelName.Location = new System.Drawing.Point(7, 9); - this.labelName.Margin = new System.Windows.Forms.Padding(3); - this.labelName.Name = "labelName"; - this.labelName.Size = new System.Drawing.Size(78, 15); - this.labelName.TabIndex = 25; - this.labelName.Text = "Game Name"; - // - // btnStart - // - this.btnStart.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btnStart.BackColor = System.Drawing.Color.Black; - this.btnStart.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnStart.Location = new System.Drawing.Point(478, 579); - this.btnStart.Name = "btnStart"; - this.btnStart.Size = new System.Drawing.Size(75, 23); - this.btnStart.TabIndex = 0; - this.btnStart.Text = "Start"; - this.btnStart.UseVisualStyleBackColor = false; - this.btnStart.Click += new System.EventHandler(this.btnStart_Click); - // - // btnCancel - // - this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btnCancel.BackColor = System.Drawing.Color.Black; - this.btnCancel.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnCancel.Location = new System.Drawing.Point(397, 579); - this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(75, 23); - this.btnCancel.TabIndex = 1; - this.btnCancel.Text = "Cancel"; - this.btnCancel.UseVisualStyleBackColor = false; - this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); - // - // btnLoadSetup - // - this.btnLoadSetup.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.btnLoadSetup.BackColor = System.Drawing.Color.Black; - this.btnLoadSetup.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnLoadSetup.Location = new System.Drawing.Point(6, 579); - this.btnLoadSetup.Name = "btnLoadSetup"; - this.btnLoadSetup.Size = new System.Drawing.Size(75, 23); - this.btnLoadSetup.TabIndex = 2; - this.btnLoadSetup.Text = "Load Setup"; - this.btnLoadSetup.UseVisualStyleBackColor = false; - this.btnLoadSetup.Click += new System.EventHandler(this.btnLoadSetup_Click); - // - // btnSaveSetup - // - this.btnSaveSetup.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.btnSaveSetup.BackColor = System.Drawing.Color.Black; - this.btnSaveSetup.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnSaveSetup.Location = new System.Drawing.Point(87, 579); - this.btnSaveSetup.Name = "btnSaveSetup"; - this.btnSaveSetup.Size = new System.Drawing.Size(75, 23); - this.btnSaveSetup.TabIndex = 3; - this.btnSaveSetup.Text = "Save Setup"; - this.btnSaveSetup.UseVisualStyleBackColor = false; - this.btnSaveSetup.Click += new System.EventHandler(this.btnSaveSetup_Click); - // - // progressBar - // - this.progressBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.progressBar.Location = new System.Drawing.Point(168, 585); - this.progressBar.Name = "progressBar"; - this.progressBar.Size = new System.Drawing.Size(223, 14); - this.progressBar.Style = System.Windows.Forms.ProgressBarStyle.Continuous; - this.progressBar.TabIndex = 5; - this.progressBar.Visible = false; - // - // btnGenerateSeed - // - this.btnGenerateSeed.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnGenerateSeed.BackColor = System.Drawing.Color.Black; - this.btnGenerateSeed.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnGenerateSeed.Location = new System.Drawing.Point(436, 6); - this.btnGenerateSeed.Name = "btnGenerateSeed"; - this.btnGenerateSeed.Size = new System.Drawing.Size(97, 23); - this.btnGenerateSeed.TabIndex = 32; - this.btnGenerateSeed.Text = "Generate"; - this.btnGenerateSeed.UseVisualStyleBackColor = false; - this.btnGenerateSeed.Click += new System.EventHandler(this.btnGenerateSeed_Click); - // - // GameSetupForm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.Black; - this.ClientSize = new System.Drawing.Size(565, 611); - this.Controls.Add(this.progressBar); - this.Controls.Add(this.btnSaveSetup); - this.Controls.Add(this.btnLoadSetup); - this.Controls.Add(this.btnCancel); - this.Controls.Add(this.btnStart); - this.Controls.Add(this.tabs); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; - this.MaximizeBox = false; - this.Name = "GameSetupForm"; - this.ShowInTaskbar = false; - this.Text = "Game Setup"; - this.Load += new System.EventHandler(this.GameSetupForm_Load); - this.tabs.ResumeLayout(false); - this.tabGalaxy.ResumeLayout(false); - this.tabGalaxy.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.spnSeed)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnSystemGroups)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnHeight)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnWidth)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.warpPointPlacementStrategyBindingSource)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnStarSystems)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.galaxyTemplateBindingSource)).EndInit(); - this.tabResources.ResumeLayout(false); - this.tabResources.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.picMiningGraph)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnMiningRate)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnStartValue)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.picValueGraph)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnHomeworldValue)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnDepletionTurnRemote)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnDepletionTurnStandard)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnMaxValuePlanet)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnMaxSpawnValueAsteroid)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnMinSpawnValueAsteroid)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnMinValueAsteroid)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnMaxSpawnValuePlanet)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnMinSpawnValuePlanet)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnMinValuePlanet)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnDepletionResourceRemote)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnBonusRemote)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnRateRemote)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnDepletionResourceStandard)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnBonusStandard)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnRateStandard)).EndInit(); - this.tabTechnology.ResumeLayout(false); - this.tabTechnology.PerformLayout(); - this.tabEmpires.ResumeLayout(false); - this.tabEmpires.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.spnResearchPerUnspentEmpirePoint)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnMaxDispersion)).EndInit(); - this.gamePanel1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.spnResourceStorage)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnMinorEmpires)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnRandomAIs)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnEmpirePoints)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnHomeworlds)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnStartResearch)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnStartResources)).EndInit(); - this.tabVictory.ResumeLayout(false); - this.tabVictory.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.spnVictoryDelay)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnVictoryPeace)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnVictoryTech)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnVictoryScorePercent)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnVictoryTurns)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.spnVictoryScore)).EndInit(); - this.tabSettings.ResumeLayout(false); - this.tabSettings.PerformLayout(); - this.ResumeLayout(false); - - } - - #endregion - - private Controls.GameTabControl tabs; - private System.Windows.Forms.TabPage tabGalaxy; - private Controls.GameButton btnStart; - private Controls.GameButton btnCancel; - private System.Windows.Forms.TabPage tabTechnology; - private System.Windows.Forms.TabPage tabEmpires; - private System.Windows.Forms.TabPage tabVictory; - private System.Windows.Forms.TabPage tabSettings; - private System.Windows.Forms.ComboBox ddlGalaxyType; - private System.Windows.Forms.Label lblGalaxyType; - private System.Windows.Forms.Label txtGalaxyTypeDescription; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.NumericUpDown spnStarSystems; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.ComboBox ddlWarpPointLocation; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.CheckBox chkOmniscient; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.CheckBox chkAllSystemsExplored; - private System.Windows.Forms.ComboBox ddlEventFrequency; - private System.Windows.Forms.Label label6; - private System.Windows.Forms.Label label9; - private System.Windows.Forms.NumericUpDown spnHeight; - private System.Windows.Forms.Label label8; - private System.Windows.Forms.NumericUpDown spnWidth; - private System.Windows.Forms.Label label7; - private System.Windows.Forms.ComboBox ddlMaximumEventSeverity; - private System.Windows.Forms.Label label10; - private System.Windows.Forms.BindingSource galaxyTemplateBindingSource; - private Controls.GameButton btnLoadSetup; - private Controls.GameButton btnSaveSetup; - private System.Windows.Forms.ProgressBar progressBar; - private System.Windows.Forms.Label txtWarpPointLocation; - private System.Windows.Forms.BindingSource warpPointPlacementStrategyBindingSource; - private System.Windows.Forms.NumericUpDown spnSystemGroups; - private System.Windows.Forms.Label label11; - private System.Windows.Forms.TabPage tabResources; - private Controls.GameButton btnLoadResourcePreset; - private System.Windows.Forms.ComboBox ddlPresets; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.Label label12; - private System.Windows.Forms.Label label13; - private System.Windows.Forms.Label label14; - private System.Windows.Forms.Label label15; - private System.Windows.Forms.Label label16; - private System.Windows.Forms.NumericUpDown spnDepletionResourceStandard; - private System.Windows.Forms.NumericUpDown spnBonusStandard; - private System.Windows.Forms.NumericUpDown spnRateStandard; - private System.Windows.Forms.NumericUpDown spnDepletionResourceRemote; - private System.Windows.Forms.NumericUpDown spnBonusRemote; - private System.Windows.Forms.NumericUpDown spnRateRemote; - private System.Windows.Forms.Label label19; - private System.Windows.Forms.Label label18; - private System.Windows.Forms.Label label21; - private System.Windows.Forms.Label label20; - private System.Windows.Forms.Label label23; - private System.Windows.Forms.Label label22; - private System.Windows.Forms.NumericUpDown spnMaxValuePlanet; - private System.Windows.Forms.NumericUpDown spnMaxSpawnValueAsteroid; - private System.Windows.Forms.NumericUpDown spnMinSpawnValueAsteroid; - private System.Windows.Forms.NumericUpDown spnMinValueAsteroid; - private System.Windows.Forms.NumericUpDown spnMaxSpawnValuePlanet; - private System.Windows.Forms.NumericUpDown spnMinSpawnValuePlanet; - private System.Windows.Forms.NumericUpDown spnMinValuePlanet; - private System.Windows.Forms.CheckBox chkBonusDepletionRemote; - private System.Windows.Forms.CheckBox chkBonusDepletionStandard; - private System.Windows.Forms.Label label17; - private System.Windows.Forms.NumericUpDown spnDepletionTurnRemote; - private System.Windows.Forms.NumericUpDown spnDepletionTurnStandard; - private System.Windows.Forms.Label label24; - private System.Windows.Forms.NumericUpDown spnHomeworldValue; - private System.Windows.Forms.Label label25; - private System.Windows.Forms.PictureBox picValueGraph; - private System.Windows.Forms.NumericUpDown spnMiningRate; - private System.Windows.Forms.NumericUpDown spnStartValue; - private System.Windows.Forms.Label label27; - private System.Windows.Forms.Label label26; - private System.Windows.Forms.PictureBox picMiningGraph; - private Controls.GameButton btnRefreshGraphs; - private System.Windows.Forms.CheckBox chkRemote; - private System.Windows.Forms.Label label28; - private System.Windows.Forms.CheckBox chkLimitRemote; - private System.Windows.Forms.CheckBox chkLimitStandard; - private System.Windows.Forms.Label label29; - private System.Windows.Forms.Label label30; - private System.Windows.Forms.ComboBox ddlStartTech; - private System.Windows.Forms.Label label31; - private System.Windows.Forms.CheckedListBox lstTechs; - private System.Windows.Forms.Label label33; - private System.Windows.Forms.Label label32; - private System.Windows.Forms.Label label36; - private System.Windows.Forms.Label label35; - private System.Windows.Forms.Label label34; - private System.Windows.Forms.Label label37; - private System.Windows.Forms.Label label39; - private System.Windows.Forms.Label label38; - private System.Windows.Forms.ComboBox ddlEmpirePlacement; - private System.Windows.Forms.NumericUpDown spnHomeworlds; - private System.Windows.Forms.NumericUpDown spnStartResearch; - private System.Windows.Forms.NumericUpDown spnStartResources; - private System.Windows.Forms.NumericUpDown spnMinorEmpires; - private System.Windows.Forms.NumericUpDown spnRandomAIs; - private System.Windows.Forms.NumericUpDown spnEmpirePoints; - private System.Windows.Forms.ComboBox ddlScoreDisplay; - private System.Windows.Forms.NumericUpDown spnResourceStorage; - private System.Windows.Forms.Label label40; - private System.Windows.Forms.Label label41; - private Controls.GamePanel gamePanel1; - private System.Windows.Forms.ListView lstEmpires; - private Controls.GameButton btnCreateEmpire; - private Controls.GameButton btnLoadEmpire; - private Controls.GameButton btnEditEmpire; - private Controls.GameButton btnRemoveEmpire; - private Controls.GameButton btnSaveEmpire; - private System.Windows.Forms.ComboBox ddlHomeworldSize; - private System.Windows.Forms.Label label42; - private System.Windows.Forms.Label label44; - private System.Windows.Forms.NumericUpDown spnMaxDispersion; - private System.Windows.Forms.Label label43; - private Controls.GameButton btnToggleAI; - private Controls.GameButton btnEmpireBottom; - private Controls.GameButton btnEmpireTop; - private Controls.GameButton btnEmpireDown; - private Controls.GameButton btnEmpireUp; - private System.Windows.Forms.Label label45; - private System.Windows.Forms.CheckBox chkVictoryEliminateMajorEmpires; - private System.Windows.Forms.Label label46; - private System.Windows.Forms.NumericUpDown spnVictoryTurns; - private System.Windows.Forms.CheckBox chkVictoryTurns; - private System.Windows.Forms.NumericUpDown spnVictoryScore; - private System.Windows.Forms.CheckBox chkVictoryScore; - private System.Windows.Forms.Label label47; - private System.Windows.Forms.NumericUpDown spnVictoryScorePercent; - private System.Windows.Forms.CheckBox chkVictoryScorePercent; - private System.Windows.Forms.Label label48; - private System.Windows.Forms.NumericUpDown spnVictoryTech; - private System.Windows.Forms.CheckBox chkVictoryTech; - private System.Windows.Forms.Label label49; - private System.Windows.Forms.NumericUpDown spnVictoryPeace; - private System.Windows.Forms.CheckBox chkVictoryPeace; - private System.Windows.Forms.Label label50; - private System.Windows.Forms.Label label51; - private System.Windows.Forms.NumericUpDown spnVictoryDelay; - private System.Windows.Forms.TextBox txtGalaxyName; - private System.Windows.Forms.Label labelName; - private System.Windows.Forms.CheckBox chkHumansVsAI; - private System.Windows.Forms.Label label53; - private System.Windows.Forms.Label label52; - private System.Windows.Forms.ComboBox ddlAllowedTrades; - private System.Windows.Forms.CheckBox chkAllowSurrender; - private System.Windows.Forms.Label label54; - private System.Windows.Forms.CheckBox chkAllowIntel; - private System.Windows.Forms.Label label55; - private System.Windows.Forms.CheckBox chkUniqueRuins; - private System.Windows.Forms.Label label57; - private System.Windows.Forms.CheckBox chkRandomRuins; - private System.Windows.Forms.Label label56; - private System.Windows.Forms.CheckBox chkColonizeOnlyBreathable; - private System.Windows.Forms.Label label58; - private System.Windows.Forms.CheckBox chkColonizeOnlyHWSurface; - private System.Windows.Forms.Label label59; - private System.Windows.Forms.CheckBox chkAllowAnalysis; - private System.Windows.Forms.Label label60; - private System.Windows.Forms.ComboBox ddlTechCost; - private System.Windows.Forms.Label label61; - private System.Windows.Forms.Label label62; - private System.Windows.Forms.ComboBox ddlTechUniqueness; - private System.Windows.Forms.Label label63; - private Controls.GameButton btnPreviewMap; - private Controls.GalaxyView galaxyView; - private System.Windows.Forms.NumericUpDown spnResearchPerUnspentEmpirePoint; - private System.Windows.Forms.Label label64; - private System.Windows.Forms.Label lblMaxBonusResearchFromEmpirePoints; - private System.Windows.Forms.Label label65; - private System.Windows.Forms.NumericUpDown spnSeed; - private Controls.GameButton btnGenerateSeed; -} \ No newline at end of file diff --git a/FrEee.WinForms/Forms/MainGameForm.Designer.cs b/FrEee.WinForms/Forms/MainGameForm.Designer.cs deleted file mode 100644 index 344308c28..000000000 --- a/FrEee.WinForms/Forms/MainGameForm.Designer.cs +++ /dev/null @@ -1,1022 +0,0 @@ -using FrEee.WinForms.Controls; - -namespace FrEee.WinForms.Forms; - -partial class MainGameForm -{ - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.components = new System.ComponentModel.Container(); - FrEee.WinForms.Objects.GalaxyViewModes.PresenceMode presenceMode1 = new FrEee.WinForms.Objects.GalaxyViewModes.PresenceMode(); - this.toolTip = new System.Windows.Forms.ToolTip(this.components); - this.btnWaypoint = new FrEee.WinForms.Controls.GameButton(); - this.btnMovementLog = new FrEee.WinForms.Controls.GameButton(); - this.btnDecloak = new FrEee.WinForms.Controls.GameButton(); - this.btnCloak = new FrEee.WinForms.Controls.GameButton(); - this.btnActivate = new FrEee.WinForms.Controls.GameButton(); - this.btnToggleMinister = new FrEee.WinForms.Controls.GameButton(); - this.btnRename = new FrEee.WinForms.Controls.GameButton(); - this.btnRecycle = new FrEee.WinForms.Controls.GameButton(); - this.btnRepeatOrders = new FrEee.WinForms.Controls.GameButton(); - this.btnNextIdle = new FrEee.WinForms.Controls.GameButton(); - this.btnRepair = new FrEee.WinForms.Controls.GameButton(); - this.btnPrevIdle = new FrEee.WinForms.Controls.GameButton(); - this.btnResupply = new FrEee.WinForms.Controls.GameButton(); - this.btnSentry = new FrEee.WinForms.Controls.GameButton(); - this.btnClearOrders = new FrEee.WinForms.Controls.GameButton(); - this.btnFleetTransfer = new FrEee.WinForms.Controls.GameButton(); - this.btnTransferCargo = new FrEee.WinForms.Controls.GameButton(); - this.btnConstructionQueue = new FrEee.WinForms.Controls.GameButton(); - this.btnColonize = new FrEee.WinForms.Controls.GameButton(); - this.btnEvade = new FrEee.WinForms.Controls.GameButton(); - this.btnWarp = new FrEee.WinForms.Controls.GameButton(); - this.btnPursue = new FrEee.WinForms.Controls.GameButton(); - this.btnMove = new FrEee.WinForms.Controls.GameButton(); - this.btnEndTurn = new FrEee.WinForms.Controls.GameButton(); - this.btnLog = new FrEee.WinForms.Controls.GameButton(); - this.btnQueues = new FrEee.WinForms.Controls.GameButton(); - this.btnShips = new FrEee.WinForms.Controls.GameButton(); - this.btnEmpires = new FrEee.WinForms.Controls.GameButton(); - this.btnPlanets = new FrEee.WinForms.Controls.GameButton(); - this.btnDesigns = new FrEee.WinForms.Controls.GameButton(); - this.btnMenu = new FrEee.WinForms.Controls.GameButton(); - this.progResearch = new FrEee.WinForms.Controls.GameProgressBar(); - this.btnCommands = new FrEee.WinForms.Controls.GameButton(); - this.pnlLayout = new FrEee.WinForms.Controls.GamePanel(); - this.pnlLeft = new System.Windows.Forms.Panel(); - this.pnlSystemMap = new FrEee.WinForms.Controls.GamePanel(); - this.starSystemView = new FrEee.WinForms.Controls.StarSystemView(); - this.pnlSearch = new FrEee.WinForms.Controls.GamePanel(); - this.searchBox = new FrEee.WinForms.Controls.SearchBox(); - this.pnlSystemTabs = new FrEee.WinForms.Controls.GamePanel(); - this.pnlTabs = new System.Windows.Forms.FlowLayoutPanel(); - this.btnNewTab = new FrEee.WinForms.Controls.GameButton(); - this.pnlSubCommands = new FrEee.WinForms.Controls.GamePanel(); - this.pnlMainCommands = new FrEee.WinForms.Controls.GamePanel(); - this.pnlHeader = new FrEee.WinForms.Controls.GamePanel(); - this.resInt = new FrEee.WinForms.Controls.ResourceDisplay(); - this.resRes = new FrEee.WinForms.Controls.ResourceDisplay(); - this.resRad = new FrEee.WinForms.Controls.ResourceDisplay(); - this.resOrg = new FrEee.WinForms.Controls.ResourceDisplay(); - this.resMin = new FrEee.WinForms.Controls.ResourceDisplay(); - this.picEmpireFlag = new System.Windows.Forms.PictureBox(); - this.pnlRight = new System.Windows.Forms.Panel(); - this.ddlGalaxyViewMode = new System.Windows.Forms.ComboBox(); - this.pnlGalaxyMap = new FrEee.WinForms.Controls.GamePanel(); - this.galaxyView = new FrEee.WinForms.Controls.GalaxyView(); - this.pnlDetailReport = new FrEee.WinForms.Controls.GamePanel(); - this.pnlLayout.SuspendLayout(); - this.pnlLeft.SuspendLayout(); - this.pnlSystemMap.SuspendLayout(); - this.pnlSearch.SuspendLayout(); - this.pnlSystemTabs.SuspendLayout(); - this.pnlTabs.SuspendLayout(); - this.pnlSubCommands.SuspendLayout(); - this.pnlMainCommands.SuspendLayout(); - this.pnlHeader.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.picEmpireFlag)).BeginInit(); - this.pnlRight.SuspendLayout(); - this.pnlGalaxyMap.SuspendLayout(); - this.SuspendLayout(); - // - // btnWaypoint - // - this.btnWaypoint.BackColor = System.Drawing.Color.Black; - this.btnWaypoint.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnWaypoint.Location = new System.Drawing.Point(49, 6); - this.btnWaypoint.Name = "btnWaypoint"; - this.btnWaypoint.Size = new System.Drawing.Size(36, 36); - this.btnWaypoint.TabIndex = 23; - this.btnWaypoint.TabStop = false; - this.btnWaypoint.Text = "Way"; - this.toolTip.SetToolTip(this.btnWaypoint, "(Ctrl-W) Move to Waypoint"); - this.btnWaypoint.UseVisualStyleBackColor = false; - // - // btnMovementLog - // - this.btnMovementLog.BackColor = System.Drawing.Color.Black; - this.btnMovementLog.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnMovementLog.Location = new System.Drawing.Point(427, 48); - this.btnMovementLog.Name = "btnMovementLog"; - this.btnMovementLog.Size = new System.Drawing.Size(36, 36); - this.btnMovementLog.TabIndex = 22; - this.btnMovementLog.TabStop = false; - this.btnMovementLog.Text = "ML"; - this.toolTip.SetToolTip(this.btnMovementLog, "(Ctrl-L) Movement Log"); - this.btnMovementLog.UseVisualStyleBackColor = false; - // - // btnDecloak - // - this.btnDecloak.BackColor = System.Drawing.Color.Black; - this.btnDecloak.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnDecloak.Location = new System.Drawing.Point(301, 49); - this.btnDecloak.Name = "btnDecloak"; - this.btnDecloak.Size = new System.Drawing.Size(36, 36); - this.btnDecloak.TabIndex = 21; - this.btnDecloak.TabStop = false; - this.btnDecloak.Text = "Dclk"; - this.toolTip.SetToolTip(this.btnDecloak, "(X) Decloak"); - this.btnDecloak.UseVisualStyleBackColor = false; - // - // btnCloak - // - this.btnCloak.BackColor = System.Drawing.Color.Black; - this.btnCloak.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnCloak.Location = new System.Drawing.Point(301, 7); - this.btnCloak.Name = "btnCloak"; - this.btnCloak.Size = new System.Drawing.Size(36, 36); - this.btnCloak.TabIndex = 20; - this.btnCloak.TabStop = false; - this.btnCloak.Text = "Clk"; - this.toolTip.SetToolTip(this.btnCloak, "(Z) Cloak"); - this.btnCloak.UseVisualStyleBackColor = false; - // - // btnActivate - // - this.btnActivate.BackColor = System.Drawing.Color.Black; - this.btnActivate.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnActivate.Location = new System.Drawing.Point(343, 7); - this.btnActivate.Name = "btnActivate"; - this.btnActivate.Size = new System.Drawing.Size(36, 36); - this.btnActivate.TabIndex = 19; - this.btnActivate.TabStop = false; - this.btnActivate.Text = "Act"; - this.toolTip.SetToolTip(this.btnActivate, "(Ctrl-A) Activate Ability"); - this.btnActivate.UseVisualStyleBackColor = false; - this.btnActivate.Click += new System.EventHandler(this.btnActivate_Click); - // - // btnToggleMinister - // - this.btnToggleMinister.BackColor = System.Drawing.Color.Black; - this.btnToggleMinister.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnToggleMinister.Location = new System.Drawing.Point(385, 49); - this.btnToggleMinister.Name = "btnToggleMinister"; - this.btnToggleMinister.Size = new System.Drawing.Size(36, 36); - this.btnToggleMinister.TabIndex = 18; - this.btnToggleMinister.TabStop = false; - this.btnToggleMinister.Text = "Min"; - this.toolTip.SetToolTip(this.btnToggleMinister, "(T) Toggle Minister Control"); - this.btnToggleMinister.UseVisualStyleBackColor = false; - // - // btnRename - // - this.btnRename.BackColor = System.Drawing.Color.Black; - this.btnRename.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnRename.Location = new System.Drawing.Point(385, 7); - this.btnRename.Name = "btnRename"; - this.btnRename.Size = new System.Drawing.Size(36, 36); - this.btnRename.TabIndex = 17; - this.btnRename.TabStop = false; - this.btnRename.Text = "Nam"; - this.toolTip.SetToolTip(this.btnRename, "(N) Rename/Notes"); - this.btnRename.UseVisualStyleBackColor = false; - // - // btnRecycle - // - this.btnRecycle.BackColor = System.Drawing.Color.Black; - this.btnRecycle.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnRecycle.Location = new System.Drawing.Point(217, 48); - this.btnRecycle.Name = "btnRecycle"; - this.btnRecycle.Size = new System.Drawing.Size(36, 36); - this.btnRecycle.TabIndex = 16; - this.btnRecycle.TabStop = false; - this.btnRecycle.Text = "Rcy"; - this.toolTip.SetToolTip(this.btnRecycle, "(Ctrl-R) Recycle/Scuttle"); - this.btnRecycle.UseVisualStyleBackColor = false; - this.btnRecycle.Click += new System.EventHandler(this.btnRecycle_Click); - // - // btnRepeatOrders - // - this.btnRepeatOrders.BackColor = System.Drawing.Color.Black; - this.btnRepeatOrders.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnRepeatOrders.Location = new System.Drawing.Point(49, 48); - this.btnRepeatOrders.Name = "btnRepeatOrders"; - this.btnRepeatOrders.Size = new System.Drawing.Size(36, 36); - this.btnRepeatOrders.TabIndex = 15; - this.btnRepeatOrders.TabStop = false; - this.btnRepeatOrders.Text = "Rept"; - this.toolTip.SetToolTip(this.btnRepeatOrders, "(P) Repeat Orders"); - this.btnRepeatOrders.UseVisualStyleBackColor = false; - // - // btnNextIdle - // - this.btnNextIdle.BackColor = System.Drawing.Color.Black; - this.btnNextIdle.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnNextIdle.Location = new System.Drawing.Point(469, 7); - this.btnNextIdle.Name = "btnNextIdle"; - this.btnNextIdle.Size = new System.Drawing.Size(36, 36); - this.btnNextIdle.TabIndex = 6; - this.btnNextIdle.TabStop = false; - this.btnNextIdle.Text = "Next"; - this.toolTip.SetToolTip(this.btnNextIdle, "(Tab) Next Idle Space Object"); - this.btnNextIdle.UseVisualStyleBackColor = false; - this.btnNextIdle.Click += new System.EventHandler(this.btnNextIdle_Click); - // - // btnRepair - // - this.btnRepair.BackColor = System.Drawing.Color.Black; - this.btnRepair.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnRepair.Location = new System.Drawing.Point(175, 49); - this.btnRepair.Name = "btnRepair"; - this.btnRepair.Size = new System.Drawing.Size(36, 36); - this.btnRepair.TabIndex = 14; - this.btnRepair.TabStop = false; - this.btnRepair.Text = "Repr"; - this.toolTip.SetToolTip(this.btnRepair, "(R) Repair"); - this.btnRepair.UseVisualStyleBackColor = false; - // - // btnPrevIdle - // - this.btnPrevIdle.BackColor = System.Drawing.Color.Black; - this.btnPrevIdle.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnPrevIdle.Location = new System.Drawing.Point(427, 7); - this.btnPrevIdle.Name = "btnPrevIdle"; - this.btnPrevIdle.Size = new System.Drawing.Size(36, 36); - this.btnPrevIdle.TabIndex = 5; - this.btnPrevIdle.TabStop = false; - this.btnPrevIdle.Text = "Prev"; - this.toolTip.SetToolTip(this.btnPrevIdle, "(Shift-Tab) Previous Idle Space Object"); - this.btnPrevIdle.UseVisualStyleBackColor = false; - this.btnPrevIdle.Click += new System.EventHandler(this.btnPrevIdle_Click); - // - // btnResupply - // - this.btnResupply.BackColor = System.Drawing.Color.Black; - this.btnResupply.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnResupply.Location = new System.Drawing.Point(175, 7); - this.btnResupply.Name = "btnResupply"; - this.btnResupply.Size = new System.Drawing.Size(36, 36); - this.btnResupply.TabIndex = 13; - this.btnResupply.TabStop = false; - this.btnResupply.Text = "Sply"; - this.toolTip.SetToolTip(this.btnResupply, "(S) Resupply"); - this.btnResupply.UseVisualStyleBackColor = false; - // - // btnSentry - // - this.btnSentry.BackColor = System.Drawing.Color.Black; - this.btnSentry.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnSentry.Location = new System.Drawing.Point(133, 49); - this.btnSentry.Name = "btnSentry"; - this.btnSentry.Size = new System.Drawing.Size(36, 36); - this.btnSentry.TabIndex = 12; - this.btnSentry.TabStop = false; - this.btnSentry.Text = "Stry"; - this.toolTip.SetToolTip(this.btnSentry, "(Y) Sentry"); - this.btnSentry.UseVisualStyleBackColor = false; - this.btnSentry.Click += new System.EventHandler(this.btnSentry_Click); - // - // btnClearOrders - // - this.btnClearOrders.BackColor = System.Drawing.Color.Black; - this.btnClearOrders.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnClearOrders.Location = new System.Drawing.Point(343, 49); - this.btnClearOrders.Name = "btnClearOrders"; - this.btnClearOrders.Size = new System.Drawing.Size(36, 36); - this.btnClearOrders.TabIndex = 11; - this.btnClearOrders.TabStop = false; - this.btnClearOrders.Text = "Clr"; - this.toolTip.SetToolTip(this.btnClearOrders, "(Bksp) Clear Orders"); - this.btnClearOrders.UseVisualStyleBackColor = false; - this.btnClearOrders.Click += new System.EventHandler(this.btnClearOrders_Click); - // - // btnFleetTransfer - // - this.btnFleetTransfer.BackColor = System.Drawing.Color.Black; - this.btnFleetTransfer.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnFleetTransfer.Location = new System.Drawing.Point(259, 49); - this.btnFleetTransfer.Name = "btnFleetTransfer"; - this.btnFleetTransfer.Size = new System.Drawing.Size(36, 36); - this.btnFleetTransfer.TabIndex = 10; - this.btnFleetTransfer.TabStop = false; - this.btnFleetTransfer.Text = "Flt"; - this.toolTip.SetToolTip(this.btnFleetTransfer, "(F) Fleet Transfer"); - this.btnFleetTransfer.UseVisualStyleBackColor = false; - this.btnFleetTransfer.Click += new System.EventHandler(this.btnFleetTransfer_Click); - // - // btnTransferCargo - // - this.btnTransferCargo.BackColor = System.Drawing.Color.Black; - this.btnTransferCargo.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnTransferCargo.Location = new System.Drawing.Point(259, 7); - this.btnTransferCargo.Name = "btnTransferCargo"; - this.btnTransferCargo.Size = new System.Drawing.Size(36, 36); - this.btnTransferCargo.TabIndex = 9; - this.btnTransferCargo.TabStop = false; - this.btnTransferCargo.Text = "TC"; - this.toolTip.SetToolTip(this.btnTransferCargo, "(T) Transfer Cargo"); - this.btnTransferCargo.UseVisualStyleBackColor = false; - this.btnTransferCargo.Click += new System.EventHandler(this.btnTransferCargo_Click); - // - // btnConstructionQueue - // - this.btnConstructionQueue.BackColor = System.Drawing.Color.Black; - this.btnConstructionQueue.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnConstructionQueue.Location = new System.Drawing.Point(217, 7); - this.btnConstructionQueue.Name = "btnConstructionQueue"; - this.btnConstructionQueue.Size = new System.Drawing.Size(36, 36); - this.btnConstructionQueue.TabIndex = 8; - this.btnConstructionQueue.TabStop = false; - this.btnConstructionQueue.Text = "CQ"; - this.toolTip.SetToolTip(this.btnConstructionQueue, "(Q) Construction Queue"); - this.btnConstructionQueue.UseVisualStyleBackColor = false; - this.btnConstructionQueue.Click += new System.EventHandler(this.btnConstructionQueue_Click); - // - // btnColonize - // - this.btnColonize.BackColor = System.Drawing.Color.Black; - this.btnColonize.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnColonize.Location = new System.Drawing.Point(133, 7); - this.btnColonize.Name = "btnColonize"; - this.btnColonize.Size = new System.Drawing.Size(36, 36); - this.btnColonize.TabIndex = 7; - this.btnColonize.TabStop = false; - this.btnColonize.Text = "Col"; - this.toolTip.SetToolTip(this.btnColonize, "(C) Colonize"); - this.btnColonize.UseVisualStyleBackColor = false; - this.btnColonize.Click += new System.EventHandler(this.btnColonize_Click); - // - // btnEvade - // - this.btnEvade.BackColor = System.Drawing.Color.Black; - this.btnEvade.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnEvade.Location = new System.Drawing.Point(91, 47); - this.btnEvade.Name = "btnEvade"; - this.btnEvade.Size = new System.Drawing.Size(36, 36); - this.btnEvade.TabIndex = 6; - this.btnEvade.TabStop = false; - this.btnEvade.Text = "Ev"; - this.toolTip.SetToolTip(this.btnEvade, "(E) Evade"); - this.btnEvade.UseVisualStyleBackColor = false; - this.btnEvade.Click += new System.EventHandler(this.btnEvade_Click); - // - // btnWarp - // - this.btnWarp.BackColor = System.Drawing.Color.Black; - this.btnWarp.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnWarp.Location = new System.Drawing.Point(7, 48); - this.btnWarp.Name = "btnWarp"; - this.btnWarp.Size = new System.Drawing.Size(36, 36); - this.btnWarp.TabIndex = 5; - this.btnWarp.TabStop = false; - this.btnWarp.Text = "Wp"; - this.toolTip.SetToolTip(this.btnWarp, "(W) Warp"); - this.btnWarp.UseVisualStyleBackColor = false; - this.btnWarp.Click += new System.EventHandler(this.btnWarp_Click); - // - // btnPursue - // - this.btnPursue.BackColor = System.Drawing.Color.Black; - this.btnPursue.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnPursue.Location = new System.Drawing.Point(91, 6); - this.btnPursue.Name = "btnPursue"; - this.btnPursue.Size = new System.Drawing.Size(36, 36); - this.btnPursue.TabIndex = 4; - this.btnPursue.TabStop = false; - this.btnPursue.Text = "Pur"; - this.toolTip.SetToolTip(this.btnPursue, "(A) Attack / Pursue"); - this.btnPursue.UseVisualStyleBackColor = false; - this.btnPursue.Click += new System.EventHandler(this.btnPursue_Click); - // - // btnMove - // - this.btnMove.BackColor = System.Drawing.Color.Black; - this.btnMove.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnMove.Location = new System.Drawing.Point(7, 6); - this.btnMove.Name = "btnMove"; - this.btnMove.Size = new System.Drawing.Size(36, 36); - this.btnMove.TabIndex = 2; - this.btnMove.TabStop = false; - this.btnMove.Text = "Mov"; - this.toolTip.SetToolTip(this.btnMove, "(M) Move"); - this.btnMove.UseVisualStyleBackColor = false; - this.btnMove.Click += new System.EventHandler(this.btnMove_Click); - // - // btnEndTurn - // - this.btnEndTurn.BackColor = System.Drawing.Color.Black; - this.btnEndTurn.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnEndTurn.Location = new System.Drawing.Point(296, 6); - this.btnEndTurn.Name = "btnEndTurn"; - this.btnEndTurn.Size = new System.Drawing.Size(36, 36); - this.btnEndTurn.TabIndex = 7; - this.btnEndTurn.TabStop = false; - this.toolTip.SetToolTip(this.btnEndTurn, "(F12) Save Commands"); - this.btnEndTurn.UseVisualStyleBackColor = false; - this.btnEndTurn.Click += new System.EventHandler(this.btnEndTurn_Click); - // - // btnLog - // - this.btnLog.BackColor = System.Drawing.Color.Black; - this.btnLog.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnLog.Location = new System.Drawing.Point(256, 6); - this.btnLog.Name = "btnLog"; - this.btnLog.Size = new System.Drawing.Size(36, 36); - this.btnLog.TabIndex = 6; - this.btnLog.TabStop = false; - this.toolTip.SetToolTip(this.btnLog, "(F10 / Shift-L) Log"); - this.btnLog.UseVisualStyleBackColor = false; - this.btnLog.Click += new System.EventHandler(this.btnLog_Click); - // - // btnQueues - // - this.btnQueues.BackColor = System.Drawing.Color.Black; - this.btnQueues.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnQueues.Location = new System.Drawing.Point(214, 6); - this.btnQueues.Name = "btnQueues"; - this.btnQueues.Size = new System.Drawing.Size(36, 36); - this.btnQueues.TabIndex = 5; - this.btnQueues.TabStop = false; - this.toolTip.SetToolTip(this.btnQueues, "(F7 / Shift-Q) Construction Queues"); - this.btnQueues.UseVisualStyleBackColor = false; - this.btnQueues.Click += new System.EventHandler(this.btnQueues_Click); - // - // btnShips - // - this.btnShips.BackColor = System.Drawing.Color.Black; - this.btnShips.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnShips.Location = new System.Drawing.Point(172, 6); - this.btnShips.Name = "btnShips"; - this.btnShips.Size = new System.Drawing.Size(36, 36); - this.btnShips.TabIndex = 4; - this.btnShips.TabStop = false; - this.toolTip.SetToolTip(this.btnShips, "(F6 / Shift-S) Ships"); - this.btnShips.UseVisualStyleBackColor = false; - this.btnShips.Click += new System.EventHandler(this.btnShips_Click); - // - // btnEmpires - // - this.btnEmpires.BackColor = System.Drawing.Color.Black; - this.btnEmpires.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnEmpires.Location = new System.Drawing.Point(130, 6); - this.btnEmpires.Name = "btnEmpires"; - this.btnEmpires.Size = new System.Drawing.Size(36, 36); - this.btnEmpires.TabIndex = 3; - this.btnEmpires.TabStop = false; - this.toolTip.SetToolTip(this.btnEmpires, "(F9 / Shift-E) Empires"); - this.btnEmpires.UseVisualStyleBackColor = false; - this.btnEmpires.Click += new System.EventHandler(this.btnEmpires_Click); - // - // btnPlanets - // - this.btnPlanets.BackColor = System.Drawing.Color.Black; - this.btnPlanets.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnPlanets.Location = new System.Drawing.Point(88, 6); - this.btnPlanets.Name = "btnPlanets"; - this.btnPlanets.Size = new System.Drawing.Size(36, 36); - this.btnPlanets.TabIndex = 0; - this.btnPlanets.TabStop = false; - this.toolTip.SetToolTip(this.btnPlanets, "(F4 / F5 / Shift-P / Shift-C) Planets/Colonies"); - this.btnPlanets.UseVisualStyleBackColor = false; - this.btnPlanets.Click += new System.EventHandler(this.btnPlanets_Click); - // - // btnDesigns - // - this.btnDesigns.BackColor = System.Drawing.Color.Black; - this.btnDesigns.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnDesigns.Location = new System.Drawing.Point(47, 6); - this.btnDesigns.Name = "btnDesigns"; - this.btnDesigns.Size = new System.Drawing.Size(36, 36); - this.btnDesigns.TabIndex = 2; - this.btnDesigns.TabStop = false; - this.toolTip.SetToolTip(this.btnDesigns, "(F3 / Shift-D) Designs"); - this.btnDesigns.UseVisualStyleBackColor = false; - this.btnDesigns.Click += new System.EventHandler(this.btnDesigns_Click); - // - // btnMenu - // - this.btnMenu.BackColor = System.Drawing.Color.Black; - this.btnMenu.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnMenu.Location = new System.Drawing.Point(5, 6); - this.btnMenu.Name = "btnMenu"; - this.btnMenu.Size = new System.Drawing.Size(36, 36); - this.btnMenu.TabIndex = 1; - this.btnMenu.TabStop = false; - this.toolTip.SetToolTip(this.btnMenu, "(F2) Menu"); - this.btnMenu.UseVisualStyleBackColor = false; - this.btnMenu.Click += new System.EventHandler(this.btnMenu_Click); - // - // progResearch - // - this.progResearch.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.progResearch.BackColor = System.Drawing.Color.Black; - this.progResearch.BarColor = System.Drawing.Color.Magenta; - this.progResearch.BorderColor = System.Drawing.Color.CornflowerBlue; - this.progResearch.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.progResearch.ForeColor = System.Drawing.Color.White; - this.progResearch.IncrementalProgress = ((long)(0)); - this.progResearch.LeftText = "Ice Planet Colonization"; - this.progResearch.Location = new System.Drawing.Point(3, -3); - this.progResearch.Margin = new System.Windows.Forms.Padding(0); - this.progResearch.Maximum = ((long)(500000)); - this.progResearch.Name = "progResearch"; - this.progResearch.Padding = new System.Windows.Forms.Padding(5); - this.progResearch.ProgressDisplayType = FrEee.WinForms.Controls.ProgressDisplayType.Numeric; - this.progResearch.RightText = "0.2 years"; - this.progResearch.Size = new System.Drawing.Size(411, 38); - this.progResearch.TabIndex = 11; - this.toolTip.SetToolTip(this.progResearch, "(F8 / Shift-R) Research"); - this.progResearch.Value = ((long)(350000)); - this.progResearch.Click += new System.EventHandler(this.progResearch_Click); - // - // btnCommands - // - this.btnCommands.BackColor = System.Drawing.Color.Black; - this.btnCommands.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnCommands.Location = new System.Drawing.Point(469, 47); - this.btnCommands.Name = "btnCommands"; - this.btnCommands.Size = new System.Drawing.Size(36, 36); - this.btnCommands.TabIndex = 24; - this.btnCommands.TabStop = false; - this.btnCommands.Text = "Cmd"; - this.toolTip.SetToolTip(this.btnCommands, "View Commands"); - this.btnCommands.UseVisualStyleBackColor = false; - this.btnCommands.Click += new System.EventHandler(this.btnCommands_Click); - // - // pnlLayout - // - this.pnlLayout.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.pnlLayout.BackColor = System.Drawing.Color.Black; - this.pnlLayout.BorderColor = System.Drawing.Color.CornflowerBlue; - this.pnlLayout.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.pnlLayout.Controls.Add(this.pnlLeft); - this.pnlLayout.Controls.Add(this.pnlRight); - this.pnlLayout.ForeColor = System.Drawing.Color.White; - this.pnlLayout.Location = new System.Drawing.Point(0, 0); - this.pnlLayout.Margin = new System.Windows.Forms.Padding(0); - this.pnlLayout.Name = "pnlLayout"; - this.pnlLayout.Padding = new System.Windows.Forms.Padding(3); - this.pnlLayout.Size = new System.Drawing.Size(1270, 779); - this.pnlLayout.TabIndex = 8; - // - // pnlLeft - // - this.pnlLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.pnlLeft.Controls.Add(this.pnlSystemMap); - this.pnlLeft.Controls.Add(this.pnlSearch); - this.pnlLeft.Controls.Add(this.pnlSystemTabs); - this.pnlLeft.Controls.Add(this.pnlSubCommands); - this.pnlLeft.Controls.Add(this.pnlMainCommands); - this.pnlLeft.Controls.Add(this.pnlHeader); - this.pnlLeft.Location = new System.Drawing.Point(1, 0); - this.pnlLeft.Margin = new System.Windows.Forms.Padding(1, 1, 0, 1); - this.pnlLeft.Name = "pnlLeft"; - this.pnlLeft.Size = new System.Drawing.Size(857, 777); - this.pnlLeft.TabIndex = 6; - // - // pnlSystemMap - // - this.pnlSystemMap.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.pnlSystemMap.BackColor = System.Drawing.Color.Black; - this.pnlSystemMap.BorderColor = System.Drawing.Color.RoyalBlue; - this.pnlSystemMap.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.pnlSystemMap.Controls.Add(this.starSystemView); - this.pnlSystemMap.ForeColor = System.Drawing.Color.White; - this.pnlSystemMap.Location = new System.Drawing.Point(145, 134); - this.pnlSystemMap.Margin = new System.Windows.Forms.Padding(0); - this.pnlSystemMap.Name = "pnlSystemMap"; - this.pnlSystemMap.Padding = new System.Windows.Forms.Padding(3); - this.pnlSystemMap.Size = new System.Drawing.Size(712, 642); - this.pnlSystemMap.TabIndex = 9; - // - // starSystemView - // - this.starSystemView.BackColor = System.Drawing.Color.Black; - this.starSystemView.Dock = System.Windows.Forms.DockStyle.Fill; - this.starSystemView.DrawText = true; - this.starSystemView.Location = new System.Drawing.Point(3, 3); - this.starSystemView.Name = "starSystemView"; - this.starSystemView.SelectedSector = null; - this.starSystemView.SelectedSpaceObject = null; - this.starSystemView.Size = new System.Drawing.Size(704, 634); - this.starSystemView.StarSystem = null; - this.starSystemView.TabIndex = 0; - this.starSystemView.SectorClicked += new FrEee.WinForms.Controls.StarSystemView.SectorSelectionDelegate(this.starSystemView_SectorClicked); - this.starSystemView.SectorSelected += new FrEee.WinForms.Controls.StarSystemView.SectorSelectionDelegate(this.starSystemView_SectorSelected); - // - // pnlSearch - // - this.pnlSearch.BackColor = System.Drawing.Color.Black; - this.pnlSearch.BorderColor = System.Drawing.Color.RoyalBlue; - this.pnlSearch.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.pnlSearch.Controls.Add(this.searchBox); - this.pnlSearch.ForeColor = System.Drawing.Color.White; - this.pnlSearch.Location = new System.Drawing.Point(-2, 85); - this.pnlSearch.Margin = new System.Windows.Forms.Padding(2); - this.pnlSearch.Name = "pnlSearch"; - this.pnlSearch.Padding = new System.Windows.Forms.Padding(3); - this.pnlSearch.Size = new System.Drawing.Size(342, 49); - this.pnlSearch.TabIndex = 8; - // - // searchBox - // - this.searchBox.BackColor = System.Drawing.Color.Black; - this.searchBox.ForeColor = System.Drawing.Color.White; - this.searchBox.Location = new System.Drawing.Point(12, 8); - this.searchBox.Margin = new System.Windows.Forms.Padding(6); - this.searchBox.Name = "searchBox"; - this.searchBox.ObjectsToSearch = null; - this.searchBox.ResultsPopupHeight = 128; - this.searchBox.Size = new System.Drawing.Size(320, 31); - this.searchBox.StarSystem = null; - this.searchBox.TabIndex = 0; - this.searchBox.TabStop = false; - this.searchBox.ObjectSelected += new FrEee.WinForms.Controls.SearchBox.ObjectSelectedDelegate(this.searchBox_ObjectSelected); - // - // pnlSystemTabs - // - this.pnlSystemTabs.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left))); - this.pnlSystemTabs.BackColor = System.Drawing.Color.Black; - this.pnlSystemTabs.BorderColor = System.Drawing.Color.RoyalBlue; - this.pnlSystemTabs.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.pnlSystemTabs.Controls.Add(this.pnlTabs); - this.pnlSystemTabs.ForeColor = System.Drawing.Color.White; - this.pnlSystemTabs.Location = new System.Drawing.Point(0, 134); - this.pnlSystemTabs.Margin = new System.Windows.Forms.Padding(0); - this.pnlSystemTabs.Name = "pnlSystemTabs"; - this.pnlSystemTabs.Padding = new System.Windows.Forms.Padding(3); - this.pnlSystemTabs.Size = new System.Drawing.Size(145, 642); - this.pnlSystemTabs.TabIndex = 7; - // - // pnlTabs - // - this.pnlTabs.Controls.Add(this.btnNewTab); - this.pnlTabs.Dock = System.Windows.Forms.DockStyle.Fill; - this.pnlTabs.FlowDirection = System.Windows.Forms.FlowDirection.TopDown; - this.pnlTabs.Location = new System.Drawing.Point(3, 3); - this.pnlTabs.Name = "pnlTabs"; - this.pnlTabs.Size = new System.Drawing.Size(137, 634); - this.pnlTabs.TabIndex = 0; - this.pnlTabs.DoubleClick += new System.EventHandler(this.btnNewTab_Click); - // - // btnNewTab - // - this.btnNewTab.BackColor = System.Drawing.Color.Black; - this.btnNewTab.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnNewTab.Location = new System.Drawing.Point(3, 3); - this.btnNewTab.Name = "btnNewTab"; - this.btnNewTab.Size = new System.Drawing.Size(128, 23); - this.btnNewTab.TabIndex = 0; - this.btnNewTab.TabStop = false; - this.btnNewTab.Text = "(New Tab)"; - this.btnNewTab.UseVisualStyleBackColor = false; - this.btnNewTab.Click += new System.EventHandler(this.btnNewTab_Click); - // - // pnlSubCommands - // - this.pnlSubCommands.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.pnlSubCommands.BackColor = System.Drawing.Color.Black; - this.pnlSubCommands.BorderColor = System.Drawing.Color.RoyalBlue; - this.pnlSubCommands.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.pnlSubCommands.Controls.Add(this.btnCommands); - this.pnlSubCommands.Controls.Add(this.btnWaypoint); - this.pnlSubCommands.Controls.Add(this.btnMovementLog); - this.pnlSubCommands.Controls.Add(this.btnDecloak); - this.pnlSubCommands.Controls.Add(this.btnCloak); - this.pnlSubCommands.Controls.Add(this.btnActivate); - this.pnlSubCommands.Controls.Add(this.btnToggleMinister); - this.pnlSubCommands.Controls.Add(this.btnRename); - this.pnlSubCommands.Controls.Add(this.btnRecycle); - this.pnlSubCommands.Controls.Add(this.btnRepeatOrders); - this.pnlSubCommands.Controls.Add(this.btnNextIdle); - this.pnlSubCommands.Controls.Add(this.btnRepair); - this.pnlSubCommands.Controls.Add(this.btnPrevIdle); - this.pnlSubCommands.Controls.Add(this.btnResupply); - this.pnlSubCommands.Controls.Add(this.btnSentry); - this.pnlSubCommands.Controls.Add(this.btnClearOrders); - this.pnlSubCommands.Controls.Add(this.btnFleetTransfer); - this.pnlSubCommands.Controls.Add(this.btnTransferCargo); - this.pnlSubCommands.Controls.Add(this.btnConstructionQueue); - this.pnlSubCommands.Controls.Add(this.btnColonize); - this.pnlSubCommands.Controls.Add(this.btnEvade); - this.pnlSubCommands.Controls.Add(this.btnWarp); - this.pnlSubCommands.Controls.Add(this.btnPursue); - this.pnlSubCommands.Controls.Add(this.btnMove); - this.pnlSubCommands.ForeColor = System.Drawing.Color.White; - this.pnlSubCommands.Location = new System.Drawing.Point(340, 37); - this.pnlSubCommands.Margin = new System.Windows.Forms.Padding(0); - this.pnlSubCommands.Name = "pnlSubCommands"; - this.pnlSubCommands.Padding = new System.Windows.Forms.Padding(4); - this.pnlSubCommands.Size = new System.Drawing.Size(517, 97); - this.pnlSubCommands.TabIndex = 6; - // - // pnlMainCommands - // - this.pnlMainCommands.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.pnlMainCommands.BackColor = System.Drawing.Color.Black; - this.pnlMainCommands.BorderColor = System.Drawing.Color.RoyalBlue; - this.pnlMainCommands.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.pnlMainCommands.Controls.Add(this.btnEndTurn); - this.pnlMainCommands.Controls.Add(this.btnLog); - this.pnlMainCommands.Controls.Add(this.btnQueues); - this.pnlMainCommands.Controls.Add(this.btnShips); - this.pnlMainCommands.Controls.Add(this.btnEmpires); - this.pnlMainCommands.Controls.Add(this.btnPlanets); - this.pnlMainCommands.Controls.Add(this.btnDesigns); - this.pnlMainCommands.Controls.Add(this.btnMenu); - this.pnlMainCommands.ForeColor = System.Drawing.Color.White; - this.pnlMainCommands.Location = new System.Drawing.Point(-2, 37); - this.pnlMainCommands.Margin = new System.Windows.Forms.Padding(0); - this.pnlMainCommands.Name = "pnlMainCommands"; - this.pnlMainCommands.Padding = new System.Windows.Forms.Padding(6); - this.pnlMainCommands.Size = new System.Drawing.Size(342, 50); - this.pnlMainCommands.TabIndex = 3; - // - // pnlHeader - // - this.pnlHeader.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.pnlHeader.BackColor = System.Drawing.Color.Black; - this.pnlHeader.BorderColor = System.Drawing.Color.RoyalBlue; - this.pnlHeader.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.pnlHeader.Controls.Add(this.resInt); - this.pnlHeader.Controls.Add(this.resRes); - this.pnlHeader.Controls.Add(this.resRad); - this.pnlHeader.Controls.Add(this.resOrg); - this.pnlHeader.Controls.Add(this.resMin); - this.pnlHeader.Controls.Add(this.picEmpireFlag); - this.pnlHeader.ForeColor = System.Drawing.Color.White; - this.pnlHeader.Location = new System.Drawing.Point(-2, 0); - this.pnlHeader.Margin = new System.Windows.Forms.Padding(2); - this.pnlHeader.Name = "pnlHeader"; - this.pnlHeader.Padding = new System.Windows.Forms.Padding(3); - this.pnlHeader.Size = new System.Drawing.Size(859, 37); - this.pnlHeader.TabIndex = 5; - // - // resInt - // - this.resInt.Amount = 0; - this.resInt.BackColor = System.Drawing.Color.Black; - this.resInt.Change = null; - this.resInt.ForeColor = System.Drawing.Color.White; - this.resInt.Location = new System.Drawing.Point(638, 6); - this.resInt.Margin = new System.Windows.Forms.Padding(0); - this.resInt.Name = "resInt"; - this.resInt.ResourceName = "Intelligence"; - this.resInt.Size = new System.Drawing.Size(147, 20); - this.resInt.TabIndex = 14; - // - // resRes - // - this.resRes.Amount = 0; - this.resRes.BackColor = System.Drawing.Color.Black; - this.resRes.Change = null; - this.resRes.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); - this.resRes.Location = new System.Drawing.Point(488, 6); - this.resRes.Margin = new System.Windows.Forms.Padding(0); - this.resRes.Name = "resRes"; - this.resRes.ResourceName = "Research"; - this.resRes.Size = new System.Drawing.Size(147, 20); - this.resRes.TabIndex = 13; - // - // resRad - // - this.resRad.Amount = 0; - this.resRad.BackColor = System.Drawing.Color.Black; - this.resRad.Change = null; - this.resRad.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.resRad.Location = new System.Drawing.Point(341, 7); - this.resRad.Margin = new System.Windows.Forms.Padding(0); - this.resRad.Name = "resRad"; - this.resRad.ResourceName = "Radioactives"; - this.resRad.Size = new System.Drawing.Size(147, 20); - this.resRad.TabIndex = 12; - // - // resOrg - // - this.resOrg.Amount = 0; - this.resOrg.BackColor = System.Drawing.Color.Black; - this.resOrg.Change = null; - this.resOrg.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); - this.resOrg.Location = new System.Drawing.Point(194, 6); - this.resOrg.Margin = new System.Windows.Forms.Padding(0); - this.resOrg.Name = "resOrg"; - this.resOrg.ResourceName = "Organics"; - this.resOrg.Size = new System.Drawing.Size(147, 20); - this.resOrg.TabIndex = 11; - // - // resMin - // - this.resMin.Amount = 0; - this.resMin.BackColor = System.Drawing.Color.Black; - this.resMin.Change = null; - this.resMin.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255))))); - this.resMin.Location = new System.Drawing.Point(47, 6); - this.resMin.Margin = new System.Windows.Forms.Padding(0); - this.resMin.Name = "resMin"; - this.resMin.ResourceName = "Minerals"; - this.resMin.Size = new System.Drawing.Size(147, 20); - this.resMin.TabIndex = 10; - // - // picEmpireFlag - // - this.picEmpireFlag.Location = new System.Drawing.Point(4, 5); - this.picEmpireFlag.Margin = new System.Windows.Forms.Padding(4); - this.picEmpireFlag.Name = "picEmpireFlag"; - this.picEmpireFlag.Size = new System.Drawing.Size(38, 21); - this.picEmpireFlag.TabIndex = 0; - this.picEmpireFlag.TabStop = false; - // - // pnlRight - // - this.pnlRight.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Right))); - this.pnlRight.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.pnlRight.Controls.Add(this.ddlGalaxyViewMode); - this.pnlRight.Controls.Add(this.pnlGalaxyMap); - this.pnlRight.Controls.Add(this.pnlDetailReport); - this.pnlRight.Controls.Add(this.progResearch); - this.pnlRight.Location = new System.Drawing.Point(853, 2); - this.pnlRight.Margin = new System.Windows.Forms.Padding(0, 1, 1, 1); - this.pnlRight.Name = "pnlRight"; - this.pnlRight.Size = new System.Drawing.Size(414, 775); - this.pnlRight.TabIndex = 4; - // - // ddlGalaxyViewMode - // - this.ddlGalaxyViewMode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.ddlGalaxyViewMode.DisplayMember = "Name"; - this.ddlGalaxyViewMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.ddlGalaxyViewMode.FormattingEnabled = true; - this.ddlGalaxyViewMode.Location = new System.Drawing.Point(3, 495); - this.ddlGalaxyViewMode.Margin = new System.Windows.Forms.Padding(0); - this.ddlGalaxyViewMode.Name = "ddlGalaxyViewMode"; - this.ddlGalaxyViewMode.Size = new System.Drawing.Size(411, 33); - this.ddlGalaxyViewMode.TabIndex = 1; - this.ddlGalaxyViewMode.SelectedIndexChanged += new System.EventHandler(this.ddlGalaxyViewMode_SelectedIndexChanged); - // - // pnlGalaxyMap - // - this.pnlGalaxyMap.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.pnlGalaxyMap.BackColor = System.Drawing.Color.Black; - this.pnlGalaxyMap.BorderColor = System.Drawing.Color.RoyalBlue; - this.pnlGalaxyMap.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.pnlGalaxyMap.Controls.Add(this.galaxyView); - this.pnlGalaxyMap.ForeColor = System.Drawing.Color.White; - this.pnlGalaxyMap.Location = new System.Drawing.Point(4, 518); - this.pnlGalaxyMap.Margin = new System.Windows.Forms.Padding(0); - this.pnlGalaxyMap.Name = "pnlGalaxyMap"; - this.pnlGalaxyMap.Padding = new System.Windows.Forms.Padding(3); - this.pnlGalaxyMap.Size = new System.Drawing.Size(411, 257); - this.pnlGalaxyMap.TabIndex = 14; - // - // galaxyView - // - this.galaxyView.BackColor = System.Drawing.Color.Black; - this.galaxyView.Dock = System.Windows.Forms.DockStyle.Fill; - this.galaxyView.Location = new System.Drawing.Point(3, 3); - this.galaxyView.Mode = presenceMode1; - this.galaxyView.Name = "galaxyView"; - this.galaxyView.SelectedStarSystem = null; - this.galaxyView.Size = new System.Drawing.Size(403, 249); - this.galaxyView.TabIndex = 0; - this.galaxyView.Text = "galaxyView1"; - this.galaxyView.StarSystemClicked += new FrEee.WinForms.Controls.GalaxyView.StarSystemSelectionDelegate(this.galaxyView_StarSystemClicked); - this.galaxyView.StarSystemSelected += new FrEee.WinForms.Controls.GalaxyView.StarSystemSelectionDelegate(this.galaxyView_StarSystemSelected); - // - // pnlDetailReport - // - this.pnlDetailReport.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.pnlDetailReport.BackColor = System.Drawing.Color.Black; - this.pnlDetailReport.BorderColor = System.Drawing.Color.RoyalBlue; - this.pnlDetailReport.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.pnlDetailReport.ForeColor = System.Drawing.Color.White; - this.pnlDetailReport.Location = new System.Drawing.Point(4, 35); - this.pnlDetailReport.Margin = new System.Windows.Forms.Padding(0); - this.pnlDetailReport.Name = "pnlDetailReport"; - this.pnlDetailReport.Padding = new System.Windows.Forms.Padding(3); - this.pnlDetailReport.Size = new System.Drawing.Size(412, 460); - this.pnlDetailReport.TabIndex = 12; - // - // MainGameForm - // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; - this.BackColor = System.Drawing.Color.Black; - this.ClientSize = new System.Drawing.Size(1270, 779); - this.Controls.Add(this.pnlLayout); - this.DoubleBuffered = true; - this.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.KeyPreview = true; - this.Margin = new System.Windows.Forms.Padding(4); - this.MinimumSize = new System.Drawing.Size(900, 700); - this.Name = "MainGameForm"; - this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.GameForm_FormClosing); - this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.GameForm_FormClosed); - this.Load += new System.EventHandler(this.GameForm_Load); - this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.GameForm_KeyDown); - this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.GameForm_KeyUp); - this.MouseDown += new System.Windows.Forms.MouseEventHandler(this.GameForm_MouseDown); - this.pnlLayout.ResumeLayout(false); - this.pnlLeft.ResumeLayout(false); - this.pnlSystemMap.ResumeLayout(false); - this.pnlSearch.ResumeLayout(false); - this.pnlSystemTabs.ResumeLayout(false); - this.pnlTabs.ResumeLayout(false); - this.pnlSubCommands.ResumeLayout(false); - this.pnlMainCommands.ResumeLayout(false); - this.pnlHeader.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.picEmpireFlag)).EndInit(); - this.pnlRight.ResumeLayout(false); - this.pnlGalaxyMap.ResumeLayout(false); - this.ResumeLayout(false); - - } - - #endregion - - private System.Windows.Forms.ToolTip toolTip; - private GamePanel pnlLayout; - private System.Windows.Forms.Panel pnlRight; - private GamePanel pnlGalaxyMap; - private GalaxyView galaxyView; - private GamePanel pnlDetailReport; - private GameProgressBar progResearch; - private System.Windows.Forms.Panel pnlLeft; - private GamePanel pnlSystemMap; - private StarSystemView starSystemView; - private GamePanel pnlSearch; - private SearchBox searchBox; - private GamePanel pnlSystemTabs; - private System.Windows.Forms.FlowLayoutPanel pnlTabs; - private GameButton btnNewTab; - private GamePanel pnlSubCommands; - private GameButton btnSentry; - private GameButton btnClearOrders; - private GameButton btnFleetTransfer; - private GameButton btnTransferCargo; - private GameButton btnConstructionQueue; - private GameButton btnColonize; - private GameButton btnEvade; - private GameButton btnWarp; - private GameButton btnPursue; - private GameButton btnMove; - private GamePanel pnlMainCommands; - private GameButton btnEndTurn; - private GameButton btnLog; - private GameButton btnQueues; - private GameButton btnShips; - private GameButton btnEmpires; - private GameButton btnPlanets; - private GameButton btnDesigns; - private GameButton btnMenu; - private GamePanel pnlHeader; - private ResourceDisplay resInt; - private ResourceDisplay resRes; - private ResourceDisplay resRad; - private ResourceDisplay resOrg; - private ResourceDisplay resMin; - private System.Windows.Forms.PictureBox picEmpireFlag; - private GameButton btnNextIdle; - private GameButton btnPrevIdle; - private GameButton btnRepeatOrders; - private GameButton btnRepair; - private GameButton btnResupply; - private GameButton btnRecycle; - private GameButton btnRename; - private GameButton btnToggleMinister; - private GameButton btnActivate; - private GameButton btnCloak; - private GameButton btnDecloak; - private GameButton btnMovementLog; - private GameButton btnWaypoint; - private System.Windows.Forms.ComboBox ddlGalaxyViewMode; - private GameButton btnCommands; -} - diff --git a/FrEee.WinForms/Forms/MainGameForm.resx b/FrEee.WinForms/Forms/MainGameForm.resx deleted file mode 100644 index 99de90164..000000000 --- a/FrEee.WinForms/Forms/MainGameForm.resx +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 17, 17 - - \ No newline at end of file diff --git a/FrEee.WinForms/Forms/OptionsForm.cs b/FrEee.WinForms/Forms/OptionsForm.cs deleted file mode 100644 index 5e70e7e57..000000000 --- a/FrEee.WinForms/Forms/OptionsForm.cs +++ /dev/null @@ -1,531 +0,0 @@ -using FrEee.Objects.Civilization; -using FrEee.WinForms.Objects; -using System; -using System.IO; -using System.Reflection; -using System.Windows.Forms; - -namespace FrEee.WinForms.Forms; - -public partial class OptionsForm : GameForm -{ - public OptionsForm() - { - InitializeComponent(); - } - - private Controls.GameButton btnCancel; - private Controls.GameButton btnSave; - private Controls.GameButton btnSE4; - private GroupBox groupBox1; - private Label label1; - private Label label2; - private Label label7; - private TrackBar sldEffects; - private TrackBar sldMaster; - private GroupBox grpPlayerInfo; - private Label label9; - private Label label8; - private Label label6; - private Label label5; - private Label label4; - private Label label3; - private TextBox txtNotes; - private TextBox txtDiscord; - private TextBox txtIrc; - private TextBox txtEmail; - private TextBox txtPbw; - private TextBox txtName; - private TextBox txtWebsite; - private Label label10; - private GroupBox groupBox2; - private CheckBox chkQuitToMainMenu; - private TrackBar sldMusic; - - private void btnCancel_Click(object sender, EventArgs e) - { - Close(); - } - - private void btnSave_Click(object sender, EventArgs e) - { - ClientSettings.Instance.MasterVolume = sldMaster.Value; - ClientSettings.Instance.MusicVolume = sldMusic.Value; - ClientSettings.Instance.EffectsVolume = sldEffects.Value; - if (ClientSettings.Instance.PlayerInfo == null) - ClientSettings.Instance.PlayerInfo = new PlayerInfo(); - ClientSettings.Instance.PlayerInfo.Name = txtName.Text; - ClientSettings.Instance.PlayerInfo.Pbw = txtPbw.Text; - ClientSettings.Instance.PlayerInfo.Email = txtEmail.Text; - ClientSettings.Instance.PlayerInfo.Irc = txtIrc.Text; - ClientSettings.Instance.PlayerInfo.Discord = txtDiscord.Text; - ClientSettings.Instance.PlayerInfo.Notes = txtNotes.Text; - ClientSettings.Instance.PlayerInfo.Website = txtWebsite.Text; - ClientSettings.Instance.QuitToMainMenu = chkQuitToMainMenu.Checked; - ClientSettings.Save(); - Music.setVolume(ClientSettings.Instance.MasterVolume * ClientSettings.Instance.MusicVolume * 1.0e-4f); - Music.StartNewTrack(); - Close(); - } - - private void btnSE4_Click(object sender, EventArgs e) - { - // find SE4 folder - FolderBrowserDialog fbd = new FolderBrowserDialog(); - fbd.Description = "Locate SE4 root folder"; - DialogResult result = fbd.ShowDialog(); - if (result == DialogResult.Cancel) - { - return; - } - string se4root = fbd.SelectedPath; - - DirectoryInfo dir = null; - string output = Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), "Pictures"); - // create the output pictures folder if it doesn't exist - if (!Directory.Exists(output)) - { - Directory.CreateDirectory(output); - } - - // === MOST OF THE ART IS HERE === - string[] folders = { "Planets", "Components", "Facilities", "Systems" }; - foreach (string f in folders) - { - dir = new DirectoryInfo(se4root + "/Pictures/" + f); - if (dir.Exists) - { - output = Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), "Pictures/" + f); - if (!Directory.Exists(output)) - { - Directory.CreateDirectory(output); - } - - FileInfo[] files = dir.GetFiles(); - foreach (FileInfo file in files) - { - string temppath = Path.Combine(output, file.Name); - string conflict = temppath.Replace(".BMP", ".png").Replace(".bmp", ".png"); - //if (File.Exists(conflict)) - //{ - // File.Delete(conflict); - //} - file.CopyTo(temppath, true); - } - } - } - - // === RACES AND THEIR SHIPSETS === - output = Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), "Pictures/Races"); - dir = new DirectoryInfo(se4root + "/Pictures/Races"); - foreach (DirectoryInfo subdir in dir.GetDirectories()) - { - string subOutput = Path.Combine(output, subdir.Name); - if (!Directory.Exists(subOutput)) - { - Directory.CreateDirectory(subOutput); - } - FileInfo[] files = (new DirectoryInfo(se4root + "/Pictures/Races/" + subdir.Name)).GetFiles(); - foreach (FileInfo file in files) - { - string temppath = Path.Combine(subOutput, file.Name); - file.CopyTo(temppath, true); - } - } - - /* // TEMPORARILY DISABLED: we need to classify all the tracks to put them in the right sub folder - // === MUSIC === - foreach (string f in folders) { - dir = new DirectoryInfo(se4root + "/Music/"); - if (dir.Exists) { - output = Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), "Music"); - if (!Directory.Exists(output)) { - Directory.CreateDirectory(output); - } - - FileInfo[] files = dir.GetFiles(); - foreach (FileInfo file in files) { - string temppath = Path.Combine(output, file.Name); - file.CopyTo(temppath, true); - } - } - } - */ - } - - private void InitializeComponent() - { - this.sldMaster = new System.Windows.Forms.TrackBar(); - this.label7 = new System.Windows.Forms.Label(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.label2 = new System.Windows.Forms.Label(); - this.sldEffects = new System.Windows.Forms.TrackBar(); - this.label1 = new System.Windows.Forms.Label(); - this.sldMusic = new System.Windows.Forms.TrackBar(); - this.btnCancel = new FrEee.WinForms.Controls.GameButton(); - this.btnSave = new FrEee.WinForms.Controls.GameButton(); - this.btnSE4 = new FrEee.WinForms.Controls.GameButton(); - this.grpPlayerInfo = new System.Windows.Forms.GroupBox(); - this.txtWebsite = new System.Windows.Forms.TextBox(); - this.label10 = new System.Windows.Forms.Label(); - this.txtNotes = new System.Windows.Forms.TextBox(); - this.txtDiscord = new System.Windows.Forms.TextBox(); - this.txtIrc = new System.Windows.Forms.TextBox(); - this.txtEmail = new System.Windows.Forms.TextBox(); - this.txtPbw = new System.Windows.Forms.TextBox(); - this.txtName = new System.Windows.Forms.TextBox(); - this.label9 = new System.Windows.Forms.Label(); - this.label8 = new System.Windows.Forms.Label(); - this.label6 = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.chkQuitToMainMenu = new System.Windows.Forms.CheckBox(); - ((System.ComponentModel.ISupportInitialize)(this.sldMaster)).BeginInit(); - this.groupBox1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.sldEffects)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.sldMusic)).BeginInit(); - this.grpPlayerInfo.SuspendLayout(); - this.groupBox2.SuspendLayout(); - this.SuspendLayout(); - // - // sldMaster - // - this.sldMaster.LargeChange = 10; - this.sldMaster.Location = new System.Drawing.Point(140, 19); - this.sldMaster.Maximum = 100; - this.sldMaster.Name = "sldMaster"; - this.sldMaster.Size = new System.Drawing.Size(213, 80); - this.sldMaster.TabIndex = 0; - this.sldMaster.TickFrequency = 10; - // - // label7 - // - this.label7.AutoSize = true; - this.label7.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label7.Location = new System.Drawing.Point(6, 19); - this.label7.Margin = new System.Windows.Forms.Padding(3); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(77, 30); - this.label7.TabIndex = 17; - this.label7.Text = "Master"; - // - // groupBox1 - // - this.groupBox1.Controls.Add(this.label2); - this.groupBox1.Controls.Add(this.sldEffects); - this.groupBox1.Controls.Add(this.label1); - this.groupBox1.Controls.Add(this.sldMusic); - this.groupBox1.Controls.Add(this.label7); - this.groupBox1.Controls.Add(this.sldMaster); - this.groupBox1.ForeColor = System.Drawing.Color.CornflowerBlue; - this.groupBox1.Location = new System.Drawing.Point(12, 319); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(359, 176); - this.groupBox1.TabIndex = 2; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Volume"; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label2.Location = new System.Drawing.Point(6, 121); - this.label2.Margin = new System.Windows.Forms.Padding(3); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(75, 30); - this.label2.TabIndex = 21; - this.label2.Text = "Effects"; - // - // sldEffects - // - this.sldEffects.Enabled = false; - this.sldEffects.LargeChange = 10; - this.sldEffects.Location = new System.Drawing.Point(140, 121); - this.sldEffects.Maximum = 100; - this.sldEffects.Name = "sldEffects"; - this.sldEffects.Size = new System.Drawing.Size(213, 80); - this.sldEffects.TabIndex = 2; - this.sldEffects.TickFrequency = 10; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label1.Location = new System.Drawing.Point(6, 70); - this.label1.Margin = new System.Windows.Forms.Padding(3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(68, 30); - this.label1.TabIndex = 19; - this.label1.Text = "Music"; - // - // sldMusic - // - this.sldMusic.LargeChange = 10; - this.sldMusic.Location = new System.Drawing.Point(140, 70); - this.sldMusic.Maximum = 100; - this.sldMusic.Name = "sldMusic"; - this.sldMusic.Size = new System.Drawing.Size(213, 80); - this.sldMusic.TabIndex = 1; - this.sldMusic.TickFrequency = 10; - // - // btnCancel - // - this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btnCancel.BackColor = System.Drawing.Color.Black; - this.btnCancel.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnCancel.Location = new System.Drawing.Point(295, 585); - this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(75, 23); - this.btnCancel.TabIndex = 5; - this.btnCancel.Text = "Cancel"; - this.btnCancel.UseVisualStyleBackColor = false; - this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); - // - // btnSave - // - this.btnSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btnSave.BackColor = System.Drawing.Color.Black; - this.btnSave.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnSave.Location = new System.Drawing.Point(214, 585); - this.btnSave.Name = "btnSave"; - this.btnSave.Size = new System.Drawing.Size(75, 23); - this.btnSave.TabIndex = 4; - this.btnSave.Text = "Save"; - this.btnSave.UseVisualStyleBackColor = false; - this.btnSave.Click += new System.EventHandler(this.btnSave_Click); - // - // btnSE4 - // - this.btnSE4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.btnSE4.BackColor = System.Drawing.Color.Black; - this.btnSE4.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btnSE4.Location = new System.Drawing.Point(12, 578); - this.btnSE4.Name = "btnSE4"; - this.btnSE4.Size = new System.Drawing.Size(104, 30); - this.btnSE4.TabIndex = 3; - this.btnSE4.Text = "Copy SE4 Assets"; - this.btnSE4.UseVisualStyleBackColor = false; - this.btnSE4.Click += new System.EventHandler(this.btnSE4_Click); - // - // grpPlayerInfo - // - this.grpPlayerInfo.Controls.Add(this.txtWebsite); - this.grpPlayerInfo.Controls.Add(this.label10); - this.grpPlayerInfo.Controls.Add(this.txtNotes); - this.grpPlayerInfo.Controls.Add(this.txtDiscord); - this.grpPlayerInfo.Controls.Add(this.txtIrc); - this.grpPlayerInfo.Controls.Add(this.txtEmail); - this.grpPlayerInfo.Controls.Add(this.txtPbw); - this.grpPlayerInfo.Controls.Add(this.txtName); - this.grpPlayerInfo.Controls.Add(this.label9); - this.grpPlayerInfo.Controls.Add(this.label8); - this.grpPlayerInfo.Controls.Add(this.label6); - this.grpPlayerInfo.Controls.Add(this.label5); - this.grpPlayerInfo.Controls.Add(this.label4); - this.grpPlayerInfo.Controls.Add(this.label3); - this.grpPlayerInfo.ForeColor = System.Drawing.Color.CornflowerBlue; - this.grpPlayerInfo.Location = new System.Drawing.Point(12, 12); - this.grpPlayerInfo.Name = "grpPlayerInfo"; - this.grpPlayerInfo.Size = new System.Drawing.Size(359, 301); - this.grpPlayerInfo.TabIndex = 1; - this.grpPlayerInfo.TabStop = false; - this.grpPlayerInfo.Text = "Player Info"; - // - // txtWebsite - // - this.txtWebsite.Location = new System.Drawing.Point(57, 146); - this.txtWebsite.Name = "txtWebsite"; - this.txtWebsite.Size = new System.Drawing.Size(190, 35); - this.txtWebsite.TabIndex = 5; - // - // label10 - // - this.label10.AutoSize = true; - this.label10.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label10.Location = new System.Drawing.Point(7, 149); - this.label10.Margin = new System.Windows.Forms.Padding(3); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(87, 30); - this.label10.TabIndex = 30; - this.label10.Text = "Website"; - // - // txtNotes - // - this.txtNotes.Location = new System.Drawing.Point(57, 174); - this.txtNotes.Multiline = true; - this.txtNotes.Name = "txtNotes"; - this.txtNotes.Size = new System.Drawing.Size(296, 98); - this.txtNotes.TabIndex = 6; - // - // txtDiscord - // - this.txtDiscord.Location = new System.Drawing.Point(57, 120); - this.txtDiscord.Name = "txtDiscord"; - this.txtDiscord.Size = new System.Drawing.Size(190, 35); - this.txtDiscord.TabIndex = 4; - // - // txtIrc - // - this.txtIrc.Location = new System.Drawing.Point(57, 94); - this.txtIrc.Name = "txtIrc"; - this.txtIrc.Size = new System.Drawing.Size(190, 35); - this.txtIrc.TabIndex = 3; - // - // txtEmail - // - this.txtEmail.Location = new System.Drawing.Point(57, 68); - this.txtEmail.Name = "txtEmail"; - this.txtEmail.Size = new System.Drawing.Size(190, 35); - this.txtEmail.TabIndex = 2; - // - // txtPbw - // - this.txtPbw.Location = new System.Drawing.Point(57, 42); - this.txtPbw.Name = "txtPbw"; - this.txtPbw.Size = new System.Drawing.Size(190, 35); - this.txtPbw.TabIndex = 1; - // - // txtName - // - this.txtName.Location = new System.Drawing.Point(57, 16); - this.txtName.Name = "txtName"; - this.txtName.Size = new System.Drawing.Size(190, 35); - this.txtName.TabIndex = 0; - // - // label9 - // - this.label9.AutoSize = true; - this.label9.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label9.Location = new System.Drawing.Point(7, 174); - this.label9.Margin = new System.Windows.Forms.Padding(3); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(68, 30); - this.label9.TabIndex = 23; - this.label9.Text = "Notes"; - // - // label8 - // - this.label8.AutoSize = true; - this.label8.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label8.Location = new System.Drawing.Point(6, 123); - this.label8.Margin = new System.Windows.Forms.Padding(3); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(83, 30); - this.label8.TabIndex = 22; - this.label8.Text = "Discord"; - // - // label6 - // - this.label6.AutoSize = true; - this.label6.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label6.Location = new System.Drawing.Point(7, 97); - this.label6.Margin = new System.Windows.Forms.Padding(3); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(45, 30); - this.label6.TabIndex = 21; - this.label6.Text = "IRC"; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label5.Location = new System.Drawing.Point(6, 71); - this.label5.Margin = new System.Windows.Forms.Padding(3); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(63, 30); - this.label5.TabIndex = 20; - this.label5.Text = "Email"; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label4.Location = new System.Drawing.Point(7, 45); - this.label4.Margin = new System.Windows.Forms.Padding(3); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(57, 30); - this.label4.TabIndex = 19; - this.label4.Text = "PBW"; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.ForeColor = System.Drawing.Color.CornflowerBlue; - this.label3.Location = new System.Drawing.Point(7, 19); - this.label3.Margin = new System.Windows.Forms.Padding(3); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(69, 30); - this.label3.TabIndex = 18; - this.label3.Text = "Name"; - // - // groupBox2 - // - this.groupBox2.Controls.Add(this.chkQuitToMainMenu); - this.groupBox2.ForeColor = System.Drawing.Color.CornflowerBlue; - this.groupBox2.Location = new System.Drawing.Point(12, 501); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(359, 57); - this.groupBox2.TabIndex = 22; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "UI"; - this.groupBox2.Enter += new System.EventHandler(this.groupBox2_Enter); - // - // chkQuitToMainMenu - // - this.chkQuitToMainMenu.AutoSize = true; - this.chkQuitToMainMenu.Location = new System.Drawing.Point(15, 24); - this.chkQuitToMainMenu.Name = "chkQuitToMainMenu"; - this.chkQuitToMainMenu.Size = new System.Drawing.Size(217, 34); - this.chkQuitToMainMenu.TabIndex = 0; - this.chkQuitToMainMenu.Text = "Quit to Main Menu"; - this.chkQuitToMainMenu.UseVisualStyleBackColor = true; - // - // OptionsForm - // - this.BackColor = System.Drawing.Color.Black; - this.ClientSize = new System.Drawing.Size(382, 620); - this.Controls.Add(this.groupBox2); - this.Controls.Add(this.grpPlayerInfo); - this.Controls.Add(this.btnSE4); - this.Controls.Add(this.btnCancel); - this.Controls.Add(this.btnSave); - this.Controls.Add(this.groupBox1); - this.MaximizeBox = false; - this.Name = "OptionsForm"; - this.Text = "Options"; - this.Load += new System.EventHandler(this.OptionsForm_Load); - ((System.ComponentModel.ISupportInitialize)(this.sldMaster)).EndInit(); - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.sldEffects)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.sldMusic)).EndInit(); - this.grpPlayerInfo.ResumeLayout(false); - this.grpPlayerInfo.PerformLayout(); - this.groupBox2.ResumeLayout(false); - this.groupBox2.PerformLayout(); - this.ResumeLayout(false); - - } - - private void OptionsForm_Load(object sender, EventArgs e) - { - txtName.Text = ClientSettings.Instance.PlayerInfo.Name; - txtPbw.Text = ClientSettings.Instance.PlayerInfo.Pbw; - txtEmail.Text = ClientSettings.Instance.PlayerInfo.Email; - txtIrc.Text = ClientSettings.Instance.PlayerInfo.Irc; - txtDiscord.Text = ClientSettings.Instance.PlayerInfo.Discord; - txtNotes.Text = ClientSettings.Instance.PlayerInfo.Notes; - txtWebsite.Text = ClientSettings.Instance.PlayerInfo.Website; - sldMaster.Value = Math.Max(0, Math.Min(100, ClientSettings.Instance.MasterVolume)); - sldMusic.Value = Math.Max(0, Math.Min(100, ClientSettings.Instance.MusicVolume)); - sldEffects.Value = Math.Max(0, Math.Min(100, ClientSettings.Instance.EffectsVolume)); - chkQuitToMainMenu.Checked = ClientSettings.Instance.QuitToMainMenu; - } - - private void groupBox2_Enter(object sender, EventArgs e) - { - - } -} diff --git a/FrEee.WinForms/Forms/OptionsForm.resx b/FrEee.WinForms/Forms/OptionsForm.resx deleted file mode 100644 index b5ae26c78..000000000 --- a/FrEee.WinForms/Forms/OptionsForm.resx +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/FrEee.WinForms/Forms/TechTreeForm.Designer.cs b/FrEee.WinForms/Forms/TechTreeForm.Designer.cs deleted file mode 100644 index a9b61c09d..000000000 --- a/FrEee.WinForms/Forms/TechTreeForm.Designer.cs +++ /dev/null @@ -1,257 +0,0 @@ -namespace FrEee.WinForms.Forms; - -partial class TechTreeForm -{ - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.gamePanel2 = new FrEee.WinForms.Controls.GamePanel(); - this.lstUnlocks = new System.Windows.Forms.ListView(); - this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.gamePanel1 = new FrEee.WinForms.Controls.GamePanel(); - this.lstRequired = new System.Windows.Forms.ListView(); - this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.ddlItems = new System.Windows.Forms.ComboBox(); - this.lblPrereqs = new System.Windows.Forms.Label(); - this.lblDetailsHeader = new System.Windows.Forms.Label(); - this.lblUnlocks = new System.Windows.Forms.Label(); - this.ddlType = new System.Windows.Forms.ComboBox(); - this.pnlDetails = new FrEee.WinForms.Controls.GamePanel(); - this.btlReset = new FrEee.WinForms.Controls.GameButton(); - this.tableLayoutPanel1.SuspendLayout(); - this.gamePanel2.SuspendLayout(); - this.gamePanel1.SuspendLayout(); - this.SuspendLayout(); - // - // tableLayoutPanel1 - // - this.tableLayoutPanel1.ColumnCount = 3; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 200F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 200F)); - this.tableLayoutPanel1.Controls.Add(this.gamePanel2, 2, 2); - this.tableLayoutPanel1.Controls.Add(this.gamePanel1, 0, 2); - this.tableLayoutPanel1.Controls.Add(this.ddlItems, 1, 0); - this.tableLayoutPanel1.Controls.Add(this.lblPrereqs, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.lblDetailsHeader, 1, 1); - this.tableLayoutPanel1.Controls.Add(this.lblUnlocks, 2, 1); - this.tableLayoutPanel1.Controls.Add(this.ddlType, 0, 0); - this.tableLayoutPanel1.Controls.Add(this.pnlDetails, 1, 2); - this.tableLayoutPanel1.Controls.Add(this.btlReset, 2, 0); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 3; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(953, 634); - this.tableLayoutPanel1.TabIndex = 0; - // - // gamePanel2 - // - this.gamePanel2.BackColor = System.Drawing.Color.Black; - this.gamePanel2.BorderColor = System.Drawing.Color.CornflowerBlue; - this.gamePanel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.gamePanel2.Controls.Add(this.lstUnlocks); - this.gamePanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.gamePanel2.ForeColor = System.Drawing.Color.White; - this.gamePanel2.Location = new System.Drawing.Point(756, 55); - this.gamePanel2.Name = "gamePanel2"; - this.gamePanel2.Padding = new System.Windows.Forms.Padding(3); - this.gamePanel2.Size = new System.Drawing.Size(194, 576); - this.gamePanel2.TabIndex = 8; - // - // lstUnlocks - // - this.lstUnlocks.BackColor = System.Drawing.Color.Black; - this.lstUnlocks.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.lstUnlocks.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.columnHeader2}); - this.lstUnlocks.Dock = System.Windows.Forms.DockStyle.Fill; - this.lstUnlocks.ForeColor = System.Drawing.Color.White; - this.lstUnlocks.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; - this.lstUnlocks.Location = new System.Drawing.Point(3, 3); - this.lstUnlocks.Name = "lstUnlocks"; - this.lstUnlocks.Size = new System.Drawing.Size(186, 568); - this.lstUnlocks.TabIndex = 3; - this.lstUnlocks.UseCompatibleStateImageBehavior = false; - this.lstUnlocks.View = System.Windows.Forms.View.Details; - this.lstUnlocks.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.lstUnlocks_MouseDoubleClick); - // - // columnHeader2 - // - this.columnHeader2.Width = 186; - // - // gamePanel1 - // - this.gamePanel1.BackColor = System.Drawing.Color.Black; - this.gamePanel1.BorderColor = System.Drawing.Color.CornflowerBlue; - this.gamePanel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.gamePanel1.Controls.Add(this.lstRequired); - this.gamePanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.gamePanel1.ForeColor = System.Drawing.Color.White; - this.gamePanel1.Location = new System.Drawing.Point(3, 55); - this.gamePanel1.Name = "gamePanel1"; - this.gamePanel1.Padding = new System.Windows.Forms.Padding(3); - this.gamePanel1.Size = new System.Drawing.Size(194, 576); - this.gamePanel1.TabIndex = 7; - // - // lstRequired - // - this.lstRequired.BackColor = System.Drawing.Color.Black; - this.lstRequired.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.lstRequired.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.columnHeader1}); - this.lstRequired.Dock = System.Windows.Forms.DockStyle.Fill; - this.lstRequired.ForeColor = System.Drawing.Color.White; - this.lstRequired.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; - this.lstRequired.Location = new System.Drawing.Point(3, 3); - this.lstRequired.Name = "lstRequired"; - this.lstRequired.Size = new System.Drawing.Size(186, 568); - this.lstRequired.TabIndex = 2; - this.lstRequired.UseCompatibleStateImageBehavior = false; - this.lstRequired.View = System.Windows.Forms.View.Details; - this.lstRequired.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.lstRequired_MouseDoubleClick); - // - // columnHeader1 - // - this.columnHeader1.Width = 186; - // - // ddlItems - // - this.ddlItems.Dock = System.Windows.Forms.DockStyle.Fill; - this.ddlItems.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.ddlItems.FormattingEnabled = true; - this.ddlItems.Location = new System.Drawing.Point(203, 3); - this.ddlItems.Name = "ddlItems"; - this.ddlItems.Size = new System.Drawing.Size(547, 21); - this.ddlItems.TabIndex = 4; - this.ddlItems.SelectedIndexChanged += new System.EventHandler(this.ddlItems_SelectedIndexChanged); - // - // lblPrereqs - // - this.lblPrereqs.AutoSize = true; - this.lblPrereqs.ForeColor = System.Drawing.Color.CornflowerBlue; - this.lblPrereqs.Location = new System.Drawing.Point(3, 32); - this.lblPrereqs.Name = "lblPrereqs"; - this.lblPrereqs.Size = new System.Drawing.Size(67, 13); - this.lblPrereqs.TabIndex = 0; - this.lblPrereqs.Text = "Prerequisites"; - // - // lblDetailsHeader - // - this.lblDetailsHeader.AutoSize = true; - this.lblDetailsHeader.ForeColor = System.Drawing.Color.CornflowerBlue; - this.lblDetailsHeader.Location = new System.Drawing.Point(203, 32); - this.lblDetailsHeader.Name = "lblDetailsHeader"; - this.lblDetailsHeader.Size = new System.Drawing.Size(39, 13); - this.lblDetailsHeader.TabIndex = 1; - this.lblDetailsHeader.Text = "Details"; - // - // lblUnlocks - // - this.lblUnlocks.AutoSize = true; - this.lblUnlocks.ForeColor = System.Drawing.Color.CornflowerBlue; - this.lblUnlocks.Location = new System.Drawing.Point(756, 32); - this.lblUnlocks.Name = "lblUnlocks"; - this.lblUnlocks.Size = new System.Drawing.Size(46, 13); - this.lblUnlocks.TabIndex = 2; - this.lblUnlocks.Text = "Unlocks"; - // - // ddlType - // - this.ddlType.DisplayMember = "Name"; - this.ddlType.Dock = System.Windows.Forms.DockStyle.Fill; - this.ddlType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.ddlType.FormattingEnabled = true; - this.ddlType.Location = new System.Drawing.Point(3, 3); - this.ddlType.Name = "ddlType"; - this.ddlType.Size = new System.Drawing.Size(194, 21); - this.ddlType.TabIndex = 3; - this.ddlType.SelectedIndexChanged += new System.EventHandler(this.ddlType_SelectedIndexChanged); - // - // pnlDetails - // - this.pnlDetails.BackColor = System.Drawing.Color.Black; - this.pnlDetails.BorderColor = System.Drawing.Color.CornflowerBlue; - this.pnlDetails.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.pnlDetails.Dock = System.Windows.Forms.DockStyle.Fill; - this.pnlDetails.ForeColor = System.Drawing.Color.White; - this.pnlDetails.Location = new System.Drawing.Point(203, 55); - this.pnlDetails.Name = "pnlDetails"; - this.pnlDetails.Padding = new System.Windows.Forms.Padding(3); - this.pnlDetails.Size = new System.Drawing.Size(547, 576); - this.pnlDetails.TabIndex = 6; - // - // btlReset - // - this.btlReset.BackColor = System.Drawing.Color.Black; - this.btlReset.Dock = System.Windows.Forms.DockStyle.Fill; - this.btlReset.ForeColor = System.Drawing.Color.CornflowerBlue; - this.btlReset.Location = new System.Drawing.Point(756, 3); - this.btlReset.Name = "btlReset"; - this.btlReset.Size = new System.Drawing.Size(194, 26); - this.btlReset.TabIndex = 9; - this.btlReset.Text = "Reset"; - this.btlReset.UseVisualStyleBackColor = false; - this.btlReset.Click += new System.EventHandler(this.btlReset_Click); - // - // TechTreeForm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.Black; - this.ClientSize = new System.Drawing.Size(953, 634); - this.Controls.Add(this.tableLayoutPanel1); - this.Name = "TechTreeForm"; - this.Text = "Tech Tree"; - this.tableLayoutPanel1.ResumeLayout(false); - this.tableLayoutPanel1.PerformLayout(); - this.gamePanel2.ResumeLayout(false); - this.gamePanel1.ResumeLayout(false); - this.ResumeLayout(false); - - } - - #endregion - - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; - private System.Windows.Forms.Label lblPrereqs; - private System.Windows.Forms.Label lblDetailsHeader; - private System.Windows.Forms.Label lblUnlocks; - private System.Windows.Forms.ComboBox ddlType; - private System.Windows.Forms.ComboBox ddlItems; - private Controls.GamePanel pnlDetails; - private Controls.GamePanel gamePanel1; - private System.Windows.Forms.ListView lstRequired; - private Controls.GamePanel gamePanel2; - private System.Windows.Forms.ColumnHeader columnHeader1; - private System.Windows.Forms.ListView lstUnlocks; - private System.Windows.Forms.ColumnHeader columnHeader2; - private Controls.GameButton btlReset; -} \ No newline at end of file diff --git a/FrEee.sln b/FrEee.sln index d4a6b1d39..d6ca16e9f 100644 --- a/FrEee.sln +++ b/FrEee.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29911.98 +# Visual Studio Version 17 +VisualStudioVersion = 17.8.34601.278 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FrEee", "FrEee\FrEee.csproj", "{ECA7A08B-992A-43EC-8D98-2AE887897343}" EndProject @@ -14,10 +14,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Rebracer.xml = Rebracer.xml EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FrEee.WinForms", "FrEee.WinForms\FrEee.WinForms.csproj", "{61615A88-CFD2-474E-BE6D-6D0A46AA6E5C}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FrEee.Assets", "FrEee.Assets\FrEee.Assets.csproj", "{C045C843-5B6B-4F8C-ADB6-98BE77375C6D}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FrEee.UI.Blazor", "FrEee.UI.Blazor\FrEee.UI.Blazor.csproj", "{04E09E27-D192-47C5-B60A-3A792D884EE5}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FrEee.UI.WinForms", "FrEee.UI.WinForms\FrEee.UI.WinForms.csproj", "{6AD78129-8271-44B7-A01A-FF75F61CCF2D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -52,18 +54,6 @@ Global {16D44CA4-5037-4537-93BF-C18F21F1A335}.Release|x64.Build.0 = Release|Any CPU {16D44CA4-5037-4537-93BF-C18F21F1A335}.Release|x86.ActiveCfg = Release|Any CPU {16D44CA4-5037-4537-93BF-C18F21F1A335}.Release|x86.Build.0 = Release|Any CPU - {61615A88-CFD2-474E-BE6D-6D0A46AA6E5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {61615A88-CFD2-474E-BE6D-6D0A46AA6E5C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {61615A88-CFD2-474E-BE6D-6D0A46AA6E5C}.Debug|x64.ActiveCfg = Debug|Any CPU - {61615A88-CFD2-474E-BE6D-6D0A46AA6E5C}.Debug|x64.Build.0 = Debug|Any CPU - {61615A88-CFD2-474E-BE6D-6D0A46AA6E5C}.Debug|x86.ActiveCfg = Debug|Any CPU - {61615A88-CFD2-474E-BE6D-6D0A46AA6E5C}.Debug|x86.Build.0 = Debug|Any CPU - {61615A88-CFD2-474E-BE6D-6D0A46AA6E5C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {61615A88-CFD2-474E-BE6D-6D0A46AA6E5C}.Release|Any CPU.Build.0 = Release|Any CPU - {61615A88-CFD2-474E-BE6D-6D0A46AA6E5C}.Release|x64.ActiveCfg = Release|Any CPU - {61615A88-CFD2-474E-BE6D-6D0A46AA6E5C}.Release|x64.Build.0 = Release|Any CPU - {61615A88-CFD2-474E-BE6D-6D0A46AA6E5C}.Release|x86.ActiveCfg = Release|Any CPU - {61615A88-CFD2-474E-BE6D-6D0A46AA6E5C}.Release|x86.Build.0 = Release|Any CPU {C045C843-5B6B-4F8C-ADB6-98BE77375C6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C045C843-5B6B-4F8C-ADB6-98BE77375C6D}.Debug|Any CPU.Build.0 = Debug|Any CPU {C045C843-5B6B-4F8C-ADB6-98BE77375C6D}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -76,6 +66,30 @@ Global {C045C843-5B6B-4F8C-ADB6-98BE77375C6D}.Release|x64.Build.0 = Release|Any CPU {C045C843-5B6B-4F8C-ADB6-98BE77375C6D}.Release|x86.ActiveCfg = Release|Any CPU {C045C843-5B6B-4F8C-ADB6-98BE77375C6D}.Release|x86.Build.0 = Release|Any CPU + {04E09E27-D192-47C5-B60A-3A792D884EE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {04E09E27-D192-47C5-B60A-3A792D884EE5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {04E09E27-D192-47C5-B60A-3A792D884EE5}.Debug|x64.ActiveCfg = Debug|Any CPU + {04E09E27-D192-47C5-B60A-3A792D884EE5}.Debug|x64.Build.0 = Debug|Any CPU + {04E09E27-D192-47C5-B60A-3A792D884EE5}.Debug|x86.ActiveCfg = Debug|Any CPU + {04E09E27-D192-47C5-B60A-3A792D884EE5}.Debug|x86.Build.0 = Debug|Any CPU + {04E09E27-D192-47C5-B60A-3A792D884EE5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {04E09E27-D192-47C5-B60A-3A792D884EE5}.Release|Any CPU.Build.0 = Release|Any CPU + {04E09E27-D192-47C5-B60A-3A792D884EE5}.Release|x64.ActiveCfg = Release|Any CPU + {04E09E27-D192-47C5-B60A-3A792D884EE5}.Release|x64.Build.0 = Release|Any CPU + {04E09E27-D192-47C5-B60A-3A792D884EE5}.Release|x86.ActiveCfg = Release|Any CPU + {04E09E27-D192-47C5-B60A-3A792D884EE5}.Release|x86.Build.0 = Release|Any CPU + {6AD78129-8271-44B7-A01A-FF75F61CCF2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6AD78129-8271-44B7-A01A-FF75F61CCF2D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6AD78129-8271-44B7-A01A-FF75F61CCF2D}.Debug|x64.ActiveCfg = Debug|Any CPU + {6AD78129-8271-44B7-A01A-FF75F61CCF2D}.Debug|x64.Build.0 = Debug|Any CPU + {6AD78129-8271-44B7-A01A-FF75F61CCF2D}.Debug|x86.ActiveCfg = Debug|Any CPU + {6AD78129-8271-44B7-A01A-FF75F61CCF2D}.Debug|x86.Build.0 = Debug|Any CPU + {6AD78129-8271-44B7-A01A-FF75F61CCF2D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6AD78129-8271-44B7-A01A-FF75F61CCF2D}.Release|Any CPU.Build.0 = Release|Any CPU + {6AD78129-8271-44B7-A01A-FF75F61CCF2D}.Release|x64.ActiveCfg = Release|Any CPU + {6AD78129-8271-44B7-A01A-FF75F61CCF2D}.Release|x64.Build.0 = Release|Any CPU + {6AD78129-8271-44B7-A01A-FF75F61CCF2D}.Release|x86.ActiveCfg = Release|Any CPU + {6AD78129-8271-44B7-A01A-FF75F61CCF2D}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/FrEee/ClassDiagram1.cd b/FrEee/ClassDiagram1.cd index 6c0ad76b2..a75104258 100644 --- a/FrEee/ClassDiagram1.cd +++ b/FrEee/ClassDiagram1.cd @@ -2781,7 +2781,7 @@ Utility\Extensions\CommonExtensions.cs - + AAAAAAAAAAAACAAAAAAAAAAAAAgACAAAAAAAAAAAAAA= diff --git a/FrEee/Extensions/CommonExtensions.cs b/FrEee/Extensions/CommonExtensions.cs index d6c2b51ba..bf05623d4 100644 --- a/FrEee/Extensions/CommonExtensions.cs +++ b/FrEee/Extensions/CommonExtensions.cs @@ -519,9 +519,9 @@ public static StarSystem FindStarSystem(this ISpaceObject sobj) /// public static IEnumerable GetAllPoints(this Rectangle r) { - for (var x = r.Left; x <= r.Right; x++) + for (var x = r.Left; x < r.Right; x++) { - for (var y = r.Top; y <= r.Bottom; y++) + for (var y = r.Top; y < r.Bottom; y++) yield return new Point(x, y); } } diff --git a/FrEee/Extensions/MathExtensions.cs b/FrEee/Extensions/MathExtensions.cs index 6d35d2c83..98cdecd28 100644 --- a/FrEee/Extensions/MathExtensions.cs +++ b/FrEee/Extensions/MathExtensions.cs @@ -1,6 +1,8 @@ using System; using System.Collections.Generic; +using System.Formats.Asn1; using System.Linq; +using System.Numerics; using FrEee.Utility; namespace FrEee.Extensions; @@ -107,4 +109,12 @@ public static double WeightedAverage(this IEnumerable list, Func(this IEnumerable list, Func selector) + where TNumber : IAdditionOperators + => list.Select(selector).Sum(); + + public static T Sum(this IEnumerable list) + where T : IAdditionOperators + => list.Aggregate((a, b) => a + b); } diff --git a/FrEee/Utility/ProgressDisplayMode.cs b/FrEee/Utility/ProgressDisplayMode.cs index ca7474539..28ca9bd3a 100644 --- a/FrEee/Utility/ProgressDisplayMode.cs +++ b/FrEee/Utility/ProgressDisplayMode.cs @@ -1,4 +1,4 @@ -namespace FrEee.WinForms.DataGridView; +namespace FrEee.UI.WinForms.DataGridView; /// /// Display modes for progress bars.