diff --git a/src/DynamoCoreWpf/DynamoCoreWpf.csproj b/src/DynamoCoreWpf/DynamoCoreWpf.csproj index bbc6f532ef3..6991abf7249 100644 --- a/src/DynamoCoreWpf/DynamoCoreWpf.csproj +++ b/src/DynamoCoreWpf/DynamoCoreWpf.csproj @@ -504,9 +504,7 @@ - - @@ -726,10 +724,6 @@ Designer MSBuild:Compile - - Designer - MSBuild:Compile - Designer MSBuild:Compile @@ -754,10 +748,6 @@ MSBuild:Compile Designer - - Designer - MSBuild:Compile - Designer MSBuild:Compile @@ -1852,12 +1842,6 @@ MSBuild:Compile - - MSBuild:Compile - - - MSBuild:Compile - MSBuild:Compile diff --git a/src/DynamoCoreWpf/PublicAPI.Unshipped.txt b/src/DynamoCoreWpf/PublicAPI.Unshipped.txt index cce80ee963f..3416ded0706 100644 --- a/src/DynamoCoreWpf/PublicAPI.Unshipped.txt +++ b/src/DynamoCoreWpf/PublicAPI.Unshipped.txt @@ -1245,8 +1245,6 @@ Dynamo.PackageManager.UI.PackageManagerView.InitializeComponent() -> void Dynamo.PackageManager.UI.PackageManagerView.PackageManagerView(Dynamo.Controls.DynamoView dynamoView, Dynamo.PackageManager.PackageManagerViewModel packageManagerViewModel) -> void Dynamo.PackageManager.UI.PackageManagerView.PackageManagerViewModel.get -> Dynamo.PackageManager.PackageManagerViewModel Dynamo.PackageManager.UI.PackageManagerView.PackageManagerViewModel.set -> void -Dynamo.PackageManager.UI.PackageManagerWizardControl -Dynamo.PackageManager.UI.PackageManagerWizardControl.PackageManagerWizardControl() -> void Dynamo.PackageManager.UI.PackageNameLengthValidationRule Dynamo.PackageManager.UI.PackageNameLengthValidationRule.PackageNameLengthValidationRule() -> void Dynamo.PackageManager.UI.PublishPackagePreviewPage @@ -1279,18 +1277,6 @@ Dynamo.PackageManager.UI.SortingConverter Dynamo.PackageManager.UI.SortingConverter.Convert(object value, System.Type targetType, object parameter, System.Globalization.CultureInfo culture) -> object Dynamo.PackageManager.UI.SortingConverter.ConvertBack(object value, System.Type targetType, object parameter, System.Globalization.CultureInfo culture) -> object Dynamo.PackageManager.UI.SortingConverter.SortingConverter() -> void -Dynamo.PackageManager.UI.StepIndicatorControl -Dynamo.PackageManager.UI.StepIndicatorControl.State.get -> Dynamo.PackageManager.UI.StepIndicatorControl.StepState -Dynamo.PackageManager.UI.StepIndicatorControl.State.set -> void -Dynamo.PackageManager.UI.StepIndicatorControl.StepIndicatorControl() -> void -Dynamo.PackageManager.UI.StepIndicatorControl.StepNumber.get -> string -Dynamo.PackageManager.UI.StepIndicatorControl.StepNumber.set -> void -Dynamo.PackageManager.UI.StepIndicatorControl.StepState -Dynamo.PackageManager.UI.StepIndicatorControl.StepState.Active = 1 -> Dynamo.PackageManager.UI.StepIndicatorControl.StepState -Dynamo.PackageManager.UI.StepIndicatorControl.StepState.Inactive = 0 -> Dynamo.PackageManager.UI.StepIndicatorControl.StepState -Dynamo.PackageManager.UI.StepIndicatorControl.StepState.Ok = 2 -> Dynamo.PackageManager.UI.StepIndicatorControl.StepState -Dynamo.PackageManager.UI.StepIndicatorControl.Title.get -> string -Dynamo.PackageManager.UI.StepIndicatorControl.Title.set -> void Dynamo.PackageManager.UI.TermsOfUseView Dynamo.PackageManager.UI.TermsOfUseView.AcceptedTermsOfUse.get -> bool Dynamo.PackageManager.UI.TermsOfUseView.InitializeComponent() -> void @@ -5608,9 +5594,6 @@ static readonly Dynamo.PackageManager.UI.NumericUpDownControl.ValueProperty -> S static readonly Dynamo.PackageManager.UI.NumericUpDownControl.WatermarkProperty -> System.Windows.DependencyProperty static readonly Dynamo.PackageManager.UI.PackageManagerPackagesControl.SearchItemsProperty -> System.Windows.DependencyProperty static readonly Dynamo.PackageManager.UI.PackageManagerPackagesControl.SelectedItemProperty -> System.Windows.DependencyProperty -static readonly Dynamo.PackageManager.UI.StepIndicatorControl.StateProperty -> System.Windows.DependencyProperty -static readonly Dynamo.PackageManager.UI.StepIndicatorControl.StepNumberProperty -> System.Windows.DependencyProperty -static readonly Dynamo.PackageManager.UI.StepIndicatorControl.TitleProperty -> System.Windows.DependencyProperty static readonly Dynamo.PackageManager.UI.TreeViewItemHelper.IndentProperty -> System.Windows.DependencyProperty static readonly Dynamo.UI.Controls.CodeCompletionEditor.CodeProperty -> System.Windows.DependencyProperty static readonly Dynamo.UI.Controls.DynamoToolTip.AttachmentSideProperty -> System.Windows.DependencyProperty diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerWizardControl.xaml b/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerWizardControl.xaml deleted file mode 100644 index ed4d2ee988c..00000000000 --- a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerWizardControl.xaml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerWizardControl.xaml.cs b/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerWizardControl.xaml.cs deleted file mode 100644 index 2159ceb7761..00000000000 --- a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerWizardControl.xaml.cs +++ /dev/null @@ -1,72 +0,0 @@ -using System.Windows; -using System.Windows.Controls; -using System.Windows.Input; - -namespace Dynamo.PackageManager.UI -{ - /// - /// Interaction logic for PackageManagerWizardControl.xaml - /// - public partial class PackageManagerWizardControl : UserControl - { - private int currentStep; - - public PackageManagerWizardControl() - { - InitializeComponent(); - currentStep = 1; - } - - private void StepIndicatorControl_MouseDoubleClick(object sender, MouseButtonEventArgs e) - { - var indicator = sender as StepIndicatorControl; - if (indicator != null) - { - int step; - if (int.TryParse(indicator.StepNumber, out step)) - { - currentStep = step; - UpdateSteps(); - } - } - } - - private void UpdateSteps() - { - UpdateStepStateRecursive(this); - } - - private void UpdateStepStateRecursive(DependencyObject parent) - { - if (parent == null) - return; - - foreach (object child in LogicalTreeHelper.GetChildren(parent)) - { - if (child is StepIndicatorControl indicator) - { - int step; - if (int.TryParse(indicator.StepNumber, out step)) - { - if (step < currentStep) - { - indicator.State = StepIndicatorControl.StepState.Ok; - } - else if (step == currentStep) - { - indicator.State = StepIndicatorControl.StepState.Active; - } - else - { - indicator.State = StepIndicatorControl.StepState.Inactive; - } - } - } - else if (child is DependencyObject dependencyChild) - { - UpdateStepStateRecursive(dependencyChild); - } - } - } - } -} diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/StepIndicatorControl.xaml b/src/DynamoCoreWpf/Views/PackageManager/Controls/StepIndicatorControl.xaml deleted file mode 100644 index 0bbf9a59597..00000000000 --- a/src/DynamoCoreWpf/Views/PackageManager/Controls/StepIndicatorControl.xaml +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/StepIndicatorControl.xaml.cs b/src/DynamoCoreWpf/Views/PackageManager/Controls/StepIndicatorControl.xaml.cs deleted file mode 100644 index bd579cb3767..00000000000 --- a/src/DynamoCoreWpf/Views/PackageManager/Controls/StepIndicatorControl.xaml.cs +++ /dev/null @@ -1,155 +0,0 @@ -using System.Windows; -using System.Windows.Controls; -using System.Windows.Input; -using System.Windows.Media; -using Dynamo.UI; - -namespace Dynamo.PackageManager.UI -{ - /// - /// Interaction logic for StepIndicatorControl.xaml - /// - public partial class StepIndicatorControl : UserControl - { - private StepState _previousState; - private bool _clickedDuringMouseOver; - - public StepIndicatorControl() - { - InitializeComponent(); - this.UpdateVisualState(State); - this._clickedDuringMouseOver = false; - } - - /// - /// Title Dependency Property - /// - public static readonly DependencyProperty TitleProperty = - DependencyProperty.Register("Title", typeof(string), typeof(StepIndicatorControl), new PropertyMetadata("Step")); - - /// - /// Title property displayed on top of the step number - /// - public string Title - { - get { return (string)GetValue(TitleProperty); } - set { SetValue(TitleProperty, value); } - } - - /// - /// Step Number Dependency Property - /// - public static readonly DependencyProperty StepNumberProperty = - DependencyProperty.Register("StepNumber", typeof(string), typeof(StepIndicatorControl), - new PropertyMetadata("1", OnStepNumberChanged)); - - /// - /// Step Number property showing the number - /// - public string StepNumber - { - get { return (string)GetValue(StepNumberProperty); } - set { SetValue(StepNumberProperty, value); } - } - - private static void OnStepNumberChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) - { - var control = (StepIndicatorControl)d; - control.StepNumberText.Text = (string)e.NewValue; - } - - /// - /// Enum with the possible control states - /// - public enum StepState - { - Inactive, - Active, - Ok - } - - /// - /// Step State Dependency Property - /// - public static readonly DependencyProperty StateProperty = - DependencyProperty.Register("State", typeof(StepState), typeof(StepIndicatorControl), - new PropertyMetadata(StepState.Inactive, OnStateChanged)); - - /// - /// State Property accounting for the current state of the control - /// - public StepState State - { - get { return (StepState)GetValue(StateProperty); } - set { SetValue(StateProperty, value); } - } - - private static void OnStateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) - { - var control = (StepIndicatorControl)d; - var state = (StepState)e.NewValue; - control.UpdateVisualState(state); - } - - private void Ellipse_MouseEnter(object sender, MouseEventArgs e) - { - _previousState = State; // Save the current state - VisualStateManager.GoToState(this, "MouseOver", true); - } - - private void Ellipse_MouseLeave(object sender, MouseEventArgs e) - { - if (!_clickedDuringMouseOver) - { - UpdateVisualState(_previousState); - } - _clickedDuringMouseOver = false; - } - - private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) - { - _clickedDuringMouseOver = true; - - if (State == StepState.Inactive) - { - State = StepState.Active; // Change to Active on click - } - else if (State == StepState.Active) - { - State = StepState.Ok; // Change to Ok on click - } - - UpdateVisualState(State); // Update to the new state immediately - } - - private void UpdateVisualState(StepState state) - { - switch (state) - { - case StepState.Active: - StepNumberText.Foreground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#38abdf")); - StepNumberText.Visibility = Visibility.Visible; - OkIcon.Visibility = Visibility.Collapsed; - StepTitle.FontFamily = SharedDictionaryManager.DynamoModernDictionary["ArtifaktElementBold"] as FontFamily; - break; - - case StepState.Inactive: - StepNumberText.Foreground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#979797")); - StepNumberText.Visibility = Visibility.Visible; - OkIcon.Visibility = Visibility.Collapsed; - StepTitle.FontFamily = SharedDictionaryManager.DynamoModernDictionary["ArtifaktElementRegular"] as FontFamily; - break; - - case StepState.Ok: - StepNumberText.Visibility = Visibility.Collapsed; - OkIcon.Visibility = Visibility.Visible; - StepTitle.FontFamily = SharedDictionaryManager.DynamoModernDictionary["ArtifaktElementRegular"] as FontFamily; - break; - - } - - var stateName = state.ToString(); - VisualStateManager.GoToState(this, stateName, true); - } - } -}