From 7b88ea2b70f7d7f13c247dabe2aee27b62dbd2df Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Mon, 31 Jan 2022 19:55:53 +0100 Subject: [PATCH] WIP #2071 ux issue --- .../Views/FolderListSnapshotView.cs | 2 +- src/PKSim.Core/CoreConstants.cs | 31 +-- .../Services/ImportObservedDataTask.cs | 2 +- .../Extensions/LayoutControlItemExtensions.cs | 2 +- .../Extensions/TablePanelExtensions.cs | 4 +- src/PKSim.UI/UIConstants.cs | 42 ++++ src/PKSim.UI/UserSettings.cs | 12 +- .../Applications/ApplicationParametersView.cs | 3 +- .../Views/BuildingBlockSelectionView.cs | 2 +- ...ParameterWithDefaultAlternativeBaseView.cs | 10 +- .../Views/Compounds/CompoundTypeGroupView.cs | 3 +- .../Views/Compounds/CreateCompoundView.cs | 2 + .../Compounds/FractionUnboundGroupView.cs | 3 +- .../Views/Core/BuildingBlockWizardView.cs | 3 +- .../Formulations/CreateFormulationView.cs | 2 +- .../Views/Individuals/CreateIndividualView.cs | 2 +- .../IndividualSettingsView.Designer.cs | 237 ++++++++++-------- .../Individuals/IndividualSettingsView.resx | 3 + .../Individuals/OntogenySelectionView.cs | 2 +- .../Views/Individuals/ScaleIndividualView.cs | 2 +- .../Views/Observers/CreateObserverSetView.cs | 2 +- .../Views/Observers/ImportObserverSetView.cs | 3 +- .../Views/Parameters/ParameterSetView.cs | 3 +- .../Views/Parameters/TableParameterView.cs | 2 +- .../CreatePopulationAnalysisView.cs | 3 +- .../FixedLimitsGroupingView.cs | 2 +- .../MultipleNumericFieldsView.cs | 2 +- .../PopulationAnalysisFieldsView.cs | 3 +- .../ImportPopulationSettingsView.cs | 6 +- .../RandomPopulationSettingsView.cs | 4 +- .../ProteinExpressionsView.cs | 5 +- .../Views/Protocols/AdvancedProtocolView.cs | 4 +- .../Views/Protocols/CreateProtocolView.cs | 5 +- .../Simulations/ConfigureSimulationView.cs | 5 +- .../Views/Simulations/CreateSimulationView.cs | 2 +- .../Views/Simulations/EditOutputSchemaView.cs | 2 +- .../ImportSimulationResultsView.cs | 10 +- .../IndividualSimulationSettingsView.cs | 5 +- .../PopulationSimulationSettingsView.cs | 5 +- .../SimulationCompoundEnzymaticProcessView.cs | 2 +- ...ulationCompoundInteractionSelectionView.cs | 3 +- .../SimulationCompoundProcessView.cs | 7 +- ...mulationCompoundProtocolFormulationView.cs | 5 +- .../SimulationEventsConfigurationView.cs | 7 +- .../SimulationObserversConfigurationView.cs | 14 +- src/PKSim.UI/Views/TemplateView.cs | 3 +- 46 files changed, 269 insertions(+), 214 deletions(-) create mode 100644 src/PKSim.UI/UIConstants.cs 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.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.Infrastructure/Services/ImportObservedDataTask.cs b/src/PKSim.Infrastructure/Services/ImportObservedDataTask.cs index 07d580b90..2a2cd376b 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.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..c6e53f3fa 100644 --- a/src/PKSim.UI/Extensions/TablePanelExtensions.cs +++ b/src/PKSim.UI/Extensions/TablePanelExtensions.cs @@ -31,11 +31,11 @@ public static TablePanel WithButtonWidth(this TablePanel tablePanel, params int[ 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.ScaleForScreenDPI(24), OSPSuite.UI.UIConstants.Size.ScaleForScreenDPI(22)); } 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/UIConstants.cs b/src/PKSim.UI/UIConstants.cs new file mode 100644 index 000000000..eba6e8b4c --- /dev/null +++ b/src/PKSim.UI/UIConstants.cs @@ -0,0 +1,42 @@ +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 = 110; + public static readonly int DATA_SOURCE_WIDTH = 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(700); + + 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); + } + } +} \ 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/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/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/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.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..9b4d8a64e 100644 --- a/src/PKSim.UI/Views/Simulations/CreateSimulationView.cs +++ b/src/PKSim.UI/Views/Simulations/CreateSimulationView.cs @@ -16,7 +16,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/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/SimulationObserversConfigurationView.cs b/src/PKSim.UI/Views/Simulations/SimulationObserversConfigurationView.cs index 9f909c820..e41fa6c75 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); diff --git a/src/PKSim.UI/Views/TemplateView.cs b/src/PKSim.UI/Views/TemplateView.cs index 990986bd2..b65a291de 100644 --- a/src/PKSim.UI/Views/TemplateView.cs +++ b/src/PKSim.UI/Views/TemplateView.cs @@ -21,6 +21,7 @@ using PKSim.Presentation.DTO; using PKSim.Presentation.Presenters; using PKSim.Presentation.Views; +using static OSPSuite.UI.UIConstants.Size; namespace PKSim.UI.Views { @@ -128,7 +129,7 @@ public override void InitializeBinding() .WithCaption(PKSimConstants.UI.EmptyColumn) .WithShowButton(ShowButtonModeEnum.ShowAlways) .WithRepository(repositoryForTemplate) - .WithFixedWidth(UIConstants.Size.EMBEDDED_BUTTON_WIDTH * 2); + .WithFixedWidth(EMBEDDED_BUTTON_WIDTH * 2); gridView.PreviewFieldName = colDescription.PropertyName; colDescription.Visible = false;