diff --git a/src/PKSim.Assets.Images/PKSim.Assets.Images.csproj b/src/PKSim.Assets.Images/PKSim.Assets.Images.csproj index 8ed8b0bb4..66e8f56a0 100644 --- a/src/PKSim.Assets.Images/PKSim.Assets.Images.csproj +++ b/src/PKSim.Assets.Images/PKSim.Assets.Images.csproj @@ -26,8 +26,8 @@ - - + + diff --git a/src/PKSim.Assets.Images/Resources/OSP_Hor_Logo.svg b/src/PKSim.Assets.Images/Resources/OSP_Hor_Logo.svg new file mode 100644 index 000000000..ac168062a --- /dev/null +++ b/src/PKSim.Assets.Images/Resources/OSP_Hor_Logo.svg @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/PKSim.Assets.Images/Resources/PKSim.jpg b/src/PKSim.Assets.Images/Resources/PKSim.jpg index fc812424b..ea6143d58 100644 Binary files a/src/PKSim.Assets.Images/Resources/PKSim.jpg and b/src/PKSim.Assets.Images/Resources/PKSim.jpg differ diff --git a/src/PKSim.Assets.Images/Resources/PKSim.svg b/src/PKSim.Assets.Images/Resources/PKSim.svg new file mode 100644 index 000000000..494da1f33 --- /dev/null +++ b/src/PKSim.Assets.Images/Resources/PKSim.svg @@ -0,0 +1,677 @@ + + + + diff --git a/src/PKSim.Assets.Images/Resources/PKSimAbout.svg b/src/PKSim.Assets.Images/Resources/PKSimAbout.svg new file mode 100644 index 000000000..20d35a783 --- /dev/null +++ b/src/PKSim.Assets.Images/Resources/PKSimAbout.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + diff --git a/src/PKSim.Assets.Images/Resources/SmallMoleculesStructure.png b/src/PKSim.Assets.Images/Resources/SmallMoleculesStructure.png index 7a0b6369a..27961e6b8 100644 Binary files a/src/PKSim.Assets.Images/Resources/SmallMoleculesStructure.png and b/src/PKSim.Assets.Images/Resources/SmallMoleculesStructure.png differ diff --git a/src/PKSim.Assets.Images/Resources/TwoPoresModelStructure.png b/src/PKSim.Assets.Images/Resources/TwoPoresModelStructure.png index 94081ce52..fb08d9591 100644 Binary files a/src/PKSim.Assets.Images/Resources/TwoPoresModelStructure.png and b/src/PKSim.Assets.Images/Resources/TwoPoresModelStructure.png differ diff --git a/src/PKSim.Assets/PKSim.Assets.csproj b/src/PKSim.Assets/PKSim.Assets.csproj index b6b216f64..d3f8fd8b2 100644 --- a/src/PKSim.Assets/PKSim.Assets.csproj +++ b/src/PKSim.Assets/PKSim.Assets.csproj @@ -26,8 +26,8 @@ - - + + diff --git a/src/PKSim.BatchTool/PKSim.BatchTool.csproj b/src/PKSim.BatchTool/PKSim.BatchTool.csproj index a60b30bf3..9bc02494f 100644 --- a/src/PKSim.BatchTool/PKSim.BatchTool.csproj +++ b/src/PKSim.BatchTool/PKSim.BatchTool.csproj @@ -63,9 +63,9 @@ - + - + diff --git a/src/PKSim.BatchTool/Views/FolderListSnapshotView.cs b/src/PKSim.BatchTool/Views/FolderListSnapshotView.cs index 0be948139..02d2e6f36 100644 --- a/src/PKSim.BatchTool/Views/FolderListSnapshotView.cs +++ b/src/PKSim.BatchTool/Views/FolderListSnapshotView.cs @@ -67,7 +67,7 @@ public override void InitializeBinding() .WithCaption(UIConstants.EMPTY_COLUMN) .WithShowButton(ShowButtonModeEnum.ShowAlways) .WithRepository(x => _deleteRepository) - .WithFixedWidth(UIConstants.Size.EMBEDDED_BUTTON_WIDTH); + .WithFixedWidth(OSPSuite.UI.UIConstants.Size.EMBEDDED_BUTTON_WIDTH); _gridViewBinder.Changed += NotifyViewChanged; diff --git a/src/PKSim.CLI.Core/PKSim.CLI.Core.csproj b/src/PKSim.CLI.Core/PKSim.CLI.Core.csproj index c132baaa7..e0860d4db 100644 --- a/src/PKSim.CLI.Core/PKSim.CLI.Core.csproj +++ b/src/PKSim.CLI.Core/PKSim.CLI.Core.csproj @@ -28,7 +28,7 @@ - + diff --git a/src/PKSim.CLI/PKSim.CLI.csproj b/src/PKSim.CLI/PKSim.CLI.csproj index de0dbf81e..e436768fa 100644 --- a/src/PKSim.CLI/PKSim.CLI.csproj +++ b/src/PKSim.CLI/PKSim.CLI.csproj @@ -61,10 +61,10 @@ - - + + - + diff --git a/src/PKSim.Core/CoreConstants.cs b/src/PKSim.Core/CoreConstants.cs index a5bfcc9b3..1ab812017 100644 --- a/src/PKSim.Core/CoreConstants.cs +++ b/src/PKSim.Core/CoreConstants.cs @@ -1283,36 +1283,7 @@ public static string ParticlesApplicationWithNBins(int binIndex) } } - public static class UI - { - public static readonly int BUILDING_BLOCK_SELECTION_SIZE = 32; - public static readonly int PARAMETER_WIDTH = 110; - public static readonly int DATA_SOURCE_WIDTH = 180; - public const int SIMULATION_SETTINGS_WIDTH = 750; - public const int SIMULATION_SETTINGS_HEIGHT = 650; - public const int SIMULATION_VIEW_WIDTH = 700; - public const int INDIVIDUAL_VIEW_WIDTH = 880; - public const int INDIVIDUAL_VIEW_HEIGHT = 780; - public const int CONFIGURE_SIMULATION_VIEW_HEIGHT = 708; - public const int CREATE_SIMULATION_VIEW_HEIGHT = CONFIGURE_SIMULATION_VIEW_HEIGHT + 40; - - public const int EXPRESSION_QUERY_VIEW_HEIGHT = 900; - public const int EXPRESSION_QUERY_VIEW_WIDTH = 1100; - - public const int FORMULATION_VIEW_WIDTH = 650; - public const int FORMULATION_VIEW_HEIGHT = 760; - - public const int OBSERVER_VIEW_HEIGHT = 760; - public const int OBSERVER_VIEW_WIDTH = 650; - - public const int PROTOCOL_VIEW_WIDTH = 700; - public const int PROTOCOL_VIEW_HEIGHT = 760; - - public const int EXPRESSION_PROFILE_VIEW_HEIGHT = 900; - public const int EXPRESSION_PROFILE_VIEW_WIDTH = 760; - - } - + public static class Covariates { public static readonly string GENDER = "Gender"; diff --git a/src/PKSim.Core/PKSim.Core.csproj b/src/PKSim.Core/PKSim.Core.csproj index f09183eb1..e8a25b464 100644 --- a/src/PKSim.Core/PKSim.Core.csproj +++ b/src/PKSim.Core/PKSim.Core.csproj @@ -30,10 +30,10 @@ - - - - + + + + diff --git a/src/PKSim.Infrastructure/PKSim.Infrastructure.csproj b/src/PKSim.Infrastructure/PKSim.Infrastructure.csproj index e717487b4..e3958d39c 100644 --- a/src/PKSim.Infrastructure/PKSim.Infrastructure.csproj +++ b/src/PKSim.Infrastructure/PKSim.Infrastructure.csproj @@ -41,14 +41,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/PKSim.Infrastructure/Services/ImportObservedDataTask.cs b/src/PKSim.Infrastructure/Services/ImportObservedDataTask.cs index 96fb87d0b..8eeda96f1 100644 --- a/src/PKSim.Infrastructure/Services/ImportObservedDataTask.cs +++ b/src/PKSim.Infrastructure/Services/ImportObservedDataTask.cs @@ -210,7 +210,7 @@ private void addNamingPatterns(DataImporterSettings dataImporterSettings) { Caption = $"{CoreConstants.ProductDisplayName} - {PKSimConstants.UI.ImportObservedData}", IconName = ApplicationIcons.ObservedData.IconName, - CheckMolWeightAgainstMolecule = true + // CheckMolWeightAgainstMolecule = true }; addNamingPatterns(dataImporterSettings); dataImporterSettings.NameOfMetaDataHoldingMoleculeInformation = Constants.ObservedData.MOLECULE; diff --git a/src/PKSim.Matlab/PKSim.Matlab.csproj b/src/PKSim.Matlab/PKSim.Matlab.csproj index c2c0a1fc4..9f29b0edd 100644 --- a/src/PKSim.Matlab/PKSim.Matlab.csproj +++ b/src/PKSim.Matlab/PKSim.Matlab.csproj @@ -27,7 +27,7 @@ - + diff --git a/src/PKSim.Presentation/PKSim.Presentation.csproj b/src/PKSim.Presentation/PKSim.Presentation.csproj index 5ce77adcd..84afa8ef8 100644 --- a/src/PKSim.Presentation/PKSim.Presentation.csproj +++ b/src/PKSim.Presentation/PKSim.Presentation.csproj @@ -29,8 +29,8 @@ - - + + diff --git a/src/PKSim.Presentation/Presenters/CalculationMethodSelectionPresenterForSimulation.cs b/src/PKSim.Presentation/Presenters/CalculationMethodSelectionPresenterForSimulation.cs index 8c0608345..0505e68e8 100644 --- a/src/PKSim.Presentation/Presenters/CalculationMethodSelectionPresenterForSimulation.cs +++ b/src/PKSim.Presentation/Presenters/CalculationMethodSelectionPresenterForSimulation.cs @@ -14,7 +14,8 @@ public interface ICalculationMethodSelectionPresenterForSimulation : IConfigurat public class CalculationMethodSelectionPresenterForSimulation : CalculationMethodSelectionPresenter, ICalculationMethodSelectionPresenterForSimulation { - public CalculationMethodSelectionPresenterForSimulation(ICalculationMethodSelectionViewForSimulation view, + public CalculationMethodSelectionPresenterForSimulation( + ICalculationMethodSelectionViewForSimulation view, ICalculationMethodToCategoryCalculationMethodDTOMapper mapper, ICompoundCalculationMethodCategoryRepository compoundCalculationMethodCategoryRepository) : base(view, mapper, compoundCalculationMethodCategoryRepository) @@ -29,7 +30,7 @@ public void SaveConfiguration() public bool ReadOnly { - set { _view.SetReadOnly(readOnly: value); } + set => _view.SetReadOnly(readOnly: value); } } } \ No newline at end of file diff --git a/src/PKSim.Presentation/Presenters/Simulations/SimulationCompoundCalculationMethodSelectionPresenter.cs b/src/PKSim.Presentation/Presenters/Simulations/SimulationCompoundCalculationMethodSelectionPresenter.cs index 58246e186..d921e3aaf 100644 --- a/src/PKSim.Presentation/Presenters/Simulations/SimulationCompoundCalculationMethodSelectionPresenter.cs +++ b/src/PKSim.Presentation/Presenters/Simulations/SimulationCompoundCalculationMethodSelectionPresenter.cs @@ -13,7 +13,8 @@ public class SimulationCompoundCalculationMethodSelectionPresenter : AbstractSub private readonly ICalculationMethodSelectionPresenterForSimulation _calculationMethodSelectionPresenter; public SimulationCompoundCalculationMethodSelectionPresenter( - ISimulationCompoundCalculationMethodSelectionView view, ICalculationMethodSelectionPresenterForSimulation calculationMethodSelectionPresenter) + ISimulationCompoundCalculationMethodSelectionView view, + ICalculationMethodSelectionPresenterForSimulation calculationMethodSelectionPresenter) : base(view) { _calculationMethodSelectionPresenter = calculationMethodSelectionPresenter; diff --git a/src/PKSim.Presentation/Presenters/Simulations/SimulationModelConfigurationPresenter.cs b/src/PKSim.Presentation/Presenters/Simulations/SimulationModelConfigurationPresenter.cs index 1d215b823..0718b5214 100644 --- a/src/PKSim.Presentation/Presenters/Simulations/SimulationModelConfigurationPresenter.cs +++ b/src/PKSim.Presentation/Presenters/Simulations/SimulationModelConfigurationPresenter.cs @@ -55,7 +55,9 @@ public class SimulationModelConfigurationPresenter : AbstractSubPresenterContain public bool SimulationCreated { get; private set; } public Simulation Simulation { get; private set; } - public SimulationModelConfigurationPresenter(ISimulationModelConfigurationView view, ISubPresenterItemManager subPresenterItemManager, + public SimulationModelConfigurationPresenter( + ISimulationModelConfigurationView view, + ISubPresenterItemManager subPresenterItemManager, ISimulationFactory simulationFactory) : base(view, subPresenterItemManager, SimulationModelConfigurationItems.All) { @@ -75,7 +77,7 @@ public override void InitializeWith(ICommandCollector commandRegister) base.InitializeWith(commandRegister); subjectConfigurationPresenter.SubjectSelectionChanged += updateModelSelectionBasedOnCurrentSubject; - //triggers once after initalization + //triggers once after initialization updateModelSelectionBasedOnCurrentSubject(); } diff --git a/src/PKSim.Presentation/Presenters/Simulations/SimulationWizardPresenter.cs b/src/PKSim.Presentation/Presenters/Simulations/SimulationWizardPresenter.cs index 7d3113101..9caf08ffe 100644 --- a/src/PKSim.Presentation/Presenters/Simulations/SimulationWizardPresenter.cs +++ b/src/PKSim.Presentation/Presenters/Simulations/SimulationWizardPresenter.cs @@ -2,7 +2,6 @@ using OSPSuite.Core.Services; using OSPSuite.Presentation.Core; using OSPSuite.Presentation.Presenters; -using OSPSuite.Presentation.Services; using OSPSuite.Utility.Extensions; using PKSim.Core.Model; using PKSim.Core.Services; diff --git a/src/PKSim.R/PKSim.R.csproj b/src/PKSim.R/PKSim.R.csproj index 9e8e4586c..f7b5ff692 100644 --- a/src/PKSim.R/PKSim.R.csproj +++ b/src/PKSim.R/PKSim.R.csproj @@ -50,8 +50,8 @@ - - + + diff --git a/src/PKSim.UI/Extensions/LayoutControlItemExtensions.cs b/src/PKSim.UI/Extensions/LayoutControlItemExtensions.cs index 54f5f5614..55758456b 100644 --- a/src/PKSim.UI/Extensions/LayoutControlItemExtensions.cs +++ b/src/PKSim.UI/Extensions/LayoutControlItemExtensions.cs @@ -19,7 +19,7 @@ public static void FillWith(this LayoutControlItem layoutControlItem, UxBuilding panel.Margin = new Padding(0); panel.FillWith((IView) buildingBlockSelection); panel.BorderStyle = BorderStyles.NoBorder; - var size = new Size(layoutControlItem.Size.Width, CoreConstants.UI.BUILDING_BLOCK_SELECTION_SIZE); + var size = new Size(layoutControlItem.Size.Width, UIConstants.Size.BUILDING_BLOCK_SELECTION_SIZE); layoutControlItem.SizeConstraintsType = SizeConstraintsType.Custom; layoutControlItem.MinSize = size; layoutControlItem.Size = size; diff --git a/src/PKSim.UI/Extensions/TablePanelExtensions.cs b/src/PKSim.UI/Extensions/TablePanelExtensions.cs index a55604bf5..9f03ee30c 100644 --- a/src/PKSim.UI/Extensions/TablePanelExtensions.cs +++ b/src/PKSim.UI/Extensions/TablePanelExtensions.cs @@ -1,8 +1,6 @@ using System.Drawing; -using System.Windows.Forms; using DevExpress.Utils.Layout; using DevExpress.XtraEditors; -using OSPSuite.UI; using OSPSuite.Utility.Extensions; namespace PKSim.UI.Extensions @@ -16,26 +14,14 @@ public static TablePanel WithAbsoluteWidth(this TablePanel tablePanel, int colum return tablePanel; } - public static TablePanel WithLongButtonWidth(this TablePanel tablePanel, params int[] columnIndexes) - { - //TODO define constant - columnIndexes.Each(columnIndex => WithAbsoluteWidth(tablePanel, columnIndex, 150)); - return tablePanel; - } - - public static TablePanel WithButtonWidth(this TablePanel tablePanel, params int[] columnIndexes) - { - columnIndexes.Each(columnIndex => WithAbsoluteWidth(tablePanel, columnIndex, 30)); - return tablePanel; - } - public static void AdjustButtonWithImageOnly(this SimpleButton button) { - button.Size = new Size(UIConstants.Size.ScaleForScreenDPI(24), UIConstants.Size.ScaleForScreenDPI(22)); + button.Size = new Size(OSPSuite.UI.UIConstants.Size.RADIO_GROUP_HEIGHT, OSPSuite.UI.UIConstants.Size.BUTTON_HEIGHT); } + public static void AdjustLongButtonWidth(this SimpleButton button) { - button.Size = new Size(UIConstants.Size.LARGE_BUTTON_WIDTH, button.Height); + button.Size = new Size(OSPSuite.UI.UIConstants.Size.LARGE_BUTTON_WIDTH, button.Height); } } } \ No newline at end of file diff --git a/src/PKSim.UI/PKSim.UI.csproj b/src/PKSim.UI/PKSim.UI.csproj index c2f104f9c..ad3f86fde 100644 --- a/src/PKSim.UI/PKSim.UI.csproj +++ b/src/PKSim.UI/PKSim.UI.csproj @@ -51,9 +51,9 @@ - - - + + + diff --git a/src/PKSim.UI/UIConstants.cs b/src/PKSim.UI/UIConstants.cs new file mode 100644 index 000000000..34cfc5054 --- /dev/null +++ b/src/PKSim.UI/UIConstants.cs @@ -0,0 +1,44 @@ +using static OSPSuite.UI.UIConstants.Size; + +namespace PKSim.UI +{ + public static class UIConstants + { + public static class Size + { + public static readonly int BUILDING_BLOCK_SELECTION_SIZE = 32; + public static readonly int PARAMETER_WIDTH = ScaleForScreenDPI(110); + public static readonly int DATA_SOURCE_WIDTH = ScaleForScreenDPI(180); + + public static readonly int SIMULATION_SETTINGS_WIDTH = ScaleForScreenDPI(750); + public static readonly int SIMULATION_SETTINGS_HEIGHT = ScaleForScreenDPI(650); + + public static readonly int INDIVIDUAL_VIEW_WIDTH = ScaleForScreenDPI(880); + public static readonly int INDIVIDUAL_VIEW_HEIGHT = ScaleForScreenDPI(780); + + public static readonly int CONFIGURE_SIMULATION_VIEW_HEIGHT = ScaleForScreenDPI(708); + public static readonly int CREATE_SIMULATION_VIEW_HEIGHT = ScaleForScreenDPI(750); + public static readonly int SIMULATION_VIEW_WIDTH = ScaleForScreenDPI(600); + + public static readonly int EXPRESSION_QUERY_VIEW_HEIGHT = ScaleForScreenDPI(900); + public static readonly int EXPRESSION_QUERY_VIEW_WIDTH = ScaleForScreenDPI(1100); + + public static readonly int FORMULATION_VIEW_WIDTH = ScaleForScreenDPI(650); + public static readonly int FORMULATION_VIEW_HEIGHT = ScaleForScreenDPI(760); + + public static readonly int OBSERVER_VIEW_HEIGHT = ScaleForScreenDPI(760); + public static readonly int OBSERVER_VIEW_WIDTH = ScaleForScreenDPI(650); + + public static readonly int PROTOCOL_VIEW_WIDTH = ScaleForScreenDPI(700); + public static readonly int PROTOCOL_VIEW_HEIGHT = ScaleForScreenDPI(760); + + public static readonly int EXPRESSION_PROFILE_VIEW_HEIGHT = ScaleForScreenDPI(900); + public static readonly int EXPRESSION_PROFILE_VIEW_WIDTH = ScaleForScreenDPI(760); + + public static readonly int COMPOUND_VIEW_HEIGHT = ScaleForScreenDPI(900); + public static readonly int COMPOUND_VIEW_WIDTH = ScaleForScreenDPI(760); + + public static readonly int MODEL_PICTURE_HEIGHT = ScaleForScreenDPI(400); + } + } +} \ No newline at end of file diff --git a/src/PKSim.UI/UserSettings.cs b/src/PKSim.UI/UserSettings.cs index 24cc8aebe..66e2eee0d 100644 --- a/src/PKSim.UI/UserSettings.cs +++ b/src/PKSim.UI/UserSettings.cs @@ -209,30 +209,30 @@ public string TemplateDatabasePath public IconSize IconSizeTab { - get => UIConstants.ICON_SIZE_TAB; + get => OSPSuite.UI.UIConstants.ICON_SIZE_TAB; set { - UIConstants.ICON_SIZE_TAB = value; + OSPSuite.UI.UIConstants.ICON_SIZE_TAB = value; OnPropertyChanged(() => IconSizeTab); } } public IconSize IconSizeTreeView { - get => UIConstants.ICON_SIZE_TREE_VIEW; + get => OSPSuite.UI.UIConstants.ICON_SIZE_TREE_VIEW; set { - UIConstants.ICON_SIZE_TREE_VIEW = value; + OSPSuite.UI.UIConstants.ICON_SIZE_TREE_VIEW = value; OnPropertyChanged(() => IconSizeTreeView); } } public IconSize IconSizeContextMenu { - get => UIConstants.ICON_SIZE_CONTEXT_MENU; + get => OSPSuite.UI.UIConstants.ICON_SIZE_CONTEXT_MENU; set { - UIConstants.ICON_SIZE_CONTEXT_MENU = value; + OSPSuite.UI.UIConstants.ICON_SIZE_CONTEXT_MENU = value; OnPropertyChanged(() => IconSizeContextMenu); } } diff --git a/src/PKSim.UI/Views/Applications/ApplicationParametersView.cs b/src/PKSim.UI/Views/Applications/ApplicationParametersView.cs index 85dd7f3ca..b7b336b69 100644 --- a/src/PKSim.UI/Views/Applications/ApplicationParametersView.cs +++ b/src/PKSim.UI/Views/Applications/ApplicationParametersView.cs @@ -19,6 +19,7 @@ using PKSim.Presentation.DTO.Applications; using PKSim.Presentation.Presenters.Applications; using PKSim.Presentation.Views.Applications; +using static OSPSuite.UI.UIConstants.Size; using BaseView = DevExpress.XtraGrid.Views.Base.BaseView; namespace PKSim.UI.Views.Applications @@ -114,7 +115,7 @@ private void initParameterBinding(GridViewBinder parameterBinder) parameterBinder.Bind(x => x.IsFavorite) .WithCaption(PKSimConstants.UI.Favorites) - .WithFixedWidth(UIConstants.Size.EMBEDDED_CHECK_BOX_WIDTH) + .WithFixedWidth(EMBEDDED_CHECK_BOX_WIDTH) .WithRepository(x => new UxRepositoryItemCheckEdit(parameterBinder.GridView)) .WithToolTip(PKSimConstants.UI.FavoritesToolTip) .WithOnValueUpdating((o, e) => OnEvent(() => _presenter.SetFavorite(o, e.NewValue))); diff --git a/src/PKSim.UI/Views/BuildingBlockSelectionView.cs b/src/PKSim.UI/Views/BuildingBlockSelectionView.cs index 5b0516bd3..b00e07a11 100644 --- a/src/PKSim.UI/Views/BuildingBlockSelectionView.cs +++ b/src/PKSim.UI/Views/BuildingBlockSelectionView.cs @@ -108,7 +108,7 @@ private void initializeResource() layoutItemLoad.AdjustButtonSizeWithImageOnly(); layoutItemCreate.AdjustButtonSizeWithImageOnly(); //Make combo box same size as button - layoutItemBuildingBlock.AdjustSize(0, UIConstants.Size.BUTTON_HEIGHT); + layoutItemBuildingBlock.AdjustSize(0, OSPSuite.UI.UIConstants.Size.BUTTON_HEIGHT); cbBuildingBlocks.Properties.AllowHtmlDraw = DefaultBoolean.True; } } diff --git a/src/PKSim.UI/Views/Compounds/CompoundParameterGroupWithCalculatedDefaultBaseView.cs b/src/PKSim.UI/Views/Compounds/CompoundParameterGroupWithCalculatedDefaultBaseView.cs index 521fb5986..08921caab 100644 --- a/src/PKSim.UI/Views/Compounds/CompoundParameterGroupWithCalculatedDefaultBaseView.cs +++ b/src/PKSim.UI/Views/Compounds/CompoundParameterGroupWithCalculatedDefaultBaseView.cs @@ -97,9 +97,7 @@ protected void AddValueBinding(IGridViewAutoBindColumn(); } - } + private ICompoundParameterGroupWithCalculatedDefaultPresenter withCalculatedDefaultPresenter => + _presenter.DowncastTo(); } } \ No newline at end of file diff --git a/src/PKSim.UI/Views/Compounds/CompoundParameterWithDefaultAlternativeBaseView.cs b/src/PKSim.UI/Views/Compounds/CompoundParameterWithDefaultAlternativeBaseView.cs index 211b76515..81aa12886 100644 --- a/src/PKSim.UI/Views/Compounds/CompoundParameterWithDefaultAlternativeBaseView.cs +++ b/src/PKSim.UI/Views/Compounds/CompoundParameterWithDefaultAlternativeBaseView.cs @@ -12,7 +12,6 @@ using OSPSuite.DataBinding.DevExpress; using OSPSuite.DataBinding.DevExpress.XtraGrid; using OSPSuite.Presentation.Views; -using OSPSuite.UI; using OSPSuite.UI.Binders; using OSPSuite.UI.Controls; using OSPSuite.UI.Extensions; @@ -25,6 +24,7 @@ using PKSim.Presentation.Presenters.Compounds; using PKSim.Presentation.Views.Compounds; using PKSim.UI.Views.Core; +using static OSPSuite.UI.UIConstants.Size; namespace PKSim.UI.Views.Compounds { @@ -45,7 +45,6 @@ public partial class CompoundParameterWithDefaultAlternativeBaseView _gridViewBinder; private IGridViewColumn _colButtons; - public CompoundParameterWithDefaultAlternativeBaseView() { @@ -89,16 +88,16 @@ public override void InitializeBinding() var colDefault = _gridViewBinder.Bind(x => x.IsDefault) .WithCaption(PKSimConstants.UI.IsDefault) .WithRepository(dto => _isDefaultRepository) - .WithFixedWidth(UIConstants.Size.EMBEDDED_CHECK_BOX_WIDTH); + .WithFixedWidth(EMBEDDED_CHECK_BOX_WIDTH); colDefault.OnValueUpdating += (o, e) => OnEvent(() => _presenter.SetIsDefaultFor(o, e.NewValue)); _colDefault = colDefault; - _colButtons = _gridViewBinder.AddUnboundColumn() + _colButtons = _gridViewBinder.AddUnboundColumn() .WithCaption(PKSimConstants.UI.EmptyColumn) .WithShowButton(ShowButtonModeEnum.ShowAlways) .WithRepository(GetButtonRepository) - .WithFixedWidth(UIConstants.Size.EMBEDDED_BUTTON_WIDTH * 2); + .WithFixedWidth(EMBEDDED_BUTTON_WIDTH * 2); _addAndRemoveButtonRepository.ButtonClick += (o, e) => OnEvent(() => buttonRepositoryButtonClick(e, _gridViewBinder.FocusedElement)); _addButtonRepository.ButtonClick += (o, e) => OnEvent(() => _presenter.AddAlternative()); @@ -112,7 +111,6 @@ protected override bool ColumnIsButton(GridColumn column) return Equals(_colButtons?.XtraColumn, column); } - protected override bool ColumnIsCheckBox(GridColumn column) { return Equals(_colDefault?.XtraColumn, column); diff --git a/src/PKSim.UI/Views/Compounds/CompoundTypeGroupView.cs b/src/PKSim.UI/Views/Compounds/CompoundTypeGroupView.cs index b05a0f50c..847f33593 100644 --- a/src/PKSim.UI/Views/Compounds/CompoundTypeGroupView.cs +++ b/src/PKSim.UI/Views/Compounds/CompoundTypeGroupView.cs @@ -21,6 +21,7 @@ using PKSim.Presentation.Services; using PKSim.Presentation.Views.Compounds; using PKSim.UI.Views.Core; +using static OSPSuite.UI.UIConstants.Size; namespace PKSim.UI.Views.Compounds { @@ -84,7 +85,7 @@ public override void InitializeBinding() _colFavorites = _gridViewBinder.Bind(x => x.IsFavorite) .WithCaption(PKSimConstants.UI.Favorites) - .WithFixedWidth(UIConstants.Size.EMBEDDED_CHECK_BOX_WIDTH) + .WithFixedWidth(EMBEDDED_CHECK_BOX_WIDTH) .WithRepository(x => _favoriteRepository) .WithToolTip(PKSimConstants.UI.FavoritesToolTip) .WithOnValueUpdating((o, e) => OnEvent(() => compoundTypeGroupPresenter.SetFavorite(o, e.NewValue))); diff --git a/src/PKSim.UI/Views/Compounds/CreateCompoundView.cs b/src/PKSim.UI/Views/Compounds/CreateCompoundView.cs index b3d4072ee..05d5313de 100644 --- a/src/PKSim.UI/Views/Compounds/CreateCompoundView.cs +++ b/src/PKSim.UI/Views/Compounds/CreateCompoundView.cs @@ -1,3 +1,4 @@ +using System.Drawing; using PKSim.Assets; using OSPSuite.Assets; using PKSim.Presentation.Presenters.Compounds; @@ -12,6 +13,7 @@ public partial class CreateCompoundView : BuildingBlockWizardView, ICreateCompou public CreateCompoundView(Shell shell) : base(shell) { InitializeComponent(); + ClientSize = new Size(UIConstants.Size.COMPOUND_VIEW_WIDTH, UIConstants.Size.COMPOUND_VIEW_HEIGHT); } public void AttachPresenter(ICreateCompoundPresenter presenter) diff --git a/src/PKSim.UI/Views/Compounds/FractionUnboundGroupView.cs b/src/PKSim.UI/Views/Compounds/FractionUnboundGroupView.cs index 4dd403626..8ed68ca09 100644 --- a/src/PKSim.UI/Views/Compounds/FractionUnboundGroupView.cs +++ b/src/PKSim.UI/Views/Compounds/FractionUnboundGroupView.cs @@ -20,6 +20,7 @@ using OSPSuite.Presentation.Extensions; using OSPSuite.UI.Binders; using PKSim.Core.Model; +using static OSPSuite.UI.UIConstants.Size; using UIConstants = OSPSuite.UI.UIConstants; namespace PKSim.UI.Views.Compounds @@ -100,7 +101,7 @@ public override void InitializeResources() Control = _rgPlasmaBindingPartner, Text = PKSimConstants.UI.FractionUnboundBindingType.FormatForLabel() }; - _layoutItemBindingMode.AdjustControlHeight(UIConstants.Size.RADIO_GROUP_HEIGHT); + _layoutItemBindingMode.AdjustControlHeight(RADIO_GROUP_HEIGHT); _layoutItemBindingMode.Move(layoutItemGrid, InsertType.Top); _rgPlasmaBindingPartner.SelectedIndexChanged += (o, e) => OnEvent(bindingPartnerChanged); } diff --git a/src/PKSim.UI/Views/Core/BuildingBlockWizardView.cs b/src/PKSim.UI/Views/Core/BuildingBlockWizardView.cs index e6334f0cf..a45fce7d8 100644 --- a/src/PKSim.UI/Views/Core/BuildingBlockWizardView.cs +++ b/src/PKSim.UI/Views/Core/BuildingBlockWizardView.cs @@ -7,6 +7,7 @@ using OSPSuite.UI; using OSPSuite.UI.Extensions; using OSPSuite.UI.Views; +using static OSPSuite.UI.UIConstants.Size; namespace PKSim.UI.Views.Core { @@ -34,7 +35,7 @@ public override void InitializeResources() { base.InitializeResources(); layoutItemName.Text = PKSimConstants.UI.Name.FormatForLabel(); - this.ReziseForCurrentScreen(fractionHeight: UIConstants.Size.SCREEN_RESIZE_FRACTION, fractionWidth: UIConstants.Size.SCREEN_RESIZE_FRACTION); + this.ReziseForCurrentScreen(fractionHeight: SCREEN_RESIZE_FRACTION, fractionWidth: SCREEN_RESIZE_FRACTION); } public virtual void BindToProperties(ObjectBaseDTO populationPropertiesDTO) diff --git a/src/PKSim.UI/Views/Core/CalculationMethodSelectionViewBase.Designer.cs b/src/PKSim.UI/Views/Core/CalculationMethodSelectionViewBase.Designer.cs index 79bfc7c45..4ae9aa892 100644 --- a/src/PKSim.UI/Views/Core/CalculationMethodSelectionViewBase.Designer.cs +++ b/src/PKSim.UI/Views/Core/CalculationMethodSelectionViewBase.Designer.cs @@ -30,20 +30,32 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { ((System.ComponentModel.ISupportInitialize)(this.layoutControl)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutItemGrid)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit(); this.SuspendLayout(); // // layoutControl // - this.layoutControl.Size = new System.Drawing.Size(434, 350); + this.layoutControl.AutoScroll = false; + this.layoutControl.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.layoutControl.Size = new System.Drawing.Size(506, 431); // - // CalculationMethodSelectionView + // layoutItemGrid // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.layoutItemGrid.MaxSize = new System.Drawing.Size(0, 86); + this.layoutItemGrid.MinSize = new System.Drawing.Size(1, 86); + this.layoutItemGrid.Size = new System.Drawing.Size(506, 431); + this.layoutItemGrid.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; + // + // CalculationMethodSelectionViewBase + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Name = "CalculationMethodSelectionViewForSimulation"; - this.Size = new System.Drawing.Size(434, 350); + this.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); + this.Name = "CalculationMethodSelectionViewBase"; + this.Size = new System.Drawing.Size(506, 431); ((System.ComponentModel.ISupportInitialize)(this.layoutControl)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutItemGrid)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit(); this.ResumeLayout(false); diff --git a/src/PKSim.UI/Views/Formulations/CreateFormulationView.cs b/src/PKSim.UI/Views/Formulations/CreateFormulationView.cs index ffddee6e3..23df8719f 100644 --- a/src/PKSim.UI/Views/Formulations/CreateFormulationView.cs +++ b/src/PKSim.UI/Views/Formulations/CreateFormulationView.cs @@ -13,7 +13,7 @@ public partial class CreateFormulationView : BuildingBlockContainerView, ICreate public CreateFormulationView(Shell shell) : base(shell) { InitializeComponent(); - ClientSize = new Size(CoreConstants.UI.FORMULATION_VIEW_WIDTH, CoreConstants.UI.FORMULATION_VIEW_HEIGHT); + ClientSize = new Size(UIConstants.Size.FORMULATION_VIEW_WIDTH, UIConstants.Size.FORMULATION_VIEW_HEIGHT); } public void AttachPresenter(ICreateFormulationPresenter presenter) diff --git a/src/PKSim.UI/Views/Individuals/CreateIndividualView.cs b/src/PKSim.UI/Views/Individuals/CreateIndividualView.cs index a25d03bf7..a8fdec0de 100644 --- a/src/PKSim.UI/Views/Individuals/CreateIndividualView.cs +++ b/src/PKSim.UI/Views/Individuals/CreateIndividualView.cs @@ -13,7 +13,7 @@ public partial class CreateIndividualView : BuildingBlockWizardView, ICreateIndi public CreateIndividualView(Shell shell) : base(shell) { InitializeComponent(); - ClientSize = new Size(CoreConstants.UI.INDIVIDUAL_VIEW_WIDTH, CoreConstants.UI.INDIVIDUAL_VIEW_HEIGHT); + ClientSize = new Size(UIConstants.Size.INDIVIDUAL_VIEW_WIDTH, UIConstants.Size.INDIVIDUAL_VIEW_HEIGHT); } public void AttachPresenter(ICreateIndividualPresenter presenter) diff --git a/src/PKSim.UI/Views/Individuals/IndividualSettingsView.Designer.cs b/src/PKSim.UI/Views/Individuals/IndividualSettingsView.Designer.cs index 907a6d251..bbee97da8 100644 --- a/src/PKSim.UI/Views/Individuals/IndividualSettingsView.Designer.cs +++ b/src/PKSim.UI/Views/Individuals/IndividualSettingsView.Designer.cs @@ -114,10 +114,12 @@ private void InitializeComponent() // // gridCalculationMethods // - this.gridCalculationMethods.Location = new System.Drawing.Point(181, 141); + this.gridCalculationMethods.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(5); + this.gridCalculationMethods.Location = new System.Drawing.Point(206, 152); this.gridCalculationMethods.MainView = this.gridViewCalculationMethods; + this.gridCalculationMethods.Margin = new System.Windows.Forms.Padding(4); this.gridCalculationMethods.Name = "gridCalculationMethods"; - this.gridCalculationMethods.Size = new System.Drawing.Size(417, 20); + this.gridCalculationMethods.Size = new System.Drawing.Size(496, 22); this.gridCalculationMethods.TabIndex = 13; this.gridCalculationMethods.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridViewCalculationMethods}); @@ -125,6 +127,7 @@ private void InitializeComponent() // gridViewCalculationMethods // this.gridViewCalculationMethods.AllowsFiltering = true; + this.gridViewCalculationMethods.DetailHeight = 431; this.gridViewCalculationMethods.EnableColumnContextMenu = true; this.gridViewCalculationMethods.GridControl = this.gridCalculationMethods; this.gridViewCalculationMethods.MultiSelect = false; @@ -137,20 +140,23 @@ private void InitializeComponent() // uxHeight // this.uxHeight.Caption = ""; - this.uxHeight.Location = new System.Drawing.Point(181, 282); - this.uxHeight.MaximumSize = new System.Drawing.Size(10000, 22); - this.uxHeight.MinimumSize = new System.Drawing.Size(0, 22); + this.uxHeight.Location = new System.Drawing.Point(206, 318); + this.uxHeight.Margin = new System.Windows.Forms.Padding(6); + this.uxHeight.MaximumSize = new System.Drawing.Size(11667, 27); + this.uxHeight.MinimumSize = new System.Drawing.Size(0, 27); this.uxHeight.Name = "uxHeight"; - this.uxHeight.Size = new System.Drawing.Size(348, 22); + this.uxHeight.Size = new System.Drawing.Size(414, 27); this.uxHeight.TabIndex = 9; this.uxHeight.ToolTip = ""; // // gridParameterValueVersions // - this.gridParameterValueVersions.Location = new System.Drawing.Point(181, 117); + this.gridParameterValueVersions.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(5); + this.gridParameterValueVersions.Location = new System.Drawing.Point(206, 128); this.gridParameterValueVersions.MainView = this.gridViewParameterValueVersions; + this.gridParameterValueVersions.Margin = new System.Windows.Forms.Padding(4); this.gridParameterValueVersions.Name = "gridParameterValueVersions"; - this.gridParameterValueVersions.Size = new System.Drawing.Size(417, 20); + this.gridParameterValueVersions.Size = new System.Drawing.Size(496, 20); this.gridParameterValueVersions.TabIndex = 5; this.gridParameterValueVersions.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridViewParameterValueVersions}); @@ -158,6 +164,7 @@ private void InitializeComponent() // gridViewParameterValueVersions // this.gridViewParameterValueVersions.AllowsFiltering = true; + this.gridViewParameterValueVersions.DetailHeight = 431; this.gridViewParameterValueVersions.EnableColumnContextMenu = true; this.gridViewParameterValueVersions.GridControl = this.gridParameterValueVersions; this.gridViewParameterValueVersions.MultiSelect = false; @@ -170,21 +177,23 @@ private void InitializeComponent() // uxAge // this.uxAge.Caption = ""; - this.uxAge.Location = new System.Drawing.Point(181, 210); - this.uxAge.MaximumSize = new System.Drawing.Size(10000, 22); - this.uxAge.MinimumSize = new System.Drawing.Size(0, 22); + this.uxAge.Location = new System.Drawing.Point(206, 228); + this.uxAge.Margin = new System.Windows.Forms.Padding(6); + this.uxAge.MaximumSize = new System.Drawing.Size(11667, 27); + this.uxAge.MinimumSize = new System.Drawing.Size(0, 27); this.uxAge.Name = "uxAge"; - this.uxAge.Size = new System.Drawing.Size(348, 22); + this.uxAge.Size = new System.Drawing.Size(414, 27); this.uxAge.TabIndex = 7; this.uxAge.ToolTip = ""; // // cbSpecies // - this.cbSpecies.Location = new System.Drawing.Point(181, 45); + this.cbSpecies.Location = new System.Drawing.Point(206, 50); + this.cbSpecies.Margin = new System.Windows.Forms.Padding(4); this.cbSpecies.Name = "cbSpecies"; this.cbSpecies.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.cbSpecies.Size = new System.Drawing.Size(417, 20); + this.cbSpecies.Size = new System.Drawing.Size(496, 22); this.cbSpecies.StyleController = this.layoutControl; this.cbSpecies.TabIndex = 3; // @@ -208,107 +217,118 @@ private void InitializeComponent() this.layoutControl.Controls.Add(this.btnMeanValues); this.layoutControl.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutControl.Location = new System.Drawing.Point(0, 0); + this.layoutControl.Margin = new System.Windows.Forms.Padding(4); this.layoutControl.Name = "layoutControl"; this.layoutControl.Root = this.layoutMainGroup; - this.layoutControl.Size = new System.Drawing.Size(622, 511); + this.layoutControl.Size = new System.Drawing.Size(726, 629); this.layoutControl.TabIndex = 1; this.layoutControl.Text = "layoutControl1"; // // uxDiseaseParameter // this.uxDiseaseParameter.Caption = ""; - this.uxDiseaseParameter.Location = new System.Drawing.Point(181, 425); - this.uxDiseaseParameter.MinimumSize = new System.Drawing.Size(0, 21); + this.uxDiseaseParameter.Location = new System.Drawing.Point(206, 477); + this.uxDiseaseParameter.Margin = new System.Windows.Forms.Padding(6); + this.uxDiseaseParameter.MinimumSize = new System.Drawing.Size(0, 26); this.uxDiseaseParameter.Name = "uxDiseaseParameter"; - this.uxDiseaseParameter.Size = new System.Drawing.Size(417, 22); + this.uxDiseaseParameter.Size = new System.Drawing.Size(496, 28); this.uxDiseaseParameter.TabIndex = 18; this.uxDiseaseParameter.ToolTip = ""; // // lblDescription // - this.lblDescription.Location = new System.Drawing.Point(24, 451); + this.lblDescription.Location = new System.Drawing.Point(24, 509); + this.lblDescription.Margin = new System.Windows.Forms.Padding(4); this.lblDescription.Name = "lblDescription"; - this.lblDescription.Size = new System.Drawing.Size(63, 13); + this.lblDescription.Size = new System.Drawing.Size(76, 16); this.lblDescription.StyleController = this.layoutControl; this.lblDescription.TabIndex = 17; this.lblDescription.Text = "lblDescription"; // // cbDiseaseState // - this.cbDiseaseState.Location = new System.Drawing.Point(181, 401); + this.cbDiseaseState.Location = new System.Drawing.Point(206, 451); + this.cbDiseaseState.Margin = new System.Windows.Forms.Padding(4); this.cbDiseaseState.Name = "cbDiseaseState"; this.cbDiseaseState.Properties.AllowMouseWheel = false; this.cbDiseaseState.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.cbDiseaseState.Size = new System.Drawing.Size(417, 20); + this.cbDiseaseState.Size = new System.Drawing.Size(496, 22); this.cbDiseaseState.StyleController = this.layoutControl; this.cbDiseaseState.TabIndex = 16; // // _panelValueOrigin // - this._panelValueOrigin.Location = new System.Drawing.Point(181, 332); + this._panelValueOrigin.Location = new System.Drawing.Point(206, 378); + this._panelValueOrigin.Margin = new System.Windows.Forms.Padding(4); this._panelValueOrigin.Name = "_panelValueOrigin"; - this._panelValueOrigin.Size = new System.Drawing.Size(348, 20); + this._panelValueOrigin.Size = new System.Drawing.Size(414, 19); this._panelValueOrigin.TabIndex = 15; // // uxGestationalAge // this.uxGestationalAge.Caption = ""; - this.uxGestationalAge.Location = new System.Drawing.Point(181, 234); - this.uxGestationalAge.MaximumSize = new System.Drawing.Size(10000, 22); - this.uxGestationalAge.MinimumSize = new System.Drawing.Size(0, 22); + this.uxGestationalAge.Location = new System.Drawing.Point(206, 258); + this.uxGestationalAge.Margin = new System.Windows.Forms.Padding(6); + this.uxGestationalAge.MaximumSize = new System.Drawing.Size(11667, 27); + this.uxGestationalAge.MinimumSize = new System.Drawing.Size(0, 27); this.uxGestationalAge.Name = "uxGestationalAge"; - this.uxGestationalAge.Size = new System.Drawing.Size(348, 22); + this.uxGestationalAge.Size = new System.Drawing.Size(414, 27); this.uxGestationalAge.TabIndex = 14; this.uxGestationalAge.ToolTip = ""; // // uxBMI // this.uxBMI.Caption = ""; - this.uxBMI.Location = new System.Drawing.Point(181, 306); - this.uxBMI.MaximumSize = new System.Drawing.Size(10000, 22); - this.uxBMI.MinimumSize = new System.Drawing.Size(0, 22); + this.uxBMI.Location = new System.Drawing.Point(206, 348); + this.uxBMI.Margin = new System.Windows.Forms.Padding(6); + this.uxBMI.MaximumSize = new System.Drawing.Size(11667, 27); + this.uxBMI.MinimumSize = new System.Drawing.Size(0, 27); this.uxBMI.Name = "uxBMI"; - this.uxBMI.Size = new System.Drawing.Size(348, 22); + this.uxBMI.Size = new System.Drawing.Size(414, 27); this.uxBMI.TabIndex = 10; this.uxBMI.ToolTip = ""; // // cbPopulation // - this.cbPopulation.Location = new System.Drawing.Point(181, 69); + this.cbPopulation.Location = new System.Drawing.Point(206, 76); + this.cbPopulation.Margin = new System.Windows.Forms.Padding(4); this.cbPopulation.Name = "cbPopulation"; this.cbPopulation.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.cbPopulation.Size = new System.Drawing.Size(417, 20); + this.cbPopulation.Size = new System.Drawing.Size(496, 22); this.cbPopulation.StyleController = this.layoutControl; this.cbPopulation.TabIndex = 4; // // cbGender // - this.cbGender.Location = new System.Drawing.Point(181, 93); + this.cbGender.Location = new System.Drawing.Point(206, 102); + this.cbGender.Margin = new System.Windows.Forms.Padding(4); this.cbGender.Name = "cbGender"; this.cbGender.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.cbGender.Size = new System.Drawing.Size(417, 20); + this.cbGender.Size = new System.Drawing.Size(496, 22); this.cbGender.StyleController = this.layoutControl; this.cbGender.TabIndex = 6; // // uxWeight // this.uxWeight.Caption = ""; - this.uxWeight.Location = new System.Drawing.Point(181, 258); - this.uxWeight.MaximumSize = new System.Drawing.Size(10000, 22); - this.uxWeight.MinimumSize = new System.Drawing.Size(0, 22); + this.uxWeight.Location = new System.Drawing.Point(206, 288); + this.uxWeight.Margin = new System.Windows.Forms.Padding(6); + this.uxWeight.MaximumSize = new System.Drawing.Size(11667, 27); + this.uxWeight.MinimumSize = new System.Drawing.Size(0, 27); this.uxWeight.Name = "uxWeight"; - this.uxWeight.Size = new System.Drawing.Size(348, 22); + this.uxWeight.Size = new System.Drawing.Size(414, 27); this.uxWeight.TabIndex = 8; this.uxWeight.ToolTip = ""; // // btnMeanValues // - this.btnMeanValues.Location = new System.Drawing.Point(533, 258); + this.btnMeanValues.Location = new System.Drawing.Point(624, 288); + this.btnMeanValues.Margin = new System.Windows.Forms.Padding(4); this.btnMeanValues.Name = "btnMeanValues"; - this.btnMeanValues.Size = new System.Drawing.Size(65, 44); + this.btnMeanValues.Size = new System.Drawing.Size(78, 56); this.btnMeanValues.StyleController = this.layoutControl; this.btnMeanValues.TabIndex = 10; this.btnMeanValues.Text = "Mean"; @@ -324,7 +344,7 @@ private void InitializeComponent() this.layoutGroupDiseaseState, this.emptySpaceItem}); this.layoutMainGroup.Name = "layoutMainGroup"; - this.layoutMainGroup.Size = new System.Drawing.Size(622, 511); + this.layoutMainGroup.Size = new System.Drawing.Size(726, 629); this.layoutMainGroup.TextVisible = false; // // layoutControlGroupPopulationProperties @@ -338,27 +358,27 @@ private void InitializeComponent() this.layoutItemPopulation}); this.layoutControlGroupPopulationProperties.Location = new System.Drawing.Point(0, 0); this.layoutControlGroupPopulationProperties.Name = "layoutControlGroupPopulationProperties"; - this.layoutControlGroupPopulationProperties.Size = new System.Drawing.Size(602, 165); + this.layoutControlGroupPopulationProperties.Size = new System.Drawing.Size(706, 178); // // layoutItemSubPopulation // this.layoutItemSubPopulation.AllowHide = false; this.layoutItemSubPopulation.Control = this.gridParameterValueVersions; this.layoutItemSubPopulation.CustomizationFormText = "layoutItemSubPopulation"; - this.layoutItemSubPopulation.Location = new System.Drawing.Point(0, 72); + this.layoutItemSubPopulation.Location = new System.Drawing.Point(0, 78); this.layoutItemSubPopulation.Name = "layoutItemSubPopulation"; - this.layoutItemSubPopulation.Size = new System.Drawing.Size(578, 24); - this.layoutItemSubPopulation.TextSize = new System.Drawing.Size(145, 13); + this.layoutItemSubPopulation.Size = new System.Drawing.Size(682, 24); + this.layoutItemSubPopulation.TextSize = new System.Drawing.Size(170, 16); // // layoutItemCalculationMethods // this.layoutItemCalculationMethods.AllowHide = false; this.layoutItemCalculationMethods.Control = this.gridCalculationMethods; this.layoutItemCalculationMethods.CustomizationFormText = "layoutItemCalculationMethods"; - this.layoutItemCalculationMethods.Location = new System.Drawing.Point(0, 96); + this.layoutItemCalculationMethods.Location = new System.Drawing.Point(0, 102); this.layoutItemCalculationMethods.Name = "layoutItemCalculationMethods"; - this.layoutItemCalculationMethods.Size = new System.Drawing.Size(578, 24); - this.layoutItemCalculationMethods.TextSize = new System.Drawing.Size(145, 13); + this.layoutItemCalculationMethods.Size = new System.Drawing.Size(682, 26); + this.layoutItemCalculationMethods.TextSize = new System.Drawing.Size(170, 16); // // layoutItemSpecies // @@ -366,27 +386,27 @@ private void InitializeComponent() this.layoutItemSpecies.CustomizationFormText = "layoutItemSpecies"; this.layoutItemSpecies.Location = new System.Drawing.Point(0, 0); this.layoutItemSpecies.Name = "layoutItemCreature"; - this.layoutItemSpecies.Size = new System.Drawing.Size(578, 24); - this.layoutItemSpecies.TextSize = new System.Drawing.Size(145, 13); + this.layoutItemSpecies.Size = new System.Drawing.Size(682, 26); + this.layoutItemSpecies.TextSize = new System.Drawing.Size(170, 16); // // layoutItemGender // this.layoutItemGender.AllowHide = false; this.layoutItemGender.Control = this.cbGender; this.layoutItemGender.CustomizationFormText = "layoutItemGender"; - this.layoutItemGender.Location = new System.Drawing.Point(0, 48); + this.layoutItemGender.Location = new System.Drawing.Point(0, 52); this.layoutItemGender.Name = "layoutItemGender"; - this.layoutItemGender.Size = new System.Drawing.Size(578, 24); - this.layoutItemGender.TextSize = new System.Drawing.Size(145, 13); + this.layoutItemGender.Size = new System.Drawing.Size(682, 26); + this.layoutItemGender.TextSize = new System.Drawing.Size(170, 16); // // layoutItemPopulation // this.layoutItemPopulation.Control = this.cbPopulation; this.layoutItemPopulation.CustomizationFormText = "layoutItemPopulation"; - this.layoutItemPopulation.Location = new System.Drawing.Point(0, 24); + this.layoutItemPopulation.Location = new System.Drawing.Point(0, 26); this.layoutItemPopulation.Name = "layoutItemPopulation"; - this.layoutItemPopulation.Size = new System.Drawing.Size(578, 24); - this.layoutItemPopulation.TextSize = new System.Drawing.Size(145, 13); + this.layoutItemPopulation.Size = new System.Drawing.Size(682, 26); + this.layoutItemPopulation.TextSize = new System.Drawing.Size(170, 16); // // layoutControlGroupPopulationParameters // @@ -401,42 +421,42 @@ private void InitializeComponent() this.emptySpaceBMI, this.layoutItemGestationalAge, this.layoutItemValueOrigin}); - this.layoutControlGroupPopulationParameters.Location = new System.Drawing.Point(0, 165); + this.layoutControlGroupPopulationParameters.Location = new System.Drawing.Point(0, 178); this.layoutControlGroupPopulationParameters.Name = "layoutControlGroupPopulationParameters"; - this.layoutControlGroupPopulationParameters.Size = new System.Drawing.Size(602, 191); + this.layoutControlGroupPopulationParameters.Size = new System.Drawing.Size(706, 223); // // layoutItemWeight // this.layoutItemWeight.Control = this.uxWeight; this.layoutItemWeight.CustomizationFormText = "layoutItemWeight"; - this.layoutItemWeight.Location = new System.Drawing.Point(0, 48); - this.layoutItemWeight.MaxSize = new System.Drawing.Size(0, 24); - this.layoutItemWeight.MinSize = new System.Drawing.Size(173, 24); + this.layoutItemWeight.Location = new System.Drawing.Point(0, 60); + this.layoutItemWeight.MaxSize = new System.Drawing.Size(0, 30); + this.layoutItemWeight.MinSize = new System.Drawing.Size(202, 30); this.layoutItemWeight.Name = "layoutItemWeight"; - this.layoutItemWeight.Size = new System.Drawing.Size(509, 24); + this.layoutItemWeight.Size = new System.Drawing.Size(600, 30); this.layoutItemWeight.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; - this.layoutItemWeight.TextSize = new System.Drawing.Size(145, 13); + this.layoutItemWeight.TextSize = new System.Drawing.Size(170, 16); // // layoutItemHeight // this.layoutItemHeight.Control = this.uxHeight; this.layoutItemHeight.CustomizationFormText = "layoutItemHeight"; - this.layoutItemHeight.Location = new System.Drawing.Point(0, 72); - this.layoutItemHeight.MaxSize = new System.Drawing.Size(0, 24); - this.layoutItemHeight.MinSize = new System.Drawing.Size(173, 24); + this.layoutItemHeight.Location = new System.Drawing.Point(0, 90); + this.layoutItemHeight.MaxSize = new System.Drawing.Size(0, 30); + this.layoutItemHeight.MinSize = new System.Drawing.Size(202, 30); this.layoutItemHeight.Name = "layoutItemHeight"; - this.layoutItemHeight.Size = new System.Drawing.Size(509, 24); + this.layoutItemHeight.Size = new System.Drawing.Size(600, 30); this.layoutItemHeight.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; - this.layoutItemHeight.TextSize = new System.Drawing.Size(145, 13); + this.layoutItemHeight.TextSize = new System.Drawing.Size(170, 16); // // layoutControlMeanButton // this.layoutControlMeanButton.Control = this.btnMeanValues; this.layoutControlMeanButton.CustomizationFormText = "layoutControlMeanButton"; - this.layoutControlMeanButton.Location = new System.Drawing.Point(509, 48); + this.layoutControlMeanButton.Location = new System.Drawing.Point(600, 60); this.layoutControlMeanButton.MinSize = new System.Drawing.Size(1, 1); this.layoutControlMeanButton.Name = "layoutControlMeanButton"; - this.layoutControlMeanButton.Size = new System.Drawing.Size(69, 48); + this.layoutControlMeanButton.Size = new System.Drawing.Size(82, 60); this.layoutControlMeanButton.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlMeanButton.TextSize = new System.Drawing.Size(0, 0); this.layoutControlMeanButton.TextVisible = false; @@ -445,9 +465,9 @@ private void InitializeComponent() // this.emptySpaceAge.AllowHotTrack = false; this.emptySpaceAge.CustomizationFormText = "emptySpaceItem1"; - this.emptySpaceAge.Location = new System.Drawing.Point(509, 0); + this.emptySpaceAge.Location = new System.Drawing.Point(600, 0); this.emptySpaceAge.Name = "emptySpaceAge"; - this.emptySpaceAge.Size = new System.Drawing.Size(69, 48); + this.emptySpaceAge.Size = new System.Drawing.Size(82, 60); this.emptySpaceAge.TextSize = new System.Drawing.Size(0, 0); // // layoutItemAge @@ -455,53 +475,53 @@ private void InitializeComponent() this.layoutItemAge.Control = this.uxAge; this.layoutItemAge.CustomizationFormText = "layoutItemAge"; this.layoutItemAge.Location = new System.Drawing.Point(0, 0); - this.layoutItemAge.MaxSize = new System.Drawing.Size(0, 24); - this.layoutItemAge.MinSize = new System.Drawing.Size(173, 24); + this.layoutItemAge.MaxSize = new System.Drawing.Size(0, 30); + this.layoutItemAge.MinSize = new System.Drawing.Size(202, 30); this.layoutItemAge.Name = "layoutItemAge"; - this.layoutItemAge.Size = new System.Drawing.Size(509, 24); + this.layoutItemAge.Size = new System.Drawing.Size(600, 30); this.layoutItemAge.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; - this.layoutItemAge.TextSize = new System.Drawing.Size(145, 13); + this.layoutItemAge.TextSize = new System.Drawing.Size(170, 16); // // layoutItemBMI // this.layoutItemBMI.Control = this.uxBMI; this.layoutItemBMI.CustomizationFormText = "layoutItemBMI"; - this.layoutItemBMI.Location = new System.Drawing.Point(0, 96); - this.layoutItemBMI.MaxSize = new System.Drawing.Size(10153, 26); - this.layoutItemBMI.MinSize = new System.Drawing.Size(173, 24); + this.layoutItemBMI.Location = new System.Drawing.Point(0, 120); + this.layoutItemBMI.MaxSize = new System.Drawing.Size(11845, 32); + this.layoutItemBMI.MinSize = new System.Drawing.Size(202, 30); this.layoutItemBMI.Name = "layoutItemBMI"; - this.layoutItemBMI.Size = new System.Drawing.Size(509, 26); + this.layoutItemBMI.Size = new System.Drawing.Size(600, 30); this.layoutItemBMI.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; - this.layoutItemBMI.TextSize = new System.Drawing.Size(145, 13); + this.layoutItemBMI.TextSize = new System.Drawing.Size(170, 16); // // emptySpaceBMI // this.emptySpaceBMI.AllowHotTrack = false; this.emptySpaceBMI.CustomizationFormText = "emptySpaceBMI"; - this.emptySpaceBMI.Location = new System.Drawing.Point(509, 96); + this.emptySpaceBMI.Location = new System.Drawing.Point(600, 120); this.emptySpaceBMI.Name = "emptySpaceBMI"; - this.emptySpaceBMI.Size = new System.Drawing.Size(69, 50); + this.emptySpaceBMI.Size = new System.Drawing.Size(82, 68); this.emptySpaceBMI.TextSize = new System.Drawing.Size(0, 0); // // layoutItemGestationalAge // this.layoutItemGestationalAge.Control = this.uxGestationalAge; this.layoutItemGestationalAge.CustomizationFormText = "layoutItemGestationalAge"; - this.layoutItemGestationalAge.Location = new System.Drawing.Point(0, 24); - this.layoutItemGestationalAge.MaxSize = new System.Drawing.Size(10153, 24); - this.layoutItemGestationalAge.MinSize = new System.Drawing.Size(173, 24); + this.layoutItemGestationalAge.Location = new System.Drawing.Point(0, 30); + this.layoutItemGestationalAge.MaxSize = new System.Drawing.Size(11845, 30); + this.layoutItemGestationalAge.MinSize = new System.Drawing.Size(202, 30); this.layoutItemGestationalAge.Name = "layoutItemGestationalAge"; - this.layoutItemGestationalAge.Size = new System.Drawing.Size(509, 24); + this.layoutItemGestationalAge.Size = new System.Drawing.Size(600, 30); this.layoutItemGestationalAge.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; - this.layoutItemGestationalAge.TextSize = new System.Drawing.Size(145, 13); + this.layoutItemGestationalAge.TextSize = new System.Drawing.Size(170, 16); // // layoutItemValueOrigin // this.layoutItemValueOrigin.Control = this._panelValueOrigin; - this.layoutItemValueOrigin.Location = new System.Drawing.Point(0, 122); + this.layoutItemValueOrigin.Location = new System.Drawing.Point(0, 150); this.layoutItemValueOrigin.Name = "layoutItemValueOrigin"; - this.layoutItemValueOrigin.Size = new System.Drawing.Size(509, 24); - this.layoutItemValueOrigin.TextSize = new System.Drawing.Size(145, 13); + this.layoutItemValueOrigin.Size = new System.Drawing.Size(600, 23); + this.layoutItemValueOrigin.TextSize = new System.Drawing.Size(170, 16); // // layoutGroupDiseaseState // @@ -509,53 +529,54 @@ private void InitializeComponent() this.layoutItemDiseaseState, this.layoutItemDescription, this.layoutItemDiseaseParameter}); - this.layoutGroupDiseaseState.Location = new System.Drawing.Point(0, 356); + this.layoutGroupDiseaseState.Location = new System.Drawing.Point(0, 401); this.layoutGroupDiseaseState.Name = "layoutGroupDiseaseState"; - this.layoutGroupDiseaseState.Size = new System.Drawing.Size(602, 112); + this.layoutGroupDiseaseState.Size = new System.Drawing.Size(706, 128); // // layoutItemDiseaseState // this.layoutItemDiseaseState.Control = this.cbDiseaseState; this.layoutItemDiseaseState.Location = new System.Drawing.Point(0, 0); this.layoutItemDiseaseState.Name = "layoutItemDiseaseState"; - this.layoutItemDiseaseState.Size = new System.Drawing.Size(578, 24); - this.layoutItemDiseaseState.TextSize = new System.Drawing.Size(145, 13); + this.layoutItemDiseaseState.Size = new System.Drawing.Size(682, 26); + this.layoutItemDiseaseState.TextSize = new System.Drawing.Size(170, 16); // // layoutItemDescription // this.layoutItemDescription.Control = this.lblDescription; - this.layoutItemDescription.Location = new System.Drawing.Point(0, 50); + this.layoutItemDescription.Location = new System.Drawing.Point(0, 58); this.layoutItemDescription.Name = "layoutItemDescription"; - this.layoutItemDescription.Size = new System.Drawing.Size(578, 17); + this.layoutItemDescription.Size = new System.Drawing.Size(682, 20); this.layoutItemDescription.TextSize = new System.Drawing.Size(0, 0); this.layoutItemDescription.TextVisible = false; // // layoutItemDiseaseParameter // this.layoutItemDiseaseParameter.Control = this.uxDiseaseParameter; - this.layoutItemDiseaseParameter.Location = new System.Drawing.Point(0, 24); - this.layoutItemDiseaseParameter.MaxSize = new System.Drawing.Size(10153, 26); - this.layoutItemDiseaseParameter.MinSize = new System.Drawing.Size(265, 25); + this.layoutItemDiseaseParameter.Location = new System.Drawing.Point(0, 26); + this.layoutItemDiseaseParameter.MaxSize = new System.Drawing.Size(11845, 32); + this.layoutItemDiseaseParameter.MinSize = new System.Drawing.Size(309, 31); this.layoutItemDiseaseParameter.Name = "layoutItemDiseaseParameter"; - this.layoutItemDiseaseParameter.Size = new System.Drawing.Size(578, 26); + this.layoutItemDiseaseParameter.Size = new System.Drawing.Size(682, 32); this.layoutItemDiseaseParameter.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; - this.layoutItemDiseaseParameter.TextSize = new System.Drawing.Size(145, 13); + this.layoutItemDiseaseParameter.TextSize = new System.Drawing.Size(170, 16); // // emptySpaceItem // this.emptySpaceItem.AllowHotTrack = false; - this.emptySpaceItem.Location = new System.Drawing.Point(0, 468); + this.emptySpaceItem.Location = new System.Drawing.Point(0, 570); this.emptySpaceItem.Name = "emptySpaceItem"; - this.emptySpaceItem.Size = new System.Drawing.Size(602, 23); + this.emptySpaceItem.Size = new System.Drawing.Size(706, 39); this.emptySpaceItem.TextSize = new System.Drawing.Size(0, 0); // // IndividualSettingsView // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.layoutControl); + this.Margin = new System.Windows.Forms.Padding(5); this.Name = "IndividualSettingsView"; - this.Size = new System.Drawing.Size(622, 511); + this.Size = new System.Drawing.Size(726, 629); ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridCalculationMethods)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridViewCalculationMethods)).EndInit(); diff --git a/src/PKSim.UI/Views/Individuals/IndividualSettingsView.resx b/src/PKSim.UI/Views/Individuals/IndividualSettingsView.resx index 29a1e5cd6..4fc9cabff 100644 --- a/src/PKSim.UI/Views/Individuals/IndividualSettingsView.resx +++ b/src/PKSim.UI/Views/Individuals/IndividualSettingsView.resx @@ -120,4 +120,7 @@ 17, 17 + + 25 + \ No newline at end of file diff --git a/src/PKSim.UI/Views/Individuals/OntogenySelectionView.cs b/src/PKSim.UI/Views/Individuals/OntogenySelectionView.cs index dfadc2f5e..72ab51cb4 100644 --- a/src/PKSim.UI/Views/Individuals/OntogenySelectionView.cs +++ b/src/PKSim.UI/Views/Individuals/OntogenySelectionView.cs @@ -20,7 +20,7 @@ public partial class OntogenySelectionView : BaseResizableUserControl, IOntogeny private IOntogenySelectionPresenter _presenter; private ScreenBinder _screenBinder; - public override int OptimalHeight => UIConstants.Size.ScaleForScreenDPI(30); + public override int OptimalHeight => OSPSuite.UI.UIConstants.Size.ScaleForScreenDPI(30); public OntogenySelectionView(IToolTipCreator toolTipCreator) { diff --git a/src/PKSim.UI/Views/Individuals/ScaleIndividualView.cs b/src/PKSim.UI/Views/Individuals/ScaleIndividualView.cs index 8eb0cb394..8e88ebb6f 100644 --- a/src/PKSim.UI/Views/Individuals/ScaleIndividualView.cs +++ b/src/PKSim.UI/Views/Individuals/ScaleIndividualView.cs @@ -20,7 +20,7 @@ public partial class ScaleIndividualView : WizardView, IScaleIndividualView public ScaleIndividualView(Shell shell) : base(shell) { InitializeComponent(); - ClientSize = new Size(CoreConstants.UI.INDIVIDUAL_VIEW_WIDTH, CoreConstants.UI.INDIVIDUAL_VIEW_HEIGHT); + ClientSize = new Size(UIConstants.Size.INDIVIDUAL_VIEW_WIDTH, UIConstants.Size.INDIVIDUAL_VIEW_HEIGHT); } public override void InitializeBinding() diff --git a/src/PKSim.UI/Views/Observers/CreateObserverSetView.cs b/src/PKSim.UI/Views/Observers/CreateObserverSetView.cs index 9d130f159..68b2521d5 100644 --- a/src/PKSim.UI/Views/Observers/CreateObserverSetView.cs +++ b/src/PKSim.UI/Views/Observers/CreateObserverSetView.cs @@ -13,7 +13,7 @@ public partial class CreateObserverSetView : BuildingBlockContainerView, ICreate public CreateObserverSetView(Shell shell) : base(shell) { InitializeComponent(); - ClientSize = new Size(CoreConstants.UI.OBSERVER_VIEW_WIDTH, CoreConstants.UI.OBSERVER_VIEW_HEIGHT); + ClientSize = new Size(UIConstants.Size.OBSERVER_VIEW_WIDTH, UIConstants.Size.OBSERVER_VIEW_HEIGHT); } public void AttachPresenter(ICreateObserverSetPresenter presenter) diff --git a/src/PKSim.UI/Views/Observers/ImportObserverSetView.cs b/src/PKSim.UI/Views/Observers/ImportObserverSetView.cs index 3f7b071e0..e13597eca 100644 --- a/src/PKSim.UI/Views/Observers/ImportObserverSetView.cs +++ b/src/PKSim.UI/Views/Observers/ImportObserverSetView.cs @@ -13,6 +13,7 @@ using PKSim.Presentation.DTO.Observers; using PKSim.Presentation.Presenters.Observers; using PKSim.Presentation.Views.Observers; +using static OSPSuite.UI.UIConstants.Size; namespace PKSim.UI.Views.Observers { @@ -86,7 +87,7 @@ public override void InitializeBinding() .WithCaption(PKSimConstants.UI.EmptyColumn) .WithShowButton(ShowButtonModeEnum.ShowAlways) .WithRepository(x => _removeButtonRepository) - .WithFixedWidth(UIConstants.Size.EMBEDDED_BUTTON_WIDTH * 2); + .WithFixedWidth(EMBEDDED_BUTTON_WIDTH * 2); _removeButtonRepository.ButtonClick += (o, e) => OnEvent(_presenter.RemoveObserver, _gridViewBinder.FocusedElement); diff --git a/src/PKSim.UI/Views/Parameters/ParameterSetView.cs b/src/PKSim.UI/Views/Parameters/ParameterSetView.cs index 259b8396a..f95cf38f8 100644 --- a/src/PKSim.UI/Views/Parameters/ParameterSetView.cs +++ b/src/PKSim.UI/Views/Parameters/ParameterSetView.cs @@ -29,6 +29,7 @@ using PKSim.Presentation.DTO.Parameters; using PKSim.Presentation.Presenters.Parameters; using PKSim.UI.Views.Core; +using static OSPSuite.UI.UIConstants.Size; namespace PKSim.UI.Views.Parameters { @@ -156,7 +157,7 @@ protected void InitializeFavoriteBinding() { _columnFavorites = _gridViewBinder.Bind(x => x.IsFavorite) .WithCaption(PKSimConstants.UI.Favorites) - .WithWidth(UIConstants.Size.EMBEDDED_CHECK_BOX_WIDTH) + .WithWidth(EMBEDDED_CHECK_BOX_WIDTH) .WithRepository(x => _favoriteRepository) .WithToolTip(PKSimConstants.UI.FavoritesToolTip) .WithOnValueUpdating((o, e) => OnEvent(() => _presenter.SetFavorite(o, e.NewValue))); diff --git a/src/PKSim.UI/Views/Parameters/TableParameterView.cs b/src/PKSim.UI/Views/Parameters/TableParameterView.cs index 11343f09b..521a0c10b 100644 --- a/src/PKSim.UI/Views/Parameters/TableParameterView.cs +++ b/src/PKSim.UI/Views/Parameters/TableParameterView.cs @@ -56,7 +56,7 @@ public override void InitializeBinding() .WithCaption(PKSimConstants.UI.EmptyColumn) .WithShowButton(ShowButtonModeEnum.ShowAlways) .WithRepository(dto => _removePointRepository) - .WithFixedWidth(UIConstants.Size.EMBEDDED_BUTTON_WIDTH); + .WithFixedWidth(OSPSuite.UI.UIConstants.Size.EMBEDDED_BUTTON_WIDTH); _gridViewBinder.Changed += () => OnEvent(_presenter.ViewChanged); btnImportPoints.Click += (o, e) => OnEvent(_presenter.ImportTable); diff --git a/src/PKSim.UI/Views/PopulationAnalyses/BaseChartView.cs b/src/PKSim.UI/Views/PopulationAnalyses/BaseChartView.cs index 4814d26f8..292a0b00b 100644 --- a/src/PKSim.UI/Views/PopulationAnalyses/BaseChartView.cs +++ b/src/PKSim.UI/Views/PopulationAnalyses/BaseChartView.cs @@ -56,7 +56,7 @@ public BaseChartView(IImageListRetriever imageListRetriever, IToolTipCreator too _pnlChart.FillWith(Chart); Chart.RefreshDataOnRepaint = false; Chart.CacheToMemory = true; - Chart.Legend.MarkerSize = UIConstants.Chart.LEGEND_MARKER_SIZE; + Chart.Legend.MarkerSize = OSPSuite.UI.UIConstants.Chart.LEGEND_MARKER_SIZE; DragDropEnabled = false; initializeChart(imageListRetriever); } diff --git a/src/PKSim.UI/Views/PopulationAnalyses/CreatePopulationAnalysisView.cs b/src/PKSim.UI/Views/PopulationAnalyses/CreatePopulationAnalysisView.cs index b69ed0d16..27283eabd 100644 --- a/src/PKSim.UI/Views/PopulationAnalyses/CreatePopulationAnalysisView.cs +++ b/src/PKSim.UI/Views/PopulationAnalyses/CreatePopulationAnalysisView.cs @@ -8,6 +8,7 @@ using OSPSuite.UI; using OSPSuite.UI.Extensions; using OSPSuite.UI.Views; +using static OSPSuite.UI.UIConstants.Size; namespace PKSim.UI.Views.PopulationAnalyses { @@ -39,7 +40,7 @@ public override void InitializeResources() var dropDownButtonItem = createAnalysisPresenter.CreateTemplateButtonItem(_toolTipCreator, layoutControlBase); dropDownButtonItem.Move(emptySpaceItemBase, InsertType.Left); MaximizeBox = true; - this.ReziseForCurrentScreen(fractionHeight: UIConstants.Size.SCREEN_RESIZE_FRACTION, fractionWidth: UIConstants.Size.SCREEN_RESIZE_FRACTION); + this.ReziseForCurrentScreen(fractionHeight: SCREEN_RESIZE_FRACTION, fractionWidth: SCREEN_RESIZE_FRACTION); } private ICreatePopulationAnalysisPresenter createAnalysisPresenter => WizardPresenter as ICreatePopulationAnalysisPresenter; diff --git a/src/PKSim.UI/Views/PopulationAnalyses/FixedLimitsGroupingView.cs b/src/PKSim.UI/Views/PopulationAnalyses/FixedLimitsGroupingView.cs index bc2b3b31e..fa2cac519 100644 --- a/src/PKSim.UI/Views/PopulationAnalyses/FixedLimitsGroupingView.cs +++ b/src/PKSim.UI/Views/PopulationAnalyses/FixedLimitsGroupingView.cs @@ -74,7 +74,7 @@ public override void InitializeBinding() .WithCaption(PKSimConstants.UI.EmptyColumn) .WithShowButton(ShowButtonModeEnum.ShowAlways) .WithRepository(getButtonRepository) - .WithFixedWidth(UIConstants.Size.EMBEDDED_BUTTON_WIDTH * 2); + .WithFixedWidth(OSPSuite.UI.UIConstants.Size.EMBEDDED_BUTTON_WIDTH * 2); _addButtonRepository.ButtonClick += (o, e) => OnEvent(addFixedLimit); _addAndRemoveButtonRepository.ButtonClick += (o, e) => OnEvent(addOrRemoveFixedLimit, e); diff --git a/src/PKSim.UI/Views/PopulationAnalyses/MultipleNumericFieldsView.cs b/src/PKSim.UI/Views/PopulationAnalyses/MultipleNumericFieldsView.cs index 6045e5d37..a2d319f38 100644 --- a/src/PKSim.UI/Views/PopulationAnalyses/MultipleNumericFieldsView.cs +++ b/src/PKSim.UI/Views/PopulationAnalyses/MultipleNumericFieldsView.cs @@ -41,7 +41,7 @@ public override void InitializeBinding() { _gridViewBinder.Bind(x => x.Selected) .WithRepository(x => _selectionRepository) - .WithFixedWidth(UIConstants.Size.EMBEDDED_BUTTON_WIDTH) + .WithFixedWidth(OSPSuite.UI.UIConstants.Size.EMBEDDED_BUTTON_WIDTH) .WithOnChanged(_presenter.SelectionChanged); _gridViewBinder.Bind(x => x.Name).AsReadOnly(); diff --git a/src/PKSim.UI/Views/PopulationAnalyses/PopulationAnalysisFieldsView.cs b/src/PKSim.UI/Views/PopulationAnalyses/PopulationAnalysisFieldsView.cs index e77e94ba9..a1cdeacd9 100644 --- a/src/PKSim.UI/Views/PopulationAnalyses/PopulationAnalysisFieldsView.cs +++ b/src/PKSim.UI/Views/PopulationAnalyses/PopulationAnalysisFieldsView.cs @@ -27,6 +27,7 @@ using OSPSuite.Assets; using OSPSuite.UI.Controls; using OSPSuite.UI.Views; +using static OSPSuite.UI.UIConstants.Size; using UIConstants = OSPSuite.UI.UIConstants; namespace PKSim.UI.Views.PopulationAnalyses @@ -121,7 +122,7 @@ public override void InitializeBinding() .WithCaption(PKSimConstants.UI.EmptyColumn) .WithShowButton(ShowButtonModeEnum.ShowAlways) .WithRepository(getAddRemoveRepository) - .WithFixedWidth(UIConstants.Size.EMBEDDED_BUTTON_WIDTH * 2); + .WithFixedWidth(EMBEDDED_BUTTON_WIDTH * 2); gridView.FocusedRowChanged += (o, e) => OnEvent(gridViewRowChanged, e); gridView.MouseDown += (o, e) => OnEvent(onGridViewMouseDown, e); diff --git a/src/PKSim.UI/Views/Populations/ImportPopulationSettingsView.cs b/src/PKSim.UI/Views/Populations/ImportPopulationSettingsView.cs index fe6ca1f92..1b23f1b2a 100644 --- a/src/PKSim.UI/Views/Populations/ImportPopulationSettingsView.cs +++ b/src/PKSim.UI/Views/Populations/ImportPopulationSettingsView.cs @@ -61,7 +61,7 @@ public override void InitializeBinding() _gridViewBinder.Bind(x => x.Image) .WithCaption(PKSimConstants.UI.EmptyColumn) .WithRepository(dto => _statusIconRepository) - .WithFixedWidth(UIConstants.Size.EMBEDDED_BUTTON_WIDTH); + .WithFixedWidth(OSPSuite.UI.UIConstants.Size.EMBEDDED_BUTTON_WIDTH); _gridViewBinder.Bind(x => x.FilePath) .WithShowButton(ShowButtonModeEnum.ShowAlways) @@ -69,7 +69,7 @@ public override void InitializeBinding() .WithCaption(PKSimConstants.UI.FilePath); _gridViewBinder.Bind(x => x.Count) - .WithFixedWidth(CoreConstants.UI.PARAMETER_WIDTH) + .WithFixedWidth(UIConstants.Size.PARAMETER_WIDTH) .WithFormat(new NullIntParameterFormatter()) .AsReadOnly(); @@ -77,7 +77,7 @@ public override void InitializeBinding() .WithCaption(PKSimConstants.UI.EmptyColumn) .WithShowButton(ShowButtonModeEnum.ShowAlways) .WithRepository(x => _removeButtonRepository) - .WithFixedWidth(UIConstants.Size.EMBEDDED_BUTTON_WIDTH * 2); + .WithFixedWidth(OSPSuite.UI.UIConstants.Size.EMBEDDED_BUTTON_WIDTH * 2); gridView.FocusedRowChanged += (o, e) => OnEvent(selectedRowChanged, e); _removeButtonRepository.ButtonClick += (o, e) => OnEvent(_presenter.RemoveFile, _gridViewBinder.FocusedElement); diff --git a/src/PKSim.UI/Views/Populations/RandomPopulationSettingsView.Designer.cs b/src/PKSim.UI/Views/Populations/RandomPopulationSettingsView.Designer.cs index 8850e83e2..89ee3432a 100644 --- a/src/PKSim.UI/Views/Populations/RandomPopulationSettingsView.Designer.cs +++ b/src/PKSim.UI/Views/Populations/RandomPopulationSettingsView.Designer.cs @@ -54,9 +54,10 @@ private void InitializeComponent() this.layoutGroupIndividualSelection = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutItemIndividual = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutItemPopulation = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutItemDescription = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutItemDiseaseState = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutItemDescription = new DevExpress.XtraLayout.LayoutControlItem(); this.emptySpaceItem = new DevExpress.XtraLayout.EmptySpaceItem(); + this.emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem(); ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControl)).BeginInit(); this.layoutControl.SuspendLayout(); @@ -77,9 +78,10 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.layoutGroupIndividualSelection)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutItemIndividual)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutItemPopulation)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutItemDescription)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutItemDiseaseState)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutItemDescription)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).BeginInit(); this.SuspendLayout(); // // layoutControl @@ -95,78 +97,88 @@ private void InitializeComponent() this.layoutControl.Controls.Add(this.gridParameters); this.layoutControl.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutControl.Location = new System.Drawing.Point(0, 0); + this.layoutControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.layoutControl.Name = "layoutControl"; this.layoutControl.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(642, 336, 250, 350); this.layoutControl.Root = this.layoutMainGroup; - this.layoutControl.Size = new System.Drawing.Size(451, 546); + this.layoutControl.Size = new System.Drawing.Size(526, 672); this.layoutControl.TabIndex = 9; this.layoutControl.Text = "layoutControl1"; // // lblDiseaseState // - this.lblDiseaseState.Location = new System.Drawing.Point(12, 63); + this.lblDiseaseState.Location = new System.Drawing.Point(14, 78); + this.lblDiseaseState.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.lblDiseaseState.Name = "lblDiseaseState"; - this.lblDiseaseState.Size = new System.Drawing.Size(73, 13); + this.lblDiseaseState.Size = new System.Drawing.Size(87, 16); this.lblDiseaseState.StyleController = this.layoutControl; this.lblDiseaseState.TabIndex = 21; this.lblDiseaseState.Text = "lblDiseaseState"; // // lblDescription // - this.lblDescription.Location = new System.Drawing.Point(12, 29); + this.lblDescription.Location = new System.Drawing.Point(14, 38); + this.lblDescription.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.lblDescription.Name = "lblDescription"; - this.lblDescription.Size = new System.Drawing.Size(63, 13); + this.lblDescription.Size = new System.Drawing.Size(76, 16); this.lblDescription.StyleController = this.layoutControl; this.lblDescription.TabIndex = 20; this.lblDescription.Text = "lblDescription"; // // btnStop // - this.btnStop.Location = new System.Drawing.Point(227, 397); + this.btnStop.Location = new System.Drawing.Point(264, 486); + this.btnStop.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnStop.Name = "btnStop"; - this.btnStop.Size = new System.Drawing.Size(212, 22); + this.btnStop.Size = new System.Drawing.Size(248, 27); this.btnStop.StyleController = this.layoutControl; this.btnStop.TabIndex = 19; this.btnStop.Text = "btnStop"; // // lblPopulation // - this.lblPopulation.Location = new System.Drawing.Point(12, 46); + this.lblPopulation.Location = new System.Drawing.Point(14, 58); + this.lblPopulation.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.lblPopulation.Name = "lblPopulation"; - this.lblPopulation.Size = new System.Drawing.Size(60, 13); + this.lblPopulation.Size = new System.Drawing.Size(72, 16); this.lblPopulation.StyleController = this.layoutControl; this.lblPopulation.TabIndex = 18; this.lblPopulation.Text = "lblPopulation"; // // tbProportionsOfFemales // - this.tbProportionsOfFemales.Location = new System.Drawing.Point(189, 147); + this.tbProportionsOfFemales.Location = new System.Drawing.Point(221, 180); + this.tbProportionsOfFemales.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tbProportionsOfFemales.Name = "tbProportionsOfFemales"; - this.tbProportionsOfFemales.Size = new System.Drawing.Size(238, 20); + this.tbProportionsOfFemales.Size = new System.Drawing.Size(278, 22); this.tbProportionsOfFemales.StyleController = this.layoutControl; this.tbProportionsOfFemales.TabIndex = 17; // // tbNumberOfIndividuals // - this.tbNumberOfIndividuals.Location = new System.Drawing.Point(189, 123); + this.tbNumberOfIndividuals.Location = new System.Drawing.Point(221, 150); + this.tbNumberOfIndividuals.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tbNumberOfIndividuals.Name = "tbNumberOfIndividuals"; - this.tbNumberOfIndividuals.Size = new System.Drawing.Size(238, 20); + this.tbNumberOfIndividuals.Size = new System.Drawing.Size(278, 22); this.tbNumberOfIndividuals.StyleController = this.layoutControl; this.tbNumberOfIndividuals.TabIndex = 14; // // panelIndividualSelection // - this.panelIndividualSelection.Location = new System.Drawing.Point(115, 12); + this.panelIndividualSelection.Location = new System.Drawing.Point(133, 14); + this.panelIndividualSelection.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panelIndividualSelection.Name = "panelIndividualSelection"; - this.panelIndividualSelection.Size = new System.Drawing.Size(324, 13); + this.panelIndividualSelection.Size = new System.Drawing.Size(379, 20); this.panelIndividualSelection.TabIndex = 16; // // gridParameters // - this.gridParameters.Location = new System.Drawing.Point(24, 216); + this.gridParameters.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.gridParameters.Location = new System.Drawing.Point(27, 260); this.gridParameters.MainView = this.gridViewParameters; + this.gridParameters.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.gridParameters.Name = "gridParameters"; - this.gridParameters.Size = new System.Drawing.Size(403, 165); + this.gridParameters.Size = new System.Drawing.Size(472, 186); this.gridParameters.TabIndex = 10; this.gridParameters.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridViewParameters}); @@ -174,6 +186,7 @@ private void InitializeComponent() // gridViewParameters // this.gridViewParameters.AllowsFiltering = true; + this.gridViewParameters.DetailHeight = 431; this.gridViewParameters.EnableColumnContextMenu = true; this.gridViewParameters.GridControl = this.gridParameters; this.gridViewParameters.MultiSelect = false; @@ -197,7 +210,7 @@ private void InitializeComponent() this.layoutGroupIndividualSelection, this.emptySpaceItem}); this.layoutMainGroup.Name = "layoutMainGroup"; - this.layoutMainGroup.Size = new System.Drawing.Size(451, 546); + this.layoutMainGroup.Size = new System.Drawing.Size(526, 672); this.layoutMainGroup.TextVisible = false; // // layoutGroupPopulationProperties @@ -206,39 +219,40 @@ private void InitializeComponent() this.layoutGroupPopulationProperties.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutItemProportionOfFemales, this.layoutItemNumberOfIndividuals}); - this.layoutGroupPopulationProperties.Location = new System.Drawing.Point(0, 78); + this.layoutGroupPopulationProperties.Location = new System.Drawing.Point(0, 96); this.layoutGroupPopulationProperties.Name = "layoutGroupPopulationProperties"; - this.layoutGroupPopulationProperties.Size = new System.Drawing.Size(431, 93); + this.layoutGroupPopulationProperties.Size = new System.Drawing.Size(502, 110); // // layoutItemProportionOfFemales // this.layoutItemProportionOfFemales.Control = this.tbProportionsOfFemales; this.layoutItemProportionOfFemales.CustomizationFormText = "layoutItemProportionOfFemales"; - this.layoutItemProportionOfFemales.Location = new System.Drawing.Point(0, 24); + this.layoutItemProportionOfFemales.Location = new System.Drawing.Point(0, 30); this.layoutItemProportionOfFemales.Name = "layoutItemProportionOfFemales"; - this.layoutItemProportionOfFemales.Size = new System.Drawing.Size(407, 24); - this.layoutItemProportionOfFemales.TextSize = new System.Drawing.Size(153, 13); + this.layoutItemProportionOfFemales.Size = new System.Drawing.Size(476, 26); + this.layoutItemProportionOfFemales.TextSize = new System.Drawing.Size(180, 16); // // layoutItemNumberOfIndividuals // this.layoutItemNumberOfIndividuals.Control = this.tbNumberOfIndividuals; this.layoutItemNumberOfIndividuals.CustomizationFormText = "layoutItemNumberOfIndividuals"; this.layoutItemNumberOfIndividuals.Location = new System.Drawing.Point(0, 0); - this.layoutItemNumberOfIndividuals.MaxSize = new System.Drawing.Size(0, 24); - this.layoutItemNumberOfIndividuals.MinSize = new System.Drawing.Size(210, 24); + this.layoutItemNumberOfIndividuals.MaxSize = new System.Drawing.Size(0, 30); + this.layoutItemNumberOfIndividuals.MinSize = new System.Drawing.Size(245, 30); this.layoutItemNumberOfIndividuals.Name = "layoutItemNumberOfIndividuals"; - this.layoutItemNumberOfIndividuals.Size = new System.Drawing.Size(407, 24); + this.layoutItemNumberOfIndividuals.Size = new System.Drawing.Size(476, 30); this.layoutItemNumberOfIndividuals.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; - this.layoutItemNumberOfIndividuals.TextSize = new System.Drawing.Size(153, 13); + this.layoutItemNumberOfIndividuals.TextSize = new System.Drawing.Size(180, 16); // // layoutGroupParameterRanges // this.layoutGroupParameterRanges.CustomizationFormText = "layoutGroupParameterRanges"; this.layoutGroupParameterRanges.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { - this.layoutItemParameters}); - this.layoutGroupParameterRanges.Location = new System.Drawing.Point(0, 171); + this.layoutItemParameters, + this.emptySpaceItem3}); + this.layoutGroupParameterRanges.Location = new System.Drawing.Point(0, 206); this.layoutGroupParameterRanges.Name = "layoutGroupParameterRanges"; - this.layoutGroupParameterRanges.Size = new System.Drawing.Size(431, 214); + this.layoutGroupParameterRanges.Size = new System.Drawing.Size(502, 266); // // layoutItemParameters // @@ -246,7 +260,7 @@ private void InitializeComponent() this.layoutItemParameters.CustomizationFormText = "layoutItemParameters"; this.layoutItemParameters.Location = new System.Drawing.Point(0, 0); this.layoutItemParameters.Name = "layoutItemParameters"; - this.layoutItemParameters.Size = new System.Drawing.Size(407, 169); + this.layoutItemParameters.Size = new System.Drawing.Size(476, 190); this.layoutItemParameters.TextSize = new System.Drawing.Size(0, 0); this.layoutItemParameters.TextVisible = false; // @@ -254,9 +268,9 @@ private void InitializeComponent() // this.layoutItemStop.Control = this.btnStop; this.layoutItemStop.CustomizationFormText = "layoutItemStop"; - this.layoutItemStop.Location = new System.Drawing.Point(215, 385); + this.layoutItemStop.Location = new System.Drawing.Point(250, 472); this.layoutItemStop.Name = "layoutItemStop"; - this.layoutItemStop.Size = new System.Drawing.Size(216, 26); + this.layoutItemStop.Size = new System.Drawing.Size(252, 31); this.layoutItemStop.TextSize = new System.Drawing.Size(0, 0); this.layoutItemStop.TextVisible = false; // @@ -264,18 +278,18 @@ private void InitializeComponent() // this.emptySpaceItem1.AllowHotTrack = false; this.emptySpaceItem1.CustomizationFormText = "emptySpaceItem1"; - this.emptySpaceItem1.Location = new System.Drawing.Point(0, 411); + this.emptySpaceItem1.Location = new System.Drawing.Point(0, 503); this.emptySpaceItem1.Name = "emptySpaceItem1"; - this.emptySpaceItem1.Size = new System.Drawing.Size(431, 115); + this.emptySpaceItem1.Size = new System.Drawing.Size(502, 145); this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0); // // emptySpaceItem2 // this.emptySpaceItem2.AllowHotTrack = false; this.emptySpaceItem2.CustomizationFormText = "emptySpaceItem2"; - this.emptySpaceItem2.Location = new System.Drawing.Point(0, 385); + this.emptySpaceItem2.Location = new System.Drawing.Point(0, 472); this.emptySpaceItem2.Name = "emptySpaceItem2"; - this.emptySpaceItem2.Size = new System.Drawing.Size(215, 26); + this.emptySpaceItem2.Size = new System.Drawing.Size(250, 31); this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0); // // layoutGroupIndividualSelection @@ -289,7 +303,7 @@ private void InitializeComponent() this.layoutItemDescription}); this.layoutGroupIndividualSelection.Location = new System.Drawing.Point(0, 0); this.layoutGroupIndividualSelection.Name = "layoutGroupIndividualSelection"; - this.layoutGroupIndividualSelection.Size = new System.Drawing.Size(431, 68); + this.layoutGroupIndividualSelection.Size = new System.Drawing.Size(502, 84); // // layoutItemIndividual // @@ -297,56 +311,65 @@ private void InitializeComponent() this.layoutItemIndividual.CustomizationFormText = "layoutItemIndividual"; this.layoutItemIndividual.Location = new System.Drawing.Point(0, 0); this.layoutItemIndividual.Name = "layoutItemIndividual"; - this.layoutItemIndividual.Size = new System.Drawing.Size(431, 17); + this.layoutItemIndividual.Size = new System.Drawing.Size(502, 24); this.layoutItemIndividual.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize; - this.layoutItemIndividual.TextSize = new System.Drawing.Size(98, 13); + this.layoutItemIndividual.TextSize = new System.Drawing.Size(114, 16); this.layoutItemIndividual.TextToControlDistance = 5; // // layoutItemPopulation // this.layoutItemPopulation.Control = this.lblPopulation; this.layoutItemPopulation.CustomizationFormText = "layoutControlItem1"; - this.layoutItemPopulation.Location = new System.Drawing.Point(0, 34); + this.layoutItemPopulation.Location = new System.Drawing.Point(0, 44); this.layoutItemPopulation.Name = "layoutItemPopulation"; - this.layoutItemPopulation.Size = new System.Drawing.Size(431, 17); + this.layoutItemPopulation.Size = new System.Drawing.Size(502, 20); this.layoutItemPopulation.TextSize = new System.Drawing.Size(0, 0); this.layoutItemPopulation.TextVisible = false; // + // layoutItemDiseaseState + // + this.layoutItemDiseaseState.Control = this.lblDiseaseState; + this.layoutItemDiseaseState.Location = new System.Drawing.Point(0, 64); + this.layoutItemDiseaseState.Name = "layoutItemDiseaseState"; + this.layoutItemDiseaseState.Size = new System.Drawing.Size(502, 20); + this.layoutItemDiseaseState.TextSize = new System.Drawing.Size(0, 0); + this.layoutItemDiseaseState.TextVisible = false; + // // layoutItemDescription // this.layoutItemDescription.Control = this.lblDescription; this.layoutItemDescription.CustomizationFormText = "layoutItemDescription"; - this.layoutItemDescription.Location = new System.Drawing.Point(0, 17); + this.layoutItemDescription.Location = new System.Drawing.Point(0, 24); this.layoutItemDescription.Name = "layoutItemDescription"; - this.layoutItemDescription.Size = new System.Drawing.Size(431, 17); + this.layoutItemDescription.Size = new System.Drawing.Size(502, 20); this.layoutItemDescription.TextSize = new System.Drawing.Size(0, 0); this.layoutItemDescription.TextVisible = false; // - // layoutItemDiseaseState - // - this.layoutItemDiseaseState.Control = this.lblDiseaseState; - this.layoutItemDiseaseState.Location = new System.Drawing.Point(0, 51); - this.layoutItemDiseaseState.Name = "layoutItemDiseaseState"; - this.layoutItemDiseaseState.Size = new System.Drawing.Size(431, 17); - this.layoutItemDiseaseState.TextSize = new System.Drawing.Size(0, 0); - this.layoutItemDiseaseState.TextVisible = false; - // // emptySpaceItem // this.emptySpaceItem.AllowHotTrack = false; this.emptySpaceItem.CustomizationFormText = "emptySpaceItem3"; - this.emptySpaceItem.Location = new System.Drawing.Point(0, 68); + this.emptySpaceItem.Location = new System.Drawing.Point(0, 84); this.emptySpaceItem.Name = "emptySpaceItem"; - this.emptySpaceItem.Size = new System.Drawing.Size(431, 10); + this.emptySpaceItem.Size = new System.Drawing.Size(502, 12); this.emptySpaceItem.TextSize = new System.Drawing.Size(0, 0); // + // emptySpaceItem3 + // + this.emptySpaceItem3.AllowHotTrack = false; + this.emptySpaceItem3.Location = new System.Drawing.Point(0, 190); + this.emptySpaceItem3.Name = "emptySpaceItem3"; + this.emptySpaceItem3.Size = new System.Drawing.Size(476, 22); + this.emptySpaceItem3.TextSize = new System.Drawing.Size(0, 0); + // // RandomPopulationSettingsView // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.layoutControl); + this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.Name = "RandomPopulationSettingsView"; - this.Size = new System.Drawing.Size(451, 546); + this.Size = new System.Drawing.Size(526, 672); ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControl)).EndInit(); this.layoutControl.ResumeLayout(false); @@ -367,9 +390,10 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.layoutGroupIndividualSelection)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutItemIndividual)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutItemPopulation)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutItemDescription)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutItemDiseaseState)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutItemDescription)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).EndInit(); this.ResumeLayout(false); } @@ -401,5 +425,6 @@ private void InitializeComponent() private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem; private DevExpress.XtraEditors.LabelControl lblDiseaseState; private DevExpress.XtraLayout.LayoutControlItem layoutItemDiseaseState; + private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem3; } } diff --git a/src/PKSim.UI/Views/Populations/RandomPopulationSettingsView.cs b/src/PKSim.UI/Views/Populations/RandomPopulationSettingsView.cs index c307ab0d7..2808ca43d 100644 --- a/src/PKSim.UI/Views/Populations/RandomPopulationSettingsView.cs +++ b/src/PKSim.UI/Views/Populations/RandomPopulationSettingsView.cs @@ -93,14 +93,14 @@ public override void InitializeBinding() .AsReadOnly(); _colFrom = _gridViewBinder.AddUnboundColumn() - .WithCaption(UIConstants.EMPTY_COLUMN) + .WithCaption(OSPSuite.UI.UIConstants.EMPTY_COLUMN) .WithRepository(fromRepository).AsReadOnly(); _colFrom.XtraColumn.MaxWidth = 40; bindValue(x => x.MinValueInDisplayUnit); _colTo = _gridViewBinder.AddUnboundColumn() - .WithCaption(UIConstants.EMPTY_COLUMN) + .WithCaption(OSPSuite.UI.UIConstants.EMPTY_COLUMN) .WithRepository(toRepository).AsReadOnly(); _colTo.XtraColumn.MaxWidth = 40; diff --git a/src/PKSim.UI/Views/ProteinExpression/ProteinExpressionsView.cs b/src/PKSim.UI/Views/ProteinExpression/ProteinExpressionsView.cs index 88c96a721..b695c3847 100644 --- a/src/PKSim.UI/Views/ProteinExpression/ProteinExpressionsView.cs +++ b/src/PKSim.UI/Views/ProteinExpression/ProteinExpressionsView.cs @@ -8,6 +8,7 @@ using OSPSuite.UI; using OSPSuite.UI.Extensions; using OSPSuite.UI.Views; +using static OSPSuite.UI.UIConstants.Size; namespace PKSim.UI.Views.ProteinExpression { @@ -16,7 +17,7 @@ public partial class ProteinExpressionsView : WizardView, IProteinExpressionsVie public ProteinExpressionsView(Shell shell):base(shell) { InitializeComponent(); - ClientSize = new System.Drawing.Size(CoreConstants.UI.EXPRESSION_QUERY_VIEW_WIDTH, CoreConstants.UI.EXPRESSION_QUERY_VIEW_HEIGHT); + ClientSize = new System.Drawing.Size(UIConstants.Size.EXPRESSION_QUERY_VIEW_WIDTH, UIConstants.Size.EXPRESSION_QUERY_VIEW_HEIGHT); } @@ -35,7 +36,7 @@ public override void InitializeResources() base.InitializeResources(); Text = PKSimConstants.ProteinExpressions.MainView.MainText; Icon = ApplicationIcons.ProteinExpression.WithSize(IconSizes.Size16x16); - this.ReziseForCurrentScreen(fractionHeight: UIConstants.Size.SCREEN_RESIZE_FRACTION, fractionWidth: UIConstants.Size.SCREEN_RESIZE_FRACTION); + this.ReziseForCurrentScreen(fractionHeight: SCREEN_RESIZE_FRACTION, fractionWidth: SCREEN_RESIZE_FRACTION); MaximizeBox = true; } } diff --git a/src/PKSim.UI/Views/Protocols/AdvancedProtocolView.cs b/src/PKSim.UI/Views/Protocols/AdvancedProtocolView.cs index c09c15f11..84bc3ea94 100644 --- a/src/PKSim.UI/Views/Protocols/AdvancedProtocolView.cs +++ b/src/PKSim.UI/Views/Protocols/AdvancedProtocolView.cs @@ -159,7 +159,7 @@ public override void InitializeBinding() .WithCaption(PKSimConstants.UI.EmptyColumn) .WithShowButton(ShowButtonModeEnum.ShowAlways) .WithRepository(dto => schemaButtonRepository) - .WithFixedWidth(UIConstants.Size.EMBEDDED_BUTTON_WIDTH * 2); + .WithFixedWidth(OSPSuite.UI.UIConstants.Size.EMBEDDED_BUTTON_WIDTH * 2); _gridProtocolBinder.Changed += NotifyViewChanged; @@ -210,7 +210,7 @@ private void initializeSchemaItemBinding(GridViewBinder schemaIte .WithCaption(PKSimConstants.UI.EmptyColumn) .WithShowButton(ShowButtonModeEnum.ShowAlways) .WithRepository(dto => schemaItemButtonRepository) - .WithFixedWidth(UIConstants.Size.EMBEDDED_BUTTON_WIDTH * 2); + .WithFixedWidth(OSPSuite.UI.UIConstants.Size.EMBEDDED_BUTTON_WIDTH * 2); schemaItemBinder.Changed += NotifyViewChanged; diff --git a/src/PKSim.UI/Views/Protocols/CreateProtocolView.cs b/src/PKSim.UI/Views/Protocols/CreateProtocolView.cs index 884fe6185..79bf79028 100644 --- a/src/PKSim.UI/Views/Protocols/CreateProtocolView.cs +++ b/src/PKSim.UI/Views/Protocols/CreateProtocolView.cs @@ -18,6 +18,7 @@ using PKSim.Core.Model; using PKSim.Presentation.Presenters.Protocols; using PKSim.Presentation.Views.Protocols; +using static OSPSuite.UI.UIConstants.Size; namespace PKSim.UI.Views.Protocols { @@ -30,7 +31,7 @@ public partial class CreateProtocolView : BaseModalContainerView, ICreateProtoco public CreateProtocolView(Shell shell) : base(shell) { InitializeComponent(); - ClientSize = new Size(CoreConstants.UI.PROTOCOL_VIEW_WIDTH, CoreConstants.UI.PROTOCOL_VIEW_HEIGHT); + ClientSize = new Size(UIConstants.Size.PROTOCOL_VIEW_WIDTH, UIConstants.Size.PROTOCOL_VIEW_HEIGHT); } public void AttachPresenter(ICreateProtocolPresenter presenter) @@ -106,7 +107,7 @@ public override void InitializeResources() layoutItemName.Text = PKSimConstants.UI.Name.FormatForLabel(); Caption = PKSimConstants.UI.CreateAdministrationProtocol; Icon = ApplicationIcons.Protocol.WithSize(IconSizes.Size16x16); - this.ReziseForCurrentScreen(fractionHeight: UIConstants.Size.SCREEN_RESIZE_FRACTION, fractionWidth: UIConstants.Size.SCREEN_RESIZE_FRACTION); + this.ReziseForCurrentScreen(fractionHeight: SCREEN_RESIZE_FRACTION, fractionWidth: SCREEN_RESIZE_FRACTION); } public override void AddSubItemView(ISubPresenterItem subPresenterItem, IView viewToAdd) diff --git a/src/PKSim.UI/Views/Simulations/ConfigureSimulationView.cs b/src/PKSim.UI/Views/Simulations/ConfigureSimulationView.cs index 88b067aed..60b5ac2a4 100644 --- a/src/PKSim.UI/Views/Simulations/ConfigureSimulationView.cs +++ b/src/PKSim.UI/Views/Simulations/ConfigureSimulationView.cs @@ -10,6 +10,7 @@ using OSPSuite.UI; using OSPSuite.UI.Extensions; using OSPSuite.UI.Views; +using static OSPSuite.UI.UIConstants.Size; namespace PKSim.UI.Views.Simulations { @@ -18,7 +19,7 @@ public partial class ConfigureSimulationView : WizardView, IConfigureSimulationV public ConfigureSimulationView(Shell shell) : base(shell) { InitializeComponent(); - ClientSize = new Size(CoreConstants.UI.SIMULATION_VIEW_WIDTH, CoreConstants.UI.CONFIGURE_SIMULATION_VIEW_HEIGHT); + ClientSize = new Size(UIConstants.Size.SIMULATION_VIEW_WIDTH, UIConstants.Size.CONFIGURE_SIMULATION_VIEW_HEIGHT); } public override XtraTabControl TabControl => tabConfigureSimulation; @@ -32,7 +33,7 @@ public override void InitializeResources() { base.InitializeResources(); Icon = ApplicationIcons.SimulationConfigure.WithSize(IconSizes.Size16x16); - this.ReziseForCurrentScreen(fractionHeight: UIConstants.Size.SCREEN_RESIZE_FRACTION, fractionWidth: UIConstants.Size.SCREEN_RESIZE_FRACTION); + this.ReziseForCurrentScreen(fractionHeight: SCREEN_RESIZE_FRACTION, fractionWidth: SCREEN_RESIZE_FRACTION); btnOk.DialogResult = DialogResult.None; } diff --git a/src/PKSim.UI/Views/Simulations/CreateSimulationView.cs b/src/PKSim.UI/Views/Simulations/CreateSimulationView.cs index f20b68cbb..2b9a467c2 100644 --- a/src/PKSim.UI/Views/Simulations/CreateSimulationView.cs +++ b/src/PKSim.UI/Views/Simulations/CreateSimulationView.cs @@ -3,11 +3,9 @@ using PKSim.Assets; using OSPSuite.Assets; using OSPSuite.Utility.Extensions; -using PKSim.Core; using PKSim.Presentation.Presenters.Simulations; using PKSim.Presentation.Views.Simulations; using PKSim.UI.Views.Core; -using OSPSuite.Presentation; namespace PKSim.UI.Views.Simulations { @@ -16,7 +14,7 @@ public partial class CreateSimulationView : BuildingBlockWizardView, ICreateSimu public CreateSimulationView(Shell shell) : base(shell) { InitializeComponent(); - ClientSize = new Size(CoreConstants.UI.SIMULATION_VIEW_WIDTH, CoreConstants.UI.CREATE_SIMULATION_VIEW_HEIGHT); + ClientSize = new Size(UIConstants.Size.SIMULATION_VIEW_WIDTH, UIConstants.Size.CREATE_SIMULATION_VIEW_HEIGHT); } public void AttachPresenter(ISimulationWizardPresenter presenter) diff --git a/src/PKSim.UI/Views/Simulations/EditOutputSchemaView.cs b/src/PKSim.UI/Views/Simulations/EditOutputSchemaView.cs index fc35d91e7..284bc8d5e 100644 --- a/src/PKSim.UI/Views/Simulations/EditOutputSchemaView.cs +++ b/src/PKSim.UI/Views/Simulations/EditOutputSchemaView.cs @@ -65,7 +65,7 @@ public override void InitializeBinding() .WithCaption(PKSimConstants.UI.EmptyColumn) .WithShowButton(ShowButtonModeEnum.ShowAlways) .WithRepository(getButtonRepository) - .WithFixedWidth(UIConstants.Size.EMBEDDED_BUTTON_WIDTH * 2); + .WithFixedWidth(OSPSuite.UI.UIConstants.Size.EMBEDDED_BUTTON_WIDTH * 2); _addAndRemoveButtonRepository.ButtonClick += (o, e) => OnEvent(() => addRemoveButtonClick(e)); _addButtonRepository.ButtonClick += (o, e) => OnEvent(addButtonClick); diff --git a/src/PKSim.UI/Views/Simulations/ImportSimulationResultsView.cs b/src/PKSim.UI/Views/Simulations/ImportSimulationResultsView.cs index 68f9222ec..f91b04bcc 100644 --- a/src/PKSim.UI/Views/Simulations/ImportSimulationResultsView.cs +++ b/src/PKSim.UI/Views/Simulations/ImportSimulationResultsView.cs @@ -16,6 +16,8 @@ using OSPSuite.UI.Controls; using OSPSuite.UI.Extensions; using OSPSuite.UI.Views; +using static OSPSuite.UI.UIConstants.Size; +using static PKSim.UI.UIConstants.Size; using UIConstants = OSPSuite.UI.UIConstants; namespace PKSim.UI.Views.Simulations @@ -66,7 +68,7 @@ public override void InitializeBinding() _colImage = _gridViewBinder.Bind(x => x.Image) .WithCaption(PKSimConstants.UI.EmptyColumn) .WithRepository(dto => _statusIconRepository) - .WithFixedWidth(UIConstants.Size.EMBEDDED_BUTTON_WIDTH); + .WithFixedWidth(EMBEDDED_BUTTON_WIDTH); _gridViewBinder.Bind(x => x.FilePath) .WithShowButton(ShowButtonModeEnum.ShowAlways) @@ -75,13 +77,13 @@ public override void InitializeBinding() _gridViewBinder.Bind(x => x.NumberOfIndividuals) .WithCaption(PKSimConstants.UI.NumberOfIndividuals) - .WithFixedWidth(CoreConstants.UI.PARAMETER_WIDTH) + .WithFixedWidth(PARAMETER_WIDTH) .WithFormat(new NullIntParameterFormatter()) .AsReadOnly(); _gridViewBinder.Bind(x => x.NumberOfQuantities) .WithCaption(PKSimConstants.UI.NumberOfOutputs) - .WithFixedWidth(CoreConstants.UI.PARAMETER_WIDTH) + .WithFixedWidth(PARAMETER_WIDTH) .WithFormat(new NullIntParameterFormatter()) .AsReadOnly(); @@ -89,7 +91,7 @@ public override void InitializeBinding() .WithCaption(PKSimConstants.UI.EmptyColumn) .WithShowButton(ShowButtonModeEnum.ShowAlways) .WithRepository(x => _removeButtonRepository) - .WithFixedWidth(UIConstants.Size.EMBEDDED_BUTTON_WIDTH * 2); + .WithFixedWidth(OSPSuite.UI.UIConstants.Size.EMBEDDED_BUTTON_WIDTH * 2); _removeButtonRepository.ButtonClick += (o, e) => OnEvent(() => _presenter.RemoveFile(_gridViewBinder.FocusedElement)); _filePathRepository.ButtonClick += (o, e) => OnEvent(() => _presenter.ChangePath(_gridViewBinder.FocusedElement)); diff --git a/src/PKSim.UI/Views/Simulations/IndividualSimulationSettingsView.cs b/src/PKSim.UI/Views/Simulations/IndividualSimulationSettingsView.cs index 743a11539..e039c1cb3 100644 --- a/src/PKSim.UI/Views/Simulations/IndividualSimulationSettingsView.cs +++ b/src/PKSim.UI/Views/Simulations/IndividualSimulationSettingsView.cs @@ -9,6 +9,7 @@ using OSPSuite.UI; using OSPSuite.UI.Extensions; using OSPSuite.UI.Views; +using static OSPSuite.UI.UIConstants.Size; namespace PKSim.UI.Views.Simulations { @@ -22,7 +23,7 @@ public IndividualSimulationSettingsView(Shell shell, IToolTipCreator toolTipCrea { _toolTipCreator = toolTipCreator; InitializeComponent(); - ClientSize = new Size(CoreConstants.UI.SIMULATION_SETTINGS_WIDTH, CoreConstants.UI.SIMULATION_SETTINGS_HEIGHT); + ClientSize = new Size(UIConstants.Size.SIMULATION_SETTINGS_WIDTH, UIConstants.Size.SIMULATION_SETTINGS_HEIGHT); } public void AttachPresenter(IIndividualSimulationSettingsPresenter presenter) @@ -48,7 +49,7 @@ public override void InitializeResources() var dropDownButtonItem = _presenter.CreateSaveSettingsButtonItem(_toolTipCreator, layoutControlBase); dropDownButtonItem.Move(emptySpaceItemBase, InsertType.Left); - this.ReziseForCurrentScreen(fractionHeight: UIConstants.Size.SCREEN_RESIZE_FRACTION, fractionWidth: UIConstants.Size.SCREEN_RESIZE_FRACTION); + this.ReziseForCurrentScreen(fractionHeight: SCREEN_RESIZE_FRACTION, fractionWidth: SCREEN_RESIZE_FRACTION); } } } \ No newline at end of file diff --git a/src/PKSim.UI/Views/Simulations/PopulationSimulationSettingsView.cs b/src/PKSim.UI/Views/Simulations/PopulationSimulationSettingsView.cs index 9f0c56c6e..ee2a65123 100644 --- a/src/PKSim.UI/Views/Simulations/PopulationSimulationSettingsView.cs +++ b/src/PKSim.UI/Views/Simulations/PopulationSimulationSettingsView.cs @@ -9,6 +9,7 @@ using OSPSuite.UI; using OSPSuite.UI.Extensions; using OSPSuite.UI.Views; +using static OSPSuite.UI.UIConstants.Size; namespace PKSim.UI.Views.Simulations { @@ -22,7 +23,7 @@ public PopulationSimulationSettingsView(Shell shell, IToolTipCreator toolTipCrea { _toolTipCreator = toolTipCreator; InitializeComponent(); - ClientSize = new Size(CoreConstants.UI.SIMULATION_SETTINGS_WIDTH, CoreConstants.UI.SIMULATION_SETTINGS_HEIGHT); + ClientSize = new Size(UIConstants.Size.SIMULATION_SETTINGS_WIDTH, UIConstants.Size.SIMULATION_SETTINGS_HEIGHT); } public void AttachPresenter(IPopulationSimulationSettingsPresenter presenter) @@ -46,7 +47,7 @@ public override void InitializeResources() Caption = PKSimConstants.UI.PopulationSimulationSettings; var dropDownButtonItem = _presenter.CreateSaveSettingsButtonItem(_toolTipCreator, layoutControlBase); dropDownButtonItem.Move(emptySpaceItemBase, InsertType.Left); - this.ReziseForCurrentScreen(fractionHeight: UIConstants.Size.SCREEN_RESIZE_FRACTION, fractionWidth: UIConstants.Size.SCREEN_RESIZE_FRACTION); + this.ReziseForCurrentScreen(fractionHeight: SCREEN_RESIZE_FRACTION, fractionWidth: SCREEN_RESIZE_FRACTION); } } } \ No newline at end of file diff --git a/src/PKSim.UI/Views/Simulations/SimulationCompoundEnzymaticProcessView.cs b/src/PKSim.UI/Views/Simulations/SimulationCompoundEnzymaticProcessView.cs index 2c7bfc12e..c31d4c692 100644 --- a/src/PKSim.UI/Views/Simulations/SimulationCompoundEnzymaticProcessView.cs +++ b/src/PKSim.UI/Views/Simulations/SimulationCompoundEnzymaticProcessView.cs @@ -44,7 +44,7 @@ protected override void InitializePartialBinding() .WithCaption(PKSimConstants.UI.EmptyColumn) .WithShowButton(ShowButtonModeEnum.ShowAlways) .WithRepository(getAddRepository) - .WithFixedWidth(UIConstants.Size.EMBEDDED_BUTTON_WIDTH * 2); + .WithFixedWidth(OSPSuite.UI.UIConstants.Size.EMBEDDED_BUTTON_WIDTH * 2); _addAndRemoveRepository.ButtonClick += (o, e) => OnEvent(() => buttonRepositoryButtonClick(e, _gridViewPartialBinder.FocusedElement)); _addAndDisableRemoveRepository.ButtonClick += (o, e) => OnEvent(() => buttonRepositoryButtonClick(e, _gridViewPartialBinder.FocusedElement)); diff --git a/src/PKSim.UI/Views/Simulations/SimulationCompoundInteractionSelectionView.cs b/src/PKSim.UI/Views/Simulations/SimulationCompoundInteractionSelectionView.cs index a6d5e9fee..83126cfa9 100644 --- a/src/PKSim.UI/Views/Simulations/SimulationCompoundInteractionSelectionView.cs +++ b/src/PKSim.UI/Views/Simulations/SimulationCompoundInteractionSelectionView.cs @@ -15,6 +15,7 @@ using OSPSuite.UI.Controls; using OSPSuite.UI.Extensions; using OSPSuite.UI.RepositoryItems; +using static OSPSuite.UI.UIConstants.Size; namespace PKSim.UI.Views.Simulations { @@ -96,7 +97,7 @@ protected IGridViewColumn BindToDeleteInteraction() .WithCaption(PKSimConstants.UI.EmptyColumn) .WithShowButton(ShowButtonModeEnum.ShowAlways) .WithRepository(x => _removeField) - .WithFixedWidth(UIConstants.Size.EMBEDDED_BUTTON_WIDTH); + .WithFixedWidth(EMBEDDED_BUTTON_WIDTH); } public override void InitializeResources() diff --git a/src/PKSim.UI/Views/Simulations/SimulationCompoundProcessView.cs b/src/PKSim.UI/Views/Simulations/SimulationCompoundProcessView.cs index a14c4d2db..e8de68c66 100644 --- a/src/PKSim.UI/Views/Simulations/SimulationCompoundProcessView.cs +++ b/src/PKSim.UI/Views/Simulations/SimulationCompoundProcessView.cs @@ -19,6 +19,7 @@ using PKSim.Presentation.DTO.Simulations; using PKSim.Presentation.Presenters.Simulations; using PKSim.Presentation.Views.Simulations; +using static OSPSuite.UI.UIConstants.Size; using UxGridView = PKSim.UI.Views.Core.UxGridView; namespace PKSim.UI.Views.Simulations @@ -108,7 +109,7 @@ protected virtual void InitializeSystemicBinding() _gridViewSystemicBinder.Bind(x => x.Image) .WithCaption(PKSimConstants.UI.EmptyColumn) .WithRepository(dto => _statusIconRepository) - .WithFixedWidth(UIConstants.Size.EMBEDDED_BUTTON_WIDTH) + .WithFixedWidth(EMBEDDED_BUTTON_WIDTH) .AsReadOnly(); _gridViewSystemicBinder.Bind(x => x.SystemicProcessType) @@ -119,7 +120,7 @@ protected virtual void InitializeSystemicBinding() .WithCaption(PKSimConstants.UI.DataSourceColumn) .WithRepository(repositoryItemForSystemicProcesses) .WithEditorConfiguration(configureSystemicProcessesRepository) - .WithFixedWidth(CoreConstants.UI.DATA_SOURCE_WIDTH) + .WithFixedWidth(UIConstants.Size.DATA_SOURCE_WIDTH) .WithShowButton(ShowButtonModeEnum.ShowAlways) .WithOnChanged(dto => OnEvent(() => _presenter.SelectionChanged(dto))); } @@ -152,7 +153,7 @@ protected IGridViewColumn BindToPartialImage() return _gridViewPartialBinder.Bind(x => x.Image) .WithCaption(PKSimConstants.UI.EmptyColumn) .WithRepository(dto => _statusIconRepository) - .WithFixedWidth(UIConstants.Size.EMBEDDED_BUTTON_WIDTH) + .WithFixedWidth(EMBEDDED_BUTTON_WIDTH) .AsReadOnly(); } diff --git a/src/PKSim.UI/Views/Simulations/SimulationCompoundProtocolFormulationView.cs b/src/PKSim.UI/Views/Simulations/SimulationCompoundProtocolFormulationView.cs index 80424fce7..4e70de9a4 100644 --- a/src/PKSim.UI/Views/Simulations/SimulationCompoundProtocolFormulationView.cs +++ b/src/PKSim.UI/Views/Simulations/SimulationCompoundProtocolFormulationView.cs @@ -15,6 +15,7 @@ using OSPSuite.UI.Controls; using OSPSuite.UI.Extensions; using OSPSuite.UI.RepositoryItems; +using static OSPSuite.UI.UIConstants.Size; namespace PKSim.UI.Views.Simulations { @@ -84,7 +85,7 @@ public override void InitializeBinding() _gridViewBinder.AddUnboundColumn() .WithCaption(PKSimConstants.UI.EmptyColumn) - .WithFixedWidth(UIConstants.Size.EMBEDDED_BUTTON_WIDTH) + .WithFixedWidth(EMBEDDED_BUTTON_WIDTH) .WithShowButton(ShowButtonModeEnum.ShowAlways) .WithRepository(dto => createFormulationButton); @@ -92,7 +93,7 @@ public override void InitializeBinding() _gridViewBinder.AddUnboundColumn() .WithCaption(PKSimConstants.UI.EmptyColumn) .WithShowButton(ShowButtonModeEnum.ShowAlways) - .WithFixedWidth(UIConstants.Size.EMBEDDED_BUTTON_WIDTH) + .WithFixedWidth(EMBEDDED_BUTTON_WIDTH) .WithRepository(dto => loadFormulationButton); _gridViewBinder.Changed += () => _presenter.ViewChanged(); diff --git a/src/PKSim.UI/Views/Simulations/SimulationCompoundsSelectionView.Designer.cs b/src/PKSim.UI/Views/Simulations/SimulationCompoundsSelectionView.Designer.cs index eb8bafcb4..88bcf78f1 100644 --- a/src/PKSim.UI/Views/Simulations/SimulationCompoundsSelectionView.Designer.cs +++ b/src/PKSim.UI/Views/Simulations/SimulationCompoundsSelectionView.Designer.cs @@ -42,6 +42,7 @@ private void InitializeComponent() this.layoutItemLoadCompound = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutItemCompounds = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutItemWarning = new DevExpress.XtraLayout.LayoutControlItem(); + this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem(); ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControl)).BeginInit(); this.layoutControl.SuspendLayout(); @@ -53,6 +54,7 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.layoutItemLoadCompound)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutItemCompounds)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutItemWarning)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit(); this.SuspendLayout(); // // layoutControl @@ -64,47 +66,54 @@ private void InitializeComponent() this.layoutControl.Controls.Add(this.gridControl); this.layoutControl.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutControl.Location = new System.Drawing.Point(0, 0); + this.layoutControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.layoutControl.Name = "layoutControl"; this.layoutControl.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(545, 67, 250, 350); this.layoutControl.Root = this.layoutControlGroup; - this.layoutControl.Size = new System.Drawing.Size(323, 296); + this.layoutControl.Size = new System.Drawing.Size(377, 364); this.layoutControl.TabIndex = 0; this.layoutControl.Text = "layoutControl1"; // // uxHintPanel // this.uxHintPanel.Location = new System.Drawing.Point(2, 2); - this.uxHintPanel.MaximumSize = new System.Drawing.Size(1000000, 40); - this.uxHintPanel.MinimumSize = new System.Drawing.Size(200, 40); + this.uxHintPanel.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.uxHintPanel.MaximumSize = new System.Drawing.Size(1166667, 49); + this.uxHintPanel.MaxLines = 3; + this.uxHintPanel.MinimumSize = new System.Drawing.Size(233, 49); this.uxHintPanel.Name = "uxHintPanel"; this.uxHintPanel.NoteText = ""; - this.uxHintPanel.Size = new System.Drawing.Size(319, 40); + this.uxHintPanel.Size = new System.Drawing.Size(373, 49); this.uxHintPanel.TabIndex = 7; // // btnLoadCompound // - this.btnLoadCompound.Location = new System.Drawing.Point(211, 46); + this.btnLoadCompound.Location = new System.Drawing.Point(246, 60); + this.btnLoadCompound.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnLoadCompound.Name = "btnLoadCompound"; - this.btnLoadCompound.Size = new System.Drawing.Size(110, 22); + this.btnLoadCompound.Size = new System.Drawing.Size(129, 27); this.btnLoadCompound.StyleController = this.layoutControl; this.btnLoadCompound.TabIndex = 6; this.btnLoadCompound.Text = "btnLoadCompound"; // // btnCreateCompound // - this.btnCreateCompound.Location = new System.Drawing.Point(87, 46); + this.btnCreateCompound.Location = new System.Drawing.Point(101, 60); + this.btnCreateCompound.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnCreateCompound.Name = "btnCreateCompound"; - this.btnCreateCompound.Size = new System.Drawing.Size(120, 22); + this.btnCreateCompound.Size = new System.Drawing.Size(141, 27); this.btnCreateCompound.StyleController = this.layoutControl; this.btnCreateCompound.TabIndex = 5; this.btnCreateCompound.Text = "btnCreateCompound"; // // gridControl // - this.gridControl.Location = new System.Drawing.Point(2, 72); + this.gridControl.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.gridControl.Location = new System.Drawing.Point(2, 91); this.gridControl.MainView = this.gridView; + this.gridControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.gridControl.Name = "gridControl"; - this.gridControl.Size = new System.Drawing.Size(319, 222); + this.gridControl.Size = new System.Drawing.Size(373, 259); this.gridControl.TabIndex = 4; this.gridControl.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView}); @@ -112,11 +121,13 @@ private void InitializeComponent() // gridView // this.gridView.AllowsFiltering = true; + this.gridView.DetailHeight = 431; this.gridView.EnableColumnContextMenu = true; this.gridView.GridControl = this.gridControl; this.gridView.MultiSelect = true; this.gridView.Name = "gridView"; this.gridView.OptionsSelection.EnableAppearanceFocusedRow = false; + this.gridView.OptionsSelection.MultiSelect = true; // // layoutControlGroup // @@ -128,58 +139,50 @@ private void InitializeComponent() this.layoutItemAddCompound, this.layoutItemLoadCompound, this.layoutItemCompounds, - this.layoutItemWarning}); - this.layoutControlGroup.Location = new System.Drawing.Point(0, 0); + this.layoutItemWarning, + this.emptySpaceItem2}); this.layoutControlGroup.Name = "layoutControlGroup"; this.layoutControlGroup.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); - this.layoutControlGroup.Size = new System.Drawing.Size(323, 296); - this.layoutControlGroup.Text = "layoutControlGroup"; + this.layoutControlGroup.Size = new System.Drawing.Size(377, 364); this.layoutControlGroup.TextVisible = false; // // emptySpaceItem1 // this.emptySpaceItem1.AllowHotTrack = false; this.emptySpaceItem1.CustomizationFormText = "emptySpaceItem1"; - this.emptySpaceItem1.Location = new System.Drawing.Point(0, 44); + this.emptySpaceItem1.Location = new System.Drawing.Point(0, 58); this.emptySpaceItem1.Name = "emptySpaceItem1"; - this.emptySpaceItem1.Size = new System.Drawing.Size(85, 26); - this.emptySpaceItem1.Text = "emptySpaceItem1"; + this.emptySpaceItem1.Size = new System.Drawing.Size(99, 31); this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0); // // layoutItemAddCompound // this.layoutItemAddCompound.Control = this.btnCreateCompound; this.layoutItemAddCompound.CustomizationFormText = "layoutControlItem1"; - this.layoutItemAddCompound.Location = new System.Drawing.Point(85, 44); + this.layoutItemAddCompound.Location = new System.Drawing.Point(99, 58); this.layoutItemAddCompound.Name = "layoutItemAddCompound"; - this.layoutItemAddCompound.Size = new System.Drawing.Size(124, 26); - this.layoutItemAddCompound.Text = "layoutItemAddCompound"; + this.layoutItemAddCompound.Size = new System.Drawing.Size(145, 31); this.layoutItemAddCompound.TextSize = new System.Drawing.Size(0, 0); - this.layoutItemAddCompound.TextToControlDistance = 0; this.layoutItemAddCompound.TextVisible = false; // // layoutItemLoadCompound // this.layoutItemLoadCompound.Control = this.btnLoadCompound; this.layoutItemLoadCompound.CustomizationFormText = "layoutControlItem2"; - this.layoutItemLoadCompound.Location = new System.Drawing.Point(209, 44); + this.layoutItemLoadCompound.Location = new System.Drawing.Point(244, 58); this.layoutItemLoadCompound.Name = "layoutItemLoadCompound"; - this.layoutItemLoadCompound.Size = new System.Drawing.Size(114, 26); - this.layoutItemLoadCompound.Text = "layoutItemLoadCompound"; + this.layoutItemLoadCompound.Size = new System.Drawing.Size(133, 31); this.layoutItemLoadCompound.TextSize = new System.Drawing.Size(0, 0); - this.layoutItemLoadCompound.TextToControlDistance = 0; this.layoutItemLoadCompound.TextVisible = false; // // layoutItemCompounds // this.layoutItemCompounds.Control = this.gridControl; this.layoutItemCompounds.CustomizationFormText = "layoutItemCompounds"; - this.layoutItemCompounds.Location = new System.Drawing.Point(0, 70); + this.layoutItemCompounds.Location = new System.Drawing.Point(0, 89); this.layoutItemCompounds.Name = "layoutItemCompounds"; - this.layoutItemCompounds.Size = new System.Drawing.Size(323, 226); - this.layoutItemCompounds.Text = "layoutItemCompounds"; + this.layoutItemCompounds.Size = new System.Drawing.Size(377, 263); this.layoutItemCompounds.TextSize = new System.Drawing.Size(0, 0); - this.layoutItemCompounds.TextToControlDistance = 0; this.layoutItemCompounds.TextVisible = false; // // layoutItemWarning @@ -188,19 +191,27 @@ private void InitializeComponent() this.layoutItemWarning.CustomizationFormText = "layoutControlItem1"; this.layoutItemWarning.Location = new System.Drawing.Point(0, 0); this.layoutItemWarning.Name = "layoutItemWarning"; - this.layoutItemWarning.Size = new System.Drawing.Size(323, 44); + this.layoutItemWarning.Size = new System.Drawing.Size(377, 58); this.layoutItemWarning.Text = "uxWarningItem"; this.layoutItemWarning.TextSize = new System.Drawing.Size(0, 0); - this.layoutItemWarning.TextToControlDistance = 0; this.layoutItemWarning.TextVisible = false; // + // emptySpaceItem2 + // + this.emptySpaceItem2.AllowHotTrack = false; + this.emptySpaceItem2.Location = new System.Drawing.Point(0, 352); + this.emptySpaceItem2.Name = "emptySpaceItem2"; + this.emptySpaceItem2.Size = new System.Drawing.Size(377, 12); + this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0); + // // SimulationCompoundsSelectionView // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.layoutControl); + this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.Name = "SimulationCompoundsSelectionView"; - this.Size = new System.Drawing.Size(323, 296); + this.Size = new System.Drawing.Size(377, 364); ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControl)).EndInit(); this.layoutControl.ResumeLayout(false); @@ -212,13 +223,12 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.layoutItemLoadCompound)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutItemCompounds)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutItemWarning)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit(); this.ResumeLayout(false); } #endregion - - private DevExpress.XtraGrid.GridControl gridControl; private PKSim.UI.Views.Core.UxGridView gridView; private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup; private OSPSuite.UI.Controls.UxLayoutControl layoutControl; @@ -230,5 +240,7 @@ private void InitializeComponent() private DevExpress.XtraLayout.LayoutControlItem layoutItemLoadCompound; private DevExpress.XtraLayout.LayoutControlItem layoutItemCompounds; private DevExpress.XtraLayout.LayoutControlItem layoutItemWarning; + private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem2; + private OSPSuite.UI.Controls.UxGridControl gridControl; } } diff --git a/src/PKSim.UI/Views/Simulations/SimulationCompoundsSelectionView.cs b/src/PKSim.UI/Views/Simulations/SimulationCompoundsSelectionView.cs index 8a9c79048..99d80a5b0 100644 --- a/src/PKSim.UI/Views/Simulations/SimulationCompoundsSelectionView.cs +++ b/src/PKSim.UI/Views/Simulations/SimulationCompoundsSelectionView.cs @@ -100,7 +100,7 @@ public override int OptimalHeight get { var warningHeight = layoutItemWarning.Visible ? layoutItemWarning.Height : 1; - return layoutItemCompounds.Padding.Height + gridView.OptimalHeight + layoutItemAddCompound.Height + warningHeight; + return layoutItemCompounds.Padding.Height + gridView.OptimalHeight + layoutItemAddCompound.Height + warningHeight + emptySpaceItem2.Height; } } diff --git a/src/PKSim.UI/Views/Simulations/SimulationEventsConfigurationView.cs b/src/PKSim.UI/Views/Simulations/SimulationEventsConfigurationView.cs index e9094037e..eca2a42e6 100644 --- a/src/PKSim.UI/Views/Simulations/SimulationEventsConfigurationView.cs +++ b/src/PKSim.UI/Views/Simulations/SimulationEventsConfigurationView.cs @@ -19,6 +19,7 @@ using OSPSuite.UI.Extensions; using OSPSuite.UI.RepositoryItems; using OSPSuite.UI.Views; +using static OSPSuite.UI.UIConstants.Size; namespace PKSim.UI.Views.Simulations { @@ -63,18 +64,18 @@ public override void InitializeBinding() _colCreateEvent= _gridViewBinder.AddUnboundColumn() .WithCaption(PKSimConstants.UI.EmptyColumn) .WithShowButton(ShowButtonModeEnum.ShowAlways) - .WithFixedWidth(UIConstants.Size.EMBEDDED_BUTTON_WIDTH) + .WithFixedWidth(EMBEDDED_BUTTON_WIDTH) .WithRepository(dto => createButtonRepository); _colLoadEvent = _gridViewBinder.AddUnboundColumn() .WithCaption(PKSimConstants.UI.EmptyColumn) .WithShowButton(ShowButtonModeEnum.ShowAlways) - .WithFixedWidth(UIConstants.Size.EMBEDDED_BUTTON_WIDTH) + .WithFixedWidth(EMBEDDED_BUTTON_WIDTH) .WithRepository(dto => loadButtonRepository); _colRemoveEvent = _gridViewBinder.AddUnboundColumn() .WithCaption(PKSimConstants.UI.EmptyColumn) - .WithFixedWidth(UIConstants.Size.EMBEDDED_BUTTON_WIDTH) + .WithFixedWidth(EMBEDDED_BUTTON_WIDTH) .WithShowButton(ShowButtonModeEnum.ShowAlways) .WithRepository(dto => _removeButtonRepository); diff --git a/src/PKSim.UI/Views/Simulations/SimulationModelConfigurationView.Designer.cs b/src/PKSim.UI/Views/Simulations/SimulationModelConfigurationView.Designer.cs index f440a4bde..64a694a16 100644 --- a/src/PKSim.UI/Views/Simulations/SimulationModelConfigurationView.Designer.cs +++ b/src/PKSim.UI/Views/Simulations/SimulationModelConfigurationView.Designer.cs @@ -28,7 +28,7 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.layoutControl = new OSPSuite.UI.Controls.UxLayoutControl(); + this.layoutControl = new OSPSuite.UI.Controls.UxLayoutControl(); this.panelModelSelection = new DevExpress.XtraEditors.PanelControl(); this.panelCompoundList = new DevExpress.XtraEditors.PanelControl(); this.panelSubjectSelection = new DevExpress.XtraEditors.PanelControl(); @@ -38,6 +38,8 @@ private void InitializeComponent() this.layoutItemCompoundListView = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutGroupSubjectSelection = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutItemSubjectSelectionView = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutGroupModelSettings = new DevExpress.XtraLayout.LayoutControlGroup(); + this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem(); ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControl)).BeginInit(); this.layoutControl.SuspendLayout(); @@ -50,40 +52,47 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.layoutItemCompoundListView)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutGroupSubjectSelection)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutItemSubjectSelectionView)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutGroupModelSettings)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).BeginInit(); this.SuspendLayout(); // // layoutControl // + this.layoutControl.AllowCustomization = false; this.layoutControl.Controls.Add(this.panelModelSelection); this.layoutControl.Controls.Add(this.panelCompoundList); this.layoutControl.Controls.Add(this.panelSubjectSelection); this.layoutControl.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutControl.Location = new System.Drawing.Point(0, 0); + this.layoutControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.layoutControl.Name = "layoutControl"; this.layoutControl.Root = this.layoutControlGroup; - this.layoutControl.Size = new System.Drawing.Size(442, 545); + this.layoutControl.Size = new System.Drawing.Size(516, 671); this.layoutControl.TabIndex = 0; this.layoutControl.Text = "layoutControl1"; // // panelModelSelection // - this.panelModelSelection.Location = new System.Drawing.Point(168, 281); + this.panelModelSelection.Location = new System.Drawing.Point(224, 395); + this.panelModelSelection.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panelModelSelection.Name = "panelModelSelection"; - this.panelModelSelection.Size = new System.Drawing.Size(262, 252); + this.panelModelSelection.Size = new System.Drawing.Size(265, 248); this.panelModelSelection.TabIndex = 6; // // panelCompoundList // - this.panelCompoundList.Location = new System.Drawing.Point(180, 177); + this.panelCompoundList.Location = new System.Drawing.Point(224, 220); + this.panelCompoundList.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panelCompoundList.Name = "panelCompoundList"; - this.panelCompoundList.Size = new System.Drawing.Size(238, 88); + this.panelCompoundList.Size = new System.Drawing.Size(265, 107); this.panelCompoundList.TabIndex = 5; // // panelSubjectSelection // - this.panelSubjectSelection.Location = new System.Drawing.Point(180, 43); + this.panelSubjectSelection.Location = new System.Drawing.Point(224, 54); + this.panelSubjectSelection.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panelSubjectSelection.Name = "panelSubjectSelection"; - this.panelSubjectSelection.Size = new System.Drawing.Size(238, 87); + this.panelSubjectSelection.Size = new System.Drawing.Size(265, 108); this.panelSubjectSelection.TabIndex = 4; // // layoutControlGroup @@ -92,34 +101,32 @@ private void InitializeComponent() this.layoutControlGroup.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; this.layoutControlGroup.GroupBordersVisible = false; this.layoutControlGroup.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { - this.layoutItemModelSelectionView, this.layoutGroupCompoundsSelection, - this.layoutGroupSubjectSelection}); - this.layoutControlGroup.Location = new System.Drawing.Point(0, 0); + this.layoutGroupSubjectSelection, + this.layoutGroupModelSettings, + this.emptySpaceItem1}); this.layoutControlGroup.Name = "layoutControlGroup"; - this.layoutControlGroup.Size = new System.Drawing.Size(442, 545); - this.layoutControlGroup.Text = "layoutControlGroup"; + this.layoutControlGroup.Size = new System.Drawing.Size(516, 671); this.layoutControlGroup.TextVisible = false; // // layoutItemModelSelectionView // this.layoutItemModelSelectionView.Control = this.panelModelSelection; this.layoutItemModelSelectionView.CustomizationFormText = "layoutItemModelSelectionView"; - this.layoutItemModelSelectionView.Location = new System.Drawing.Point(0, 269); + this.layoutItemModelSelectionView.Location = new System.Drawing.Point(0, 0); this.layoutItemModelSelectionView.Name = "layoutItemModelSelectionView"; - this.layoutItemModelSelectionView.Size = new System.Drawing.Size(422, 256); - this.layoutItemModelSelectionView.Text = "layoutItemModelSelectionView"; - this.layoutItemModelSelectionView.TextSize = new System.Drawing.Size(153, 13); + this.layoutItemModelSelectionView.Size = new System.Drawing.Size(466, 252); + this.layoutItemModelSelectionView.TextSize = new System.Drawing.Size(183, 16); // // layoutGroupCompoundsSelection // this.layoutGroupCompoundsSelection.CustomizationFormText = "layoutGroupCompoundsSelection"; this.layoutGroupCompoundsSelection.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutItemCompoundListView}); - this.layoutGroupCompoundsSelection.Location = new System.Drawing.Point(0, 134); + this.layoutGroupCompoundsSelection.Location = new System.Drawing.Point(0, 166); this.layoutGroupCompoundsSelection.Name = "layoutGroupCompoundsSelection"; - this.layoutGroupCompoundsSelection.Size = new System.Drawing.Size(422, 135); - this.layoutGroupCompoundsSelection.Text = "layoutControlGroup1"; + this.layoutGroupCompoundsSelection.Size = new System.Drawing.Size(492, 165); + this.layoutGroupCompoundsSelection.Text = "layoutGroupCompoundsSelection"; // // layoutItemCompoundListView // @@ -127,9 +134,8 @@ private void InitializeComponent() this.layoutItemCompoundListView.CustomizationFormText = "layoutItemCompoundListView"; this.layoutItemCompoundListView.Location = new System.Drawing.Point(0, 0); this.layoutItemCompoundListView.Name = "layoutItemCompoundListView"; - this.layoutItemCompoundListView.Size = new System.Drawing.Size(398, 92); - this.layoutItemCompoundListView.Text = "layoutItemCompoundListView"; - this.layoutItemCompoundListView.TextSize = new System.Drawing.Size(153, 13); + this.layoutItemCompoundListView.Size = new System.Drawing.Size(466, 111); + this.layoutItemCompoundListView.TextSize = new System.Drawing.Size(183, 16); // // layoutGroupSubjectSelection // @@ -138,29 +144,44 @@ private void InitializeComponent() this.layoutItemSubjectSelectionView}); this.layoutGroupSubjectSelection.Location = new System.Drawing.Point(0, 0); this.layoutGroupSubjectSelection.Name = "layoutGroupSubjectSelection"; - this.layoutGroupSubjectSelection.Size = new System.Drawing.Size(422, 134); - this.layoutGroupSubjectSelection.Text = "layoutGroupSubjectSelection"; + this.layoutGroupSubjectSelection.Size = new System.Drawing.Size(492, 166); // // layoutItemSubjectSelectionView // this.layoutItemSubjectSelectionView.Control = this.panelSubjectSelection; this.layoutItemSubjectSelectionView.CustomizationFormText = "layoutItemSubjectSelectionView"; this.layoutItemSubjectSelectionView.Location = new System.Drawing.Point(0, 0); - this.layoutItemSubjectSelectionView.MaxSize = new System.Drawing.Size(0, 91); - this.layoutItemSubjectSelectionView.MinSize = new System.Drawing.Size(261, 91); + this.layoutItemSubjectSelectionView.MaxSize = new System.Drawing.Size(0, 112); + this.layoutItemSubjectSelectionView.MinSize = new System.Drawing.Size(304, 112); this.layoutItemSubjectSelectionView.Name = "layoutItemSubjectSelectionView"; - this.layoutItemSubjectSelectionView.Size = new System.Drawing.Size(398, 91); + this.layoutItemSubjectSelectionView.Size = new System.Drawing.Size(466, 112); this.layoutItemSubjectSelectionView.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; - this.layoutItemSubjectSelectionView.Text = "layoutItemSubjectSelectionView"; - this.layoutItemSubjectSelectionView.TextSize = new System.Drawing.Size(153, 13); + this.layoutItemSubjectSelectionView.TextSize = new System.Drawing.Size(183, 16); + // + // layoutGroupModelSettings + // + this.layoutGroupModelSettings.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.layoutItemModelSelectionView}); + this.layoutGroupModelSettings.Location = new System.Drawing.Point(0, 341); + this.layoutGroupModelSettings.Name = "layoutGroupModelSettings"; + this.layoutGroupModelSettings.Size = new System.Drawing.Size(492, 306); + // + // emptySpaceItem1 + // + this.emptySpaceItem1.AllowHotTrack = false; + this.emptySpaceItem1.Location = new System.Drawing.Point(0, 331); + this.emptySpaceItem1.Name = "emptySpaceItem1"; + this.emptySpaceItem1.Size = new System.Drawing.Size(492, 10); + this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0); // // SimulationModelConfigurationView // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.layoutControl); + this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.Name = "SimulationModelConfigurationView"; - this.Size = new System.Drawing.Size(442, 545); + this.Size = new System.Drawing.Size(516, 671); ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControl)).EndInit(); this.layoutControl.ResumeLayout(false); @@ -173,6 +194,8 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.layoutItemCompoundListView)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutGroupSubjectSelection)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutItemSubjectSelectionView)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutGroupModelSettings)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).EndInit(); this.ResumeLayout(false); } @@ -189,5 +212,7 @@ private void InitializeComponent() private DevExpress.XtraLayout.LayoutControlItem layoutItemCompoundListView; private DevExpress.XtraLayout.LayoutControlGroup layoutGroupCompoundsSelection; private DevExpress.XtraLayout.LayoutControlGroup layoutGroupSubjectSelection; + private DevExpress.XtraLayout.LayoutControlGroup layoutGroupModelSettings; + private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1; } } diff --git a/src/PKSim.UI/Views/Simulations/SimulationModelConfigurationView.cs b/src/PKSim.UI/Views/Simulations/SimulationModelConfigurationView.cs index ad4c5a56b..d6aee1b6d 100644 --- a/src/PKSim.UI/Views/Simulations/SimulationModelConfigurationView.cs +++ b/src/PKSim.UI/Views/Simulations/SimulationModelConfigurationView.cs @@ -3,9 +3,11 @@ using OSPSuite.Presentation.Core; using OSPSuite.Presentation.Views; using OSPSuite.UI.Controls; +using OSPSuite.UI.Extensions; using PKSim.Assets; using PKSim.Presentation.Presenters.Simulations; using PKSim.Presentation.Views.Simulations; +using static PKSim.UI.UIConstants.Size; namespace PKSim.UI.Views.Simulations { @@ -46,6 +48,9 @@ public override void InitializeResources() layoutGroupCompoundsSelection.Text = PKSimConstants.UI.CompoundsSelection; layoutGroupSubjectSelection.Text = PKSimConstants.ObjectTypes.IndividualOrPopulation; + layoutGroupModelSettings.Text = PKSimConstants.UI.ModelSettings; + + layoutItemModelSelectionView.AdjustControlHeight(MODEL_PICTURE_HEIGHT); } } } \ No newline at end of file diff --git a/src/PKSim.UI/Views/Simulations/SimulationModelSelectionView.Designer.cs b/src/PKSim.UI/Views/Simulations/SimulationModelSelectionView.Designer.cs index c7bd8e912..0b378ccdc 100644 --- a/src/PKSim.UI/Views/Simulations/SimulationModelSelectionView.Designer.cs +++ b/src/PKSim.UI/Views/Simulations/SimulationModelSelectionView.Designer.cs @@ -36,18 +36,18 @@ private void InitializeComponent() this.pbModel = new System.Windows.Forms.PictureBox(); this.cbModel = new OSPSuite.UI.Controls.UxComboBoxEdit(); this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); - this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutGroupModelSettings = new DevExpress.XtraLayout.LayoutControlGroup(); + this.layoutControlImage = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutItemModel = new DevExpress.XtraLayout.LayoutControlItem(); + this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem(); ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControl)).BeginInit(); this.layoutControl.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pbModel)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.cbModel.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutGroupModelSettings)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlImage)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutItemModel)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).BeginInit(); this.SuspendLayout(); // // layoutControl @@ -57,29 +57,32 @@ private void InitializeComponent() this.layoutControl.Controls.Add(this.cbModel); this.layoutControl.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutControl.Location = new System.Drawing.Point(0, 0); + this.layoutControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.layoutControl.Name = "layoutControl"; - this.layoutControl.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(788, 203, 250, 350); + this.layoutControl.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(788, 203, 442, 494); this.layoutControl.Root = this.layoutControlGroup1; - this.layoutControl.Size = new System.Drawing.Size(357, 386); + this.layoutControl.Size = new System.Drawing.Size(416, 475); this.layoutControl.TabIndex = 0; this.layoutControl.Text = "layoutControl1"; // // pbModel // - this.pbModel.Location = new System.Drawing.Point(2, 69); + this.pbModel.Location = new System.Drawing.Point(2, 38); + this.pbModel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pbModel.Name = "pbModel"; - this.pbModel.Size = new System.Drawing.Size(353, 315); + this.pbModel.Size = new System.Drawing.Size(412, 435); this.pbModel.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbModel.TabIndex = 7; this.pbModel.TabStop = false; // // cbModel // - this.cbModel.Location = new System.Drawing.Point(14, 33); + this.cbModel.Location = new System.Drawing.Point(2, 2); + this.cbModel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.cbModel.Name = "cbModel"; this.cbModel.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.cbModel.Size = new System.Drawing.Size(329, 20); + this.cbModel.Size = new System.Drawing.Size(412, 22); this.cbModel.StyleController = this.layoutControl; this.cbModel.TabIndex = 5; // @@ -89,36 +92,23 @@ private void InitializeComponent() this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; this.layoutControlGroup1.GroupBordersVisible = false; this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { - this.layoutControlItem1, - this.layoutGroupModelSettings}); - this.layoutControlGroup1.Location = new System.Drawing.Point(0, 0); - this.layoutControlGroup1.Name = "layoutControlGroup1"; + this.layoutControlImage, + this.layoutItemModel, + this.emptySpaceItem1}); + this.layoutControlGroup1.Name = "Root"; this.layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); - this.layoutControlGroup1.Size = new System.Drawing.Size(357, 386); - this.layoutControlGroup1.Text = "layoutControlGroup1"; + this.layoutControlGroup1.Size = new System.Drawing.Size(416, 475); this.layoutControlGroup1.TextVisible = false; // - // layoutControlItem1 + // layoutControlImage // - this.layoutControlItem1.Control = this.pbModel; - this.layoutControlItem1.CustomizationFormText = "layoutControlItem1"; - this.layoutControlItem1.Location = new System.Drawing.Point(0, 67); - this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Size = new System.Drawing.Size(357, 319); - this.layoutControlItem1.Text = "layoutControlItem1"; - this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem1.TextToControlDistance = 0; - this.layoutControlItem1.TextVisible = false; - // - // layoutGroupModelSettings - // - this.layoutGroupModelSettings.CustomizationFormText = "layoutGroupModelSettings"; - this.layoutGroupModelSettings.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { - this.layoutItemModel}); - this.layoutGroupModelSettings.Location = new System.Drawing.Point(0, 0); - this.layoutGroupModelSettings.Name = "layoutGroupModelSettings"; - this.layoutGroupModelSettings.Size = new System.Drawing.Size(357, 67); - this.layoutGroupModelSettings.Text = "layoutGroupModelSettings"; + this.layoutControlImage.Control = this.pbModel; + this.layoutControlImage.CustomizationFormText = "layoutControlItem1"; + this.layoutControlImage.Location = new System.Drawing.Point(0, 36); + this.layoutControlImage.Name = "layoutControlImage"; + this.layoutControlImage.Size = new System.Drawing.Size(416, 439); + this.layoutControlImage.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlImage.TextVisible = false; // // layoutItemModel // @@ -126,29 +116,35 @@ private void InitializeComponent() this.layoutItemModel.CustomizationFormText = "layoutItemModel"; this.layoutItemModel.Location = new System.Drawing.Point(0, 0); this.layoutItemModel.Name = "layoutItemModel"; - this.layoutItemModel.Size = new System.Drawing.Size(333, 24); - this.layoutItemModel.Text = "layoutItemModel"; + this.layoutItemModel.Size = new System.Drawing.Size(416, 26); this.layoutItemModel.TextSize = new System.Drawing.Size(0, 0); - this.layoutItemModel.TextToControlDistance = 0; this.layoutItemModel.TextVisible = false; // + // emptySpaceItem1 + // + this.emptySpaceItem1.AllowHotTrack = false; + this.emptySpaceItem1.Location = new System.Drawing.Point(0, 26); + this.emptySpaceItem1.Name = "emptySpaceItem1"; + this.emptySpaceItem1.Size = new System.Drawing.Size(416, 10); + this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0); + // // SimulationModelSelectionView // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.layoutControl); - this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.Name = "SimulationModelSelectionView"; - this.Size = new System.Drawing.Size(357, 386); + this.Size = new System.Drawing.Size(416, 475); ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControl)).EndInit(); this.layoutControl.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pbModel)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.cbModel.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutGroupModelSettings)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlImage)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutItemModel)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).EndInit(); this.ResumeLayout(false); } @@ -157,10 +153,10 @@ private void InitializeComponent() private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1; private OSPSuite.UI.Controls.UxComboBoxEdit cbModel; - private DevExpress.XtraLayout.LayoutControlItem layoutItemModel; private System.Windows.Forms.PictureBox pbModel; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; + private DevExpress.XtraLayout.LayoutControlItem layoutControlImage; private OSPSuite.UI.Controls.UxLayoutControl layoutControl; - private DevExpress.XtraLayout.LayoutControlGroup layoutGroupModelSettings; + private DevExpress.XtraLayout.LayoutControlItem layoutItemModel; + private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1; } } diff --git a/src/PKSim.UI/Views/Simulations/SimulationModelSelectionView.cs b/src/PKSim.UI/Views/Simulations/SimulationModelSelectionView.cs index f701e9896..4256b919b 100644 --- a/src/PKSim.UI/Views/Simulations/SimulationModelSelectionView.cs +++ b/src/PKSim.UI/Views/Simulations/SimulationModelSelectionView.cs @@ -1,7 +1,6 @@ using PKSim.Assets; using OSPSuite.DataBinding; using OSPSuite.DataBinding.DevExpress; -using OSPSuite.Assets; using PKSim.Presentation.DTO.Simulations; using PKSim.Presentation.Presenters.Simulations; using PKSim.Presentation.Views.Simulations; @@ -25,12 +24,6 @@ public void AttachPresenter(ISimulationModelSelectionPresenter presenter) _presenter = presenter; } - public override void InitializeResources() - { - base.InitializeResources(); - layoutGroupModelSettings.Text = PKSimConstants.UI.ModelSettings; - } - public override void InitializeBinding() { _modelBinder = new ScreenBinder(); diff --git a/src/PKSim.UI/Views/Simulations/SimulationObserversConfigurationView.cs b/src/PKSim.UI/Views/Simulations/SimulationObserversConfigurationView.cs index 9f909c820..313f03f30 100644 --- a/src/PKSim.UI/Views/Simulations/SimulationObserversConfigurationView.cs +++ b/src/PKSim.UI/Views/Simulations/SimulationObserversConfigurationView.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using DevExpress.Utils; -using DevExpress.XtraEditors; using DevExpress.XtraEditors.Repository; using DevExpress.XtraGrid.Columns; using DevExpress.XtraGrid.Views.Base; @@ -8,7 +7,6 @@ using OSPSuite.Core.Extensions; using OSPSuite.DataBinding.DevExpress; using OSPSuite.DataBinding.DevExpress.XtraGrid; -using OSPSuite.UI; using OSPSuite.UI.Controls; using OSPSuite.UI.Extensions; using OSPSuite.UI.RepositoryItems; @@ -18,6 +16,7 @@ using PKSim.Presentation.Presenters.Simulations; using PKSim.Presentation.Views.Simulations; using PKSim.UI.Views.Core; +using static OSPSuite.UI.UIConstants.Size; namespace PKSim.UI.Views.Simulations { @@ -80,24 +79,24 @@ public override void InitializeBinding() .WithShowButton(ShowButtonModeEnum.ShowAlways) .WithCaption(PKSimConstants.ObjectTypes.ObserverSet); - _colCreateObserverSet = _gridViewBinder.AddUnboundColumn() + _colCreateObserverSet = _gridViewBinder.AddUnboundColumn() .WithCaption(PKSimConstants.UI.EmptyColumn) .WithShowButton(ShowButtonModeEnum.ShowAlways) - .WithFixedWidth(UIConstants.Size.EMBEDDED_BUTTON_WIDTH) + .WithFixedWidth(EMBEDDED_BUTTON_WIDTH) .WithRepository(dto => _createButtonRepository); _colLoadObserverSet = _gridViewBinder.AddUnboundColumn() .WithCaption(PKSimConstants.UI.EmptyColumn) .WithShowButton(ShowButtonModeEnum.ShowAlways) - .WithFixedWidth(UIConstants.Size.EMBEDDED_BUTTON_WIDTH) + .WithFixedWidth(EMBEDDED_BUTTON_WIDTH) .WithRepository(dto => _loadButtonRepository); _colRemoveObserverSet = _gridViewBinder.AddUnboundColumn() .WithCaption(PKSimConstants.UI.EmptyColumn) - .WithFixedWidth(UIConstants.Size.EMBEDDED_BUTTON_WIDTH) + .WithFixedWidth(EMBEDDED_BUTTON_WIDTH) .WithShowButton(ShowButtonModeEnum.ShowAlways) .WithRepository(dto => _removeButtonRepository); - + btnAddObserverSet.Click += (o, e) => OnEvent(_presenter.AddObserverSet); _removeButtonRepository.ButtonClick += (o, e) => OnEvent(() => _presenter.RemoveObserverSetMapping(_gridViewBinder.FocusedElement)); @@ -114,7 +113,6 @@ private UxRepositoryItemImageComboBox initObserverSetRepository(ObserverSetMappi return _observerSetRepository; } - protected override bool ColumnIsButton(GridColumn column) { return column.IsOneOf(_colCreateObserverSet.XtraColumn, _colLoadObserverSet.XtraColumn, _colRemoveObserverSet.XtraColumn); @@ -134,7 +132,7 @@ public override void InitializeResources() { base.InitializeResources(); btnAddObserverSet.InitWithImage(ApplicationIcons.Add, PKSimConstants.UI.AddObserverSet); - layoutItemAddObserverSet.AdjustLongButtonSize(); + layoutItemAddObserverSet.AdjustButtonSize(); } public override bool HasError => _gridViewBinder.HasError; diff --git a/src/PKSim.UI/Views/SplashScreen.Designer.cs b/src/PKSim.UI/Views/SplashScreen.Designer.cs index ecec320d2..9f2dfa535 100644 --- a/src/PKSim.UI/Views/SplashScreen.Designer.cs +++ b/src/PKSim.UI/Views/SplashScreen.Designer.cs @@ -1,111 +1,107 @@ -namespace PKSim.UI.Views +namespace PKSim.UI.Views { - partial class SplashScreen - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; + partial class SplashScreen + { + /// + /// 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); - } + /// + /// 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 + #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() - { + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SplashScreen)); - this.progressBar = new DevExpress.XtraEditors.ProgressBarControl(); - this.lblProgress = new DevExpress.XtraEditors.LabelControl(); - this.tablePanel = new DevExpress.Utils.Layout.TablePanel(); - this.buttonHide = new DevExpress.XtraEditors.SimpleButton(); - this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.progressBarControl = new DevExpress.XtraEditors.ProgressBarControl(); + this.labelCopyright = new DevExpress.XtraEditors.LabelControl(); + this.labelStatus = new DevExpress.XtraEditors.LabelControl(); + this.peImage = new DevExpress.XtraEditors.PictureEdit(); + this.peLogo = new DevExpress.XtraEditors.PictureEdit(); ((System.ComponentModel.ISupportInitialize)(this._errorProvider)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.progressBar.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.tablePanel)).BeginInit(); - this.tablePanel.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.progressBarControl.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.peImage.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.peLogo.Properties)).BeginInit(); this.SuspendLayout(); // - // progressBar + // progressBarControl // - this.tablePanel.SetColumn(this.progressBar, 0); - this.tablePanel.SetColumnSpan(this.progressBar, 2); - this.progressBar.Location = new System.Drawing.Point(0, 135); - this.progressBar.Margin = new System.Windows.Forms.Padding(0); - this.progressBar.Name = "progressBar"; - this.progressBar.Properties.LookAndFeel.SkinName = "Blue"; - this.progressBar.Properties.LookAndFeel.UseDefaultLookAndFeel = false; - this.tablePanel.SetRow(this.progressBar, 2); - this.progressBar.Size = new System.Drawing.Size(505, 20); - this.progressBar.TabIndex = 7; + this.progressBarControl.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.progressBarControl.Location = new System.Drawing.Point(27, 205); + this.progressBarControl.Margin = new System.Windows.Forms.Padding(4); + this.progressBarControl.Name = "progressBarControl"; + this.progressBarControl.Size = new System.Drawing.Size(744, 20); + this.progressBarControl.TabIndex = 5; // - // lblProgress + // labelCopyright // - this.tablePanel.SetColumn(this.lblProgress, 0); - this.lblProgress.Location = new System.Drawing.Point(4, 115); - this.lblProgress.Margin = new System.Windows.Forms.Padding(4, 0, 0, 0); - this.lblProgress.Name = "lblProgress"; - this.tablePanel.SetRow(this.lblProgress, 1); - this.lblProgress.Size = new System.Drawing.Size(63, 16); - this.lblProgress.TabIndex = 8; - this.lblProgress.Text = "lblProgress"; + this.labelCopyright.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder; + this.labelCopyright.Location = new System.Drawing.Point(28, 260); + this.labelCopyright.Margin = new System.Windows.Forms.Padding(4); + this.labelCopyright.Name = "labelCopyright"; + this.labelCopyright.Size = new System.Drawing.Size(54, 16); + this.labelCopyright.TabIndex = 6; + this.labelCopyright.Text = "Copyright"; // - // tablePanel + // labelStatus // - this.tablePanel.Columns.AddRange(new DevExpress.Utils.Layout.TablePanelColumn[] { - new DevExpress.Utils.Layout.TablePanelColumn(DevExpress.Utils.Layout.TablePanelEntityStyle.Relative, 53.73F), - new DevExpress.Utils.Layout.TablePanelColumn(DevExpress.Utils.Layout.TablePanelEntityStyle.AutoSize, 1.27F)}); - this.tablePanel.Controls.Add(this.buttonHide); - this.tablePanel.Controls.Add(this.pictureBox1); - this.tablePanel.Controls.Add(this.progressBar); - this.tablePanel.Controls.Add(this.lblProgress); - this.tablePanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.tablePanel.Location = new System.Drawing.Point(0, 0); - this.tablePanel.Name = "tablePanel"; - this.tablePanel.Rows.AddRange(new DevExpress.Utils.Layout.TablePanelRow[] { - new DevExpress.Utils.Layout.TablePanelRow(DevExpress.Utils.Layout.TablePanelEntityStyle.Absolute, 110.8001F), - new DevExpress.Utils.Layout.TablePanelRow(DevExpress.Utils.Layout.TablePanelEntityStyle.Absolute, 23.59935F), - new DevExpress.Utils.Layout.TablePanelRow(DevExpress.Utils.Layout.TablePanelEntityStyle.Absolute, 26F)}); - this.tablePanel.Size = new System.Drawing.Size(505, 155); - this.tablePanel.TabIndex = 9; + this.labelStatus.Location = new System.Drawing.Point(27, 184); + this.labelStatus.Margin = new System.Windows.Forms.Padding(4, 4, 4, 1); + this.labelStatus.Name = "labelStatus"; + this.labelStatus.Size = new System.Drawing.Size(57, 16); + this.labelStatus.TabIndex = 7; + this.labelStatus.Text = "Starting..."; // - // buttonHide + // peImage // - this.tablePanel.SetColumn(this.buttonHide, 1); - this.buttonHide.Location = new System.Drawing.Point(477, 114); - this.buttonHide.Name = "buttonHide"; - this.tablePanel.SetRow(this.buttonHide, 1); - this.buttonHide.Size = new System.Drawing.Size(25, 18); - this.buttonHide.TabIndex = 10; - this.buttonHide.Text = "x"; + this.peImage.Dock = System.Windows.Forms.DockStyle.Top; + this.peImage.EditValue = ((object)(resources.GetObject("peImage.EditValue"))); + this.peImage.Location = new System.Drawing.Point(1, 1); + this.peImage.Margin = new System.Windows.Forms.Padding(4); + this.peImage.Name = "peImage"; + this.peImage.Properties.AllowFocused = false; + this.peImage.Properties.Appearance.BackColor = System.Drawing.Color.Transparent; + this.peImage.Properties.Appearance.Options.UseBackColor = true; + this.peImage.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder; + this.peImage.Properties.ShowMenu = false; + this.peImage.Properties.SizeMode = DevExpress.XtraEditors.Controls.PictureSizeMode.Stretch; + this.peImage.Properties.SvgImageColorizationMode = DevExpress.Utils.SvgImageColorizationMode.None; + this.peImage.Size = new System.Drawing.Size(798, 175); + this.peImage.TabIndex = 9; // - // pictureBox1 + // peLogo // - this.pictureBox1.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pictureBox1.BackgroundImage"))); - this.tablePanel.SetColumn(this.pictureBox1, 0); - this.tablePanel.SetColumnSpan(this.pictureBox1, 2); - this.pictureBox1.Location = new System.Drawing.Point(3, 3); - this.pictureBox1.Name = "pictureBox1"; - this.tablePanel.SetRow(this.pictureBox1, 0); - this.pictureBox1.Size = new System.Drawing.Size(499, 105); - this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.pictureBox1.TabIndex = 9; - this.pictureBox1.TabStop = false; + this.peLogo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.peLogo.EditValue = ((object)(resources.GetObject("peLogo.EditValue"))); + this.peLogo.Location = new System.Drawing.Point(429, 237); + this.peLogo.Margin = new System.Windows.Forms.Padding(4); + this.peLogo.Name = "peLogo"; + this.peLogo.Properties.AllowFocused = false; + this.peLogo.Properties.Appearance.BackColor = System.Drawing.Color.Transparent; + this.peLogo.Properties.Appearance.Options.UseBackColor = true; + this.peLogo.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder; + this.peLogo.Properties.ShowMenu = false; + this.peLogo.Properties.SizeMode = DevExpress.XtraEditors.Controls.PictureSizeMode.Squeeze; + this.peLogo.Size = new System.Drawing.Size(351, 52); + this.peLogo.TabIndex = 8; // // SplashScreen // @@ -113,30 +109,31 @@ private void InitializeComponent() this.Appearance.Options.UseBackColor = true; this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Caption = "SplashScreen"; - this.ClientSize = new System.Drawing.Size(505, 155); - this.Controls.Add(this.tablePanel); - this.LookAndFeel.SkinName = "Blue"; - this.LookAndFeel.UseDefaultLookAndFeel = false; - this.Margin = new System.Windows.Forms.Padding(5); + this.Caption = "SplashScreenNew"; + this.ClientSize = new System.Drawing.Size(800, 301); + this.Controls.Add(this.peImage); + this.Controls.Add(this.peLogo); + this.Controls.Add(this.labelStatus); + this.Controls.Add(this.labelCopyright); + this.Controls.Add(this.progressBarControl); this.Name = "SplashScreen"; - this.Text = "SplashScreen"; + this.Padding = new System.Windows.Forms.Padding(1); + this.Text = "SplashScreenNew"; ((System.ComponentModel.ISupportInitialize)(this._errorProvider)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.progressBar.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.tablePanel)).EndInit(); - this.tablePanel.ResumeLayout(false); - this.tablePanel.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.progressBarControl.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.peImage.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.peLogo.Properties)).EndInit(); this.ResumeLayout(false); + this.PerformLayout(); - } + } - #endregion + #endregion - private DevExpress.XtraEditors.ProgressBarControl progressBar; - private DevExpress.XtraEditors.LabelControl lblProgress; - private DevExpress.Utils.Layout.TablePanel tablePanel; - private System.Windows.Forms.PictureBox pictureBox1; - private DevExpress.XtraEditors.SimpleButton buttonHide; + private DevExpress.XtraEditors.ProgressBarControl progressBarControl; + private DevExpress.XtraEditors.LabelControl labelCopyright; + private DevExpress.XtraEditors.LabelControl labelStatus; + private DevExpress.XtraEditors.PictureEdit peLogo; + private DevExpress.XtraEditors.PictureEdit peImage; } -} \ No newline at end of file +} diff --git a/src/PKSim.UI/Views/SplashScreen.cs b/src/PKSim.UI/Views/SplashScreen.cs index 9e9c038c4..d3508f7fc 100644 --- a/src/PKSim.UI/Views/SplashScreen.cs +++ b/src/PKSim.UI/Views/SplashScreen.cs @@ -1,60 +1,45 @@ -using System.Drawing; +using System; using System.Windows.Forms; -using DevExpress.XtraEditors.Controls; -using PKSim.Assets; using OSPSuite.Assets; -using OSPSuite.UI.Extensions; +using OSPSuite.UI.Views; +using PKSim.Assets; using PKSim.Presentation.Presenters.Main; using PKSim.Presentation.Views.Main; -using OSPSuite.UI.Views; -using PKSim.Assets.Images; -using PKSim.UI.Extensions; namespace PKSim.UI.Views { public partial class SplashScreen : BaseView, ISplashView { - //should hold a reference to allow progress information - private ISplashViewPresenter _presenter; - public SplashScreen() { InitializeComponent(); - - BackgroundImage = ApplicationImages.Splash; + this.labelCopyright.Text = $"Copyright © 2002-{DateTime.Now.Year} - Open Systems Pharmacology Community"; FormBorderStyle = FormBorderStyle.None; StartPosition = FormStartPosition.CenterScreen; ShowInTaskbar = false; - TopMost = true; - Opacity = 0.9; - progressBar.Properties.ShowTitle = true; + Opacity = 0.98; + progressBarControl.Properties.ShowTitle = true; Text = PKSimConstants.UI.LoadingApplication; - buttonHide.Click += (o, e) => OnEvent(() => Visible = false); } - public string StatusInfo + public void AttachPresenter(ISplashViewPresenter presenter) { - set => lblProgress.Text = $"{value}"; } - public double ProgressValue + public string StatusInfo { - set => progressBar.EditValue = value; + set => labelStatus.Text = $"{value}"; } - public void AttachPresenter(ISplashViewPresenter presenter) + public double ProgressValue { - _presenter = presenter; + set => progressBarControl.EditValue = value; } public override void InitializeResources() { - lblProgress.Text = string.Empty; + labelStatus.Text = string.Empty; Icon = ApplicationIcons.PKSim.WithSize(IconSizes.Size48x48); - buttonHide.Text = "x"; - buttonHide.ButtonStyle = BorderStyles.NoBorder; - buttonHide.AdjustButtonWithImageOnly(); - buttonHide.AllowFocus = false; } } } \ No newline at end of file diff --git a/src/PKSim.UI/Views/SplashScreen.resx b/src/PKSim.UI/Views/SplashScreen.resx index 85ea98bb4..c451bb8c3 100644 --- a/src/PKSim.UI/Views/SplashScreen.resx +++ b/src/PKSim.UI/Views/SplashScreen.resx @@ -1,4 +1,4 @@ - +