diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index 0b84aba305..517303a880 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -35,13 +35,13 @@ jobs: - name: create version environment variable - alpha if: ${{ github.event.inputs.revision != 0 }} run: | - echo "gingertag=20${{ github.event.inputs.major}}.${{ github.event.inputs.minor}}-Alpha\ ${{github.event.inputs.build}}.${{ github.event.inputs.revision}}" >> $GITHUB_ENV + echo "gingertag=20${{ github.event.inputs.major}}.${{ github.event.inputs.minor}}-Alpha.${{github.event.inputs.build}}.${{ github.event.inputs.revision}}" >> $GITHUB_ENV echo "gingernumber=${{ github.event.inputs.major}}.${{ github.event.inputs.minor}}.${{ github.event.inputs.build}}.${{ github.event.inputs.revision}}" >> $GITHUB_ENV - name: create version environment variable - BETA if: ${{ (github.event.inputs.build != 0) && (github.event.inputs.revision == 0 )}} run: | - echo "gingertag=20${{ github.event.inputs.major}}.${{ github.event.inputs.minor}}-Beta\ ${{ github.event.inputs.build}}" >> $GITHUB_ENV + echo "gingertag=20${{ github.event.inputs.major}}.${{ github.event.inputs.minor}}-Beta.${{ github.event.inputs.build}}" >> $GITHUB_ENV echo "gingernumber=${{ github.event.inputs.major}}.${{ github.event.inputs.minor}}.${{ github.event.inputs.build}}.${{ github.event.inputs.revision}}" >> $GITHUB_ENV - name: create version environment variable - Release diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 1b47e7447d..e044fb736b 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -4,12 +4,6 @@ on: workflow_dispatch: workflow_call: - pull_request: - branches: - - master - - Features/Linux-Migration - - Releases/* - - Releases/*/* jobs: # Codacy: diff --git a/.github/workflows/Deploy-2.yml b/.github/workflows/Deploy-2.yml index 34e3d7481e..47c20086bb 100644 --- a/.github/workflows/Deploy-2.yml +++ b/.github/workflows/Deploy-2.yml @@ -57,9 +57,9 @@ jobs: # ------------------------------------------------------------------------------------------------------ # Create new Release for ginger # ------------------------------------------------------------------------------------------------------ - - name: Create Github new Release + - name: Create Github Release id: create-new-release - uses: actions/create-release@v1 + uses: GongT/actions-recreate-release@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token with: diff --git a/.github/workflows/LinuxBuild.yml b/.github/workflows/LinuxBuild.yml index 6ffa1355ba..a6bfb29aca 100644 --- a/.github/workflows/LinuxBuild.yml +++ b/.github/workflows/LinuxBuild.yml @@ -1,12 +1,12 @@ name: Ginger Linux Build on: - pull_request: - branches: - - master - - Features/Linux-Migration - - Releases/* - - Releases/*/* + # pull_request: + # branches: + # - master + # - Features/Linux-Migration + # - Releases/* + # - Releases/*/* workflow_dispatch: diff --git a/.github/workflows/MacBuild.yml b/.github/workflows/MacBuild.yml index 393dfd0cbb..8bbbac8126 100644 --- a/.github/workflows/MacBuild.yml +++ b/.github/workflows/MacBuild.yml @@ -1,12 +1,12 @@ name: Ginger Mac Build on: - pull_request: - branches: - - master - - Features/Linux-Migration - - Releases/* - - Releases/*/* + # pull_request: + # branches: + # - master + # - Features/Linux-Migration + # - Releases/* + # - Releases/*/* workflow_dispatch: @@ -62,4 +62,4 @@ jobs: with: name: Ginger MacOS UnitTests # Name of the check run which will be created path: "**/*.trx" # Path to test results - reporter: dotnet-trx # Format of test results \ No newline at end of file + reporter: dotnet-trx # Format of test results diff --git a/.github/workflows/Release-2.yml b/.github/workflows/Release-2.yml index 0006dc555a..2069ee449b 100644 --- a/.github/workflows/Release-2.yml +++ b/.github/workflows/Release-2.yml @@ -33,8 +33,12 @@ jobs: - name: Create Directory for GingerRuntime run: | - mv ./Documents/ReadMe.txt ./Runtime/ReadMe.txt - mv ./Documents/gingerInstall.sh ./Runtime/gingerInstall.sh + mv ./Documents/ReadMe.txt ./Runtime/ReadMe.txt + mv ./Documents/gingerInstall.sh ./Runtime/gingerInstall.sh + chmod +x ./Runtime/gingerInstall.sh + sudo apt install dos2unix + dos2unix -b ./Runtime/ReadMe.txt + dos2unix -b ./Runtime/gingerInstall.sh - uses: sibiraj-s/action-archiver@v1 with: diff --git a/.github/workflows/WindowsBuild.yml b/.github/workflows/WindowsBuild.yml index 71c53c6bc6..f858852973 100644 --- a/.github/workflows/WindowsBuild.yml +++ b/.github/workflows/WindowsBuild.yml @@ -1,12 +1,12 @@ name: Ginger Windows Build on: - pull_request: - branches: - - master - - Features/Linux-Migration - - Releases/* - - Releases/*/* + # pull_request: + # branches: + # - master + # - Features/Linux-Migration + # - Releases/* + # - Releases/*/* workflow_dispatch: @@ -114,4 +114,4 @@ jobs: # sealightsToken: "$(SLAGENTTOKEN)" # SealightsBuildSessionId : $(Build.ArtifactStagingDirectory)\SealightsBuildSessionId.txt - \ No newline at end of file + diff --git a/CLITestsGithub.sh b/CLITestsGithub.sh index dc82adbe5c..d98e7ce61a 100644 --- a/CLITestsGithub.sh +++ b/CLITestsGithub.sh @@ -17,7 +17,7 @@ echo "************************************************************************** echo "run simple solution" echo "******************************************************************************************************************************" -dotnet GingerRuntime.dll run -s "/home/runner/work/Ginger/Ginger/Ginger/GingerCoreNETUnitTest/TestResources/Solutions/CLI" -e "Default" -r "Default Run Set" +dotnet GingerRuntime.dll run -s "/home/runner/work/Ginger/Ginger/Ginger/GingerCoreNETUnitTest/TestResources/Solutions/CLI" -e "Default" -r "Default Run Set" -v "debug" # echo "******************************************************************************************************************************" diff --git a/Ginger/Ginger/ALM/ALMConnectionPage.xaml b/Ginger/Ginger/ALM/ALMConnectionPage.xaml index 428642a3ef..010ddc7d98 100644 --- a/Ginger/Ginger/ALM/ALMConnectionPage.xaml +++ b/Ginger/Ginger/ALM/ALMConnectionPage.xaml @@ -10,10 +10,10 @@ Title="ALM Connection Settings"> - + - + @@ -49,7 +49,7 @@ - + @@ -95,7 +95,7 @@ - + @@ -108,17 +108,17 @@ - + - + - + diff --git a/Ginger/Ginger/ALM/JIRA/JiraImportSetByIdPage.xaml b/Ginger/Ginger/ALM/JIRA/JiraImportSetByIdPage.xaml index f63f8617de..3c094d6052 100644 --- a/Ginger/Ginger/ALM/JIRA/JiraImportSetByIdPage.xaml +++ b/Ginger/Ginger/ALM/JIRA/JiraImportSetByIdPage.xaml @@ -10,7 +10,7 @@ Title="Jira Import Test Set By Id"> - + diff --git a/Ginger/Ginger/ALM/JIRA/JiraZephyrCyclesExplorerPage.xaml b/Ginger/Ginger/ALM/JIRA/JiraZephyrCyclesExplorerPage.xaml index 92dc0c8442..c589d236e0 100644 --- a/Ginger/Ginger/ALM/JIRA/JiraZephyrCyclesExplorerPage.xaml +++ b/Ginger/Ginger/ALM/JIRA/JiraZephyrCyclesExplorerPage.xaml @@ -10,7 +10,7 @@ Height="600" Width="700" Title=""> - + @@ -39,7 +39,7 @@ - 'BusinessFlow\aaa\ccc\vvv' + 'BusinessFlow\aaa\ccc\vvv' diff --git a/Ginger/Ginger/ALM/MapToALMWizard/TestCasesMappingPage.xaml b/Ginger/Ginger/ALM/MapToALMWizard/TestCasesMappingPage.xaml index 9ae0fe4a31..aa2c10e711 100644 --- a/Ginger/Ginger/ALM/MapToALMWizard/TestCasesMappingPage.xaml +++ b/Ginger/Ginger/ALM/MapToALMWizard/TestCasesMappingPage.xaml @@ -11,7 +11,7 @@ d:DesignHeight="450" d:DesignWidth="800" Title="TestCasesMappingPage"> - + diff --git a/Ginger/Ginger/ALM/MapToALMWizard/TestSetMappingPage.xaml b/Ginger/Ginger/ALM/MapToALMWizard/TestSetMappingPage.xaml index d0715a6d86..64b341dfd9 100644 --- a/Ginger/Ginger/ALM/MapToALMWizard/TestSetMappingPage.xaml +++ b/Ginger/Ginger/ALM/MapToALMWizard/TestSetMappingPage.xaml @@ -9,7 +9,7 @@ d:DesignHeight="450" d:DesignWidth="800" Title="TestSetMappingPage"> - + - 'BusinessFlow\aaa\ccc\vvv' + 'BusinessFlow\aaa\ccc\vvv' diff --git a/Ginger/Ginger/ALM/QC/QCTestPlanExplorerPage.xaml b/Ginger/Ginger/ALM/QC/QCTestPlanExplorerPage.xaml index 9866b3e4ad..bdbe2091f5 100644 --- a/Ginger/Ginger/ALM/QC/QCTestPlanExplorerPage.xaml +++ b/Ginger/Ginger/ALM/QC/QCTestPlanExplorerPage.xaml @@ -9,7 +9,7 @@ mc:Ignorable="d" Height="600" Width="700" Title="QC/ALM Test Plan"> - + diff --git a/Ginger/Ginger/ALM/Qtest/QtestCyclesExplorerPage.xaml b/Ginger/Ginger/ALM/Qtest/QtestCyclesExplorerPage.xaml index a4faaf2680..813e9b83f8 100644 --- a/Ginger/Ginger/ALM/Qtest/QtestCyclesExplorerPage.xaml +++ b/Ginger/Ginger/ALM/Qtest/QtestCyclesExplorerPage.xaml @@ -10,7 +10,7 @@ Height="600" Width="700" Title=""> - + @@ -39,7 +39,7 @@ - 'BusinessFlow\aaa\ccc\vvv' + 'BusinessFlow\aaa\ccc\vvv' diff --git a/Ginger/Ginger/ALM/Qtest/QtestModuleExplorerPage.xaml b/Ginger/Ginger/ALM/Qtest/QtestModuleExplorerPage.xaml index a3e2f1ab3e..285fb23f33 100644 --- a/Ginger/Ginger/ALM/Qtest/QtestModuleExplorerPage.xaml +++ b/Ginger/Ginger/ALM/Qtest/QtestModuleExplorerPage.xaml @@ -9,7 +9,7 @@ mc:Ignorable="d" Height="600" Width="700" Title="Qtest/ALM Test Plan"> - + diff --git a/Ginger/Ginger/ALM/RQM/RQMImportPlanByIdPage.xaml b/Ginger/Ginger/ALM/RQM/RQMImportPlanByIdPage.xaml index 0807d97497..39df02742c 100644 --- a/Ginger/Ginger/ALM/RQM/RQMImportPlanByIdPage.xaml +++ b/Ginger/Ginger/ALM/RQM/RQMImportPlanByIdPage.xaml @@ -10,7 +10,7 @@ Title="RQM Import Test Plan By Id"> - + diff --git a/Ginger/Ginger/ALM/ZephyrEnt/ZephyrEntPlanningExplorerPage.xaml b/Ginger/Ginger/ALM/ZephyrEnt/ZephyrEntPlanningExplorerPage.xaml index 5f0f23285a..970ead9382 100644 --- a/Ginger/Ginger/ALM/ZephyrEnt/ZephyrEntPlanningExplorerPage.xaml +++ b/Ginger/Ginger/ALM/ZephyrEnt/ZephyrEntPlanningExplorerPage.xaml @@ -9,7 +9,7 @@ Height="600" Width="700" Title=""> - + @@ -38,7 +38,7 @@ - 'BusinessFlow\aaa\ccc\vvv' + 'BusinessFlow\aaa\ccc\vvv' diff --git a/Ginger/Ginger/ALM/ZephyrEnt/ZephyrEntRepositoryExplorerPage.xaml b/Ginger/Ginger/ALM/ZephyrEnt/ZephyrEntRepositoryExplorerPage.xaml index da17b745f6..5c11e40102 100644 --- a/Ginger/Ginger/ALM/ZephyrEnt/ZephyrEntRepositoryExplorerPage.xaml +++ b/Ginger/Ginger/ALM/ZephyrEnt/ZephyrEntRepositoryExplorerPage.xaml @@ -9,7 +9,7 @@ d:DesignHeight="450" d:DesignWidth="800" Height="600" Width="700" Title="ALM Test Repository"> - + diff --git a/Ginger/Ginger/Actions/ActionConversion/ActionConverterPage.xaml b/Ginger/Ginger/Actions/ActionConversion/ActionConverterPage.xaml index 1f35d4e6ee..5a88e350c1 100644 --- a/Ginger/Ginger/Actions/ActionConversion/ActionConverterPage.xaml +++ b/Ginger/Ginger/Actions/ActionConversion/ActionConverterPage.xaml @@ -11,7 +11,7 @@ Title="ActionConverterPage"> - + @@ -36,7 +36,7 @@ + BorderThickness="1" BorderBrush="{StaticResource $PrimaryColor_Black}" > - + - + @@ -79,7 +79,7 @@ - + diff --git a/Ginger/Ginger/Actions/ActionConversion/ActionConverterPage.xaml.cs b/Ginger/Ginger/Actions/ActionConversion/ActionConverterPage.xaml.cs index 472591540c..eec74820aa 100644 --- a/Ginger/Ginger/Actions/ActionConversion/ActionConverterPage.xaml.cs +++ b/Ginger/Ginger/Actions/ActionConversion/ActionConverterPage.xaml.cs @@ -268,7 +268,7 @@ private void btnConvertAction_Click(object sender, RoutedEventArgs e) // by default, set the old activity as inactive oldActivity.Active = false; - // if the user has not chosen any target application in the combobox then, we set it as empty + // if the user has not chosen any target application in the combo box then, we set it as empty if ((Boolean)chkDefaultTargetApp.IsChecked && cmbTargetApp.SelectedIndex != -1) { newActivity.TargetApplication = cmbTargetApp.SelectedValue.ToString(); @@ -307,7 +307,7 @@ private void btnConvertAction_Click(object sender, RoutedEventArgs e) } } - // if the user has not chosen any target application in the combobox then, we set it as empty + // if the user has not chosen any target application in the combo box then, we set it as empty if ((Boolean)chkDefaultTargetApp.IsChecked && cmbTargetApp.SelectedIndex != -1) { activity.TargetApplication = cmbTargetApp.SelectedValue.ToString(); diff --git a/Ginger/Ginger/ConflictResolve/ConflictResolve.cs b/Ginger/Ginger/Actions/ActionConversion/BooleanToEnabledConverter.cs similarity index 50% rename from Ginger/Ginger/ConflictResolve/ConflictResolve.cs rename to Ginger/Ginger/Actions/ActionConversion/BooleanToEnabledConverter.cs index 9ec9292b5a..429d82f22e 100644 --- a/Ginger/Ginger/ConflictResolve/ConflictResolve.cs +++ b/Ginger/Ginger/Actions/ActionConversion/BooleanToEnabledConverter.cs @@ -1,4 +1,4 @@ -#region License +#region License /* Copyright © 2014-2023 European Support Limited @@ -16,32 +16,27 @@ limitations under the License. */ #endregion -using Amdocs.Ginger.Common; +using System; +using System.Windows; +using System.Windows.Data; -namespace Ginger.ConflictResolve +namespace Ginger.Actions.ActionConversion { - - public class ConflictResolve + public class BooleanToEnabledConverter : IValueConverter { - public enum eResolveOperations - { - [EnumValueDescription("Accept Server Changes")] - AcceptServer, - [EnumValueDescription("Keep Local Changes")] - KeepLocal - } - public string ConflictPath { get; set; } - - public string RelativeConflictPath + public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) { - get + if (value is bool isChecked) { - return amdocs.ginger.GingerCoreNET.WorkSpace.Instance.SolutionRepository.ConvertFullPathToBeRelative(ConflictPath); + return isChecked; } - } - public string ItemName { get; set; } + return DependencyProperty.UnsetValue; + } - public eResolveOperations resolveOperations { get; set; } + public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) + { + throw new NotImplementedException(); + } } } diff --git a/Ginger/Ginger/Actions/ActionConversion/ConversionConfigurationWzardPage.xaml b/Ginger/Ginger/Actions/ActionConversion/ConversionConfigurationWzardPage.xaml index 0462ccd2a4..0e0e3e564b 100644 --- a/Ginger/Ginger/Actions/ActionConversion/ConversionConfigurationWzardPage.xaml +++ b/Ginger/Ginger/Actions/ActionConversion/ConversionConfigurationWzardPage.xaml @@ -11,7 +11,7 @@ d:DesignHeight="450" d:DesignWidth="700" Title="ConversionConfigurationWzardPage"> - + @@ -50,7 +50,7 @@ Style="{StaticResource $MenuExpanderTransparentStyle}" BorderBrush="Transparent" Expanded="ControlsViewsExpander_Expanded" Collapsed="ControlsViewsExpander_Collapsed" Visibility="{Binding ElementName=xNewActivityRadioBtn, Path=IsChecked, Converter={StaticResource visibilityConverter}}" > - - diff --git a/Ginger/Ginger/Actions/ActionConversion/ConversionStatusForgroundColorConverter.cs b/Ginger/Ginger/Actions/ActionConversion/ConversionStatusForgroundColorConverter.cs index 7e4c468c17..73fc419386 100644 --- a/Ginger/Ginger/Actions/ActionConversion/ConversionStatusForgroundColorConverter.cs +++ b/Ginger/Ginger/Actions/ActionConversion/ConversionStatusForgroundColorConverter.cs @@ -36,7 +36,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn return App.Current.TryFindResource("$PassedStatusColor") as SolidColorBrush; //green case Amdocs.Ginger.Common.Enums.eImageType.Running: - return App.Current.TryFindResource("$Color_DarkBlue") as SolidColorBrush;//blue + return App.Current.TryFindResource("$PrimaryColor_Black") as SolidColorBrush;//blue case Amdocs.Ginger.Common.Enums.eImageType.Pending: return App.Current.TryFindResource("$PendingStatusColor") as SolidColorBrush;//orange diff --git a/Ginger/Ginger/Actions/ActionConversion/ConversionStatusReportPage.xaml b/Ginger/Ginger/Actions/ActionConversion/ConversionStatusReportPage.xaml index a63f93d525..82db1ee47f 100644 --- a/Ginger/Ginger/Actions/ActionConversion/ConversionStatusReportPage.xaml +++ b/Ginger/Ginger/Actions/ActionConversion/ConversionStatusReportPage.xaml @@ -10,7 +10,7 @@ d:DesignHeight="450" d:DesignWidth="700" Title="ConversionStatusReportPage"> - + diff --git a/Ginger/Ginger/Actions/ActionConversion/EnumValueToBooleanConverter.cs b/Ginger/Ginger/Actions/ActionConversion/EnumValueToBooleanConverter.cs new file mode 100644 index 0000000000..3d130aef2f --- /dev/null +++ b/Ginger/Ginger/Actions/ActionConversion/EnumValueToBooleanConverter.cs @@ -0,0 +1,50 @@ +#region License +/* +Copyright © 2014-2023 European Support Limited + +Licensed under the Apache License, Version 2.0 (the "License") +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ +#endregion + +using System; +using System.Windows.Data; + +namespace Ginger.Actions.ActionConversion +{ + public class EnumValueToBooleanConverter : IValueConverter where TEnum : struct, Enum + { + public TEnum ValueToCheck { get; set; } + public bool IsCheckEqual { get; set; } + public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) + { + if (Enum.TryParse(value?.ToString(), out TEnum enumValue)) + { + if (IsCheckEqual) + { + return enumValue.Equals(ValueToCheck); + } + else + { + return !enumValue.Equals(ValueToCheck); + + } + } + return false; + } + + public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) + { + throw new NotImplementedException(); + } + } +} diff --git a/Ginger/Ginger/Actions/ActionConversion/MultiBooleanToVisibilityConverter.cs b/Ginger/Ginger/Actions/ActionConversion/MultiBooleanToVisibilityConverter.cs new file mode 100644 index 0000000000..6e3f16e119 --- /dev/null +++ b/Ginger/Ginger/Actions/ActionConversion/MultiBooleanToVisibilityConverter.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Data; + +namespace Ginger.Actions.ActionConversion +{ + public sealed class MultiBooleanToVisibilityConverter : IMultiValueConverter + { + /// + /// Converts the target type visibility to visible if one of the values is true + /// + /// + /// + /// + /// + /// + public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture) + { + return values.OfType().Any(b => b) ? Visibility.Visible : Visibility.Collapsed; + } + + public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture) + { + throw new NotImplementedException(); + } + } +} diff --git a/Ginger/Ginger/Actions/ActionConversion/SelectActionWzardPage.xaml b/Ginger/Ginger/Actions/ActionConversion/SelectActionWzardPage.xaml index d5a56d058f..fc4db89ae2 100644 --- a/Ginger/Ginger/Actions/ActionConversion/SelectActionWzardPage.xaml +++ b/Ginger/Ginger/Actions/ActionConversion/SelectActionWzardPage.xaml @@ -10,7 +10,7 @@ d:DesignHeight="450" d:DesignWidth="700" Title="SelectActionWzardPage"> - + diff --git a/Ginger/Ginger/Actions/ActionConversion/SelectActivityWzardPage.xaml b/Ginger/Ginger/Actions/ActionConversion/SelectActivityWzardPage.xaml index 88ffe75d58..c7f746328c 100644 --- a/Ginger/Ginger/Actions/ActionConversion/SelectActivityWzardPage.xaml +++ b/Ginger/Ginger/Actions/ActionConversion/SelectActivityWzardPage.xaml @@ -10,7 +10,7 @@ d:DesignHeight="450" d:DesignWidth="700" Title="SelectActivityWzardPage"> - + diff --git a/Ginger/Ginger/Actions/ActionConversion/SelectBusinessFlowWzardPage.xaml b/Ginger/Ginger/Actions/ActionConversion/SelectBusinessFlowWzardPage.xaml index 452decc326..f1137297bc 100644 --- a/Ginger/Ginger/Actions/ActionConversion/SelectBusinessFlowWzardPage.xaml +++ b/Ginger/Ginger/Actions/ActionConversion/SelectBusinessFlowWzardPage.xaml @@ -10,7 +10,7 @@ d:DesignHeight="450" d:DesignWidth="700" Title="SelectBusinessFlowWzardPage"> - + diff --git a/Ginger/Ginger/Actions/ActionEditPage.xaml b/Ginger/Ginger/Actions/ActionEditPage.xaml index 4e070fa063..66bd11f0fc 100644 --- a/Ginger/Ginger/Actions/ActionEditPage.xaml +++ b/Ginger/Ginger/Actions/ActionEditPage.xaml @@ -14,7 +14,7 @@ d:DesignWidth="1000" d:DesignHeight="800"> - + - + @@ -211,7 +211,7 @@ - + @@ -220,7 +220,7 @@ - diff --git a/Ginger/Ginger/Actions/ActionEditPages/ActDemoPageEditPage.xaml b/Ginger/Ginger/Actions/ActionEditPages/ActDemoPageEditPage.xaml index 047f0fcd4a..4180f4606a 100644 --- a/Ginger/Ginger/Actions/ActionEditPages/ActDemoPageEditPage.xaml +++ b/Ginger/Ginger/Actions/ActionEditPages/ActDemoPageEditPage.xaml @@ -9,7 +9,7 @@ d:DesignHeight="650" d:DesignWidth="700" Title="Data Structure Example"> - + diff --git a/Ginger/Ginger/Actions/ActionEditPages/ActDescriptionPage.xaml b/Ginger/Ginger/Actions/ActionEditPages/ActDescriptionPage.xaml index 7a87cbe181..6605c1e855 100644 --- a/Ginger/Ginger/Actions/ActionEditPages/ActDescriptionPage.xaml +++ b/Ginger/Ginger/Actions/ActionEditPages/ActDescriptionPage.xaml @@ -11,13 +11,13 @@ - + - + - @@ -57,10 +57,10 @@ - - - - + + + + @@ -71,7 +71,7 @@ - + @@ -80,7 +80,7 @@ - + diff --git a/Ginger/Ginger/Actions/ActionEditPages/ActUIElementLib/ActUIElementEditPage.xaml b/Ginger/Ginger/Actions/ActionEditPages/ActUIElementLib/ActUIElementEditPage.xaml index 5865c3dfe8..ce7a7cfbd0 100644 --- a/Ginger/Ginger/Actions/ActionEditPages/ActUIElementLib/ActUIElementEditPage.xaml +++ b/Ginger/Ginger/Actions/ActionEditPages/ActUIElementLib/ActUIElementEditPage.xaml @@ -7,7 +7,7 @@ mc:Ignorable="d" d:DesignHeight="500" d:DesignWidth="800" Title="ActUIElementEditPage"> - + diff --git a/Ginger/Ginger/Actions/ActionEditPages/ActUIElementLib/Locators/LocateByPOMElementPage.xaml b/Ginger/Ginger/Actions/ActionEditPages/ActUIElementLib/Locators/LocateByPOMElementPage.xaml index 10529c523d..7e617fbaa8 100644 --- a/Ginger/Ginger/Actions/ActionEditPages/ActUIElementLib/Locators/LocateByPOMElementPage.xaml +++ b/Ginger/Ginger/Actions/ActionEditPages/ActUIElementLib/Locators/LocateByPOMElementPage.xaml @@ -10,7 +10,7 @@ d:DesignHeight="30" d:DesignWidth="1035" Title="LocateByPOMElementPage"> - + diff --git a/Ginger/Ginger/Actions/ActionEditPages/ActUIElementLib/UIElementDragAndDropEditPage.xaml b/Ginger/Ginger/Actions/ActionEditPages/ActUIElementLib/UIElementDragAndDropEditPage.xaml index 74d6021e27..a8a19ab55b 100644 --- a/Ginger/Ginger/Actions/ActionEditPages/ActUIElementLib/UIElementDragAndDropEditPage.xaml +++ b/Ginger/Ginger/Actions/ActionEditPages/ActUIElementLib/UIElementDragAndDropEditPage.xaml @@ -23,13 +23,13 @@ - - + diff --git a/Ginger/Ginger/Actions/ActionEditPages/ActUIElementLib/UIElementJavaPlatformPage.xaml b/Ginger/Ginger/Actions/ActionEditPages/ActUIElementLib/UIElementJavaPlatformPage.xaml index b2b41ca9a1..04b49f000e 100644 --- a/Ginger/Ginger/Actions/ActionEditPages/ActUIElementLib/UIElementJavaPlatformPage.xaml +++ b/Ginger/Ginger/Actions/ActionEditPages/ActUIElementLib/UIElementJavaPlatformPage.xaml @@ -14,7 +14,7 @@ - diff --git a/Ginger/Ginger/Actions/ActionEditPages/ActUIElementLib/UIElementSelectAndValidate.xaml b/Ginger/Ginger/Actions/ActionEditPages/ActUIElementLib/UIElementSelectAndValidate.xaml index 28e8c8127b..ac2f2a5a0b 100644 --- a/Ginger/Ginger/Actions/ActionEditPages/ActUIElementLib/UIElementSelectAndValidate.xaml +++ b/Ginger/Ginger/Actions/ActionEditPages/ActUIElementLib/UIElementSelectAndValidate.xaml @@ -22,7 +22,7 @@ - + @@ -35,7 +35,7 @@ - + diff --git a/Ginger/Ginger/Actions/ActionEditPages/ActUIElementLib/UIElementSendKeysAndValidate.xaml b/Ginger/Ginger/Actions/ActionEditPages/ActUIElementLib/UIElementSendKeysAndValidate.xaml index d5993d031f..0b12d1bdff 100644 --- a/Ginger/Ginger/Actions/ActionEditPages/ActUIElementLib/UIElementSendKeysAndValidate.xaml +++ b/Ginger/Ginger/Actions/ActionEditPages/ActUIElementLib/UIElementSendKeysAndValidate.xaml @@ -22,7 +22,7 @@ - + @@ -35,7 +35,7 @@ - + diff --git a/Ginger/Ginger/Actions/ActionEditPages/ActUIElementLib/UIElementTableConfigPage.xaml b/Ginger/Ginger/Actions/ActionEditPages/ActUIElementLib/UIElementTableConfigPage.xaml index db41843f10..e97a1f55ed 100644 --- a/Ginger/Ginger/Actions/ActionEditPages/ActUIElementLib/UIElementTableConfigPage.xaml +++ b/Ginger/Ginger/Actions/ActionEditPages/ActUIElementLib/UIElementTableConfigPage.xaml @@ -9,7 +9,7 @@ d:DesignHeight="430" d:DesignWidth="820" Title="TableActionConfigPage"> - + @@ -40,17 +40,17 @@ + Background="{StaticResource $BackgroundColor_White}" VerticalAlignment="Center" Grid.Row="0" Grid.Column="0">Sub-element Type + Background="{StaticResource $BackgroundColor_White}" VerticalAlignment="Center" Grid.Row="1" Grid.Column="0">Sub Element Action -